diff --git a/global/cust/custjs/src/main/js/default/i18n/en-US.json b/global/cust/custjs/src/main/js/default/i18n/en-US.json index e63c70d978a3a53be988388c87182f81785e170c..136dc546ee59704b87b0a301c0e6df21b0cc8350 100755 --- a/global/cust/custjs/src/main/js/default/i18n/en-US.json +++ b/global/cust/custjs/src/main/js/default/i18n/en-US.json @@ -1,6 +1,6 @@ { "strings": { - "hello": "Hello", - "world": "World" + "hello": "Global", + "world": "System" } } \ No newline at end of file diff --git a/global/cust/custjs/src/main/js/default/i18n/zh-CN.json b/global/cust/custjs/src/main/js/default/i18n/zh-CN.json index de6ee5748322f44942c1b003319d8e66c837675f..43f49ec631aadd96361fc79cab84a05fbfa866fe 100755 --- a/global/cust/custjs/src/main/js/default/i18n/zh-CN.json +++ b/global/cust/custjs/src/main/js/default/i18n/zh-CN.json @@ -1,6 +1,6 @@ { "strings": { - "hello": "您好", - "world": "世界" + "hello": "全球化", + "world": "子系统" } } \ No newline at end of file diff --git a/global/cust/custjs/src/main/js/default/test/Cust.test.js b/global/cust/custjs/src/main/js/default/test/Cust.test.js index 8a2f9496eeff037608343bdebbc714d72c5aa262..0ebd311ff5509887697b579d0c1dcd04e7d6b64e 100755 --- a/global/cust/custjs/src/main/js/default/test/Cust.test.js +++ b/global/cust/custjs/src/main/js/default/test/Cust.test.js @@ -49,7 +49,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_001 - * @tc.name test getCfgFiles method in callback mode + * @tc.name test getCfgFiles method in callback mode with not exist param * @tc.desc get getCfgFiles in callback mode */ it('getCfgFiles_test_001', 0, async function (done) { @@ -63,7 +63,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_002 - * @tc.name test getCfgFiles method in callback mode + * @tc.name test getCfgFiles method in callback mode with low priority param * @tc.desc get getCfgFiles in callback mode */ it('getCfgFiles_test_002', 0, async function (done) { @@ -77,7 +77,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_003 - * @tc.name test getCfgFiles method in callback mode + * @tc.name test getCfgFiles method in callback mode both exist param * @tc.desc get getCfgFiles in callback mode */ it('getCfgFiles_test_003', 0, async function (done) { @@ -91,7 +91,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_004 - * @tc.name test getCfgFiles method in callback mode + * @tc.name test getCfgFiles method in callback mode with high priority param * @tc.desc get getCfgFiles in callback mode */ it('getCfgFiles_test_004', 0, async function (done) { @@ -105,7 +105,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_005 - * @tc.name test getCfgFiles method in promise mode + * @tc.name test getCfgFiles method in promise mode with not exist param * @tc.desc get getCfgFiles in promise mode */ it('getCfgFiles_test_005', 0, async function (done) { @@ -119,7 +119,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_006 - * @tc.name test getCfgFiles method in promise mode + * @tc.name test getCfgFiles method in promise mode with low priority param * @tc.desc get getCfgFiles in promise mode */ it('getCfgFiles_test_006', 0, async function (done) { @@ -133,7 +133,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_007 - * @tc.name test getCfgFiles method in promise mode + * @tc.name test getCfgFiles method in promise mode with both exist param * @tc.desc get getCfgFiles in promise mode */ it('getCfgFiles_test_007', 0, async function (done) { @@ -147,7 +147,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETFILES_JS_008 - * @tc.name test getCfgFiles method in promise mode + * @tc.name test getCfgFiles method in promise mode with high priority param * @tc.desc get getCfgFiles in promise mode */ it('getCfgFiles_test_008', 0, async function (done) { @@ -161,7 +161,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_001 - * @tc.name test getOneCfgFile method in callback mode + * @tc.name test getOneCfgFile method in callback mode with not exist param * @tc.desc get getOneCfgFile in callback mode */ it('getOneCfgFile_test_001', 0, async function (done) { @@ -175,7 +175,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_002 - * @tc.name test getOneCfgFile method in callback mode + * @tc.name test getOneCfgFile method in callback mode with low priority param * @tc.desc get getOneCfgFile in callback mode */ it('getOneCfgFile_test_002', 0, async function (done) { @@ -189,7 +189,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_003 - * @tc.name test getOneCfgFile method in callback mode + * @tc.name test getOneCfgFile method in callback mode with both exist param * @tc.desc get getOneCfgFile in callback mode */ it('getOneCfgFile_test_003', 0, async function (done) { @@ -203,7 +203,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_004 - * @tc.name test getOneCfgFile method in callback mode + * @tc.name test getOneCfgFile method in callback mode with high priority param * @tc.desc get getOneCfgFile in callback mode */ it('getOneCfgFile_test_004', 0, async function (done) { @@ -217,7 +217,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_005 - * @tc.name test getOneCfgFile method in promise mode + * @tc.name test getOneCfgFile method in promise mode with not exist param * @tc.desc get getOneCfgFile in promise mode */ it('getOneCfgFile_test_005', 0, async function (done) { @@ -231,7 +231,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_006 - * @tc.name test getOneCfgFile method in promise mode + * @tc.name test getOneCfgFile method in promise mode with low priority param * @tc.desc get getOneCfgFile in promise mode */ it('getOneCfgFile_test_006', 0, async function (done) { @@ -246,8 +246,8 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_007 - * @tc.name test getOneCfgFile method in promise mode - * @tc.desc get getOneCfgFile in promise mode + * @tc.name test getOneCfgFile method in promise mode with both exist param + * @tc.desc get getOneCfgFile in promise mode and return the high priority file */ it('getOneCfgFile_test_007', 0, async function (done) { @@ -261,7 +261,7 @@ describe('CustTest', function () { /* * * @tc.number SUB_GLOBAL_CUST_GETONEFILE_JS_008 - * @tc.name test getOneCfgFile method in promise mode + * @tc.name test getOneCfgFile method in promise mode with high priority param * @tc.desc get getOneCfgFile in promise mode */ it('getOneCfgFile_test_008', 0, async function (done) { diff --git a/global/i18n_standard/intljs/src/main/js/default/i18n/en-US.json b/global/i18n_standard/intljs/src/main/js/default/i18n/en-US.json index 55561b83737c3c31d082fbfa11e5fc987a351104..9ad335eebfd3e52e467b818e783e21574d79a75c 100755 --- a/global/i18n_standard/intljs/src/main/js/default/i18n/en-US.json +++ b/global/i18n_standard/intljs/src/main/js/default/i18n/en-US.json @@ -1,7 +1,7 @@ { "strings": { - "hello": "Hello", - "world": "World" + "hello": "Global", + "world": "System" }, "Files": { } diff --git a/global/i18n_standard/intljs/src/main/js/default/i18n/zh-CN.json b/global/i18n_standard/intljs/src/main/js/default/i18n/zh-CN.json index cce1af06761a42add0cac1a0567aa3237eda8cb4..acf85bdacc05c91775bf8263bbbc26a08acbbfb8 100755 --- a/global/i18n_standard/intljs/src/main/js/default/i18n/zh-CN.json +++ b/global/i18n_standard/intljs/src/main/js/default/i18n/zh-CN.json @@ -1,7 +1,7 @@ { "strings": { - "hello": "您好", - "world": "世界" + "hello": "全球化", + "world": "子系统" }, "Files": { } diff --git a/global/i18n_standard/intljs/src/main/js/default/test/Lang.test.js b/global/i18n_standard/intljs/src/main/js/default/test/Lang.test.js index 6efb3800e5f5dc23a1a0e725d628c6a8a1e571aa..c6188d0fc2902744e12c48494e3cdb14a36771b5 100755 --- a/global/i18n_standard/intljs/src/main/js/default/test/Lang.test.js +++ b/global/i18n_standard/intljs/src/main/js/default/test/Lang.test.js @@ -22,11 +22,17 @@ describe('LangTest', function () { let initPreferredLang = I18n.getPreferredLanguageList(); let initLen = initPreferredLang.length; + /* * + * get the current preferred language list + */ function getCurrentPreferredLang(){ let value = I18n.getPreferredLanguageList(); return value; } + /* * + * judge if the lang is in the preferred language list or not + */ function isContainLang(langList, lang){ let len = langList.length; for (let i = 0; i < len; i++){ @@ -37,6 +43,9 @@ describe('LangTest', function () { return false } + /* * + * clear the preferred language list if exists + */ function clearLang(langList){ let len = langList.length; while(len > 0){ @@ -50,6 +59,9 @@ describe('LangTest', function () { console.log('i18n_test_preferredlanguage_clearLang ' + I18n.getPreferredLanguageList()); } + /* * + * execute this step after every testcase + */ function restoreLang(){ for(let j = 0; j < initLen; j++){ let value = I18n.addPreferredLanguage(initPreferredLang[j], j); @@ -65,10 +77,16 @@ describe('LangTest', function () { console.log('i18n_test_preferredlanguage_restoreLang ' + I18n.getPreferredLanguageList()); } + /* * + * execute this step before every testcase + */ beforeEach(function(){ console.log('i18n_test_preferredlanguage_beforeEach ' + getCurrentPreferredLang()); }) + /* * + * execute this step after every testcase + */ afterEach(function(){ let currLang = getCurrentPreferredLang(); console.log('i18n_test_preferredlanguage_afterEach ' + currLang); @@ -91,7 +109,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_CLOCK_0200 - * @tc.name test the set24HourClock interface with false param + * @tc.name test the set24HourClock interface with true param * @tc.desc check the value of set24HourClock method */ it('i18n_test_clock_0200', 0, function () { @@ -106,7 +124,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_CLOCK_0300 - * @tc.name test the set24HourClock interface with true param + * @tc.name test the set24HourClock interface with false param * @tc.desc check the value of set24HourClock method */ it('i18n_test_clock_0300', 0, function () { @@ -138,7 +156,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0100 - * @tc.name test the getPreferredLanguageList interface + * @tc.name test the getPreferredLanguageList interface with default value * @tc.desc check the value of getPreferredLanguageList method */ it('i18n_test_preferredlanguage_0100', 0, function () { @@ -225,7 +243,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0400 - * @tc.name test the addPreferredLanguage interface + * @tc.name test the addPreferredLanguage interface with en and index 1 param * @tc.desc check the value of addPreferredLanguage method */ it('i18n_test_preferredlanguage_0400', 0, function () { @@ -240,7 +258,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0500 - * @tc.name test the addPreferredLanguage interface + * @tc.name test the addPreferredLanguage interface with ja and index -1 param * @tc.desc check the value of addPreferredLanguage method */ it('i18n_test_preferredlanguage_0500', 0, function () { @@ -255,7 +273,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0600 - * @tc.name test the addPreferredLanguage interface + * @tc.name test the addPreferredLanguage interface with ko and index 100 param * @tc.desc check the value of addPreferredLanguage method */ it('i18n_test_preferredlanguage_0600', 0, function () { @@ -270,8 +288,8 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0700 - * @tc.name test the addPreferredLanguage interface - * @tc.desc check the value of addPreferredLanguage method + * @tc.name test the removePreferredLanguage interface with 0 param + * @tc.desc check the value of removePreferredLanguage method */ it('i18n_test_preferredlanguage_0700', 0, function () { console.log('i18n_test_preferredlanguage_0700 ' + 'start'); @@ -300,8 +318,8 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0800 - * @tc.name test the addPreferredLanguage interface - * @tc.desc check the value of addPreferredLanguage method + * @tc.name test the removePreferredLanguage interface with -1 param + * @tc.desc check the value of removePreferredLanguage method */ it('i18n_test_preferredlanguage_0800', 0, function () { console.log('i18n_test_preferredlanguage_0800 ' + 'start'); @@ -315,7 +333,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0820 - * @tc.name test the removePreferredLanguage interface with -1 param + * @tc.name test the removePreferredLanguage interface with -1 param after add ja * @tc.desc check the value of removePreferredLanguage method */ it('i18n_test_preferredlanguage_0820', 0, function () { @@ -333,8 +351,8 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0900 - * @tc.name test the addPreferredLanguage interface - * @tc.desc check the value of addPreferredLanguage method + * @tc.name test the removePreferredLanguage interface with 0 param + * @tc.desc check the value of removePreferredLanguage method */ it('i18n_test_preferredlanguage_0900', 0, function () { console.log('i18n_test_preferredlanguage_0900 ' + 'start'); @@ -352,7 +370,7 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0920 - * @tc.name test the addPreferredLanguage interface + * @tc.name test the addPreferredLanguage interface with it param * @tc.desc check the value of addPreferredLanguage method */ it('i18n_test_preferredlanguage_0920', 0, function () { @@ -375,8 +393,8 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_0940 - * @tc.name test the addPreferredLanguage interface - * @tc.desc check the value of addPreferredLanguage method + * @tc.name test the mixed interface with preferredlanguage + * @tc.desc check the value of preferredLanguage method */ it('i18n_test_preferredlanguage_0940', 0, function () { let value = I18n.addPreferredLanguage('it'); @@ -421,8 +439,8 @@ describe('LangTest', function () { /* * * @tc.number SUB_GLOBAL_I18N_JS_PREFERREDLANGUAGE_1000 - * @tc.name test the addPreferredLanguage interface - * @tc.desc check the value of addPreferredLanguage method + * @tc.name test the getFirstPreferredLanguage interface + * @tc.desc check the value of getFirstPreferredLanguage method */ it('i18n_test_preferredlanguage_1000', 0, function () { console.log('i18n_test_preferredlanguage_1000 ' + 'start'); diff --git a/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/en-US.json b/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/en-US.json index e63c70d978a3a53be988388c87182f81785e170c..136dc546ee59704b87b0a301c0e6df21b0cc8350 100755 --- a/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/en-US.json +++ b/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/en-US.json @@ -1,6 +1,6 @@ { "strings": { - "hello": "Hello", - "world": "World" + "hello": "Global", + "world": "System" } } \ No newline at end of file diff --git a/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/zh-CN.json b/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/zh-CN.json index de6ee5748322f44942c1b003319d8e66c837675f..43f49ec631aadd96361fc79cab84a05fbfa866fe 100755 --- a/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/zh-CN.json +++ b/global/resmgr_standard/resmgrjs/src/main/js/default/i18n/zh-CN.json @@ -1,6 +1,6 @@ { "strings": { - "hello": "您好", - "world": "世界" + "hello": "全球化", + "world": "子系统" } } \ No newline at end of file diff --git a/global/resmgr_standard/resmgrjs/src/main/js/default/test/Resmgr.test.js b/global/resmgr_standard/resmgrjs/src/main/js/default/test/Resmgr.test.js index d0af514b4fb9a3ea741121ce1950d794dff43467..ceef4e8f5c391f6f8c30e3be70da87c9a6659569 100755 --- a/global/resmgr_standard/resmgrjs/src/main/js/default/test/Resmgr.test.js +++ b/global/resmgr_standard/resmgrjs/src/main/js/default/test/Resmgr.test.js @@ -326,5 +326,20 @@ describe('resMgrTest', function () { done(); }) + /* * + * @tc.number SUB_GLOBAL_RESMGR_JS_1900 + * @tc.name test release method + * @tc.desc get the release function + */ + it('release_test_001', 0, async function (done) { + resmgr.getResourceManager((error, mgr) => { + mgr.getString(0x1000000, (err, value) => { + expect(value !== null).assertTrue(); + }) + mgr.release(); + }) + done(); + }) + console.log('*************end ResmgrTest*************'); }) \ No newline at end of file diff --git a/global/resmgr_standard/resmgrjs/src/main/resources/rawfile/rawfiletest.xml b/global/resmgr_standard/resmgrjs/src/main/resources/rawfile/rawfiletest.xml new file mode 100755 index 0000000000000000000000000000000000000000..720980eb5c2227bf16274bdcbf47979e44c3c1cb --- /dev/null +++ b/global/resmgr_standard/resmgrjs/src/main/resources/rawfile/rawfiletest.xml @@ -0,0 +1,8 @@ + + + maven-default-http-blocker + external:http:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + true +