From ca6a7566d9780e78bacb8832838f52809074532a Mon Sep 17 00:00:00 2001 From: lifansheng Date: Mon, 27 Sep 2021 16:55:19 +0800 Subject: [PATCH] Signed-off-by: lifansheng On branch master Your branch is up to date with 'origin/master'. Changes to be committed: modified: compileruntime/BUILD.gn modified: compileruntime/process_lib_standard/BUILD.gn modified: compileruntime/process_lib_standard/Test.json deleted: compileruntime/process_lib_standard/project/entry/package.json new file: compileruntime/process_lib_standard/signature/openharmony_sx.p7b renamed: compileruntime/util_lib_standard/project/entry/src/main/config.json -> compileruntime/process_lib_standard/src/main/config.json renamed: compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java -> compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MainAbility.java renamed: compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java -> compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MyApplication.java renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js -> compileruntime/process_lib_standard/src/main/js/default/app.js renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/en-US.json -> compileruntime/process_lib_standard/src/main/js/default/i18n/en-US.json renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json -> compileruntime/process_lib_standard/src/main/js/default/i18n/zh-CN.json renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.css -> compileruntime/process_lib_standard/src/main/js/default/pages/index/index.css renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.hml -> compileruntime/process_lib_standard/src/main/js/default/pages/index/index.hml renamed: compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.js -> compileruntime/process_lib_standard/src/main/js/default/pages/index/index.js renamed: compileruntime/process_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js -> compileruntime/process_lib_standard/src/main/js/test/ExampleJsunit.test.js renamed: compileruntime/process_lib_standard/project/entry/src/main/js/test/List.test.js -> compileruntime/process_lib_standard/src/main/js/test/List.test.js renamed: compileruntime/process_lib_standard/project/entry/src/main/js/test/Process.test.js -> compileruntime/process_lib_standard/src/main/js/test/Process.test.js renamed: compileruntime/process_lib_standard/project/entry/src/main/resources/base/element/string.json -> compileruntime/process_lib_standard/src/main/resources/base/element/string.json renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js -> compileruntime/process_lib_standard/src/ohosTest/js/default/app.js renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json -> compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/en-US.json renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json -> compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css -> compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.css renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml -> compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.hml renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js -> compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.js renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js -> compileruntime/process_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/List.test.js -> compileruntime/process_lib_standard/src/ohosTest/js/test/List.test.js renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json -> compileruntime/process_lib_standard/src/ohosTest/resources/base/element/string.json modified: compileruntime/url_lib_standard/BUILD.gn modified: compileruntime/url_lib_standard/Test.json deleted: compileruntime/url_lib_standard/project/entry/package.json new file: compileruntime/url_lib_standard/signature/openharmony_sx.p7b renamed: compileruntime/url_lib_standard/project/entry/src/main/config.json -> compileruntime/url_lib_standard/src/main/config.json renamed: compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java -> compileruntime/url_lib_standard/src/main/java/com/example/url/MainAbility.java renamed: compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java -> compileruntime/url_lib_standard/src/main/java/com/example/url/MyApplication.java renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js -> compileruntime/url_lib_standard/src/main/js/default/app.js renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png -> compileruntime/url_lib_standard/src/main/js/default/common/images/Wallpaper.png renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg -> compileruntime/url_lib_standard/src/main/js/default/common/images/bg-tv.jpg renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/en-US.json -> compileruntime/url_lib_standard/src/main/js/default/i18n/en-US.json renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json -> compileruntime/url_lib_standard/src/main/js/default/i18n/zh-CN.json renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.css -> compileruntime/url_lib_standard/src/main/js/default/pages/index/index.css renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.hml -> compileruntime/url_lib_standard/src/main/js/default/pages/index/index.hml renamed: compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.js -> compileruntime/url_lib_standard/src/main/js/default/pages/index/index.js renamed: compileruntime/url_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js -> compileruntime/url_lib_standard/src/main/js/test/ExampleJsunit.test.js renamed: compileruntime/url_lib_standard/project/entry/src/main/js/test/List.test.js -> compileruntime/url_lib_standard/src/main/js/test/List.test.js renamed: compileruntime/url_lib_standard/project/entry/src/main/js/test/url.test.js -> compileruntime/url_lib_standard/src/main/js/test/url.test.js renamed: compileruntime/util_lib_standard/project/entry/src/main/resources/base/element/string.json -> compileruntime/url_lib_standard/src/main/resources/base/element/string.json renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js -> compileruntime/url_lib_standard/src/ohosTest/js/default/app.js renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json -> compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/en-US.json renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json -> compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css -> compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.css renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml -> compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.hml renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js -> compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.js renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js -> compileruntime/url_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/List.test.js -> compileruntime/url_lib_standard/src/ohosTest/js/test/List.test.js renamed: compileruntime/url_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json -> compileruntime/url_lib_standard/src/ohosTest/resources/base/element/string.json modified: compileruntime/util_lib_standard/BUILD.gn modified: compileruntime/util_lib_standard/Test.json deleted: compileruntime/util_lib_standard/project/entry/package.json new file: compileruntime/util_lib_standard/signature/openharmony_sx.p7b renamed: compileruntime/process_lib_standard/project/entry/src/main/config.json -> compileruntime/util_lib_standard/src/main/config.json renamed: compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java -> compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MainAbility.java renamed: compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java -> compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MyApplication.java renamed: compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java -> compileruntime/util_lib_standard/src/main/java/com/example/url/MainAbility.java renamed: compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java -> compileruntime/util_lib_standard/src/main/java/com/example/url/MyApplication.java renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js -> compileruntime/util_lib_standard/src/main/js/default/app.js renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png -> compileruntime/util_lib_standard/src/main/js/default/common/images/Wallpaper.png renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg -> compileruntime/util_lib_standard/src/main/js/default/common/images/bg-tv.jpg renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/en-US.json -> compileruntime/util_lib_standard/src/main/js/default/i18n/en-US.json renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json -> compileruntime/util_lib_standard/src/main/js/default/i18n/zh-CN.json renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.css -> compileruntime/util_lib_standard/src/main/js/default/pages/index/index.css renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.hml -> compileruntime/util_lib_standard/src/main/js/default/pages/index/index.hml renamed: compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.js -> compileruntime/util_lib_standard/src/main/js/default/pages/index/index.js renamed: compileruntime/util_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js -> compileruntime/util_lib_standard/src/main/js/test/ExampleJsunit.test.js renamed: compileruntime/util_lib_standard/project/entry/src/main/js/test/List.test.js -> compileruntime/util_lib_standard/src/main/js/test/List.test.js renamed: compileruntime/util_lib_standard/project/entry/src/main/js/test/TextCodr.test.js -> compileruntime/util_lib_standard/src/main/js/test/TextCodr.test.js renamed: compileruntime/util_lib_standard/project/entry/src/main/js/test/url.test.js -> compileruntime/util_lib_standard/src/main/js/test/url.test.js renamed: compileruntime/url_lib_standard/project/entry/src/main/resources/base/element/string.json -> compileruntime/util_lib_standard/src/main/resources/base/element/string.json renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js -> compileruntime/util_lib_standard/src/ohosTest/js/default/app.js renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json -> compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/en-US.json renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json -> compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css -> compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.css renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml -> compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.hml renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js -> compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.js renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js -> compileruntime/util_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js renamed: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/List.test.js -> compileruntime/util_lib_standard/src/ohosTest/js/test/List.test.js renamed: compileruntime/util_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json -> compileruntime/util_lib_standard/src/ohosTest/resources/base/element/string.json modified: compileruntime/worker_lib_standard/BUILD.gn modified: compileruntime/worker_lib_standard/Test.json deleted: compileruntime/worker_lib_standard/hap/entry-debug-standard-unsigned.hap deleted: compileruntime/worker_lib_standard/project/entry/package.json new file: compileruntime/worker_lib_standard/signature/openharmony_sx.p7b renamed: compileruntime/worker_lib_standard/project/entry/src/main/config.json -> compileruntime/worker_lib_standard/src/main/config.json renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/app.js -> compileruntime/worker_lib_standard/src/main/js/default/app.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/en-US.json -> compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json -> compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.css -> compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.hml -> compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.js -> compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.css -> compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.css renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.hml -> compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.hml renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.js -> compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_002.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_003.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_004.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_005.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_006.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_007.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_008.js -> compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js -> compileruntime/worker_lib_standard/src/main/js/test/ExampleJsunit.test.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/test/List.test.js -> compileruntime/worker_lib_standard/src/main/js/test/List.test.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/js/test/Worker.test.js -> compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js renamed: compileruntime/worker_lib_standard/project/entry/src/main/resources/base/element/string.json -> compileruntime/worker_lib_standard/src/main/resources/base/element/string.json renamed: compileruntime/worker_lib_standard/project/entry/src/main/resources/base/media/icon.png -> compileruntime/worker_lib_standard/src/main/resources/base/media/icon.png --- compileruntime/BUILD.gn | 17 +- compileruntime/process_lib_standard/BUILD.gn | 26 +- compileruntime/process_lib_standard/Test.json | 2 +- .../project/entry/package.json | 1 - .../signature/openharmony_sx.p7b | Bin 0 -> 3437 bytes .../src/main/config.json | 112 +- .../com/example/childprocess/MainAbility.java | 62 +- .../example/childprocess/MyApplication.java | 50 +- .../entry => }/src/main/js/default/app.js | 0 .../src/main/js/default/i18n/en-US.json | 0 .../src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../src/main/js/test/ExampleJsunit.test.js | 0 .../entry => }/src/main/js/test/List.test.js | 32 +- .../src/main/js/test/Process.test.js | 999 +++++++-------- .../main/resources/base/element/string.json | 22 +- .../entry => }/src/ohosTest/js/default/app.js | 0 .../src/ohosTest/js/default/i18n/en-US.json | 0 .../src/ohosTest/js/default/i18n/zh-CN.json | 0 .../ohosTest/js/default/pages/index/index.css | 0 .../ohosTest/js/default/pages/index/index.hml | 0 .../ohosTest/js/default/pages/index/index.js | 0 .../ohosTest/js/test/ExampleJsunit.test.js | 0 .../src/ohosTest/js/test/List.test.js | 30 +- .../resources/base/element/string.json | 22 +- compileruntime/url_lib_standard/BUILD.gn | 26 +- compileruntime/url_lib_standard/Test.json | 2 +- .../project/entry/package.json | 1 - .../signature/openharmony_sx.p7b | Bin 0 -> 3437 bytes .../{project/entry => }/src/main/config.json | 112 +- .../java/com/example/url/MainAbility.java | 60 +- .../java/com/example/url/MyApplication.java | 48 +- .../entry => }/src/main/js/default/app.js | 0 .../js/default/common/images/Wallpaper.png | Bin .../main/js/default/common/images/bg-tv.jpg | Bin .../src/main/js/default/i18n/en-US.json | 0 .../src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../src/main/js/test/ExampleJsunit.test.js | 0 .../entry => }/src/main/js/test/List.test.js | 32 +- .../entry => }/src/main/js/test/url.test.js | 1126 ++++++++--------- .../main/resources/base/element/string.json | 22 +- .../entry => }/src/ohosTest/js/default/app.js | 0 .../src/ohosTest/js/default/i18n/en-US.json | 0 .../src/ohosTest/js/default/i18n/zh-CN.json | 0 .../ohosTest/js/default/pages/index/index.css | 0 .../ohosTest/js/default/pages/index/index.hml | 0 .../ohosTest/js/default/pages/index/index.js | 0 .../ohosTest/js/test/ExampleJsunit.test.js | 0 .../src/ohosTest/js/test/List.test.js | 30 +- .../resources/base/element/string.json | 24 +- compileruntime/util_lib_standard/BUILD.gn | 26 +- compileruntime/util_lib_standard/Test.json | 2 +- .../project/entry/package.json | 1 - .../signature/openharmony_sx.p7b | Bin 0 -> 3437 bytes .../src/main/config.json | 112 +- .../com/example/childprocess/MainAbility.java | 62 +- .../example/childprocess/MyApplication.java | 50 +- .../java/com/example/url/MainAbility.java | 60 +- .../java/com/example/url/MyApplication.java | 48 +- .../entry => }/src/main/js/default/app.js | 0 .../js/default/common/images/Wallpaper.png | Bin .../main/js/default/common/images/bg-tv.jpg | Bin .../src/main/js/default/i18n/en-US.json | 0 .../src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../src/main/js/test/ExampleJsunit.test.js | 0 .../entry => }/src/main/js/test/List.test.js | 32 +- .../src/main/js/test/TextCodr.test.js | 896 ++++++------- .../entry => }/src/main/js/test/url.test.js | 1126 ++++++++--------- .../main/resources/base/element/string.json | 22 +- .../entry => }/src/ohosTest/js/default/app.js | 0 .../src/ohosTest/js/default/i18n/en-US.json | 0 .../src/ohosTest/js/default/i18n/zh-CN.json | 0 .../ohosTest/js/default/pages/index/index.css | 0 .../ohosTest/js/default/pages/index/index.hml | 0 .../ohosTest/js/default/pages/index/index.js | 0 .../ohosTest/js/test/ExampleJsunit.test.js | 0 .../src/ohosTest/js/test/List.test.js | 30 +- .../resources/base/element/string.json | 24 +- compileruntime/worker_lib_standard/BUILD.gn | 26 +- compileruntime/worker_lib_standard/Test.json | 2 +- .../hap/entry-debug-standard-unsigned.hap | Bin 235532 -> 0 bytes .../project/entry/package.json | 1 - .../signature/openharmony_sx.p7b | Bin 0 -> 3437 bytes .../{project/entry => }/src/main/config.json | 118 +- .../entry => }/src/main/js/default/app.js | 0 .../src/main/js/default/i18n/en-US.json | 0 .../src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../main/js/default/pages/second/second.css | 0 .../main/js/default/pages/second/second.hml | 0 .../main/js/default/pages/second/second.js | 0 .../src/main/js/default/workers/worker.js | 130 +- .../src/main/js/default/workers/worker_002.js | 62 +- .../src/main/js/default/workers/worker_003.js | 58 +- .../src/main/js/default/workers/worker_004.js | 60 +- .../src/main/js/default/workers/worker_005.js | 56 +- .../src/main/js/default/workers/worker_006.js | 56 +- .../src/main/js/default/workers/worker_007.js | 56 +- .../src/main/js/default/workers/worker_008.js | 56 +- .../src/main/js/test/ExampleJsunit.test.js | 0 .../entry => }/src/main/js/test/List.test.js | 32 +- .../src/main/js/test/Worker.test.js | 1090 ++++++++-------- .../main/resources/base/element/string.json | 22 +- .../src/main/resources/base/media/icon.png | Bin 114 files changed, 3612 insertions(+), 3562 deletions(-) delete mode 100644 compileruntime/process_lib_standard/project/entry/package.json create mode 100644 compileruntime/process_lib_standard/signature/openharmony_sx.p7b rename compileruntime/{util_lib_standard/project/entry => process_lib_standard}/src/main/config.json (95%) rename compileruntime/{util_lib_standard/project/entry => process_lib_standard}/src/main/java/com/example/childprocess/MainAbility.java (96%) rename compileruntime/{util_lib_standard/project/entry => process_lib_standard}/src/main/java/com/example/childprocess/MyApplication.java (97%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/app.js (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/i18n/en-US.json (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/i18n/zh-CN.json (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.css (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.hml (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.js (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/test/ExampleJsunit.test.js (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/test/List.test.js (93%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/js/test/Process.test.js (79%) rename compileruntime/process_lib_standard/{project/entry => }/src/main/resources/base/element/string.json (94%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/app.js (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/en-US.json (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/zh-CN.json (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.css (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.hml (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.js (100%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/js/test/ExampleJsunit.test.js (100%) rename compileruntime/{url_lib_standard/project/entry => process_lib_standard}/src/ohosTest/js/test/List.test.js (92%) rename compileruntime/process_lib_standard/{project/entry => }/src/ohosTest/resources/base/element/string.json (93%) delete mode 100644 compileruntime/url_lib_standard/project/entry/package.json create mode 100644 compileruntime/url_lib_standard/signature/openharmony_sx.p7b rename compileruntime/url_lib_standard/{project/entry => }/src/main/config.json (95%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/java/com/example/url/MainAbility.java (96%) rename compileruntime/{util_lib_standard/project/entry => url_lib_standard}/src/main/java/com/example/url/MyApplication.java (97%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/app.js (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/common/images/Wallpaper.png (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/common/images/bg-tv.jpg (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/i18n/en-US.json (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/i18n/zh-CN.json (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.css (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.hml (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.js (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/test/ExampleJsunit.test.js (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/test/List.test.js (97%) rename compileruntime/url_lib_standard/{project/entry => }/src/main/js/test/url.test.js (97%) rename compileruntime/{util_lib_standard/project/entry => url_lib_standard}/src/main/resources/base/element/string.json (94%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/app.js (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/en-US.json (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/zh-CN.json (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.css (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.hml (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.js (100%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/js/test/ExampleJsunit.test.js (100%) rename compileruntime/{util_lib_standard/project/entry => url_lib_standard}/src/ohosTest/js/test/List.test.js (92%) rename compileruntime/url_lib_standard/{project/entry => }/src/ohosTest/resources/base/element/string.json (93%) delete mode 100644 compileruntime/util_lib_standard/project/entry/package.json create mode 100644 compileruntime/util_lib_standard/signature/openharmony_sx.p7b rename compileruntime/{process_lib_standard/project/entry => util_lib_standard}/src/main/config.json (95%) rename compileruntime/{process_lib_standard/project/entry => util_lib_standard}/src/main/java/com/example/childprocess/MainAbility.java (96%) rename compileruntime/{process_lib_standard/project/entry => util_lib_standard}/src/main/java/com/example/childprocess/MyApplication.java (97%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/java/com/example/url/MainAbility.java (96%) rename compileruntime/{url_lib_standard/project/entry => util_lib_standard}/src/main/java/com/example/url/MyApplication.java (97%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/app.js (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/common/images/Wallpaper.png (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/common/images/bg-tv.jpg (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/i18n/en-US.json (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/i18n/zh-CN.json (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.css (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.hml (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.js (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/test/ExampleJsunit.test.js (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/test/List.test.js (93%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/test/TextCodr.test.js (96%) rename compileruntime/util_lib_standard/{project/entry => }/src/main/js/test/url.test.js (97%) rename compileruntime/{url_lib_standard/project/entry => util_lib_standard}/src/main/resources/base/element/string.json (94%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/app.js (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/en-US.json (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/i18n/zh-CN.json (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.css (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.hml (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/default/pages/index/index.js (100%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/js/test/ExampleJsunit.test.js (100%) rename compileruntime/{process_lib_standard/project/entry => util_lib_standard}/src/ohosTest/js/test/List.test.js (92%) rename compileruntime/util_lib_standard/{project/entry => }/src/ohosTest/resources/base/element/string.json (93%) delete mode 100644 compileruntime/worker_lib_standard/hap/entry-debug-standard-unsigned.hap delete mode 100644 compileruntime/worker_lib_standard/project/entry/package.json create mode 100644 compileruntime/worker_lib_standard/signature/openharmony_sx.p7b rename compileruntime/worker_lib_standard/{project/entry => }/src/main/config.json (95%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/app.js (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/i18n/en-US.json (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/i18n/zh-CN.json (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.css (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.hml (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/index/index.js (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/second/second.css (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/second/second.hml (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/pages/second/second.js (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_002.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_003.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_004.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_005.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_006.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_007.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/default/workers/worker_008.js (97%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/test/ExampleJsunit.test.js (100%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/test/List.test.js (93%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/js/test/Worker.test.js (96%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/resources/base/element/string.json (94%) rename compileruntime/worker_lib_standard/{project/entry => }/src/main/resources/base/media/icon.png (100%) diff --git a/compileruntime/BUILD.gn b/compileruntime/BUILD.gn index 9ffdd79f7..5fbd3642b 100644 --- a/compileruntime/BUILD.gn +++ b/compileruntime/BUILD.gn @@ -10,13 +10,16 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import("//test/xts/tools/build/suite.gni") -group("jsapi") { +group("compileruntime") { testonly = true - deps = [ - "StartupProcessJSApiTest:startup_process_js_test", - "StartupUrlJSApiTest:startup_url_js_test", - "StartupUtilJSApiTest:startup_util_js_test", - "StartupWorkerJSApiTest:startup_worker_js_test", - ] + if (is_standard_system) { + deps = [ + "process_lib_standard:process_js_test", + "url_lib_standard:url_js_test", + "util_lib_standard:util_js_test", + "worker_lib_standard:worker_js_hap", + ] + } } diff --git a/compileruntime/process_lib_standard/BUILD.gn b/compileruntime/process_lib_standard/BUILD.gn index ef3f729ce..0c4e64017 100644 --- a/compileruntime/process_lib_standard/BUILD.gn +++ b/compileruntime/process_lib_standard/BUILD.gn @@ -10,9 +10,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") +ohos_js_hap_suite("process_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":process_js_assets", + ":process_resources", + ] + + # shared_libraries = [ + # "//third_party/giflib:libgif", + # "//third_party/libpng:libpng", + # ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ProcessJSApiTest" -ohos_js_hap_suite("startup_process_js_test") { - test_hap_name = "StartupProcessJSApiTest" - hap_source_path = "hap/entry-debug-rich-unsigned.hap" + # part_name = "prebuilt_hap" + # subsystem_name = "xts" +} +ohos_js_assets("process_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("process_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" } diff --git a/compileruntime/process_lib_standard/Test.json b/compileruntime/process_lib_standard/Test.json index 619814044..58980316e 100644 --- a/compileruntime/process_lib_standard/Test.json +++ b/compileruntime/process_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "StartupProcessJSApiTest.hap" + "ProcessJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/process_lib_standard/project/entry/package.json b/compileruntime/process_lib_standard/project/entry/package.json deleted file mode 100644 index 69a88e3b6..000000000 --- a/compileruntime/process_lib_standard/project/entry/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/compileruntime/process_lib_standard/signature/openharmony_sx.p7b b/compileruntime/process_lib_standard/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 GIT binary patch literal 3437 zcmcgvX>b$g8MY4FF(5FQyMT=#m||qU)nQ9cId-MBB-<-lvSdq&snM}IENNF>t+bK| zgowuF2vC|SxSZxNN5eHhV%(WPpbeB9Fc3;JDMtzMBv1-XAc2N~c2_tCXW&OCGw6qQ z-s9VS-tT?h=bI0tMS+~WDXqHJyCPmLzdbE-fV8Nd&*MRZfG8(#POFZG3xs@Lb{0ry z=R8j3wWo!5g=yjKx#BoZMFS)uA)H}cTp@-^K`9VV?RC3J59@}eik*>n|pRKOLZ zxdn7G!Yv@9O#y<&eUy{)vMXb;fQR)ffVAADQsEMXm;IBMDLfLD0w^U;6%HVo-0Q_5 zCHEa?DBuauNpZzoF+tK27w#n~?u%toS-DhR4k@Q*{7x^8Q=D6&kd^_~J#VVG2LXkL zaAy=}U*?Jto)9hx5MGjdp9hcQAu@tfk_;l!PeyxPY<8b&+&D!CyaBh9=8BSVKLpk4 z4Ml3yY|&Th)vyK4cpC{!uU8v2YBlVV`d~(nz&<@{G1oe*DHub1z7~J5*;s2bX<)_* zV_GbsPQg`(&rpxRb_*Od7}++3+liSw-$!1 zs5*g}EHWhI3i|!-FcfzYL0`SL-rq>LENC;PMl)G(0(1U2%Va|smp0UFx0xd@soZA* zD5LYc4OlbE7@ARt#h}rr3>K@bf%B#^-c+xz8Hr)0D5ExIFltezN@Hn8>o5d~bSfYtkc+_Z&kI#-N5_GhCg*V-^TSO=!G~ z(fXy{n2XV+k}6w_W`dTOP2a4u0ly;ANZ>4OxSKAzFB!yBzdo`gX zO?o|H@WiAw$y6l?=^3jA_Hy0S)nTYs12;4hKE&ekQ|>?|ZLJ}#F`2BczC7kdE4@xV zZBD_)Otwjhz+NSaz?d45!;FsGSu-#qh#hStD%B}f!mCT!KqzSo>I`NGH_9Dea$1Qi zg29Ydt!~lQVR99_T7#Hije~(12drl-P)SV?QR*9sus`8th-8^OQ7@xI$(Yp|^;bL1 zR50O$mDXw6P>i7B(TJ)ciPzTE>XY%X6HAa)b#OBRXv&~%Bw|J#Y><i4=e%95bjtw|cJp=#P#Pf#*luqI_wR;fISDCJhAqSG6R%xItn%~QtZ@m%&u zjGGLX;t6Ls62eQvNmf@v+}J%54^CygxRZ`?8X#r|wkev7(s;Ou4T#y1XNNf)h;o7z z8a^Lfq<1uH`E{G9E z*(=)Css_LSk=>E9jr)s5^2-!+MN=Ds}>1hRma4`uCIz9%p3O77839E{xf z4c_I?**|1`K2tg4!Hvyrou4BsJQuv*UfF)<%CelYIS>D^o?X)3+MK%la6kooW8&G@BU)Y0hT`+mOm$Z_%rB=a%o>I z!2c6lHyKQN)VjiFwa!eE^p8jc$sy$vB+8i25lI~6KPFFh$!o$avA~rj#L6xvR|Z83 z*WD6T9e+5Pyy=F+)pNTf{ny3cy>7Rkd3o*TS?TZJ`NS^NF2%HMkyS{?uJ$`!P4_L^ z1`NFDUbNyg_qREifgktnp1_v{Jbb`7m}2PTyUdOmtJj~m z9bB=ecw4_^rw1IW=of+>nrW5=d3k`3qHCxsIN_F{T1A545};;+fsyC&qChi+YV zr~M63H8ZLCPYmsjY>ls9cL%I)F|JIW-#+48$+lD4k*(P*kDM%zx_fvu4u5ZYUnI}5 zdrycFq>xFU)&X3p@pP2u%$o}}YcRn(MhJ&B2o?KS@cIVz>Ye%o^xV?CB{_Qhu z;}_q1bvO^g{8<3!gYbo4Di{8qzV+(9 zdlmksohQmRTs@qB;(Wo?dER_ux6XQb@q$tQPW?CMu6GVQd;R=iR;-S{Kr%Zks7>b1 zNs{|-+jhObYE}NR&`TGGr^h^4bjh%c>R#@=8nM&Md>_a+zVulsl;){flFekV1t9ob z+SqfV_Pv3$2f)bQ8%Ul2>fdYR^1zs0BQF~olsOj5AodC&Q_7SMFzsz2 z9newxE&jodk~tNHwl%LBMMDbrk=(^b literal 0 HcmV?d00001 diff --git a/compileruntime/util_lib_standard/project/entry/src/main/config.json b/compileruntime/process_lib_standard/src/main/config.json similarity index 95% rename from compileruntime/util_lib_standard/project/entry/src/main/config.json rename to compileruntime/process_lib_standard/src/main/config.json index f3773ec2f..75d1ac144 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/config.json +++ b/compileruntime/process_lib_standard/src/main/config.json @@ -1,57 +1,57 @@ -{ - "app": { - "bundleName": "com.example.childprocess", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.childprocess", - "name": ".MyApplication", - "mainAbility": "com.example.childprocess.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.childprocess.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.childprocess", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.childprocess", + "name": ".MyApplication", + "mainAbility": "com.example.childprocess.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.childprocess.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java b/compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MainAbility.java similarity index 96% rename from compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java rename to compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MainAbility.java index 1bc0c4d53..dbdddf742 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java +++ b/compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MainAbility.java @@ -1,31 +1,31 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.childprocess; - -import ohos.ace.ability.AceAbility; -import ohos.aafwk.content.Intent; - -public class MainAbility extends AceAbility { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - - @Override - public void onStop() { - super.onStop(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.childprocess; + +import ohos.ace.ability.AceAbility; +import ohos.aafwk.content.Intent; + +public class MainAbility extends AceAbility { + @Override + public void onStart(Intent intent) { + super.onStart(intent); + } + + @Override + public void onStop() { + super.onStop(); + } +} diff --git a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java b/compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MyApplication.java similarity index 97% rename from compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java rename to compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MyApplication.java index b27ffa96e..bf24a9676 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java +++ b/compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MyApplication.java @@ -1,25 +1,25 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.childprocess; - -import ohos.aafwk.ability.AbilityPackage; - -public class MyApplication extends AbilityPackage { - @Override - public void onInitialize() { - super.onInitialize(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.childprocess; + +import ohos.aafwk.ability.AbilityPackage; + +public class MyApplication extends AbilityPackage { + @Override + public void onInitialize() { + super.onInitialize(); + } +} diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/process_lib_standard/src/main/js/default/app.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js rename to compileruntime/process_lib_standard/src/main/js/default/app.js diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/en-US.json b/compileruntime/process_lib_standard/src/main/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/en-US.json rename to compileruntime/process_lib_standard/src/main/js/default/i18n/en-US.json diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json b/compileruntime/process_lib_standard/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json rename to compileruntime/process_lib_standard/src/main/js/default/i18n/zh-CN.json diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.css b/compileruntime/process_lib_standard/src/main/js/default/pages/index/index.css similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.css rename to compileruntime/process_lib_standard/src/main/js/default/pages/index/index.css diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.hml b/compileruntime/process_lib_standard/src/main/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.hml rename to compileruntime/process_lib_standard/src/main/js/default/pages/index/index.hml diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.js b/compileruntime/process_lib_standard/src/main/js/default/pages/index/index.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/default/pages/index/index.js rename to compileruntime/process_lib_standard/src/main/js/default/pages/index/index.js diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js b/compileruntime/process_lib_standard/src/main/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js rename to compileruntime/process_lib_standard/src/main/js/test/ExampleJsunit.test.js diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/test/List.test.js b/compileruntime/process_lib_standard/src/main/js/test/List.test.js similarity index 93% rename from compileruntime/process_lib_standard/project/entry/src/main/js/test/List.test.js rename to compileruntime/process_lib_standard/src/main/js/test/List.test.js index fe9706bb6..ccd2b4ce7 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/js/test/List.test.js +++ b/compileruntime/process_lib_standard/src/main/js/test/List.test.js @@ -1,17 +1,17 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -require('./ExampleJsunit.test.js') +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +require('./ExampleJsunit.test.js') require('./Process.test.js') \ No newline at end of file diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/test/Process.test.js b/compileruntime/process_lib_standard/src/main/js/test/Process.test.js similarity index 79% rename from compileruntime/process_lib_standard/project/entry/src/main/js/test/Process.test.js rename to compileruntime/process_lib_standard/src/main/js/test/Process.test.js index 63a957bdf..801ed7f40 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/js/test/Process.test.js +++ b/compileruntime/process_lib_standard/src/main/js/test/Process.test.js @@ -1,515 +1,486 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' -import process from '@ohos.process' - -describe('ChildProcessTest', function () { - - // childprocess runCmd test - it('test_runCmd_001', 0, async function () { - var child = process.runCmd('echo abc') - child.wait() - var array = new Uint8Array([97, 98, 99, 10, 0]) - child.getOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - it('test_runCmd_002', 0, async function () { - var child = process.runCmd('echo abc;', { maxBuffer : 2 }) - child.wait() - var array = new Uint8Array([97, 98, 0]) - child.getOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - it('test_runCmd_003', 0, async function () { - var child = process.runCmd('sleep 5; echo abc;', { timeout : 1, killSignal : 9 }) - child.wait() - var array = new Uint8Array([0]) - child.getOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - expect(child.exitCode).assertEqual(9) - }) - - it('test_runCmd_004', 0, async function () { - var child = process.runCmd('sleep 2; echo abc;', { timeout : 9000, killSignal : 9 }) - child.wait() - var array = new Uint8Array([97, 98, 99, 10, 0]) - child.getOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - expect(child.exitCode).assertEqual(0) - }) - - // childprocess getOutput test - it('test_getOutput_001', 0, async function () { - var child = process.runCmd('echo bcd;') - child.wait() - var array = new Uint8Array([98, 99, 100, 0]) - child.getOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - // childprocess getErrorOutput test - it('test_getErrorOutput_001', 0, async function () { - var child = process.runCmd('makdir 1.txt') - child.wait() - var array = new Uint8Array([115, 104, 58, 32, 109, 97, 107, 100, 105, 114, 58, 32, 105, 110, 97, 99, 99, - 101, 115, 115, 105, 98, 108, 101, 32, 111, 114, 32, 110, 111, 116, 32, 102, 111, 117, 110, 100, 10, 0]) - child.getErrorOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - it('test_getErrorOutput_002', 0, async function () { - var child = process.runCmd('echo "error" 1>&2') - child.wait() - var array = new Uint8Array([101, 114, 111, 114, 10, 0]) - child.getErrorOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - it('test_getErrorOutput_003', 0, async function () { - var child = process.runCmd('1') - child.wait() - var array = new Uint8Array([115, 104, 58, 32, 49, 58, 32, 105, 110, 97, 99, 99, 101, 115, 115, 105, 98, - 108, 101, 32, 111, 114, 32, 110, 111, 116, 32, 102, 111, 117, 110, 100, 10, 0]) - child.getErrorOutput().then(val=>{ - for (var i = 0; i < array.length; i++) { - expect(val[i]).assertEqual(array[i]) - } - }) - }) - - // childprocess wait test - it('test_wait_001', 0, async function () { - var child = process.runCmd('ls') - var status = child.wait() - status.then(val=>{ - expect(val).assertEqual(0) - }) - }) - - it('test_wait_002', 0, async function () { - var child = process.runCmd('ls; sleep 5;') - child.kill(9); - var status = child.wait() - status.then(val=>{ - expect(val).assertEqual(9) - }) - }) - - // childprocess pid test - it('test_pid_001', 0, function () { - var child = process.runCmd('ls; sleep 5;') - child.wait() - var pid_ = child.pid - expect(pid_ > 0).assertEqual(true) - }) - - // childprocess ppid test - it('test_ppid_001', 0, function () { - var child = process.runCmd('ls; sleep 5;') - var status = child.wait() - var ppid_ = child.ppid - expect(ppid_ > 0).assertEqual(true) - }) - - // childprocess kill test - it('test_kill_001', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.kill(13) - var temp = child.killed - expect(temp).assertEqual(true) - }) - - it('test_kill_002', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.kill(1) - var temp = child.killed - expect(temp).assertEqual(true) - }) - - it('test_kill_003', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.kill('SIGHUP') - var temp = child.killed - expect(temp).assertEqual(true) - }) - - it('test_kill_004', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.kill('ABC') - var temp = child.killed - expect(temp).assertEqual(true) - }) - - it('test_kill_005', 0, function () { - var child = process.runCmd('ls') - child.wait() - var result = child.kill(9) - var temp = child.killed - expect(temp).assertEqual(false) - }) - - // childprocess close test - it('test_close_001', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.close() - expect(child.exitCode).assertEqual(9) - }) - - it('test_close_002', 0, function () { - var child = process.runCmd('ls') - function sleep(ms, callback) { - setTimeout(callback, ms) - } - sleep(1000, () => {} ) - var result = child.close() - expect(child.exitCode===0).assertEqual(false) - }) - - it('test_close_003', 0, function () { - var child = process.runCmd('ls;') - var status = child.wait() - var result = child.close() - expect(child.exitCode).assertEqual(0) - }) - - // childprocess killed test - it('test_killed_001', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var result = child.kill(3) - var temp = child.killed - expect(temp).assertEqual(true) - }) - - // childprocess exitCode test - it('test_exitCode_001', 0, function () { - var child = process.runCmd('ls; sleep 5s;') - var temp = child.kill(9) - child.wait() - var result = child.exitCode - expect(result).assertEqual(9) - }) - - // process GetUid test - it('GetUid_test_001', 0, function () { - var that = new process.Process() - var result = that.getUid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('GetUid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++){ - var result = that.getUid - if(result != null) { - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - } - }) - - // process GetGid test - it('GetGid_test_001', 0, function () { - var that = new process.Process() - var result = that.getGid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('GetGid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++){ - var result = that.getGid - if(result != null) { - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - } - }) - - // process GetEuid test - it('GetEuid_test_001', 0, function () { - var that = new process.Process() - var result = that.getEuid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('GetEuid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++){ - var result = that.getEuid - if(result != null) { - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - } - }) - - // process GetEgid test - it('GetEgid_test_001', 0, function () { - var that = new process.Process() - var result = that.getEgid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('GetEgid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++){ - var result = that.getEgid - if(result != null) { - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - } - }) - - // process GetGroups test - it('GetGroups_test_001', 0, function () { - var that = new process.Process() - var result = that.getGroups - var len = result.length - if(len > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('GetGroups_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++){ - var result = that.getGroups - if(result != null) { - var len = result.length - if(len > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - } - }) - - // process chdir test - it('chdir_test_001', 0, function () { - var that = new process.Process() - var result = that.chdir('/system') - var result1 = that.cwd() - expect(result1).assertEqual('/system') - }) - - it('chdir_test_002', 0, function () { - var that = new process.Process() - var result = that.chdir('/system/lib') - var result1 = that.cwd() - expect(result1).assertEqual('/system/lib') - }) - - it('chdir_test_003', 0, function () { - var that = new process.Process() - var result = that.chdir('/..') - var result1 = that.cwd() - expect(result1).assertEqual('/') - }) - - // process kill test - it('kill_test_001', 0, function () { - var that = new process.Process() - var result = that.kill(123, 3) - expect(result).assertEqual(false) - }) - - it('kill_test_002', 0, function () { - var that = new process.Process() - var pres = that.getPid - var result = that.kill(pres, 23) - expect(result).assertEqual(true) - }) - - it('kill_test_003', 0, function () { - var that = new process.Process() - var pres = that.getPid - var result = that.kill(pres, 28) - expect(result).assertEqual(true) - }) - - it('kill_test_004', 0, function () { - var that = new process.Process() - var pres = that.getPid - var result = that.kill(pres, 17) - expect(result).assertEqual(true) - }) - - // process uptime test - it('uptime_test_001', 0, function () { - var that = new process.Process() - var result1 = that.uptime() - function sleep(d){ - while(that.uptime() - result1 <= d); - } - sleep(5); - var result2 = that.uptime() - 6 - expect(result1).assertEqual(result2) - }) - - it('uptime_test_002', 0, function () { - var that = new process.Process() - var result1 = that.uptime() - function sleep(d){ - while(that.uptime() - result1 <= d); - } - sleep(8); - var result2 = that.uptime() - 9 - expect(result1).assertEqual(result2) - }) - - it('uptime_test_003', 0, function () { - var that = new process.Process() - var result1 = that.uptime() - function sleep(d){ - while(that.uptime() - result1 <= d); - } - sleep(10); - var result2 = that.uptime() - 11 - expect(result1).assertEqual(result2) - }) - - // process pid test - it('pid_test_001', 0, function () { - var that = new process.Process() - var result = that.getPid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('pid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++) - { - var result = that.getPid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - }) - - // process ppid test - it('ppid_test_001', 0, function () { - var that = new process.Process() - var result = that.getPpid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - }) - - it('ppid_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++) - { - var result = that.getPpid - if(result > 0) { - var flag = true - } - expect(flag).assertEqual(true) - } - }) - - // process cwd test - it('cwd_test_001', 0, function () { - var that =new process.Process() - var cwd = that.cwd() - expect(cwd).assertEqual('/') - }) - - it('cwd_test_002', 0, function () { - var that = new process.Process() - for(var i = 0; i < 3; i++) - { - var cwd = that.cwd() - expect(cwd).assertEqual('/') - } - }) - - // process on test - it('on_test_001', 0, function () { - var that = new process.Process() - function add(){ - var value = 3 + 2 - } - var ontest = that.on(1, add) - expect(ontest).assertEqual(false) - }) - - it('on_test_002', 0, function () { - var that = new process.Process() - function add1(num){ - var value = num + 3 - } - var on = that.on("add123", add1) - }) - - it('on_test_003', 0, function () { - var that = new process.Process() - function add2(num0, num1){ - var value = num0 + num1 - } - var ontest = that.on(879, add2) - expect(ontest).assertEqual(false) - }) +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' +import process from '@ohos.process' + +describe('ChildProcessTest', function () { + + // childprocess runCmd test + it('test_runCmd_001', 0, async function () { + var child = process.runCmd('echo abc') + child.wait() + var array = new Uint8Array([97, 98, 99, 10, 0]) + child.getOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + it('test_runCmd_002', 0, async function () { + var child = process.runCmd('echo abc;', { maxBuffer : 2 }) + child.wait() + var array = new Uint8Array([97, 98, 0]) + child.getOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + it('test_runCmd_003', 0, async function () { + var child = process.runCmd('sleep 5; echo abc;', { timeout : 1, killSignal : 9 }) + child.wait() + var array = new Uint8Array([0]) + child.getOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + expect(child.exitCode).assertEqual(9) + }) + + it('test_runCmd_004', 0, async function () { + var child = process.runCmd('sleep 2; echo abc;', { timeout : 9000, killSignal : 9 }) + child.wait() + var array = new Uint8Array([97, 98, 99, 10, 0]) + child.getOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + expect(child.exitCode).assertEqual(0) + }) + + // childprocess getOutput test + it('test_getOutput_001', 0, async function () { + var child = process.runCmd('echo bcd;') + child.wait() + var array = new Uint8Array([98, 99, 100, 0]) + child.getOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + // childprocess getErrorOutput test + it('test_getErrorOutput_001', 0, async function () { + var child = process.runCmd('makdir 1.txt') + child.wait() + var array = new Uint8Array([115, 104, 58, 32, 109, 97, 107, 100, 105, 114, 58, 32, 105, 110, 97, 99, 99, + 101, 115, 115, 105, 98, 108, 101, 32, 111, 114, 32, 110, 111, 116, 32, 102, 111, 117, 110, 100, 10, 0]) + child.getErrorOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + it('test_getErrorOutput_002', 0, async function () { + var child = process.runCmd('echo "error" 1>&2') + child.wait() + var array = new Uint8Array([101, 114, 111, 114, 10, 0]) + child.getErrorOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + it('test_getErrorOutput_003', 0, async function () { + var child = process.runCmd('1') + child.wait() + var array = new Uint8Array([115, 104, 58, 32, 49, 58, 32, 105, 110, 97, 99, 99, 101, 115, 115, 105, 98, + 108, 101, 32, 111, 114, 32, 110, 111, 116, 32, 102, 111, 117, 110, 100, 10, 0]) + child.getErrorOutput().then(val=>{ + for (var i = 0; i < array.length; i++) { + expect(val[i]).assertEqual(array[i]) + } + }) + }) + + // childprocess wait test + it('test_wait_001', 0, async function () { + var child = process.runCmd('ls') + var status = child.wait() + status.then(val=>{ + expect(val).assertEqual(0) + }) + }) + + it('test_wait_002', 0, async function () { + var child = process.runCmd('ls; sleep 5;') + child.kill(9); + var status = child.wait() + status.then(val=>{ + expect(val).assertEqual(9) + }) + }) + + // childprocess pid test + it('test_pid_001', 0, function () { + var child = process.runCmd('ls; sleep 5;') + child.wait() + var pid_ = child.pid + expect(pid_ > 0).assertEqual(true) + }) + + // childprocess ppid test + it('test_ppid_001', 0, function () { + var child = process.runCmd('ls; sleep 5;') + var status = child.wait() + var ppid_ = child.ppid + expect(ppid_ > 0).assertEqual(true) + }) + + // childprocess kill test + it('test_kill_001', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.kill(13) + var temp = child.killed + expect(temp).assertEqual(true) + }) + + it('test_kill_002', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.kill(1) + var temp = child.killed + expect(temp).assertEqual(true) + }) + + it('test_kill_003', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.kill('SIGHUP') + var temp = child.killed + expect(temp).assertEqual(true) + }) + + it('test_kill_004', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.kill('ABC') + var temp = child.killed + expect(temp).assertEqual(true) + }) + + it('test_kill_005', 0, function () { + var child = process.runCmd('ls') + child.wait() + var result = child.kill(9) + var temp = child.killed + expect(temp).assertEqual(false) + }) + + // childprocess close test + it('test_close_001', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.close() + expect(child.exitCode).assertEqual(9) + }) + + it('test_close_002', 0, function () { + var child = process.runCmd('ls') + function sleep(ms, callback) { + setTimeout(callback, ms) + } + sleep(1000, () => {} ) + var result = child.close() + expect(child.exitCode===0).assertEqual(false) + }) + + it('test_close_003', 0, function () { + var child = process.runCmd('ls;') + var status = child.wait() + var result = child.close() + expect(child.exitCode).assertEqual(0) + }) + + // childprocess killed test + it('test_killed_001', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var result = child.kill(3) + var temp = child.killed + expect(temp).assertEqual(true) + }) + + // childprocess exitCode test + it('test_exitCode_001', 0, function () { + var child = process.runCmd('ls; sleep 5s;') + var temp = child.kill(9) + child.wait() + var result = child.exitCode + expect(result).assertEqual(9) + }) + + // process GetUid test + it('GetUid_test_001', 0, function () { + var result = process.getUid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('GetUid_test_002', 0, function () { + for(var i = 0; i < 3; i++){ + var result = process.getUid + if(result != null) { + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + } + }) + + // process GetGid test + it('GetGid_test_001', 0, function () { + var result = process.getGid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('GetGid_test_002', 0, function () { + for(var i = 0; i < 3; i++){ + var result = process.getGid + if(result != null) { + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + } + }) + + // process GetEuid test + it('GetEuid_test_001', 0, function () { + var result = process.getEuid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('GetEuid_test_002', 0, function () { + for(var i = 0; i < 3; i++){ + var result = process.getEuid + if(result != null) { + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + } + }) + + // process GetEgid test + it('GetEgid_test_001', 0, function () { + var result = process.getEgid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('GetEgid_test_002', 0, function () { + for(var i = 0; i < 3; i++){ + var result = process.getEgid + if(result != null) { + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + } + }) + + // process GetGroups test + it('GetGroups_test_001', 0, function () { + var result = process.getGroups + var len = result.length + if(len > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('GetGroups_test_002', 0, function () { + for(var i = 0; i < 3; i++){ + var result = process.getGroups + if(result != null) { + var len = result.length + if(len > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + } + }) + + // process chdir test + it('chdir_test_001', 0, function () { + var result = process.chdir('/system') + var result1 = process.cwd() + expect(result1).assertEqual('/system') + }) + + it('chdir_test_002', 0, function () { + var result = process.chdir('/system/lib') + var result1 = process.cwd() + expect(result1).assertEqual('/system/lib') + }) + + it('chdir_test_003', 0, function () { + var result = process.chdir('/..') + var result1 = process.cwd() + expect(result1).assertEqual('/') + }) + + // process kill test + it('kill_test_001', 0, function () { + var result = process.kill(123, 3) + expect(result).assertEqual(false) + }) + + it('kill_test_002', 0, function () { + var pres = process.getPid + var result = process.kill(pres, 23) + expect(result).assertEqual(true) + }) + + it('kill_test_003', 0, function () { + var pres = process.getPid + var result = process.kill(pres, 28) + expect(result).assertEqual(true) + }) + + it('kill_test_004', 0, function () { + var pres = process.getPid + var result = process.kill(pres, 17) + expect(result).assertEqual(true) + }) + + // process uptime test + it('uptime_test_001', 0, function () { + var result1 = process.uptime() + function sleep(d){ + while(process.uptime() - result1 <= d); + } + sleep(5); + var result2 = process.uptime() - 6 + expect(result1).assertEqual(result2) + }) + + it('uptime_test_002', 0, function () { + var result1 = process.uptime() + function sleep(d){ + while(process.uptime() - result1 <= d); + } + sleep(8); + var result2 = process.uptime() - 9 + expect(result1).assertEqual(result2) + }) + + it('uptime_test_003', 0, function () { + var result1 = process.uptime() + function sleep(d){ + while(process.uptime() - result1 <= d); + } + sleep(10); + var result2 = process.uptime() - 11 + expect(result1).assertEqual(result2) + }) + + // process pid test + it('pid_test_001', 0, function () { + var result = process.getPid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('pid_test_002', 0, function () { + for(var i = 0; i < 3; i++) + { + var result = process.getPid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + }) + + // process ppid test + it('ppid_test_001', 0, function () { + var result = process.getPpid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + }) + + it('ppid_test_002', 0, function () { + for(var i = 0; i < 3; i++) + { + var result = process.getPpid + if(result > 0) { + var flag = true + } + expect(flag).assertEqual(true) + } + }) + + // process cwd test + it('cwd_test_001', 0, function () { + var cwd = process.cwd() + expect(cwd).assertEqual('/') + }) + + it('cwd_test_002', 0, function () { + for(var i = 0; i < 3; i++) + { + var cwd = process.cwd() + expect(cwd).assertEqual('/') + } + }) + + // process on test + it('on_test_001', 0, function () { + function add(){ + var value = 3 + 2 + } + var ontest = process.on(1, add) + expect(ontest).assertEqual(false) + }) + + it('on_test_002', 0, function () { + function add1(num){ + var value = num + 3 + } + var on = process.on("add123", add1) + }) + + it('on_test_003', 0, function () { + function add2(num0, num1){ + var value = num0 + num1 + } + var ontest = process.on(879, add2) + expect(ontest).assertEqual(false) + }) }) \ No newline at end of file diff --git a/compileruntime/process_lib_standard/project/entry/src/main/resources/base/element/string.json b/compileruntime/process_lib_standard/src/main/resources/base/element/string.json similarity index 94% rename from compileruntime/process_lib_standard/project/entry/src/main/resources/base/element/string.json rename to compileruntime/process_lib_standard/src/main/resources/base/element/string.json index c0dd3a09e..0bae6bd40 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/resources/base/element/string.json +++ b/compileruntime/process_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/process_lib_standard/src/ohosTest/js/default/app.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js rename to compileruntime/process_lib_standard/src/ohosTest/js/default/app.js diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json b/compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json rename to compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/en-US.json diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json b/compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json rename to compileruntime/process_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css b/compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.css similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css rename to compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.css diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml b/compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml rename to compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.hml diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js b/compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js rename to compileruntime/process_lib_standard/src/ohosTest/js/default/pages/index/index.js diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js b/compileruntime/process_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js rename to compileruntime/process_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/List.test.js b/compileruntime/process_lib_standard/src/ohosTest/js/test/List.test.js similarity index 92% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/List.test.js rename to compileruntime/process_lib_standard/src/ohosTest/js/test/List.test.js index d21d41758..86ae9fa26 100644 --- a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/List.test.js +++ b/compileruntime/process_lib_standard/src/ohosTest/js/test/List.test.js @@ -1,16 +1,16 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + require('./ExampleJsunit.test.js') \ No newline at end of file diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json b/compileruntime/process_lib_standard/src/ohosTest/resources/base/element/string.json similarity index 93% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json rename to compileruntime/process_lib_standard/src/ohosTest/resources/base/element/string.json index e6620b59d..757cc9dc2 100644 --- a/compileruntime/process_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json +++ b/compileruntime/process_lib_standard/src/ohosTest/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "childprocess" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "childprocess" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/BUILD.gn b/compileruntime/url_lib_standard/BUILD.gn index a5f48ae0f..967123cbc 100644 --- a/compileruntime/url_lib_standard/BUILD.gn +++ b/compileruntime/url_lib_standard/BUILD.gn @@ -10,9 +10,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") +ohos_js_hap_suite("url_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":url_js_assets", + ":url_resources", + ] + + # shared_libraries = [ + # "//third_party/giflib:libgif", + # "//third_party/libpng:libpng", + # ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "UrlJsTest" -ohos_js_hap_suite("startup_url_js_test") { - test_hap_name = "StartupUrlJSApiTest" - hap_source_path = "hap/entry-debug-rich-unsigned.hap" + # part_name = "prebuilt_hap" + # subsystem_name = "xts" +} +ohos_js_assets("url_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("url_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" } diff --git a/compileruntime/url_lib_standard/Test.json b/compileruntime/url_lib_standard/Test.json index a5d217e9f..724697276 100644 --- a/compileruntime/url_lib_standard/Test.json +++ b/compileruntime/url_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "startup_url_js_test.hap" + "UrlJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/url_lib_standard/project/entry/package.json b/compileruntime/url_lib_standard/project/entry/package.json deleted file mode 100644 index 69a88e3b6..000000000 --- a/compileruntime/url_lib_standard/project/entry/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/compileruntime/url_lib_standard/signature/openharmony_sx.p7b b/compileruntime/url_lib_standard/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 GIT binary patch literal 3437 zcmcgvX>b$g8MY4FF(5FQyMT=#m||qU)nQ9cId-MBB-<-lvSdq&snM}IENNF>t+bK| zgowuF2vC|SxSZxNN5eHhV%(WPpbeB9Fc3;JDMtzMBv1-XAc2N~c2_tCXW&OCGw6qQ z-s9VS-tT?h=bI0tMS+~WDXqHJyCPmLzdbE-fV8Nd&*MRZfG8(#POFZG3xs@Lb{0ry z=R8j3wWo!5g=yjKx#BoZMFS)uA)H}cTp@-^K`9VV?RC3J59@}eik*>n|pRKOLZ zxdn7G!Yv@9O#y<&eUy{)vMXb;fQR)ffVAADQsEMXm;IBMDLfLD0w^U;6%HVo-0Q_5 zCHEa?DBuauNpZzoF+tK27w#n~?u%toS-DhR4k@Q*{7x^8Q=D6&kd^_~J#VVG2LXkL zaAy=}U*?Jto)9hx5MGjdp9hcQAu@tfk_;l!PeyxPY<8b&+&D!CyaBh9=8BSVKLpk4 z4Ml3yY|&Th)vyK4cpC{!uU8v2YBlVV`d~(nz&<@{G1oe*DHub1z7~J5*;s2bX<)_* zV_GbsPQg`(&rpxRb_*Od7}++3+liSw-$!1 zs5*g}EHWhI3i|!-FcfzYL0`SL-rq>LENC;PMl)G(0(1U2%Va|smp0UFx0xd@soZA* zD5LYc4OlbE7@ARt#h}rr3>K@bf%B#^-c+xz8Hr)0D5ExIFltezN@Hn8>o5d~bSfYtkc+_Z&kI#-N5_GhCg*V-^TSO=!G~ z(fXy{n2XV+k}6w_W`dTOP2a4u0ly;ANZ>4OxSKAzFB!yBzdo`gX zO?o|H@WiAw$y6l?=^3jA_Hy0S)nTYs12;4hKE&ekQ|>?|ZLJ}#F`2BczC7kdE4@xV zZBD_)Otwjhz+NSaz?d45!;FsGSu-#qh#hStD%B}f!mCT!KqzSo>I`NGH_9Dea$1Qi zg29Ydt!~lQVR99_T7#Hije~(12drl-P)SV?QR*9sus`8th-8^OQ7@xI$(Yp|^;bL1 zR50O$mDXw6P>i7B(TJ)ciPzTE>XY%X6HAa)b#OBRXv&~%Bw|J#Y><i4=e%95bjtw|cJp=#P#Pf#*luqI_wR;fISDCJhAqSG6R%xItn%~QtZ@m%&u zjGGLX;t6Ls62eQvNmf@v+}J%54^CygxRZ`?8X#r|wkev7(s;Ou4T#y1XNNf)h;o7z z8a^Lfq<1uH`E{G9E z*(=)Css_LSk=>E9jr)s5^2-!+MN=Ds}>1hRma4`uCIz9%p3O77839E{xf z4c_I?**|1`K2tg4!Hvyrou4BsJQuv*UfF)<%CelYIS>D^o?X)3+MK%la6kooW8&G@BU)Y0hT`+mOm$Z_%rB=a%o>I z!2c6lHyKQN)VjiFwa!eE^p8jc$sy$vB+8i25lI~6KPFFh$!o$avA~rj#L6xvR|Z83 z*WD6T9e+5Pyy=F+)pNTf{ny3cy>7Rkd3o*TS?TZJ`NS^NF2%HMkyS{?uJ$`!P4_L^ z1`NFDUbNyg_qREifgktnp1_v{Jbb`7m}2PTyUdOmtJj~m z9bB=ecw4_^rw1IW=of+>nrW5=d3k`3qHCxsIN_F{T1A545};;+fsyC&qChi+YV zr~M63H8ZLCPYmsjY>ls9cL%I)F|JIW-#+48$+lD4k*(P*kDM%zx_fvu4u5ZYUnI}5 zdrycFq>xFU)&X3p@pP2u%$o}}YcRn(MhJ&B2o?KS@cIVz>Ye%o^xV?CB{_Qhu z;}_q1bvO^g{8<3!gYbo4Di{8qzV+(9 zdlmksohQmRTs@qB;(Wo?dER_ux6XQb@q$tQPW?CMu6GVQd;R=iR;-S{Kr%Zks7>b1 zNs{|-+jhObYE}NR&`TGGr^h^4bjh%c>R#@=8nM&Md>_a+zVulsl;){flFekV1t9ob z+SqfV_Pv3$2f)bQ8%Ul2>fdYR^1zs0BQF~olsOj5AodC&Q_7SMFzsz2 z9newxE&jodk~tNHwl%LBMMDbrk=(^b literal 0 HcmV?d00001 diff --git a/compileruntime/url_lib_standard/project/entry/src/main/config.json b/compileruntime/url_lib_standard/src/main/config.json similarity index 95% rename from compileruntime/url_lib_standard/project/entry/src/main/config.json rename to compileruntime/url_lib_standard/src/main/config.json index 31cf457ed..eded041ca 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/config.json +++ b/compileruntime/url_lib_standard/src/main/config.json @@ -1,57 +1,57 @@ -{ - "app": { - "bundleName": "com.example.url", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.url", - "name": ".MyApplication", - "mainAbility": "com.example.url.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.url.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.url", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.url", + "name": ".MyApplication", + "mainAbility": "com.example.url.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.url.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java b/compileruntime/url_lib_standard/src/main/java/com/example/url/MainAbility.java similarity index 96% rename from compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java rename to compileruntime/url_lib_standard/src/main/java/com/example/url/MainAbility.java index ab25e441f..1029c0119 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java +++ b/compileruntime/url_lib_standard/src/main/java/com/example/url/MainAbility.java @@ -1,30 +1,30 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.url; - -import ohos.ace.ability.AceAbility; -import ohos.aafwk.content.Intent; - -public class MainAbility extends AceAbility { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - - @Override - public void onStop() { - super.onStop(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.url; + +import ohos.ace.ability.AceAbility; +import ohos.aafwk.content.Intent; + +public class MainAbility extends AceAbility { + @Override + public void onStart(Intent intent) { + super.onStart(intent); + } + + @Override + public void onStop() { + super.onStop(); + } +} diff --git a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java b/compileruntime/url_lib_standard/src/main/java/com/example/url/MyApplication.java similarity index 97% rename from compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java rename to compileruntime/url_lib_standard/src/main/java/com/example/url/MyApplication.java index 8b5743ec6..d0bd8e832 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java +++ b/compileruntime/url_lib_standard/src/main/java/com/example/url/MyApplication.java @@ -1,24 +1,24 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.url; - -import ohos.aafwk.ability.AbilityPackage; - -public class MyApplication extends AbilityPackage { - @Override - public void onInitialize() { - super.onInitialize(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.url; + +import ohos.aafwk.ability.AbilityPackage; + +public class MyApplication extends AbilityPackage { + @Override + public void onInitialize() { + super.onInitialize(); + } +} diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/url_lib_standard/src/main/js/default/app.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js rename to compileruntime/url_lib_standard/src/main/js/default/app.js diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png b/compileruntime/url_lib_standard/src/main/js/default/common/images/Wallpaper.png similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png rename to compileruntime/url_lib_standard/src/main/js/default/common/images/Wallpaper.png diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg b/compileruntime/url_lib_standard/src/main/js/default/common/images/bg-tv.jpg similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg rename to compileruntime/url_lib_standard/src/main/js/default/common/images/bg-tv.jpg diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/en-US.json b/compileruntime/url_lib_standard/src/main/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/en-US.json rename to compileruntime/url_lib_standard/src/main/js/default/i18n/en-US.json diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json b/compileruntime/url_lib_standard/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json rename to compileruntime/url_lib_standard/src/main/js/default/i18n/zh-CN.json diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.css b/compileruntime/url_lib_standard/src/main/js/default/pages/index/index.css similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.css rename to compileruntime/url_lib_standard/src/main/js/default/pages/index/index.css diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.hml b/compileruntime/url_lib_standard/src/main/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.hml rename to compileruntime/url_lib_standard/src/main/js/default/pages/index/index.hml diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.js b/compileruntime/url_lib_standard/src/main/js/default/pages/index/index.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/default/pages/index/index.js rename to compileruntime/url_lib_standard/src/main/js/default/pages/index/index.js diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js b/compileruntime/url_lib_standard/src/main/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js rename to compileruntime/url_lib_standard/src/main/js/test/ExampleJsunit.test.js diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/test/List.test.js b/compileruntime/url_lib_standard/src/main/js/test/List.test.js similarity index 97% rename from compileruntime/url_lib_standard/project/entry/src/main/js/test/List.test.js rename to compileruntime/url_lib_standard/src/main/js/test/List.test.js index dca817748..8a9a35ff2 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/js/test/List.test.js +++ b/compileruntime/url_lib_standard/src/main/js/test/List.test.js @@ -1,16 +1,16 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -require('./url.test.js') -require('./ExampleJsunit.test.js') +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +require('./url.test.js') +require('./ExampleJsunit.test.js') diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/test/url.test.js b/compileruntime/url_lib_standard/src/main/js/test/url.test.js similarity index 97% rename from compileruntime/url_lib_standard/project/entry/src/main/js/test/url.test.js rename to compileruntime/url_lib_standard/src/main/js/test/url.test.js index df00cd8ab..19e410b32 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/js/test/url.test.js +++ b/compileruntime/url_lib_standard/src/main/js/test/url.test.js @@ -1,564 +1,564 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License') - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' -import Url from '@ohos.url' - -describe('Url_mxa_jk_Test', function () { - it('Url_append_test_001', 0, function () { - var that = new Url.URL('http://username:password@host:8080/directory/file?foo=1&bar=2') - var params = new Url.URLSearchParams(that.search) - params.append('ma', 'jk') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&ma=jk') - }) - it('Url_append_test_002', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.append('ma 大', 'jk￥') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&ma+%E5%A4%A7=jk%EF%BF%A5') - }) - it('Url_append_test_003', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.append('foo~!@#$%^&*()_+-=', 'jk') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&foo%7E%21%40%23%24%25%5E%26*%28%29_%2B-%3D=jk') - }) - it('Url_delete_test_001', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo') - var result = params.toString() - expect(result).assertEqual('bar=2') - }) - it('Url_delete_test_002', 0, function () { - let that = new Url.URL('https://example.com?foo大=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo') - var result = params.toString() - expect(result).assertEqual('foo%E5%A4%A7=1&bar=2') - }) - it('Url_delete_test_003', 0, function () { - let that = new Url.URL('https://example.com?foo大=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo大') - var result = params.toString() - expect(result).assertEqual('bar=2') - }) - - it('Url_entries_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i] = pair[0]; - i++; - arr[i] = pair[1]; - i++; - } - expect(arr[1]).assertEqual('value1') - }) - it('Url_entries_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i] = pair[0]; - i++; - arr[i] = pair[1]; - i++; - } - expect(arr[2]).assertEqual('key2') - }) - it('Url_entries_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('foo', 'jk') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i] = pair[0]; - i++; - arr[i] = pair[1]; - i++; - } - expect(arr[5]).assertEqual('jk') - }) - - it('Url_forEach_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[0]).assertEqual('key=key1 value=value1 flag=key1=value1&key2=value2') - }) - it('Url_forEach_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[1]).assertEqual('key=key2 value=value2 flag=key1=value1&key2=value2') - }) - it('Url_forEach_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('foo', 'jk') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[2]).assertEqual('key=foo value=jk flag=key1=value1&key2=value2&foo=jk') - }) - it('Url_get_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var result = params.get('1') - expect(result).assertEqual(undefined) - }) - it('Url_get_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var result = params.get('key2') - expect(result).assertEqual('value2') - }) - it('Url_get_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('5', 'JKL') - var result = params.get('5') - expect(result).assertEqual('JKL') - }) - it('Url_getAll_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('key1', 'AAA') - var result = params.getAll('key1') - expect(result).assertEqual('value1,AAA') - }) - it('Url_getAll_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&8=DEF') - params.append('8', 'A8A') - var result = params.getAll('8') - expect(result).assertEqual('DEF,A8A') - }) - it('Url_getAll_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') - params.append('key3', 'A3A') - var result = params.getAll('key3') - expect(result).assertEqual('大,A3A') - }) - it('Url_has_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') - var result = params.has('2') - expect(result).assertEqual(false) - }) - it('Url_has_test_002', 0, function () { - let params = new Url.URLSearchParams('小=value1&key2=value2&key3=大') - var result = params.has('小') - expect(result).assertEqual(true) - }) - it('Url_has_test_003', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - params.append('￥', 'ACA') - var result = params.has('￥') - expect(result).assertEqual(true) - }) - it('Url_keys_test_001', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for (var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[0]).assertEqual('小') - }) - it('Url_keys_test_002', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for (var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[1]).assertEqual('￥') - }) - it('Url_keys_test_003', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for (var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[2]).assertEqual('key3') - }) - it('Url_set_test_001', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('11', 'CCC') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&11=CCC') - }) - it('Url_set_test_002', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('10', 'BBB') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&10=BBB') - }) - it('Url_set_test_003', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('ma 大', '10￥') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&ma+%E5%A4%A7=10%EF%BF%A5') - }) - it('Url_sort_test_001', 0, function () { - let params = new Url.URLSearchParams('1=value1&3=value3&2=key2') - params.sort() - var res = params.toString() - expect(res).assertEqual('1=value1&2=key2&3=value3') - }) - it('Url_sort_test_002', 0, function () { - let params = new Url.URLSearchParams('a=value1&c=value2&b=key2') - params.sort() - var res = params.toString() - expect(res).assertEqual('a=value1&b=key2&c=value2') - }) - it('Url_sort_test_003', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=33') - params.append('a', 'ACA') - params.sort() - var res = params.toString() - expect(res).assertEqual('a=ACA&b=33&c=value2&d=value1') - }) - it('Url_Values_test_001', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var arr = {}; - var i = 0; - for (var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[0]).assertEqual('value1') - }) - it('Url_Values_test_002', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var arr = {}; - var i = 0; - for (var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[1]).assertEqual('value2') - }) - it('Url_Values_test_003', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - params.append('a', 'ACA') - var arr = {}; - var i = 0; - for (var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[3]).assertEqual('ACA') - }) - it('Url_toString_test_001', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var result = params.toString() - expect(result).assertEqual('d=value1&c=value2&b=%E5%A4%A7') - }) - it('Url_toString_test_002', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b= 大') - params.append('1 12', 'QQQ') - var result = params.toString() - expect(result).assertEqual('d=value1&c=value2&b=+%E5%A4%A7&1+12=QQQ') - }) - it('Url_toString_test_003', 0, function () { - let params = new Url.URLSearchParams('￥=)') - params.delete('5') - var result = params.toString() - expect(result).assertEqual('%EF%BF%A5=%29') - }) - //new url SearchParams - it('Url_construction_test_001', 0, function () { - let params = new Url.URLSearchParams('?user=abc&query=xyz') - var result = params.toString() - expect(result).assertEqual('user=abc&query=xyz') - }) - it('Url_construction_test_002', 0, function () { - let params = new Url.URLSearchParams({ - user: 'abc', - query: ['first', 'second'] - }) - var result = params.toString() - expect(result).assertEqual('user=abc&query=first%2Csecond') - }) - it('Url_construction_test_003', 0, function () { - let params = new Url.URLSearchParams([ - ['user', 'abc'], - ['query', 'first'], - ['query', 'second'], - ]) - var result = params.toString() - expect(result).assertEqual('user=abc&query=first&query=second') - }) - it('Url_construction_test_004', 0, function () { - const map = new Map() - map.set('user', 'abc') - map.set('query', 'xyz') - let params = new Url.URLSearchParams(map) - var result = params.toString() - expect(result).assertEqual('user=abc&query=xyz') - }) - it('Url_construction_test_004', 0, function () { - function* getQueryPairs() { - yield ['user', 'abc'] - yield ['query', 'first'] - yield ['query', 'second'] - } - let params = new Url.URLSearchParams(getQueryPairs()) - var result = params.toString() - expect(result).assertEqual('user=abc&query=first&query=second') - }) - //new url - get - it('Url_to_string_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.to_string() - expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') - }) - - it('Url_href_test_002', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') - }) - it('Url_origin_test_003', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.origin - expect(result).assertEqual('http://host:8080') - }) - it('Url_protocol_test_004', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.protocol - expect(result).assertEqual('http:') - }) - it('Url_username_test_005', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.username - expect(result).assertEqual('username') - }) - it('Url_password_test_006', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.password - expect(result).assertEqual('password') - }) - it('Url_host_test_007', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.host - expect(result).assertEqual('host:8080') - }) - it('Url_hostname_test_008', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.hostname - expect(result).assertEqual('host') - }) - it('Url_port_test_009', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.port - expect(result).assertEqual('8080') - }) - it('Url_pathname_test_010', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result = params.pathname - expect(result).assertEqual('/directory/file') - }) - it('Url_search_test_011', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') - var result = params.search - expect(result).assertEqual('?query=qqqq') - }) - it('Url_search_test_012', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - var result = params.search - expect(result).assertEqual('?query=pppppp') - }) - it('Url_hash_test_013', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - var result = params.hash - expect(result).assertEqual('#fragment') - }) - //new url - set - it('Url_href_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.href = 'http://[::192.9.5.5]/ipng' - var result = params.href - expect(result).assertEqual('http://[::c009:505]/ipng') - }) - it('Url_protocol_test_002', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.protocol = 'https:' - var result = params.href - expect(result).assertEqual('https://username:password@host:8080/directory/file?query#fragment') - }) - it('Url_username_test_003', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.username = 'username1' - var result = params.href - expect(result).assertEqual('http://username1:password@host:8080/directory/file?query#fragment') - }) - it('Url_password_test_004', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.password = 'passwd' - var result = params.href - expect(result).assertEqual('http://username:passwd@host:8080/directory/file?query#fragment') - }) - - it('Url_host_test_005', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.host = 'www.baidu.com:99' - var result = params.href - expect(result).assertEqual('http://username:password@www.baidu.com:99/directory/file?query#fragment') - }) - - it('Url_hostname_test_006', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.hostname = 'www.baidu.com' - var result = params.href - expect(result).assertEqual('http://username:password@www.baidu.com:8080/directory/file?query#fragment') - }) - it('Url_port_test_007', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.port = '99' - var result = params.href - expect(result).assertEqual('http://username:password@host:99/directory/file?query#fragment') - }) - it('Url_pathname_test_008', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.pathname = '/path/ddd' - var result = params.href - expect(result).assertEqual('http://username:password@host:8080/path/ddd?query#fragment') - }) - it('Url_search_test_009', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') - params.search = '?pppppp=1234' - var result = params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?pppppp=1234#fragment') - }) - it('Url_hash_test_010', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - params.hash = '#qwer=da' - var result = params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - }) - //new url JSON - it('Url_toJSON_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - var result = params.toJSON() - expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - }) - //new url IPV6 - it('Url_IPV6_test_001', 0, function () { - let params = new Url.URL('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html') - var result = params.href - expect(result).assertEqual('http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/index.html') - }) - it('Url_IPV6_test_002', 0, function () { - let params = new Url.URL('http://[1080:0:0:0:8:800:200C:417A]/index.html') - var result = params.href - expect(result).assertEqual('http://[1080::8:800:200c:417a]/index.html') - }) - it('Url_IPV6_test_003', 0, function () { - let params = new Url.URL('http://[::FFFF:129.144.52.38]:80/index.html') - var result = params.href - expect(result).assertEqual('http://[::ffff:8190:3426]/index.html') - }) - //new url IPV4 - it('Url_IPV4_test_001', 0, function () { - let params = new Url.URL('http://0377.0xff.255.1:80/index.html') - var result = params.href - expect(result).assertEqual('http://255.255.255.1/index.html') - }) - it('Url_IPV4_test_002', 0, function () { - let params = new Url.URL('http://0377.0xff.255.g/index.html') - var result = params.href - expect(result).assertEqual('http://0377.0xff.255.g/index.html') - }) - it('Url_IPV4_test_003', 0, function () { - let params = new Url.URL('http://190.254.245.9:80/index.html') - var result = params.href - expect(result).assertEqual('http://190.254.245.9/index.html') - }) - //new url url_base - it('Url_base_test_001', 0, function () { - let params = new Url.URL('https://developer.mozilla.org',) - var result = params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_002', 0, function () { - let params = new Url.URL('https://developer.mozilla.org', 'flie:/developer.mozilla.org') - var result = params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_003', 0, function () { - let params = new Url.URL('https://developer.mozilla.org', 'ftp://www.example.com') - var result = params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_004', 0, function () { - let params = new Url.URL(' ', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/') - }) - it('Url_base_test_005', 0, function () { - let params = new Url.URL('.', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/') - }) - it('Url_base_test_006', 0, function () { - let params = new Url.URL('../h:', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/h:') - }) - it('Url_base_test_007', 0, function () { - let params = new Url.URL('/sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_008', 0, function () { - let params = new Url.URL('sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_009', 0, function () { - let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result = params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_010', 0, function () { - let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file://www.example.com') - var result = params.href - expect(result).assertEqual('file://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_011', 0, function () { - let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file1://www.example.com') - var result = params.href - expect(result).assertEqual('file1://www.example.com/sca/path/scasa/jjjjj') - }) +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License') + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' +import Url from '@ohos.url' + +describe('Url_mxa_jk_Test', function () { + it('Url_append_test_001', 0, function () { + var that = new Url.URL('http://username:password@host:8080/directory/file?foo=1&bar=2') + var params = new Url.URLSearchParams(that.search) + params.append('ma', 'jk') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&ma=jk') + }) + it('Url_append_test_002', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.append('ma 大', 'jk￥') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&ma+%E5%A4%A7=jk%EF%BF%A5') + }) + it('Url_append_test_003', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.append('foo~!@#$%^&*()_+-=', 'jk') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&foo%7E%21%40%23%24%25%5E%26*%28%29_%2B-%3D=jk') + }) + it('Url_delete_test_001', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo') + var result = params.toString() + expect(result).assertEqual('bar=2') + }) + it('Url_delete_test_002', 0, function () { + let that = new Url.URL('https://example.com?foo大=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo') + var result = params.toString() + expect(result).assertEqual('foo%E5%A4%A7=1&bar=2') + }) + it('Url_delete_test_003', 0, function () { + let that = new Url.URL('https://example.com?foo大=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo大') + var result = params.toString() + expect(result).assertEqual('bar=2') + }) + + it('Url_entries_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i] = pair[0]; + i++; + arr[i] = pair[1]; + i++; + } + expect(arr[1]).assertEqual('value1') + }) + it('Url_entries_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i] = pair[0]; + i++; + arr[i] = pair[1]; + i++; + } + expect(arr[2]).assertEqual('key2') + }) + it('Url_entries_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('foo', 'jk') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i] = pair[0]; + i++; + arr[i] = pair[1]; + i++; + } + expect(arr[5]).assertEqual('jk') + }) + + it('Url_forEach_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[0]).assertEqual('key=key1 value=value1 flag=key1=value1&key2=value2') + }) + it('Url_forEach_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[1]).assertEqual('key=key2 value=value2 flag=key1=value1&key2=value2') + }) + it('Url_forEach_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('foo', 'jk') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[2]).assertEqual('key=foo value=jk flag=key1=value1&key2=value2&foo=jk') + }) + it('Url_get_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var result = params.get('1') + expect(result).assertEqual(undefined) + }) + it('Url_get_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var result = params.get('key2') + expect(result).assertEqual('value2') + }) + it('Url_get_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('5', 'JKL') + var result = params.get('5') + expect(result).assertEqual('JKL') + }) + it('Url_getAll_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('key1', 'AAA') + var result = params.getAll('key1') + expect(result).assertEqual('value1,AAA') + }) + it('Url_getAll_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&8=DEF') + params.append('8', 'A8A') + var result = params.getAll('8') + expect(result).assertEqual('DEF,A8A') + }) + it('Url_getAll_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') + params.append('key3', 'A3A') + var result = params.getAll('key3') + expect(result).assertEqual('大,A3A') + }) + it('Url_has_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') + var result = params.has('2') + expect(result).assertEqual(false) + }) + it('Url_has_test_002', 0, function () { + let params = new Url.URLSearchParams('小=value1&key2=value2&key3=大') + var result = params.has('小') + expect(result).assertEqual(true) + }) + it('Url_has_test_003', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + params.append('￥', 'ACA') + var result = params.has('￥') + expect(result).assertEqual(true) + }) + it('Url_keys_test_001', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for (var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[0]).assertEqual('小') + }) + it('Url_keys_test_002', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for (var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[1]).assertEqual('￥') + }) + it('Url_keys_test_003', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for (var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[2]).assertEqual('key3') + }) + it('Url_set_test_001', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('11', 'CCC') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&11=CCC') + }) + it('Url_set_test_002', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('10', 'BBB') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&10=BBB') + }) + it('Url_set_test_003', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('ma 大', '10￥') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&ma+%E5%A4%A7=10%EF%BF%A5') + }) + it('Url_sort_test_001', 0, function () { + let params = new Url.URLSearchParams('1=value1&3=value3&2=key2') + params.sort() + var res = params.toString() + expect(res).assertEqual('1=value1&2=key2&3=value3') + }) + it('Url_sort_test_002', 0, function () { + let params = new Url.URLSearchParams('a=value1&c=value2&b=key2') + params.sort() + var res = params.toString() + expect(res).assertEqual('a=value1&b=key2&c=value2') + }) + it('Url_sort_test_003', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=33') + params.append('a', 'ACA') + params.sort() + var res = params.toString() + expect(res).assertEqual('a=ACA&b=33&c=value2&d=value1') + }) + it('Url_Values_test_001', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var arr = {}; + var i = 0; + for (var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[0]).assertEqual('value1') + }) + it('Url_Values_test_002', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var arr = {}; + var i = 0; + for (var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[1]).assertEqual('value2') + }) + it('Url_Values_test_003', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + params.append('a', 'ACA') + var arr = {}; + var i = 0; + for (var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[3]).assertEqual('ACA') + }) + it('Url_toString_test_001', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var result = params.toString() + expect(result).assertEqual('d=value1&c=value2&b=%E5%A4%A7') + }) + it('Url_toString_test_002', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b= 大') + params.append('1 12', 'QQQ') + var result = params.toString() + expect(result).assertEqual('d=value1&c=value2&b=+%E5%A4%A7&1+12=QQQ') + }) + it('Url_toString_test_003', 0, function () { + let params = new Url.URLSearchParams('￥=)') + params.delete('5') + var result = params.toString() + expect(result).assertEqual('%EF%BF%A5=%29') + }) + //new url SearchParams + it('Url_construction_test_001', 0, function () { + let params = new Url.URLSearchParams('?user=abc&query=xyz') + var result = params.toString() + expect(result).assertEqual('user=abc&query=xyz') + }) + it('Url_construction_test_002', 0, function () { + let params = new Url.URLSearchParams({ + user: 'abc', + query: ['first', 'second'] + }) + var result = params.toString() + expect(result).assertEqual('user=abc&query=first%2Csecond') + }) + it('Url_construction_test_003', 0, function () { + let params = new Url.URLSearchParams([ + ['user', 'abc'], + ['query', 'first'], + ['query', 'second'], + ]) + var result = params.toString() + expect(result).assertEqual('user=abc&query=first&query=second') + }) + it('Url_construction_test_004', 0, function () { + const map = new Map() + map.set('user', 'abc') + map.set('query', 'xyz') + let params = new Url.URLSearchParams(map) + var result = params.toString() + expect(result).assertEqual('user=abc&query=xyz') + }) + it('Url_construction_test_004', 0, function () { + function* getQueryPairs() { + yield ['user', 'abc'] + yield ['query', 'first'] + yield ['query', 'second'] + } + let params = new Url.URLSearchParams(getQueryPairs()) + var result = params.toString() + expect(result).assertEqual('user=abc&query=first&query=second') + }) + //new url - get + it('Url_to_string_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.to_string() + expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') + }) + + it('Url_href_test_002', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') + }) + it('Url_origin_test_003', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.origin + expect(result).assertEqual('http://host:8080') + }) + it('Url_protocol_test_004', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.protocol + expect(result).assertEqual('http:') + }) + it('Url_username_test_005', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.username + expect(result).assertEqual('username') + }) + it('Url_password_test_006', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.password + expect(result).assertEqual('password') + }) + it('Url_host_test_007', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.host + expect(result).assertEqual('host:8080') + }) + it('Url_hostname_test_008', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.hostname + expect(result).assertEqual('host') + }) + it('Url_port_test_009', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.port + expect(result).assertEqual('8080') + }) + it('Url_pathname_test_010', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result = params.pathname + expect(result).assertEqual('/directory/file') + }) + it('Url_search_test_011', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') + var result = params.search + expect(result).assertEqual('?query=qqqq') + }) + it('Url_search_test_012', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + var result = params.search + expect(result).assertEqual('?query=pppppp') + }) + it('Url_hash_test_013', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + var result = params.hash + expect(result).assertEqual('#fragment') + }) + //new url - set + it('Url_href_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.href = 'http://[::192.9.5.5]/ipng' + var result = params.href + expect(result).assertEqual('http://[::c009:505]/ipng') + }) + it('Url_protocol_test_002', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.protocol = 'https:' + var result = params.href + expect(result).assertEqual('https://username:password@host:8080/directory/file?query#fragment') + }) + it('Url_username_test_003', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.username = 'username1' + var result = params.href + expect(result).assertEqual('http://username1:password@host:8080/directory/file?query#fragment') + }) + it('Url_password_test_004', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.password = 'passwd' + var result = params.href + expect(result).assertEqual('http://username:passwd@host:8080/directory/file?query#fragment') + }) + + it('Url_host_test_005', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.host = 'www.baidu.com:99' + var result = params.href + expect(result).assertEqual('http://username:password@www.baidu.com:99/directory/file?query#fragment') + }) + + it('Url_hostname_test_006', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.hostname = 'www.baidu.com' + var result = params.href + expect(result).assertEqual('http://username:password@www.baidu.com:8080/directory/file?query#fragment') + }) + it('Url_port_test_007', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.port = '99' + var result = params.href + expect(result).assertEqual('http://username:password@host:99/directory/file?query#fragment') + }) + it('Url_pathname_test_008', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.pathname = '/path/ddd' + var result = params.href + expect(result).assertEqual('http://username:password@host:8080/path/ddd?query#fragment') + }) + it('Url_search_test_009', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') + params.search = '?pppppp=1234' + var result = params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?pppppp=1234#fragment') + }) + it('Url_hash_test_010', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + params.hash = '#qwer=da' + var result = params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + }) + //new url JSON + it('Url_toJSON_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + var result = params.toJSON() + expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + }) + //new url IPV6 + it('Url_IPV6_test_001', 0, function () { + let params = new Url.URL('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html') + var result = params.href + expect(result).assertEqual('http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/index.html') + }) + it('Url_IPV6_test_002', 0, function () { + let params = new Url.URL('http://[1080:0:0:0:8:800:200C:417A]/index.html') + var result = params.href + expect(result).assertEqual('http://[1080::8:800:200c:417a]/index.html') + }) + it('Url_IPV6_test_003', 0, function () { + let params = new Url.URL('http://[::FFFF:129.144.52.38]:80/index.html') + var result = params.href + expect(result).assertEqual('http://[::ffff:8190:3426]/index.html') + }) + //new url IPV4 + it('Url_IPV4_test_001', 0, function () { + let params = new Url.URL('http://0377.0xff.255.1:80/index.html') + var result = params.href + expect(result).assertEqual('http://255.255.255.1/index.html') + }) + it('Url_IPV4_test_002', 0, function () { + let params = new Url.URL('http://0377.0xff.255.g/index.html') + var result = params.href + expect(result).assertEqual('http://0377.0xff.255.g/index.html') + }) + it('Url_IPV4_test_003', 0, function () { + let params = new Url.URL('http://190.254.245.9:80/index.html') + var result = params.href + expect(result).assertEqual('http://190.254.245.9/index.html') + }) + //new url url_base + it('Url_base_test_001', 0, function () { + let params = new Url.URL('https://developer.mozilla.org',) + var result = params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_002', 0, function () { + let params = new Url.URL('https://developer.mozilla.org', 'flie:/developer.mozilla.org') + var result = params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_003', 0, function () { + let params = new Url.URL('https://developer.mozilla.org', 'ftp://www.example.com') + var result = params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_004', 0, function () { + let params = new Url.URL(' ', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/') + }) + it('Url_base_test_005', 0, function () { + let params = new Url.URL('.', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/') + }) + it('Url_base_test_006', 0, function () { + let params = new Url.URL('../h:', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/h:') + }) + it('Url_base_test_007', 0, function () { + let params = new Url.URL('/sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_008', 0, function () { + let params = new Url.URL('sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_009', 0, function () { + let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result = params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_010', 0, function () { + let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file://www.example.com') + var result = params.href + expect(result).assertEqual('file://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_011', 0, function () { + let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file1://www.example.com') + var result = params.href + expect(result).assertEqual('file1://www.example.com/sca/path/scasa/jjjjj') + }) }) \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/main/resources/base/element/string.json b/compileruntime/url_lib_standard/src/main/resources/base/element/string.json similarity index 94% rename from compileruntime/util_lib_standard/project/entry/src/main/resources/base/element/string.json rename to compileruntime/url_lib_standard/src/main/resources/base/element/string.json index c0dd3a09e..0bae6bd40 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/resources/base/element/string.json +++ b/compileruntime/url_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/url_lib_standard/src/ohosTest/js/default/app.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js rename to compileruntime/url_lib_standard/src/ohosTest/js/default/app.js diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json b/compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json rename to compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/en-US.json diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json b/compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json rename to compileruntime/url_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css b/compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.css similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css rename to compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.css diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml b/compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml rename to compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.hml diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js b/compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js rename to compileruntime/url_lib_standard/src/ohosTest/js/default/pages/index/index.js diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js b/compileruntime/url_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js rename to compileruntime/url_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/List.test.js b/compileruntime/url_lib_standard/src/ohosTest/js/test/List.test.js similarity index 92% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/List.test.js rename to compileruntime/url_lib_standard/src/ohosTest/js/test/List.test.js index d21d41758..86ae9fa26 100644 --- a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/List.test.js +++ b/compileruntime/url_lib_standard/src/ohosTest/js/test/List.test.js @@ -1,16 +1,16 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + require('./ExampleJsunit.test.js') \ No newline at end of file diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json b/compileruntime/url_lib_standard/src/ohosTest/resources/base/element/string.json similarity index 93% rename from compileruntime/url_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json rename to compileruntime/url_lib_standard/src/ohosTest/resources/base/element/string.json index 3b04ea845..2dffe5ba6 100644 --- a/compileruntime/url_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json +++ b/compileruntime/url_lib_standard/src/ohosTest/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "URL" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "URL" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/compileruntime/util_lib_standard/BUILD.gn b/compileruntime/util_lib_standard/BUILD.gn index b428754de..cceaf8a1f 100644 --- a/compileruntime/util_lib_standard/BUILD.gn +++ b/compileruntime/util_lib_standard/BUILD.gn @@ -10,9 +10,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") +ohos_js_hap_suite("util_js_test") { + hap_profile = "./src/main/config.json" + deps = [ + ":util_js_assets", + ":util_resources", + ] + + # shared_libraries = [ + # "//third_party/giflib:libgif", + # "//third_party/libpng:libpng", + # ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "UtilJsTest" -ohos_js_hap_suite("startup_util_js_test") { - test_hap_name = "StartupUtilJSApiTest" - hap_source_path = "hap/entry-debug-rich-unsigned.hap" + # part_name = "prebuilt_hap" + # subsystem_name = "xts" +} +ohos_js_assets("util_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("util_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" } diff --git a/compileruntime/util_lib_standard/Test.json b/compileruntime/util_lib_standard/Test.json index 301ce904e..111d1ab5e 100644 --- a/compileruntime/util_lib_standard/Test.json +++ b/compileruntime/util_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "startup_util_js_test.hap" + "UtilJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/util_lib_standard/project/entry/package.json b/compileruntime/util_lib_standard/project/entry/package.json deleted file mode 100644 index 69a88e3b6..000000000 --- a/compileruntime/util_lib_standard/project/entry/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/compileruntime/util_lib_standard/signature/openharmony_sx.p7b b/compileruntime/util_lib_standard/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 GIT binary patch literal 3437 zcmcgvX>b$g8MY4FF(5FQyMT=#m||qU)nQ9cId-MBB-<-lvSdq&snM}IENNF>t+bK| zgowuF2vC|SxSZxNN5eHhV%(WPpbeB9Fc3;JDMtzMBv1-XAc2N~c2_tCXW&OCGw6qQ z-s9VS-tT?h=bI0tMS+~WDXqHJyCPmLzdbE-fV8Nd&*MRZfG8(#POFZG3xs@Lb{0ry z=R8j3wWo!5g=yjKx#BoZMFS)uA)H}cTp@-^K`9VV?RC3J59@}eik*>n|pRKOLZ zxdn7G!Yv@9O#y<&eUy{)vMXb;fQR)ffVAADQsEMXm;IBMDLfLD0w^U;6%HVo-0Q_5 zCHEa?DBuauNpZzoF+tK27w#n~?u%toS-DhR4k@Q*{7x^8Q=D6&kd^_~J#VVG2LXkL zaAy=}U*?Jto)9hx5MGjdp9hcQAu@tfk_;l!PeyxPY<8b&+&D!CyaBh9=8BSVKLpk4 z4Ml3yY|&Th)vyK4cpC{!uU8v2YBlVV`d~(nz&<@{G1oe*DHub1z7~J5*;s2bX<)_* zV_GbsPQg`(&rpxRb_*Od7}++3+liSw-$!1 zs5*g}EHWhI3i|!-FcfzYL0`SL-rq>LENC;PMl)G(0(1U2%Va|smp0UFx0xd@soZA* zD5LYc4OlbE7@ARt#h}rr3>K@bf%B#^-c+xz8Hr)0D5ExIFltezN@Hn8>o5d~bSfYtkc+_Z&kI#-N5_GhCg*V-^TSO=!G~ z(fXy{n2XV+k}6w_W`dTOP2a4u0ly;ANZ>4OxSKAzFB!yBzdo`gX zO?o|H@WiAw$y6l?=^3jA_Hy0S)nTYs12;4hKE&ekQ|>?|ZLJ}#F`2BczC7kdE4@xV zZBD_)Otwjhz+NSaz?d45!;FsGSu-#qh#hStD%B}f!mCT!KqzSo>I`NGH_9Dea$1Qi zg29Ydt!~lQVR99_T7#Hije~(12drl-P)SV?QR*9sus`8th-8^OQ7@xI$(Yp|^;bL1 zR50O$mDXw6P>i7B(TJ)ciPzTE>XY%X6HAa)b#OBRXv&~%Bw|J#Y><i4=e%95bjtw|cJp=#P#Pf#*luqI_wR;fISDCJhAqSG6R%xItn%~QtZ@m%&u zjGGLX;t6Ls62eQvNmf@v+}J%54^CygxRZ`?8X#r|wkev7(s;Ou4T#y1XNNf)h;o7z z8a^Lfq<1uH`E{G9E z*(=)Css_LSk=>E9jr)s5^2-!+MN=Ds}>1hRma4`uCIz9%p3O77839E{xf z4c_I?**|1`K2tg4!Hvyrou4BsJQuv*UfF)<%CelYIS>D^o?X)3+MK%la6kooW8&G@BU)Y0hT`+mOm$Z_%rB=a%o>I z!2c6lHyKQN)VjiFwa!eE^p8jc$sy$vB+8i25lI~6KPFFh$!o$avA~rj#L6xvR|Z83 z*WD6T9e+5Pyy=F+)pNTf{ny3cy>7Rkd3o*TS?TZJ`NS^NF2%HMkyS{?uJ$`!P4_L^ z1`NFDUbNyg_qREifgktnp1_v{Jbb`7m}2PTyUdOmtJj~m z9bB=ecw4_^rw1IW=of+>nrW5=d3k`3qHCxsIN_F{T1A545};;+fsyC&qChi+YV zr~M63H8ZLCPYmsjY>ls9cL%I)F|JIW-#+48$+lD4k*(P*kDM%zx_fvu4u5ZYUnI}5 zdrycFq>xFU)&X3p@pP2u%$o}}YcRn(MhJ&B2o?KS@cIVz>Ye%o^xV?CB{_Qhu z;}_q1bvO^g{8<3!gYbo4Di{8qzV+(9 zdlmksohQmRTs@qB;(Wo?dER_ux6XQb@q$tQPW?CMu6GVQd;R=iR;-S{Kr%Zks7>b1 zNs{|-+jhObYE}NR&`TGGr^h^4bjh%c>R#@=8nM&Md>_a+zVulsl;){flFekV1t9ob z+SqfV_Pv3$2f)bQ8%Ul2>fdYR^1zs0BQF~olsOj5AodC&Q_7SMFzsz2 z9newxE&jodk~tNHwl%LBMMDbrk=(^b literal 0 HcmV?d00001 diff --git a/compileruntime/process_lib_standard/project/entry/src/main/config.json b/compileruntime/util_lib_standard/src/main/config.json similarity index 95% rename from compileruntime/process_lib_standard/project/entry/src/main/config.json rename to compileruntime/util_lib_standard/src/main/config.json index f3773ec2f..75d1ac144 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/config.json +++ b/compileruntime/util_lib_standard/src/main/config.json @@ -1,57 +1,57 @@ -{ - "app": { - "bundleName": "com.example.childprocess", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.childprocess", - "name": ".MyApplication", - "mainAbility": "com.example.childprocess.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.childprocess.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.childprocess", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.childprocess", + "name": ".MyApplication", + "mainAbility": "com.example.childprocess.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.childprocess.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java b/compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MainAbility.java similarity index 96% rename from compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java rename to compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MainAbility.java index 1bc0c4d53..dbdddf742 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java +++ b/compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MainAbility.java @@ -1,31 +1,31 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.childprocess; - -import ohos.ace.ability.AceAbility; -import ohos.aafwk.content.Intent; - -public class MainAbility extends AceAbility { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - - @Override - public void onStop() { - super.onStop(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.childprocess; + +import ohos.ace.ability.AceAbility; +import ohos.aafwk.content.Intent; + +public class MainAbility extends AceAbility { + @Override + public void onStart(Intent intent) { + super.onStart(intent); + } + + @Override + public void onStop() { + super.onStop(); + } +} diff --git a/compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java b/compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MyApplication.java similarity index 97% rename from compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java rename to compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MyApplication.java index b27ffa96e..bf24a9676 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java +++ b/compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MyApplication.java @@ -1,25 +1,25 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.childprocess; - -import ohos.aafwk.ability.AbilityPackage; - -public class MyApplication extends AbilityPackage { - @Override - public void onInitialize() { - super.onInitialize(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.childprocess; + +import ohos.aafwk.ability.AbilityPackage; + +public class MyApplication extends AbilityPackage { + @Override + public void onInitialize() { + super.onInitialize(); + } +} diff --git a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java b/compileruntime/util_lib_standard/src/main/java/com/example/url/MainAbility.java similarity index 96% rename from compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java rename to compileruntime/util_lib_standard/src/main/java/com/example/url/MainAbility.java index ab25e441f..1029c0119 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java +++ b/compileruntime/util_lib_standard/src/main/java/com/example/url/MainAbility.java @@ -1,30 +1,30 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.url; - -import ohos.ace.ability.AceAbility; -import ohos.aafwk.content.Intent; - -public class MainAbility extends AceAbility { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - - @Override - public void onStop() { - super.onStop(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.url; + +import ohos.ace.ability.AceAbility; +import ohos.aafwk.content.Intent; + +public class MainAbility extends AceAbility { + @Override + public void onStart(Intent intent) { + super.onStart(intent); + } + + @Override + public void onStop() { + super.onStop(); + } +} diff --git a/compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java b/compileruntime/util_lib_standard/src/main/java/com/example/url/MyApplication.java similarity index 97% rename from compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java rename to compileruntime/util_lib_standard/src/main/java/com/example/url/MyApplication.java index 8b5743ec6..d0bd8e832 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java +++ b/compileruntime/util_lib_standard/src/main/java/com/example/url/MyApplication.java @@ -1,24 +1,24 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.url; - -import ohos.aafwk.ability.AbilityPackage; - -public class MyApplication extends AbilityPackage { - @Override - public void onInitialize() { - super.onInitialize(); - } -} +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.url; + +import ohos.aafwk.ability.AbilityPackage; + +public class MyApplication extends AbilityPackage { + @Override + public void onInitialize() { + super.onInitialize(); + } +} diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/util_lib_standard/src/main/js/default/app.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js rename to compileruntime/util_lib_standard/src/main/js/default/app.js diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png b/compileruntime/util_lib_standard/src/main/js/default/common/images/Wallpaper.png similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/Wallpaper.png rename to compileruntime/util_lib_standard/src/main/js/default/common/images/Wallpaper.png diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg b/compileruntime/util_lib_standard/src/main/js/default/common/images/bg-tv.jpg similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/common/images/bg-tv.jpg rename to compileruntime/util_lib_standard/src/main/js/default/common/images/bg-tv.jpg diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/en-US.json b/compileruntime/util_lib_standard/src/main/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/en-US.json rename to compileruntime/util_lib_standard/src/main/js/default/i18n/en-US.json diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json b/compileruntime/util_lib_standard/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json rename to compileruntime/util_lib_standard/src/main/js/default/i18n/zh-CN.json diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.css b/compileruntime/util_lib_standard/src/main/js/default/pages/index/index.css similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.css rename to compileruntime/util_lib_standard/src/main/js/default/pages/index/index.css diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.hml b/compileruntime/util_lib_standard/src/main/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.hml rename to compileruntime/util_lib_standard/src/main/js/default/pages/index/index.hml diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.js b/compileruntime/util_lib_standard/src/main/js/default/pages/index/index.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/default/pages/index/index.js rename to compileruntime/util_lib_standard/src/main/js/default/pages/index/index.js diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js b/compileruntime/util_lib_standard/src/main/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js rename to compileruntime/util_lib_standard/src/main/js/test/ExampleJsunit.test.js diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/test/List.test.js b/compileruntime/util_lib_standard/src/main/js/test/List.test.js similarity index 93% rename from compileruntime/util_lib_standard/project/entry/src/main/js/test/List.test.js rename to compileruntime/util_lib_standard/src/main/js/test/List.test.js index 78c997a16..e4726ba94 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/js/test/List.test.js +++ b/compileruntime/util_lib_standard/src/main/js/test/List.test.js @@ -1,17 +1,17 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -require('./ExampleJsunit.test.js') +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +require('./ExampleJsunit.test.js') require('./TextCodr.test.js') \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/test/TextCodr.test.js b/compileruntime/util_lib_standard/src/main/js/test/TextCodr.test.js similarity index 96% rename from compileruntime/util_lib_standard/project/entry/src/main/js/test/TextCodr.test.js rename to compileruntime/util_lib_standard/src/main/js/test/TextCodr.test.js index 147a1d7c1..9026eca17 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/js/test/TextCodr.test.js +++ b/compileruntime/util_lib_standard/src/main/js/test/TextCodr.test.js @@ -1,449 +1,449 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -import util from '@ohos.util' -describe('textEncoderTest', function () { - it('util_printf_test_001', 0, function () { - var format = "%i,%s"; - var value1 = 1.5; - var value2 = "qwer"; - var value3 = 15; - var result = util.printf(format, value1, value2, value3); - expect(result).assertEqual("1,qwer 15"); - }) - - it('util_printf_test_002', 0, function () { - var format = "%O"; - var value = { name: 'jack', age: 15 }; - var result = util.printf(format, value); - expect(result).assertEqual("{ name: 'jack' ,age: 15 }\n"); - }) - - it('util_printf_test_003', 0, function () { - var format = "%o"; - var value = [1, 2, 3]; - var result = util.printf(format, value); - var res = '[ 1, 2, 3, [length]: 3 ]' - expect(result).assertEqual(' [ 1, 2, 3, [length]: 3 ]'); - }) - - it('util_printf_test_004', 0, function () { - var format = "%s,%s,%s"; - var value1 = "1.5"; - var value2 = "qwer"; - var result = util.printf(format, value1, value2); - expect(result).assertEqual('1.5,qwer,%s'); - }) - - it('util_getErrorString_test_001', 0, async function () { - var errnum = 10; - var result = util.getErrorString(errnum); - expect(result).assertEqual('No child process'); - }) - - it('util_getErrorString_test_002', 0, async function () { - console.log('--SK-- util_getErrorString_test_002'); - var errnum = 0; - var result = util.getErrorString(errnum); - expect(result).assertEqual('No error information'); - }) - - it('util_getErrorString_test_003', 0, async function () { - var errnum = -1; - var result = util.getErrorString(errnum); - expect(result).assertEqual('No error information'); - }) - - it('util_promisewrapper_test_002', 0, async function () { - function aysnFun(str1, str2, callback) { - if (typeof str1 === 'string' && typeof str1 === 'string') { - callback(null, str1 + str2); - } else { - callback('type err'); - } - } - let newPromiseObj = util.promiseWrapper(aysnFun)("Hello", 'World'); - newPromiseObj.then(res => { - expect(res).strictEqual('HelloWorld'); - }) - }) - - it('util_promisewrapper_test_003', 0, async function () { - function aysnFun(str1, str2, callback) { - if (typeof str1 === 'string' && typeof str1 === 'string') { - callback(null, str1 + str2); - } else { - callback('type err'); - } - } - let newPromiseObj = util.promiseWrapper(aysnFun)([1, 2], 'World'); - newPromiseObj.catch(err => { - expect(err).strictEqual('type err'); - }) - }) - - it('util_promisewrapper_test_004', 0, async function () { - const a = util.promiseWrapper(function() {}); - const b = util.promiseWrapper(a); - expect(a).strictEqual(b); - }) - - it('util_promisewrapper_test_005', 0, async function () { - let errToThrow; - const thrower = util.promiseWrapper(function(a, b, c, cb) { - errToThrow = new Error(); - throw errToThrow; - }); - thrower(1, 2, 3).catch(err => { - expect(err).strictEqual(errToThrow); - }) - }) - - it('util_promisewrapper_test_006', 0, async function () { - const err = new Error(); - const a = util.promiseWrapper((cb) => cb(err))(); - const b = util.promiseWrapper(() => {throw err;})(); - Promise.all([ - a.then(e => { - expect(e).strictEqual(err); - }), - b.then(e => { - expect(e).strictEqual(err); - }) - ]); - }) - - it('util_promisewrapper_test_007', 0, async function () { - const err = new Error('callback with the error.'); - const stack = err.stack; - const fn = util.promiseWrapper(function(cb) { - cb(null); - cb(err); - }); - (async () => { - await fn(); - await Promise.resolve(); - return expect(stack).strictEqual(err.stack); - })(); - }) - - it('util_promisewrapper_test_008', 0, async function () { - function fn(err, val, callback) { - callback(err, val); - } - (async () => { - const value = await util.promiseWrapper(fn)(null, 42); - expect(value).strictEqual(42); - })(); - }) - - it('util_callbackWrapper_test_001', 0, async function () { - const promiseFn = [1, 2]; - try { - util.callbackWrapper(promiseFn); - } catch(e) { - expect(e.message).strictEqual('original is not function'); - } - }) - - it('util_callbackWrapper_test_002', 0, async function () { - async function promiseFn() { - return Promise.resolve('value'); - }; - var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual('value'); - }) - }) - - it('util_callbackWrapper_test_003', 0, async function () { - async function promiseFn() { - return 42; - }; - var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual(42); - }) - }) - - it('util_callbackWrapper_test_004', 0, async function () { - async function promiseFn() { - return Promise.reject('value'); - }; - var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err).strictEqual('value'); - expect(ret).strictEqual(undefined); - }) - }) - - it('util_callbackWrapper_test_005', 0, async function () { - async function promiseFn(a, b) { - return a + b; - }; - var cb = util.callbackWrapper(promiseFn); - cb(1, 2, (err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual(3); - }) - }) - - it('util_callbackWrapper_test_006', 0, async function () { - async function promiseFn(){ - return null; - }; - var cb = util.callbackWrapper(promiseFn); - try { - cb([1, 2]) - } catch(err) { - expect(err.message).strictEqual('maybe is not function'); - } - }) - - it('encoding_test_001', 0, function () { - var that = new util.TextDecoder('utf-8', { ignoreBOM : true }) - var retStr = that.encoding - expect(retStr).assertEqual('utf-8') - }) - - // encoding test - it('encoding_test_002', 0, function () { - var that = new util.TextDecoder('utf-16le') - var encodingStr = that.encoding - expect(encodingStr).assertEqual('utf-16le') - }) - - it('encoding_test_003', 0, function () { - var that = new util.TextDecoder('utf-16be') - var encodingStr = that.encoding - expect(encodingStr).assertEqual('utf-16be') - }) - - // fatal test - it('fatal_test_001', 0, function () { - var that = new util.TextDecoder('utf-16be', { fatal : true }) - var fatalStr = that.fatal - expect(fatalStr).assertEqual(true) - }) - - it('fatal_test_002', 0, function () { - var that = new util.TextDecoder('utf-16be', { fatal : false }) - var fatalStr = that.fatal - expect(fatalStr).assertEqual(false) - }) - - it('fatal_test_003', 0, function () { - var that = new util.TextDecoder('utf-16be') - var fatalStr = that.fatal - expect(fatalStr).assertEqual(false) - }) - - it('fatal_test_004', 0, function () { - var that = new util.TextDecoder('utf-8') - var fatalStr = that.fatal - expect(fatalStr).assertEqual(false) - }) - - // ignoreBOM test - it('ignoreBOM_test_001', 0, function () { - var that = new util.TextDecoder('utf-16be', { ignoreBOM : true }) - var ignoreBOMStr = that.ignoreBOM - expect(ignoreBOMStr).assertEqual(true) - }) - - it('ignoreBOM_test_002', 0, function () { - var that = new util.TextDecoder('utf-16be', { ignoreBOM : false }) - var ignoreBOMStr = that.ignoreBOM - expect(ignoreBOMStr).assertEqual(false) - }) - - it('ignoreBOM_test_003', 0, function () { - var that = new util.TextDecoder('utf-16be') - var ignoreBOMStr = that.ignoreBOM - expect(ignoreBOMStr).assertEqual(false) - }) - - it('ignoreBOM_test_004', 0, function () { - var that = new util.TextDecoder('utf-8') - var ignoreBOMStr = that.ignoreBOM - expect(ignoreBOMStr).assertEqual(false) - }) - - it('decode_test_001', 0, function () { - var that = new util.TextDecoder('utf-8'); - var arr = new Uint8Array(3); - for (var i = 0; i < 3; i++) { - arr[i] = 0x61 + i; - } - var retStr = that.decode(arr); - var rel = 'abc'; - expect(retStr).assertEqual(rel); - }) - - it('decode_test_002', 0, function () { - var that = new util.TextDecoder('utf-16le') - var arr = new Uint8Array(6) - arr[0] = 0x61; - arr[1] = 0x00; - arr[2] = 0x62; - arr[3] = 0x00; - arr[4] = 0x63; - arr[5] = 0x00; - var retStr = that.decode(arr) - var rel = 'abc' - expect(retStr).assertEqual(rel) - }) - - it('decode_test_003', 0, function () { - var that = new util.TextDecoder('utf-16be'); - var arr = new Uint8Array(6); - arr[0] = 0x00; - arr[1] = 0x61; - arr[2] = 0x00; - arr[3] = 0x62; - arr[4] = 0x00; - arr[5] = 0x63; - var retStr = that.decode(arr); - var rel = 'abc' - expect(retStr).assertEqual(rel); - }) - - it('decode_test_004', 0, function () { - var that = new util.TextDecoder('utf-8', { ignoreBOM : true }) - var arr = new Uint8Array(6) - arr[0] = 0xEF; - arr[1] = 0xBB; - arr[2] = 0xBF; - arr[3] = 0x61; - arr[4] = 0x62; - arr[5] = 0x63; - var retStr = that.decode(arr, {stream:true}) - var BOM = '\uFEFF' - var rel = 'abc' - var re = BOM + rel - expect(retStr).assertEqual(re); - }) - - it('decode_test_005', 0, function () { - var that = new util.TextDecoder('utf-16le', { ignoreBOM : false }) - var arr = new Uint8Array(8) - arr[0] = 0xFF; - arr[1] = 0xFE; - arr[2] = 0x61; - arr[3] = 0x00; - arr[4] = 0x62; - arr[5] = 0x00 - arr[6] = 0x63; - arr[7] = 0x00; - var retStr = that.decode(arr, { stream : false }) - var BOM = '\uFEFF' - var rel = 'abc' - var re = BOM + rel - expect(retStr).assertEqual(re) - }) - - // encode test - it('test_get_encoding', 0, function () { - var that = new util.TextEncoder() - var str = that.encoding - expect(str).assertEqual('utf-8') - }) - - it('test_encode_01', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(20) - var result = new Uint8Array(buffer) - result = that.encode('\uD800楼楼') - expect(result[5]).assertEqual(188) - }) - - it('test_encode_02', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(20) - var result = new Uint8Array(buffer) - result = that.encode('a\uD800楼楼') - expect(result[0]).assertEqual(0x61) - }) - - it('test_encode_03', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(20) - var result = new Uint8Array(buffer) - result = that.encode('abc\uD800楼楼') - expect(result[1]).assertEqual(0x62) - }) - - it('test_encode_04', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(20) - var result = new Uint8Array(buffer) - result = that.encode('123\uD800楼楼') - expect(result[0]).assertEqual(49) - expect(result[9]).assertEqual(230) - }) - - it('test_encodeInto_01', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(20) - var dest = new Uint8Array(buffer, 0, 13) - var result = new Uint32Array(20) - result = that.encodeInto('\uD800A\uDF06A楼HiA', dest) - expect(result.read).assertEqual(7) - expect(result.written).assertEqual(13) - }) - - it('test_encodeInto_02', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(6) - var dest = new Uint8Array(buffer) - var result = new Object() - result = that.encodeInto('abc\u2603d', dest) - expect(result.read).assertEqual(4) - expect(result.written).assertEqual(6) - }) - - it('test_encodeInto_03', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(4) - var dest = new Uint8Array(buffer) - var result = new Object() - result = that.encodeInto('abcd', dest) - expect(result.read).assertEqual(4) - expect(result.written).assertEqual(4) - }) - - it('test_encodeInto_04', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(4) - var dest = new Uint8Array(buffer) - var result = new Object() - result = that.encodeInto('12345', dest) - expect(result.read).assertEqual(4) - expect(result.written).assertEqual(4) - }) - - it('test_encodeInto_05', 0, function () { - var that = new util.TextEncoder() - var buffer = new ArrayBuffer(4) - var dest = new Uint8Array(buffer) - var result = new Object() - result = that.encodeInto('123 4*!@#', dest) - expect(result.read).assertEqual(4) - expect(result.written).assertEqual(4) - }) +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' +import util from '@ohos.util' +describe('textEncoderTest', function () { + it('util_printf_test_001', 0, function () { + var format = "%i,%s"; + var value1 = 1.5; + var value2 = "qwer"; + var value3 = 15; + var result = util.printf(format, value1, value2, value3); + expect(result).assertEqual("1,qwer 15"); + }) + + it('util_printf_test_002', 0, function () { + var format = "%O"; + var value = { name: 'jack', age: 15 }; + var result = util.printf(format, value); + expect(result).assertEqual("{ name: 'jack' ,age: 15 }\n"); + }) + + it('util_printf_test_003', 0, function () { + var format = "%o"; + var value = [1, 2, 3]; + var result = util.printf(format, value); + var res = '[ 1, 2, 3, [length]: 3 ]' + expect(result).assertEqual(' [ 1, 2, 3, [length]: 3 ]'); + }) + + it('util_printf_test_004', 0, function () { + var format = "%s,%s,%s"; + var value1 = "1.5"; + var value2 = "qwer"; + var result = util.printf(format, value1, value2); + expect(result).assertEqual('1.5,qwer,%s'); + }) + + it('util_getErrorString_test_001', 0, async function () { + var errnum = 10; + var result = util.getErrorString(errnum); + expect(result).assertEqual('No child process'); + }) + + it('util_getErrorString_test_002', 0, async function () { + console.log('--SK-- util_getErrorString_test_002'); + var errnum = 0; + var result = util.getErrorString(errnum); + expect(result).assertEqual('No error information'); + }) + + it('util_getErrorString_test_003', 0, async function () { + var errnum = -1; + var result = util.getErrorString(errnum); + expect(result).assertEqual('No error information'); + }) + + it('util_promisewrapper_test_002', 0, async function () { + function aysnFun(str1, str2, callback) { + if (typeof str1 === 'string' && typeof str1 === 'string') { + callback(null, str1 + str2); + } else { + callback('type err'); + } + } + let newPromiseObj = util.promiseWrapper(aysnFun)("Hello", 'World'); + newPromiseObj.then(res => { + expect(res).strictEqual('HelloWorld'); + }) + }) + + it('util_promisewrapper_test_003', 0, async function () { + function aysnFun(str1, str2, callback) { + if (typeof str1 === 'string' && typeof str1 === 'string') { + callback(null, str1 + str2); + } else { + callback('type err'); + } + } + let newPromiseObj = util.promiseWrapper(aysnFun)([1, 2], 'World'); + newPromiseObj.catch(err => { + expect(err).strictEqual('type err'); + }) + }) + + it('util_promisewrapper_test_004', 0, async function () { + const a = util.promiseWrapper(function() {}); + const b = util.promiseWrapper(a); + expect(a).strictEqual(b); + }) + + it('util_promisewrapper_test_005', 0, async function () { + let errToThrow; + const thrower = util.promiseWrapper(function(a, b, c, cb) { + errToThrow = new Error(); + throw errToThrow; + }); + thrower(1, 2, 3).catch(err => { + expect(err).strictEqual(errToThrow); + }) + }) + + it('util_promisewrapper_test_006', 0, async function () { + const err = new Error(); + const a = util.promiseWrapper((cb) => cb(err))(); + const b = util.promiseWrapper(() => {throw err;})(); + Promise.all([ + a.then(e => { + expect(e).strictEqual(err); + }), + b.then(e => { + expect(e).strictEqual(err); + }) + ]); + }) + + it('util_promisewrapper_test_007', 0, async function () { + const err = new Error('callback with the error.'); + const stack = err.stack; + const fn = util.promiseWrapper(function(cb) { + cb(null); + cb(err); + }); + (async () => { + await fn(); + await Promise.resolve(); + return expect(stack).strictEqual(err.stack); + })(); + }) + + it('util_promisewrapper_test_008', 0, async function () { + function fn(err, val, callback) { + callback(err, val); + } + (async () => { + const value = await util.promiseWrapper(fn)(null, 42); + expect(value).strictEqual(42); + })(); + }) + + it('util_callbackWrapper_test_001', 0, async function () { + const promiseFn = [1, 2]; + try { + util.callbackWrapper(promiseFn); + } catch(e) { + expect(e.message).strictEqual('original is not function'); + } + }) + + it('util_callbackWrapper_test_002', 0, async function () { + async function promiseFn() { + return Promise.resolve('value'); + }; + var cb = util.callbackWrapper(promiseFn); + cb((err, ret) => { + expect(err).strictEqual(null); + expect(ret).strictEqual('value'); + }) + }) + + it('util_callbackWrapper_test_003', 0, async function () { + async function promiseFn() { + return 42; + }; + var cb = util.callbackWrapper(promiseFn); + cb((err, ret) => { + expect(err).strictEqual(null); + expect(ret).strictEqual(42); + }) + }) + + it('util_callbackWrapper_test_004', 0, async function () { + async function promiseFn() { + return Promise.reject('value'); + }; + var cb = util.callbackWrapper(promiseFn); + cb((err, ret) => { + expect(err).strictEqual('value'); + expect(ret).strictEqual(undefined); + }) + }) + + it('util_callbackWrapper_test_005', 0, async function () { + async function promiseFn(a, b) { + return a + b; + }; + var cb = util.callbackWrapper(promiseFn); + cb(1, 2, (err, ret) => { + expect(err).strictEqual(null); + expect(ret).strictEqual(3); + }) + }) + + it('util_callbackWrapper_test_006', 0, async function () { + async function promiseFn(){ + return null; + }; + var cb = util.callbackWrapper(promiseFn); + try { + cb([1, 2]) + } catch(err) { + expect(err.message).strictEqual('maybe is not function'); + } + }) + + it('encoding_test_001', 0, function () { + var that = new util.TextDecoder('utf-8', { ignoreBOM : true }) + var retStr = that.encoding + expect(retStr).assertEqual('utf-8') + }) + + // encoding test + it('encoding_test_002', 0, function () { + var that = new util.TextDecoder('utf-16le') + var encodingStr = that.encoding + expect(encodingStr).assertEqual('utf-16le') + }) + + it('encoding_test_003', 0, function () { + var that = new util.TextDecoder('utf-16be') + var encodingStr = that.encoding + expect(encodingStr).assertEqual('utf-16be') + }) + + // fatal test + it('fatal_test_001', 0, function () { + var that = new util.TextDecoder('utf-16be', { fatal : true }) + var fatalStr = that.fatal + expect(fatalStr).assertEqual(true) + }) + + it('fatal_test_002', 0, function () { + var that = new util.TextDecoder('utf-16be', { fatal : false }) + var fatalStr = that.fatal + expect(fatalStr).assertEqual(false) + }) + + it('fatal_test_003', 0, function () { + var that = new util.TextDecoder('utf-16be') + var fatalStr = that.fatal + expect(fatalStr).assertEqual(false) + }) + + it('fatal_test_004', 0, function () { + var that = new util.TextDecoder('utf-8') + var fatalStr = that.fatal + expect(fatalStr).assertEqual(false) + }) + + // ignoreBOM test + it('ignoreBOM_test_001', 0, function () { + var that = new util.TextDecoder('utf-16be', { ignoreBOM : true }) + var ignoreBOMStr = that.ignoreBOM + expect(ignoreBOMStr).assertEqual(true) + }) + + it('ignoreBOM_test_002', 0, function () { + var that = new util.TextDecoder('utf-16be', { ignoreBOM : false }) + var ignoreBOMStr = that.ignoreBOM + expect(ignoreBOMStr).assertEqual(false) + }) + + it('ignoreBOM_test_003', 0, function () { + var that = new util.TextDecoder('utf-16be') + var ignoreBOMStr = that.ignoreBOM + expect(ignoreBOMStr).assertEqual(false) + }) + + it('ignoreBOM_test_004', 0, function () { + var that = new util.TextDecoder('utf-8') + var ignoreBOMStr = that.ignoreBOM + expect(ignoreBOMStr).assertEqual(false) + }) + + it('decode_test_001', 0, function () { + var that = new util.TextDecoder('utf-8'); + var arr = new Uint8Array(3); + for (var i = 0; i < 3; i++) { + arr[i] = 0x61 + i; + } + var retStr = that.decode(arr); + var rel = 'abc'; + expect(retStr).assertEqual(rel); + }) + + it('decode_test_002', 0, function () { + var that = new util.TextDecoder('utf-16le') + var arr = new Uint8Array(6) + arr[0] = 0x61; + arr[1] = 0x00; + arr[2] = 0x62; + arr[3] = 0x00; + arr[4] = 0x63; + arr[5] = 0x00; + var retStr = that.decode(arr) + var rel = 'abc' + expect(retStr).assertEqual(rel) + }) + + it('decode_test_003', 0, function () { + var that = new util.TextDecoder('utf-16be'); + var arr = new Uint8Array(6); + arr[0] = 0x00; + arr[1] = 0x61; + arr[2] = 0x00; + arr[3] = 0x62; + arr[4] = 0x00; + arr[5] = 0x63; + var retStr = that.decode(arr); + var rel = 'abc' + expect(retStr).assertEqual(rel); + }) + + it('decode_test_004', 0, function () { + var that = new util.TextDecoder('utf-8', { ignoreBOM : true }) + var arr = new Uint8Array(6) + arr[0] = 0xEF; + arr[1] = 0xBB; + arr[2] = 0xBF; + arr[3] = 0x61; + arr[4] = 0x62; + arr[5] = 0x63; + var retStr = that.decode(arr, {stream:true}) + var BOM = '\uFEFF' + var rel = 'abc' + var re = BOM + rel + expect(retStr).assertEqual(re); + }) + + it('decode_test_005', 0, function () { + var that = new util.TextDecoder('utf-16le', { ignoreBOM : false }) + var arr = new Uint8Array(8) + arr[0] = 0xFF; + arr[1] = 0xFE; + arr[2] = 0x61; + arr[3] = 0x00; + arr[4] = 0x62; + arr[5] = 0x00 + arr[6] = 0x63; + arr[7] = 0x00; + var retStr = that.decode(arr, { stream : false }) + var BOM = '\uFEFF' + var rel = 'abc' + var re = BOM + rel + expect(retStr).assertEqual(re) + }) + + // encode test + it('test_get_encoding', 0, function () { + var that = new util.TextEncoder() + var str = that.encoding + expect(str).assertEqual('utf-8') + }) + + it('test_encode_01', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(20) + var result = new Uint8Array(buffer) + result = that.encode('\uD800楼楼') + expect(result[5]).assertEqual(188) + }) + + it('test_encode_02', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(20) + var result = new Uint8Array(buffer) + result = that.encode('a\uD800楼楼') + expect(result[0]).assertEqual(0x61) + }) + + it('test_encode_03', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(20) + var result = new Uint8Array(buffer) + result = that.encode('abc\uD800楼楼') + expect(result[1]).assertEqual(0x62) + }) + + it('test_encode_04', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(20) + var result = new Uint8Array(buffer) + result = that.encode('123\uD800楼楼') + expect(result[0]).assertEqual(49) + expect(result[9]).assertEqual(230) + }) + + it('test_encodeInto_01', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(20) + var dest = new Uint8Array(buffer, 0, 13) + var result = new Uint32Array(20) + result = that.encodeInto('\uD800A\uDF06A楼HiA', dest) + expect(result.read).assertEqual(7) + expect(result.written).assertEqual(13) + }) + + it('test_encodeInto_02', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(6) + var dest = new Uint8Array(buffer) + var result = new Object() + result = that.encodeInto('abc\u2603d', dest) + expect(result.read).assertEqual(4) + expect(result.written).assertEqual(6) + }) + + it('test_encodeInto_03', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(4) + var dest = new Uint8Array(buffer) + var result = new Object() + result = that.encodeInto('abcd', dest) + expect(result.read).assertEqual(4) + expect(result.written).assertEqual(4) + }) + + it('test_encodeInto_04', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(4) + var dest = new Uint8Array(buffer) + var result = new Object() + result = that.encodeInto('12345', dest) + expect(result.read).assertEqual(4) + expect(result.written).assertEqual(4) + }) + + it('test_encodeInto_05', 0, function () { + var that = new util.TextEncoder() + var buffer = new ArrayBuffer(4) + var dest = new Uint8Array(buffer) + var result = new Object() + result = that.encodeInto('123 4*!@#', dest) + expect(result.read).assertEqual(4) + expect(result.written).assertEqual(4) + }) }) \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/test/url.test.js b/compileruntime/util_lib_standard/src/main/js/test/url.test.js similarity index 97% rename from compileruntime/util_lib_standard/project/entry/src/main/js/test/url.test.js rename to compileruntime/util_lib_standard/src/main/js/test/url.test.js index 0c9363cd0..fe429b9e6 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/js/test/url.test.js +++ b/compileruntime/util_lib_standard/src/main/js/test/url.test.js @@ -1,564 +1,564 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the 'License') - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' -import Url from '@ohos.url' - -describe('Url_mxa_jk_Test', function () { - it('Url_append_test_001', 0, function () { - var that = new Url.URL('http://username:password@host:8080/directory/file?foo=1&bar=2') - var params = new Url.URLSearchParams(that.search) - params.append('ma', 'jk') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&ma=jk') - }) - it('Url_append_test_002', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.append('ma 大', 'jk￥') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&ma+%E5%A4%A7=jk%EF%BF%A5') - }) - it('Url_append_test_003', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.append('foo~!@#$%^&*()_+-=','jk') - var result = params.toString() - expect(result).assertEqual('foo=1&bar=2&foo%7E%21%40%23%24%25%5E%26*%28%29_%2B-%3D=jk') - }) - it('Url_delete_test_001', 0, function () { - let that = new Url.URL('https://example.com?foo=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo') - var result = params.toString() - expect(result).assertEqual('bar=2') - }) - it('Url_delete_test_002', 0, function () { - let that = new Url.URL('https://example.com?foo大=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo') - var result = params.toString() - expect(result).assertEqual('foo%E5%A4%A7=1&bar=2') - }) - it('Url_delete_test_003', 0, function () { - let that = new Url.URL('https://example.com?foo大=1&bar=2') - let params = new Url.URLSearchParams(that.search) - params.delete('foo大') - var result = params.toString() - expect(result).assertEqual('bar=2') - }) - - it('Url_entries_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i]=pair[0]; - i++; - arr[i]=pair[1]; - i++; - } - expect(arr[1]).assertEqual('value1') - }) - it('Url_entries_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i]=pair[0]; - i++; - arr[i]=pair[1]; - i++; - } - expect(arr[2]).assertEqual('key2') - }) - it('Url_entries_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('foo', 'jk') - var i = 0; - var arr = {}; - for(var pair of params.entries()) { - arr[i]=pair[0]; - i++; - arr[i]=pair[1]; - i++; - } - expect(arr[5]).assertEqual('jk') - }) - - it('Url_forEach_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' +'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[0]).assertEqual('key=key1 value=value1 flag=key1=value1&key2=value2') - }) - it('Url_forEach_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[1]).assertEqual('key=key2 value=value2 flag=key1=value1&key2=value2') - }) - it('Url_forEach_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('foo', 'jk') - var arr = {}; - var i = 0; - function func(str1, str2, params) { - arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params - i++; - } - params.forEach(func) - expect(arr[2]).assertEqual('key=foo value=jk flag=key1=value1&key2=value2&foo=jk') - }) - it('Url_get_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var result = params.get('1') - expect(result).assertEqual(undefined) - }) - it('Url_get_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - var result = params.get('key2') - expect(result).assertEqual('value2') - }) - it('Url_get_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('5', 'JKL') - var result = params.get('5') - expect(result).assertEqual('JKL') - }) - it('Url_getAll_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2') - params.append('key1', 'AAA') - var result = params.getAll('key1') - expect(result).assertEqual('value1,AAA') - }) - it('Url_getAll_test_002', 0, function () { - let params = new Url.URLSearchParams('key1=value1&8=DEF') - params.append('8', 'A8A') - var result = params.getAll('8') - expect(result).assertEqual('DEF,A8A') - }) - it('Url_getAll_test_003', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') - params.append('key3', 'A3A') - var result = params.getAll('key3') - expect(result).assertEqual('大,A3A') - }) - it('Url_has_test_001', 0, function () { - let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') - var result = params.has('2') - expect(result).assertEqual(false) - }) - it('Url_has_test_002', 0, function () { - let params = new Url.URLSearchParams('小=value1&key2=value2&key3=大') - var result = params.has('小') - expect(result).assertEqual(true) - }) - it('Url_has_test_003', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - params.append('￥', 'ACA') - var result = params.has('￥') - expect(result).assertEqual(true) - }) - it('Url_keys_test_001', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for(var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[0]).assertEqual('小') - }) - it('Url_keys_test_002', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for(var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[1]).assertEqual('￥') - }) - it('Url_keys_test_003', 0, function () { - let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') - var arr = {}; - var i = 0; - for(var key of params.keys()) { - arr[i] = key; - i++; - } - expect(arr[2]).assertEqual('key3') - }) - it('Url_set_test_001', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('11', 'CCC') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&11=CCC') - }) - it('Url_set_test_002', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('10', 'BBB') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&10=BBB') - }) - it('Url_set_test_003', 0, function () { - let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') - params.set('ma 大', '10￥') - var res = params.toString() - expect(res).assertEqual('1=value1&2=value2&key3=3&ma+%E5%A4%A7=10%EF%BF%A5') - }) - it('Url_sort_test_001', 0, function () { - let params = new Url.URLSearchParams('1=value1&3=value3&2=key2') - params.sort() - var res = params.toString() - expect(res).assertEqual('1=value1&2=key2&3=value3') - }) - it('Url_sort_test_002', 0, function () { - let params = new Url.URLSearchParams('a=value1&c=value2&b=key2') - params.sort() - var res = params.toString() - expect(res).assertEqual('a=value1&b=key2&c=value2') - }) - it('Url_sort_test_003', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=33') - params.append('a', 'ACA') - params.sort() - var res = params.toString() - expect(res).assertEqual('a=ACA&b=33&c=value2&d=value1') - }) - it('Url_Values_test_001', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var arr = {}; - var i = 0; - for(var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[0]).assertEqual('value1') - }) - it('Url_Values_test_002', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var arr = {}; - var i = 0; - for(var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[1]).assertEqual('value2') - }) - it('Url_Values_test_003', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - params.append('a', 'ACA') - var arr = {}; - var i = 0; - for(var value of params.values()) { - arr[i] = value; - i++; - } - expect(arr[3]).assertEqual('ACA') - }) - it('Url_toString_test_001', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b=大') - var result= params.toString() - expect(result).assertEqual('d=value1&c=value2&b=%E5%A4%A7') - }) - it('Url_toString_test_002', 0, function () { - let params = new Url.URLSearchParams('d=value1&c=value2&b= 大') - params.append('1 12','QQQ') - var result= params.toString() - expect(result).assertEqual('d=value1&c=value2&b=+%E5%A4%A7&1+12=QQQ') - }) - it('Url_toString_test_003', 0, function () { - let params = new Url.URLSearchParams('￥=)') - params.delete('5') - var result= params.toString() - expect(result).assertEqual('%EF%BF%A5=%29') - }) - //new url SearchParams - it('Url_construction_test_001', 0, function () { - let params = new Url.URLSearchParams('?user=abc&query=xyz') - var result= params.toString() - expect(result).assertEqual('user=abc&query=xyz') - }) - it('Url_construction_test_002', 0, function () { - let params = new Url.URLSearchParams({ - user: 'abc', - query: ['first', 'second'] - }) - var result= params.toString() - expect(result).assertEqual('user=abc&query=first%2Csecond') - }) - it('Url_construction_test_003', 0, function () { - let params = new Url.URLSearchParams([ - ['user', 'abc'], - ['query', 'first'], - ['query', 'second'], - ]) - var result= params.toString() - expect(result).assertEqual('user=abc&query=first&query=second') - }) - it('Url_construction_test_004', 0, function () { - const map = new Map() - map.set('user', 'abc') - map.set('query', 'xyz') - let params = new Url.URLSearchParams(map) - var result= params.toString() - expect(result).assertEqual('user=abc&query=xyz') - }) - it('Url_construction_test_004', 0, function () { - function* getQueryPairs() { - yield ['user', 'abc'] - yield ['query', 'first'] - yield ['query', 'second'] - } - let params = new Url.URLSearchParams(getQueryPairs()) - var result= params.toString() - expect(result).assertEqual('user=abc&query=first&query=second') - }) - //new url - get - it('Url_to_string_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.to_string() - expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') - }) - - it('Url_href_test_002', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') - }) - it('Url_origin_test_003', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.origin - expect(result).assertEqual('http://host:8080') - }) - it('Url_protocol_test_004', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.protocol - expect(result).assertEqual('http:') - }) - it('Url_username_test_005', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.username - expect(result).assertEqual('username') - }) - it('Url_password_test_006', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.password - expect(result).assertEqual('password') - }) - it('Url_host_test_007', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.host - expect(result).assertEqual('host:8080') - }) - it('Url_hostname_test_008', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.hostname - expect(result).assertEqual('host') - }) - it('Url_port_test_009', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.port - expect(result).assertEqual('8080') - }) - it('Url_pathname_test_010', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - var result= params.pathname - expect(result).assertEqual('/directory/file') - }) - it('Url_search_test_011', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') - var result= params.search - expect(result).assertEqual('?query=qqqq') - }) - it('Url_search_test_012', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - var result= params.search - expect(result).assertEqual('?query=pppppp') - }) - it('Url_hash_test_013', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - var result= params.hash - expect(result).assertEqual('#fragment') - }) - //new url - set - it('Url_href_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.href = 'http://[::192.9.5.5]/ipng' - var result = params.href - expect(result).assertEqual('http://[::c009:505]/ipng') - }) - it('Url_protocol_test_002', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.protocol = 'https:' - var result= params.href - expect(result).assertEqual('https://username:password@host:8080/directory/file?query#fragment') - }) - it('Url_username_test_003', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.username = 'username1' - var result= params.href - expect(result).assertEqual('http://username1:password@host:8080/directory/file?query#fragment') - }) - it('Url_password_test_004', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.password = 'passwd' - var result= params.href - expect(result).assertEqual('http://username:passwd@host:8080/directory/file?query#fragment') - }) - - it('Url_host_test_005', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.host = 'www.baidu.com:99' - var result= params.href - expect(result).assertEqual('http://username:password@www.baidu.com:99/directory/file?query#fragment') - }) - - it('Url_hostname_test_006', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.hostname = 'www.baidu.com' - var result= params.href - expect(result).assertEqual('http://username:password@www.baidu.com:8080/directory/file?query#fragment') - }) - it('Url_port_test_007', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.port = '99' - var result= params.href - expect(result).assertEqual('http://username:password@host:99/directory/file?query#fragment') - }) - it('Url_pathname_test_008', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') - params.pathname = '/path/ddd' - var result= params.href - expect(result).assertEqual('http://username:password@host:8080/path/ddd?query#fragment') - }) - it('Url_search_test_009', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') - params.search = '?pppppp=1234' - var result= params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?pppppp=1234#fragment') - }) - it('Url_hash_test_010', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') - params.hash = '#qwer=da' - var result= params.href - expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - }) - //new url JSON - it('Url_toJSON_test_001', 0, function () { - let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - var result= params.toJSON() - expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') - }) - //new url IPV6 - it('Url_IPV6_test_001', 0, function () { - let params = new Url.URL('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html') - var result= params.href - expect(result).assertEqual('http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/index.html') - }) - it('Url_IPV6_test_002', 0, function () { - let params = new Url.URL('http://[1080:0:0:0:8:800:200C:417A]/index.html') - var result= params.href - expect(result).assertEqual('http://[1080::8:800:200c:417a]/index.html') - }) - it('Url_IPV6_test_003', 0, function () { - let params = new Url.URL('http://[::FFFF:129.144.52.38]:80/index.html') - var result= params.href - expect(result).assertEqual('http://[::ffff:8190:3426]/index.html') - }) - //new url IPV4 - it('Url_IPV4_test_001', 0, function () { - let params = new Url.URL('http://0377.0xff.255.1:80/index.html') - var result= params.href - expect(result).assertEqual('http://255.255.255.1/index.html') - }) - it('Url_IPV4_test_002', 0, function () { - let params = new Url.URL('http://0377.0xff.255.g/index.html') - var result= params.href - expect(result).assertEqual('http://0377.0xff.255.g/index.html') - }) - it('Url_IPV4_test_003', 0, function () { - let params = new Url.URL('http://190.254.245.9:80/index.html') - var result= params.href - expect(result).assertEqual('http://190.254.245.9/index.html') - }) - //new url url_base - it('Url_base_test_001', 0, function () { - let params = new Url.URL('https://developer.mozilla.org',) - var result= params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_002', 0, function () { - let params = new Url.URL('https://developer.mozilla.org', 'flie:/developer.mozilla.org') - var result= params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_003', 0, function () { - let params = new Url.URL('https://developer.mozilla.org', 'ftp://www.example.com') - var result= params.href - expect(result).assertEqual('https://developer.mozilla.org/') - }) - it('Url_base_test_004', 0, function () { - let params = new Url.URL(' ', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/') - }) - it('Url_base_test_005', 0, function () { - let params = new Url.URL('.', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/') - }) - it('Url_base_test_006', 0, function () { - let params = new Url.URL('../h:', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/h:') - }) - it('Url_base_test_007', 0, function () { - let params = new Url.URL('/sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_008', 0, function () { - let params = new Url.URL('sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_009', 0, function () { - let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'http://www.example.com') - var result= params.href - expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_010', 0, function () { - let params = new Url.URL( '/../sca/./path/path/../scasa/jjjjj', 'file://www.example.com') - var result= params.href - expect(result).assertEqual('file://www.example.com/sca/path/scasa/jjjjj') - }) - it('Url_base_test_011', 0, function () { - let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file1://www.example.com') - var result= params.href - expect(result).assertEqual('file1://www.example.com/sca/path/scasa/jjjjj') - }) +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License') + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite' +import Url from '@ohos.url' + +describe('Url_mxa_jk_Test', function () { + it('Url_append_test_001', 0, function () { + var that = new Url.URL('http://username:password@host:8080/directory/file?foo=1&bar=2') + var params = new Url.URLSearchParams(that.search) + params.append('ma', 'jk') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&ma=jk') + }) + it('Url_append_test_002', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.append('ma 大', 'jk￥') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&ma+%E5%A4%A7=jk%EF%BF%A5') + }) + it('Url_append_test_003', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.append('foo~!@#$%^&*()_+-=','jk') + var result = params.toString() + expect(result).assertEqual('foo=1&bar=2&foo%7E%21%40%23%24%25%5E%26*%28%29_%2B-%3D=jk') + }) + it('Url_delete_test_001', 0, function () { + let that = new Url.URL('https://example.com?foo=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo') + var result = params.toString() + expect(result).assertEqual('bar=2') + }) + it('Url_delete_test_002', 0, function () { + let that = new Url.URL('https://example.com?foo大=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo') + var result = params.toString() + expect(result).assertEqual('foo%E5%A4%A7=1&bar=2') + }) + it('Url_delete_test_003', 0, function () { + let that = new Url.URL('https://example.com?foo大=1&bar=2') + let params = new Url.URLSearchParams(that.search) + params.delete('foo大') + var result = params.toString() + expect(result).assertEqual('bar=2') + }) + + it('Url_entries_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i]=pair[0]; + i++; + arr[i]=pair[1]; + i++; + } + expect(arr[1]).assertEqual('value1') + }) + it('Url_entries_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i]=pair[0]; + i++; + arr[i]=pair[1]; + i++; + } + expect(arr[2]).assertEqual('key2') + }) + it('Url_entries_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('foo', 'jk') + var i = 0; + var arr = {}; + for(var pair of params.entries()) { + arr[i]=pair[0]; + i++; + arr[i]=pair[1]; + i++; + } + expect(arr[5]).assertEqual('jk') + }) + + it('Url_forEach_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' +'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[0]).assertEqual('key=key1 value=value1 flag=key1=value1&key2=value2') + }) + it('Url_forEach_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[1]).assertEqual('key=key2 value=value2 flag=key1=value1&key2=value2') + }) + it('Url_forEach_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('foo', 'jk') + var arr = {}; + var i = 0; + function func(str1, str2, params) { + arr[i] = 'key=' + str1 + ' ' + 'value=' + str2 + ' ' + 'flag=' + params + i++; + } + params.forEach(func) + expect(arr[2]).assertEqual('key=foo value=jk flag=key1=value1&key2=value2&foo=jk') + }) + it('Url_get_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var result = params.get('1') + expect(result).assertEqual(undefined) + }) + it('Url_get_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + var result = params.get('key2') + expect(result).assertEqual('value2') + }) + it('Url_get_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('5', 'JKL') + var result = params.get('5') + expect(result).assertEqual('JKL') + }) + it('Url_getAll_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2') + params.append('key1', 'AAA') + var result = params.getAll('key1') + expect(result).assertEqual('value1,AAA') + }) + it('Url_getAll_test_002', 0, function () { + let params = new Url.URLSearchParams('key1=value1&8=DEF') + params.append('8', 'A8A') + var result = params.getAll('8') + expect(result).assertEqual('DEF,A8A') + }) + it('Url_getAll_test_003', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') + params.append('key3', 'A3A') + var result = params.getAll('key3') + expect(result).assertEqual('大,A3A') + }) + it('Url_has_test_001', 0, function () { + let params = new Url.URLSearchParams('key1=value1&key2=value2&key3=大') + var result = params.has('2') + expect(result).assertEqual(false) + }) + it('Url_has_test_002', 0, function () { + let params = new Url.URLSearchParams('小=value1&key2=value2&key3=大') + var result = params.has('小') + expect(result).assertEqual(true) + }) + it('Url_has_test_003', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + params.append('￥', 'ACA') + var result = params.has('￥') + expect(result).assertEqual(true) + }) + it('Url_keys_test_001', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for(var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[0]).assertEqual('小') + }) + it('Url_keys_test_002', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for(var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[1]).assertEqual('￥') + }) + it('Url_keys_test_003', 0, function () { + let params = new Url.URLSearchParams('小=value1&￥=value2&key3=大') + var arr = {}; + var i = 0; + for(var key of params.keys()) { + arr[i] = key; + i++; + } + expect(arr[2]).assertEqual('key3') + }) + it('Url_set_test_001', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('11', 'CCC') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&11=CCC') + }) + it('Url_set_test_002', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('10', 'BBB') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&10=BBB') + }) + it('Url_set_test_003', 0, function () { + let params = new Url.URLSearchParams('1=value1&2=value2&key3=3') + params.set('ma 大', '10￥') + var res = params.toString() + expect(res).assertEqual('1=value1&2=value2&key3=3&ma+%E5%A4%A7=10%EF%BF%A5') + }) + it('Url_sort_test_001', 0, function () { + let params = new Url.URLSearchParams('1=value1&3=value3&2=key2') + params.sort() + var res = params.toString() + expect(res).assertEqual('1=value1&2=key2&3=value3') + }) + it('Url_sort_test_002', 0, function () { + let params = new Url.URLSearchParams('a=value1&c=value2&b=key2') + params.sort() + var res = params.toString() + expect(res).assertEqual('a=value1&b=key2&c=value2') + }) + it('Url_sort_test_003', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=33') + params.append('a', 'ACA') + params.sort() + var res = params.toString() + expect(res).assertEqual('a=ACA&b=33&c=value2&d=value1') + }) + it('Url_Values_test_001', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var arr = {}; + var i = 0; + for(var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[0]).assertEqual('value1') + }) + it('Url_Values_test_002', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var arr = {}; + var i = 0; + for(var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[1]).assertEqual('value2') + }) + it('Url_Values_test_003', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + params.append('a', 'ACA') + var arr = {}; + var i = 0; + for(var value of params.values()) { + arr[i] = value; + i++; + } + expect(arr[3]).assertEqual('ACA') + }) + it('Url_toString_test_001', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b=大') + var result= params.toString() + expect(result).assertEqual('d=value1&c=value2&b=%E5%A4%A7') + }) + it('Url_toString_test_002', 0, function () { + let params = new Url.URLSearchParams('d=value1&c=value2&b= 大') + params.append('1 12','QQQ') + var result= params.toString() + expect(result).assertEqual('d=value1&c=value2&b=+%E5%A4%A7&1+12=QQQ') + }) + it('Url_toString_test_003', 0, function () { + let params = new Url.URLSearchParams('￥=)') + params.delete('5') + var result= params.toString() + expect(result).assertEqual('%EF%BF%A5=%29') + }) + //new url SearchParams + it('Url_construction_test_001', 0, function () { + let params = new Url.URLSearchParams('?user=abc&query=xyz') + var result= params.toString() + expect(result).assertEqual('user=abc&query=xyz') + }) + it('Url_construction_test_002', 0, function () { + let params = new Url.URLSearchParams({ + user: 'abc', + query: ['first', 'second'] + }) + var result= params.toString() + expect(result).assertEqual('user=abc&query=first%2Csecond') + }) + it('Url_construction_test_003', 0, function () { + let params = new Url.URLSearchParams([ + ['user', 'abc'], + ['query', 'first'], + ['query', 'second'], + ]) + var result= params.toString() + expect(result).assertEqual('user=abc&query=first&query=second') + }) + it('Url_construction_test_004', 0, function () { + const map = new Map() + map.set('user', 'abc') + map.set('query', 'xyz') + let params = new Url.URLSearchParams(map) + var result= params.toString() + expect(result).assertEqual('user=abc&query=xyz') + }) + it('Url_construction_test_004', 0, function () { + function* getQueryPairs() { + yield ['user', 'abc'] + yield ['query', 'first'] + yield ['query', 'second'] + } + let params = new Url.URLSearchParams(getQueryPairs()) + var result= params.toString() + expect(result).assertEqual('user=abc&query=first&query=second') + }) + //new url - get + it('Url_to_string_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.to_string() + expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') + }) + + it('Url_href_test_002', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?query#fragment') + }) + it('Url_origin_test_003', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.origin + expect(result).assertEqual('http://host:8080') + }) + it('Url_protocol_test_004', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.protocol + expect(result).assertEqual('http:') + }) + it('Url_username_test_005', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.username + expect(result).assertEqual('username') + }) + it('Url_password_test_006', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.password + expect(result).assertEqual('password') + }) + it('Url_host_test_007', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.host + expect(result).assertEqual('host:8080') + }) + it('Url_hostname_test_008', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.hostname + expect(result).assertEqual('host') + }) + it('Url_port_test_009', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.port + expect(result).assertEqual('8080') + }) + it('Url_pathname_test_010', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + var result= params.pathname + expect(result).assertEqual('/directory/file') + }) + it('Url_search_test_011', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') + var result= params.search + expect(result).assertEqual('?query=qqqq') + }) + it('Url_search_test_012', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + var result= params.search + expect(result).assertEqual('?query=pppppp') + }) + it('Url_hash_test_013', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + var result= params.hash + expect(result).assertEqual('#fragment') + }) + //new url - set + it('Url_href_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.href = 'http://[::192.9.5.5]/ipng' + var result = params.href + expect(result).assertEqual('http://[::c009:505]/ipng') + }) + it('Url_protocol_test_002', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.protocol = 'https:' + var result= params.href + expect(result).assertEqual('https://username:password@host:8080/directory/file?query#fragment') + }) + it('Url_username_test_003', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.username = 'username1' + var result= params.href + expect(result).assertEqual('http://username1:password@host:8080/directory/file?query#fragment') + }) + it('Url_password_test_004', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.password = 'passwd' + var result= params.href + expect(result).assertEqual('http://username:passwd@host:8080/directory/file?query#fragment') + }) + + it('Url_host_test_005', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.host = 'www.baidu.com:99' + var result= params.href + expect(result).assertEqual('http://username:password@www.baidu.com:99/directory/file?query#fragment') + }) + + it('Url_hostname_test_006', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.hostname = 'www.baidu.com' + var result= params.href + expect(result).assertEqual('http://username:password@www.baidu.com:8080/directory/file?query#fragment') + }) + it('Url_port_test_007', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.port = '99' + var result= params.href + expect(result).assertEqual('http://username:password@host:99/directory/file?query#fragment') + }) + it('Url_pathname_test_008', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query#fragment') + params.pathname = '/path/ddd' + var result= params.href + expect(result).assertEqual('http://username:password@host:8080/path/ddd?query#fragment') + }) + it('Url_search_test_009', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=qqqq#fragment') + params.search = '?pppppp=1234' + var result= params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?pppppp=1234#fragment') + }) + it('Url_hash_test_010', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#fragment') + params.hash = '#qwer=da' + var result= params.href + expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + }) + //new url JSON + it('Url_toJSON_test_001', 0, function () { + let params = new Url.URL('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + var result= params.toJSON() + expect(result).assertEqual('http://username:password@host:8080/directory/file?query=pppppp#qwer=da') + }) + //new url IPV6 + it('Url_IPV6_test_001', 0, function () { + let params = new Url.URL('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html') + var result= params.href + expect(result).assertEqual('http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/index.html') + }) + it('Url_IPV6_test_002', 0, function () { + let params = new Url.URL('http://[1080:0:0:0:8:800:200C:417A]/index.html') + var result= params.href + expect(result).assertEqual('http://[1080::8:800:200c:417a]/index.html') + }) + it('Url_IPV6_test_003', 0, function () { + let params = new Url.URL('http://[::FFFF:129.144.52.38]:80/index.html') + var result= params.href + expect(result).assertEqual('http://[::ffff:8190:3426]/index.html') + }) + //new url IPV4 + it('Url_IPV4_test_001', 0, function () { + let params = new Url.URL('http://0377.0xff.255.1:80/index.html') + var result= params.href + expect(result).assertEqual('http://255.255.255.1/index.html') + }) + it('Url_IPV4_test_002', 0, function () { + let params = new Url.URL('http://0377.0xff.255.g/index.html') + var result= params.href + expect(result).assertEqual('http://0377.0xff.255.g/index.html') + }) + it('Url_IPV4_test_003', 0, function () { + let params = new Url.URL('http://190.254.245.9:80/index.html') + var result= params.href + expect(result).assertEqual('http://190.254.245.9/index.html') + }) + //new url url_base + it('Url_base_test_001', 0, function () { + let params = new Url.URL('https://developer.mozilla.org',) + var result= params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_002', 0, function () { + let params = new Url.URL('https://developer.mozilla.org', 'flie:/developer.mozilla.org') + var result= params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_003', 0, function () { + let params = new Url.URL('https://developer.mozilla.org', 'ftp://www.example.com') + var result= params.href + expect(result).assertEqual('https://developer.mozilla.org/') + }) + it('Url_base_test_004', 0, function () { + let params = new Url.URL(' ', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/') + }) + it('Url_base_test_005', 0, function () { + let params = new Url.URL('.', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/') + }) + it('Url_base_test_006', 0, function () { + let params = new Url.URL('../h:', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/h:') + }) + it('Url_base_test_007', 0, function () { + let params = new Url.URL('/sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_008', 0, function () { + let params = new Url.URL('sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_009', 0, function () { + let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'http://www.example.com') + var result= params.href + expect(result).assertEqual('http://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_010', 0, function () { + let params = new Url.URL( '/../sca/./path/path/../scasa/jjjjj', 'file://www.example.com') + var result= params.href + expect(result).assertEqual('file://www.example.com/sca/path/scasa/jjjjj') + }) + it('Url_base_test_011', 0, function () { + let params = new Url.URL('/../sca/./path/path/../scasa/jjjjj', 'file1://www.example.com') + var result= params.href + expect(result).assertEqual('file1://www.example.com/sca/path/scasa/jjjjj') + }) }) \ No newline at end of file diff --git a/compileruntime/url_lib_standard/project/entry/src/main/resources/base/element/string.json b/compileruntime/util_lib_standard/src/main/resources/base/element/string.json similarity index 94% rename from compileruntime/url_lib_standard/project/entry/src/main/resources/base/element/string.json rename to compileruntime/util_lib_standard/src/main/resources/base/element/string.json index c0dd3a09e..0bae6bd40 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/resources/base/element/string.json +++ b/compileruntime/util_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/util_lib_standard/src/ohosTest/js/default/app.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js rename to compileruntime/util_lib_standard/src/ohosTest/js/default/app.js diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json b/compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/en-US.json rename to compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/en-US.json diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json b/compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/i18n/zh-CN.json rename to compileruntime/util_lib_standard/src/ohosTest/js/default/i18n/zh-CN.json diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css b/compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.css similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.css rename to compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.css diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml b/compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.hml rename to compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.hml diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js b/compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js rename to compileruntime/util_lib_standard/src/ohosTest/js/default/pages/index/index.js diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js b/compileruntime/util_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/ExampleJsunit.test.js rename to compileruntime/util_lib_standard/src/ohosTest/js/test/ExampleJsunit.test.js diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/List.test.js b/compileruntime/util_lib_standard/src/ohosTest/js/test/List.test.js similarity index 92% rename from compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/List.test.js rename to compileruntime/util_lib_standard/src/ohosTest/js/test/List.test.js index d21d41758..86ae9fa26 100644 --- a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/List.test.js +++ b/compileruntime/util_lib_standard/src/ohosTest/js/test/List.test.js @@ -1,16 +1,16 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + require('./ExampleJsunit.test.js') \ No newline at end of file diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json b/compileruntime/util_lib_standard/src/ohosTest/resources/base/element/string.json similarity index 93% rename from compileruntime/util_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json rename to compileruntime/util_lib_standard/src/ohosTest/resources/base/element/string.json index a1d8e0cb1..ee04e2875 100644 --- a/compileruntime/util_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json +++ b/compileruntime/util_lib_standard/src/ohosTest/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "childprocess" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "childprocess" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/compileruntime/worker_lib_standard/BUILD.gn b/compileruntime/worker_lib_standard/BUILD.gn index 74c9b2ba4..9fcf8c928 100644 --- a/compileruntime/worker_lib_standard/BUILD.gn +++ b/compileruntime/worker_lib_standard/BUILD.gn @@ -10,9 +10,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") +ohos_js_hap_suite("worker_js_hap") { + hap_profile = "./src/main/config.json" + deps = [ + ":worker_js_assets", + ":worker_resources", + ] + + # shared_libraries = [ + # "//third_party/giflib:libgif", + # "//third_party/libpng:libpng", + # ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "WorkerJSTest" -ohos_js_hap_suite("startup_worker_js_test") { - test_hap_name = "StartupWorkerJSApiTest" - hap_source_path = "hap/entry-debug-standard-unsigned.hap" + # part_name = "prebuilt_hap" + # subsystem_name = "xts" +} +ohos_js_assets("worker_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("worker_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" } diff --git a/compileruntime/worker_lib_standard/Test.json b/compileruntime/worker_lib_standard/Test.json index 35b00e6e0..92175f082 100644 --- a/compileruntime/worker_lib_standard/Test.json +++ b/compileruntime/worker_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "startup_worker_js_test.hap" + "WorkerJSTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/worker_lib_standard/hap/entry-debug-standard-unsigned.hap b/compileruntime/worker_lib_standard/hap/entry-debug-standard-unsigned.hap deleted file mode 100644 index 2dd20e91797124322c3e93ef891286a28e0a7f75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235532 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 literal 0 HcmV?d00001 diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/config.json b/compileruntime/worker_lib_standard/src/main/config.json similarity index 95% rename from compileruntime/worker_lib_standard/project/entry/src/main/config.json rename to compileruntime/worker_lib_standard/src/main/config.json index d3dc9f3b3..18665aeb4 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/config.json +++ b/compileruntime/worker_lib_standard/src/main/config.json @@ -1,60 +1,60 @@ -{ - "app": { - "bundleName": "com.example.workerxts", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.workerxts", - "name": ".MyApplication", - "mainAbility": "com.example.workerxts.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "unspecified", - "name": "com.example.workerxts.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "formsEnabled": false, - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index", - "pages/second/second" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.example.workerxts", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.workerxts", + "name": ".MyApplication", + "mainAbility": "com.example.workerxts.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "orientation": "unspecified", + "name": "com.example.workerxts.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "formsEnabled": false, + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index", + "pages/second/second" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/worker_lib_standard/src/main/js/default/app.js similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/app.js rename to compileruntime/worker_lib_standard/src/main/js/default/app.js diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/en-US.json b/compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/en-US.json rename to compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json b/compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/i18n/zh-CN.json rename to compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.css b/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.css rename to compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.hml b/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.hml rename to compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.js b/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/index/index.js rename to compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.css b/compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.css similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.css rename to compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.css diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.hml b/compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.hml similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.hml rename to compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.hml diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.js b/compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.js similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/pages/second/second.js rename to compileruntime/worker_lib_standard/src/main/js/default/pages/second/second.js diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js index 178918c03..461c65677 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js @@ -1,66 +1,66 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - function foo(x) {return x} - - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - console.info("worker:: new version") - - parentPort.onclose = function() { - console.info("worker::worker.js onclose"); - } - - parentPort.onmessage = function(e) { - var data = e.data; - console.info("worker:: worker thread worker data is " + data.data); - switch(data.type) { - case "normal": - console.info("worker:: worker thread receive data " + data.data); - parentPort.postMessage(data); - console.info("worker:: worker thread post back"); - break; - case "error": - throw new Error("123"); - break; - case "buffer": - console.info("worker:: worker.js receive buffer length is " + data.data.byteLength); - parentPort.postMessage(data, [data.data]); - console.info("worker:: worker.js post buffer length is " + data.data.byteLength); - break; - default: - console.info("worker:: worker.js receive unknow type"); - break - } - } - - // 反序列错误 - parentPort.onmessageerror = function() { - console.info("worker:: worker.js onmessageerror"); - } - - // js执行异常 - parentPort.onerror = function(data) { - console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno); - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + function foo(x) {return x} + + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + console.info("worker:: new version") + + parentPort.onclose = function() { + console.info("worker::worker.js onclose"); + } + + parentPort.onmessage = function(e) { + var data = e.data; + console.info("worker:: worker thread worker data is " + data.data); + switch(data.type) { + case "normal": + console.info("worker:: worker thread receive data " + data.data); + parentPort.postMessage(data); + console.info("worker:: worker thread post back"); + break; + case "error": + throw new Error("123"); + break; + case "buffer": + console.info("worker:: worker.js receive buffer length is " + data.data.byteLength); + parentPort.postMessage(data, [data.data]); + console.info("worker:: worker.js post buffer length is " + data.data.byteLength); + break; + default: + console.info("worker:: worker.js receive unknow type"); + break + } + } + + // 反序列错误 + parentPort.onmessageerror = function() { + console.info("worker:: worker.js onmessageerror"); + } + + // js执行异常 + parentPort.onerror = function(data) { + console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno); + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_002.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_002.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js index b4d4dac2e..5914eea6d 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_002.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js @@ -1,32 +1,32 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - console.log("worker:: run script"); - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - console.log("worker:: worker receive data " + e.data); - var data = e.data + " worker"; - parentPort.postMessage(data) - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + console.log("worker:: run script"); + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + console.log("worker:: worker receive data " + e.data); + var data = e.data + " worker"; + parentPort.postMessage(data) + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_003.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_003.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js index 4bd01e96b..a680ac178 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_003.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js @@ -1,30 +1,30 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - var data = e.data * 2 + 1 - parentPort.postMessage(data) - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + var data = e.data * 2 + 1 + parentPort.postMessage(data) + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_004.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_004.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js index de3fdc760..49e442384 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_004.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js @@ -1,31 +1,31 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - var data = e.data; - data.message = "hello world " + "worker" - parentPort.postMessage(data) - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + var data = e.data; + data.message = "hello world " + "worker" + parentPort.postMessage(data) + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_005.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_005.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js index d5414270e..cc1cbaaad 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_005.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js @@ -1,29 +1,29 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - parentPort.postMessage(name) - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + parentPort.postMessage(name) + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_006.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_006.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js index bc79a4796..6b9ce1e02 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_006.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js @@ -1,29 +1,29 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - parentPort.postMessage("hello world") - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + parentPort.postMessage("hello world") + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_007.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_007.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js index f3163c5bd..9d5790347 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_007.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js @@ -1,29 +1,29 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - throw new Error(123) - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + throw new Error(123) + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_008.js b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js similarity index 97% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_008.js rename to compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js index fa3ce5a35..02d4825b9 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/default/workers/worker_008.js +++ b/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js @@ -1,29 +1,29 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/******/ (() => { // webpackBootstrap - var __webpack_exports__ = {}; - /*!********************************************************************************************!*\ - !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! - \********************************************************************************************/ - var worker = globalThis.requireNapi('worker'); - - const parentPort = worker.parentPort; - - parentPort.onmessage = function(e) { - parentPort.close() - } - /******/ })() +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******/ (() => { // webpackBootstrap + var __webpack_exports__ = {}; + /*!********************************************************************************************!*\ + !*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***! + \********************************************************************************************/ + var worker = globalThis.requireNapi('worker'); + + const parentPort = worker.parentPort; + + parentPort.onmessage = function(e) { + parentPort.close() + } + /******/ })() ; \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js b/compileruntime/worker_lib_standard/src/main/js/test/ExampleJsunit.test.js similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/test/ExampleJsunit.test.js rename to compileruntime/worker_lib_standard/src/main/js/test/ExampleJsunit.test.js diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/test/List.test.js b/compileruntime/worker_lib_standard/src/main/js/test/List.test.js similarity index 93% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/test/List.test.js rename to compileruntime/worker_lib_standard/src/main/js/test/List.test.js index 2fbe075f9..f0714ab28 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/test/List.test.js +++ b/compileruntime/worker_lib_standard/src/main/js/test/List.test.js @@ -1,17 +1,17 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -require('./ExampleJsunit.test.js') +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +require('./ExampleJsunit.test.js') require("./Worker.test.js") \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/js/test/Worker.test.js b/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js similarity index 96% rename from compileruntime/worker_lib_standard/project/entry/src/main/js/test/Worker.test.js rename to compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js index a878e9c51..0b5a96cd7 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/js/test/Worker.test.js +++ b/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js @@ -1,546 +1,546 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// @ts-nocheck -import app from '@system.app' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -//import worker from "@ohos.worker"; -var worker = globalThis.requireNapi('worker'); - -describe('workerTest', function () { - - afterAll(function () { - console.info('total case over') - }) - - function PromiseCase() { - let p = new Promise(function (resolve, reject) { - setTimeout(function () { - resolve() - }, 100); - }).then(undefined, (error) => { - }) - return p - } - - // check worker constructor is ok - it('worker_constructor_test_001', 0, function () { - var ss = new worker.Worker("workers/worker.js") - expect(ss != null).assertTrue() - }) - - it('worker_constructor_test_002', 0, function () { - var ss = new worker.Worker("workers/worker.js",{name:"second worker",shared:"False"}) - expect(ss != null).assertTrue() - }) - - it('worker_constructor_test_003', 0, function () { - var ss = new worker.Worker("workers/worker.js",{type:"classic",name:"second worker",shared:"false"}) - expect(ss != null).assertTrue() - }) - - it('worker_constructor_test_004', 0, function () { - var ss = new worker.Worker("workers/worker.js",{type:"classic",name:"third worker",shared:"true"}) - expect(ss != null).assertTrue() - }) - - // check postMessage is ok - // main post "hello world", will receive "hello world worker" - it('worker_postMessage_test_001', 0, async function (done) { - var ss = new worker.Worker("workers/worker_002.js"); - - var res = undefined - var flag = false - - ss.onmessage = function (e) { - res = e.data; - flag = true - } - - ss.postMessage("hello world") - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual("hello world worker") - done() - }) - - // check postMessage is ok - // main post 12 , will receive 12 * 2 + 1 - it('worker_postMessage_test_002', 0, async function (done) { - var ss = new worker.Worker("workers/worker_003.js"); - - var res = undefined - var flag = false - - ss.onmessage = function (e) { - res = e.data; - flag = true - } - - ss.postMessage(12) - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual(25) - done() - }) - - // check postMessage is ok - // main post {message:"hello world"} , will receive {message:"hello world worker"} - it('worker_postMessage_test_003', 0, async function (done) { - var ss = new worker.Worker("workers/worker_004.js"); - - var res = undefined - var flag = false - - ss.onmessage = function (e) { - res = e.data.message; - flag = true - } - - ss.postMessage({"message":"hello world"}) - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual("hello world worker") - done() - }) - - // check worker name is ok - it('worker_postMessage_test_004', 0, async function (done) { - var ss = new worker.Worker("workers/worker_005.js", {name: "zhangsan"}); - - var res = undefined - var flag = false - - ss.onmessage = function (e) { - res = e.data; - flag = true - } - - ss.postMessage("hello world") - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual("zhangsan") - done() - }) - - // check worker transfer buffer is ok - it('worker_postMessage_test_005', 0, function () { - var ss = new worker.Worker("workers/worker_006.js"); - - const buffer = new ArrayBuffer(8) - expect(buffer.byteLength).assertEqual(8) - ss.postMessage(buffer, [buffer]) - expect(buffer.byteLength).assertEqual(0) - }) - - // check worker handle error is ok - it('worker_postMessage_test_006', 0, async function (done) { - var ss = new worker.Worker("workers/worker_007.js"); - - var res = undefined - var flag = false - - ss.onerror = function (e) { - res = e.message; - flag = true - } - - ss.postMessage("hello world") - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual("Error: 123") - done() - }) - - // check worker terminate is ok - it('worker_terminate_test_001', 0, async function (done) { - var ss = new worker.Worker("workers/worker.js"); - var res = 0 - var flag = false - - ss.onexit = function () { - flag = true - res++; - } - ss.terminate() - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual(1) - done() - }) - - // check worker terminate is ok - it('worker_terminate_test_002', 0, async function (done) { - var ss = new worker.Worker("workers/worker.js"); - var res = 0 - var flag = false - - ss.onexit = function () { - flag = true - res++; - } - - // Repeated execution terminate - ss.terminate() - ss.terminate() - - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual(1) - done() - }) - - // check worker terminate is ok - it('worker_terminate_test_003', 0, async function (done) { - var ss = new worker.Worker("workers/worker.js"); - var res = 0 - var flag = false - - ss.onexit = function () { - flag = true - res++; - } - - ss.onmessage = function (e) { - res++; - } - - ss.terminate() - while (!flag) { - await PromiseCase() - } - expect(res).assertEqual(1) - - ss.postMessage("hello world") - await PromiseCase() - expect(res).assertEqual(1) - done() - }) - - // check worker on function is ok - it('worker_on_test_001', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.on("zhangsan", ()=>{ - times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - - expect(times).assertEqual(1) - }) - - // check worker on function is ok - it('worker_on_test_002', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.on("zhangsan", ()=>{ - times--; - }) - - ss.on("lisi", ()=>{ - times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "lisi"}) - - expect(times).assertEqual(0) - }) - - // check worker on function is ok - it('worker_on_test_003', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.on("zhangsan", ()=>{ - times++; - }) - - for (var i=0;i<10;i++) - { - ss.dispatchEvent({type: "zhangsan"}) - } - console.log("times " + times); - expect(times).assertEqual(10) - }) - - // check worker once function is ok - it('worker_once_test_001', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.once("zhangsan", ()=>{ - times++; - }) - ss.dispatchEvent({type: "zhangsan"}) - expect(times).assertEqual(1) - }) - - // check worker once function is ok - it('worker_once_test_002', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.once("zhangsan", ()=>{ - times++; - }) - - for (var i=0;i<10;i++) - { - ss.dispatchEvent({type: "zhangsan"}) - } - - expect(times).assertEqual(1) - }) - - it('worker_once_test_003', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.once("zhangsan", ()=>{ - times--; - }) - - ss.once("lisi", ()=>{ - times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "lisi"}) - - expect(times).assertEqual(0) - }) - - // check worker addEventListener function is ok - it('worker_addEventListener_test_001', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.addEventListener("zhangsan", ()=>{ - times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "zhangsan"}) - - expect(times).assertEqual(2) - }) - - // check worker addEventListener function is ok - it('worker_addEventListener_test_002', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.addEventListener("zhangsan", ()=>{ - times++; - }) - - ss.addEventListener("lisi", ()=>{ - times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "lisi"}) - - expect(times).assertEqual(2) - }) - - // check worker addEventListener function is ok - it('worker_addEventListener_test_003', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var times = 0; - ss.addEventListener("zhangsan", ()=>{ - times++; - }) - - for (var i=0;i<10;i++) - { - ss.dispatchEvent({type: "zhangsan"}) - } - - expect(times).assertEqual(10) - }) - - // check worker removeEventListener function is ok - it('worker_removeListener_test_001', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var zhangsan_times = 0; - ss.addEventListener("zhangsan", ()=>{ - zhangsan_times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(1) - - ss.removeEventListener("zhangsan") - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(1) - }) - - // check worker removeEventListener function is ok - it('worker_removeListener_test_002', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var zhangsan_times = 0; - ss.addEventListener("zhangsan", ()=>{ - zhangsan_times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(2) - - for (var i=0;i<3;i++) - { - ss.removeEventListener("zhangsan") - } - - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(2) - - }) - - // check worker removeAllListener function is ok - it('worker_removeListener_test_003', 0, function () { - var ss = new worker.Worker("workers/worker.js"); - - var zhangsan_times = 0; - ss.addEventListener("zhangsan", ()=>{ - zhangsan_times++; - }) - - var lisi_times = 0; - ss.addEventListener("lisi", ()=>{ - lisi_times++; - }) - - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(2) - - ss.dispatchEvent({type: "lisi"}) - ss.dispatchEvent({type: "lisi"}) - expect(lisi_times).assertEqual(2) - - ss.removeAllListener() - ss.dispatchEvent({type: "zhangsan"}) - ss.dispatchEvent({type: "zhangsan"}) - expect(zhangsan_times).assertEqual(2) - - ss.dispatchEvent({type: "lisi"}) - ss.dispatchEvent({type: "lisi"}) - expect(lisi_times).assertEqual(2) - }) - - // check parentPort.close is ok - it('worker_parentPortClose_test_001', 0, async function (done) { - var ss = new worker.Worker("workers/worker_008.js"); - var res = 0 - - ss.onmessage = function (e) { - res++; - } - - ss.postMessage("abc") - await PromiseCase() - expect(res).assertEqual(0) - done() - }) - - // check parentPort.close is ok - it('worker_parentPortClose_test_002', 0, async function (done) { - var ss1 = new worker.Worker("workers/worker_008.js"); - var ss2 = new worker.Worker("workers/worker_008.js"); - var res = 0 - var times = 0 - - ss1.onmessage = function (e) { - res++; - } - - ss1.postMessage("abc") - await PromiseCase() - expect(res).assertEqual(0) - - ss2.postMessage("hello world") - await PromiseCase() - expect(res).assertEqual(0) - - done() - }) - - // check parentPort.close is ok - it('worker_parentPortClose_test_003', 0, async function (done) { - var ss1 = new worker.Worker("workers/worker_008.js"); - var ss2 = new worker.Worker("workers/worker_008.js"); - var res = 0 - var times = 0 - - ss1.onmessage = function (e) { - res++; - } - - ss1.postMessage("abc") - await PromiseCase() - expect(res).assertEqual(0) - - ss2.addEventListener("zhangsan", ()=>{ - times++; - }) - - ss2.dispatchEvent({type: "zhangsan"}) - expect(times).assertEqual(1) - done() - }) - - // check parentPort.close is ok - it('worker_parentPortClose_test_004', 0, async function (done) { - var ss = new worker.Worker("workers/worker_008.js"); - var res = 0 - var flag = false; - - ss.onexit = function () { - flag = true - } - - ss.onmessage = function (e) { - res++; - } - - ss.postMessage("abc") - while (!flag) { - await PromiseCase() - } - - ss.postMessage("hello") - await PromiseCase() - expect(res).assertEqual(0) - done() - }) +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-nocheck +import app from '@system.app' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' +//import worker from "@ohos.worker"; +var worker = globalThis.requireNapi('worker'); + +describe('workerTest', function () { + + afterAll(function () { + console.info('total case over') + }) + + function PromiseCase() { + let p = new Promise(function (resolve, reject) { + setTimeout(function () { + resolve() + }, 100); + }).then(undefined, (error) => { + }) + return p + } + + // check worker constructor is ok + it('worker_constructor_test_001', 0, function () { + var ss = new worker.Worker("workers/worker.js") + expect(ss != null).assertTrue() + }) + + it('worker_constructor_test_002', 0, function () { + var ss = new worker.Worker("workers/worker.js",{name:"second worker",shared:"False"}) + expect(ss != null).assertTrue() + }) + + it('worker_constructor_test_003', 0, function () { + var ss = new worker.Worker("workers/worker.js",{type:"classic",name:"second worker",shared:"false"}) + expect(ss != null).assertTrue() + }) + + it('worker_constructor_test_004', 0, function () { + var ss = new worker.Worker("workers/worker.js",{type:"classic",name:"third worker",shared:"true"}) + expect(ss != null).assertTrue() + }) + + // check postMessage is ok + // main post "hello world", will receive "hello world worker" + it('worker_postMessage_test_001', 0, async function (done) { + var ss = new worker.Worker("workers/worker_002.js"); + + var res = undefined + var flag = false + + ss.onmessage = function (e) { + res = e.data; + flag = true + } + + ss.postMessage("hello world") + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual("hello world worker") + done() + }) + + // check postMessage is ok + // main post 12 , will receive 12 * 2 + 1 + it('worker_postMessage_test_002', 0, async function (done) { + var ss = new worker.Worker("workers/worker_003.js"); + + var res = undefined + var flag = false + + ss.onmessage = function (e) { + res = e.data; + flag = true + } + + ss.postMessage(12) + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual(25) + done() + }) + + // check postMessage is ok + // main post {message:"hello world"} , will receive {message:"hello world worker"} + it('worker_postMessage_test_003', 0, async function (done) { + var ss = new worker.Worker("workers/worker_004.js"); + + var res = undefined + var flag = false + + ss.onmessage = function (e) { + res = e.data.message; + flag = true + } + + ss.postMessage({"message":"hello world"}) + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual("hello world worker") + done() + }) + + // check worker name is ok + it('worker_postMessage_test_004', 0, async function (done) { + var ss = new worker.Worker("workers/worker_005.js", {name: "zhangsan"}); + + var res = undefined + var flag = false + + ss.onmessage = function (e) { + res = e.data; + flag = true + } + + ss.postMessage("hello world") + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual("zhangsan") + done() + }) + + // check worker transfer buffer is ok + it('worker_postMessage_test_005', 0, function () { + var ss = new worker.Worker("workers/worker_006.js"); + + const buffer = new ArrayBuffer(8) + expect(buffer.byteLength).assertEqual(8) + ss.postMessage(buffer, [buffer]) + expect(buffer.byteLength).assertEqual(0) + }) + + // check worker handle error is ok + it('worker_postMessage_test_006', 0, async function (done) { + var ss = new worker.Worker("workers/worker_007.js"); + + var res = undefined + var flag = false + + ss.onerror = function (e) { + res = e.message; + flag = true + } + + ss.postMessage("hello world") + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual("Error: 123") + done() + }) + + // check worker terminate is ok + it('worker_terminate_test_001', 0, async function (done) { + var ss = new worker.Worker("workers/worker.js"); + var res = 0 + var flag = false + + ss.onexit = function () { + flag = true + res++; + } + ss.terminate() + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual(1) + done() + }) + + // check worker terminate is ok + it('worker_terminate_test_002', 0, async function (done) { + var ss = new worker.Worker("workers/worker.js"); + var res = 0 + var flag = false + + ss.onexit = function () { + flag = true + res++; + } + + // Repeated execution terminate + ss.terminate() + ss.terminate() + + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual(1) + done() + }) + + // check worker terminate is ok + it('worker_terminate_test_003', 0, async function (done) { + var ss = new worker.Worker("workers/worker.js"); + var res = 0 + var flag = false + + ss.onexit = function () { + flag = true + res++; + } + + ss.onmessage = function (e) { + res++; + } + + ss.terminate() + while (!flag) { + await PromiseCase() + } + expect(res).assertEqual(1) + + ss.postMessage("hello world") + await PromiseCase() + expect(res).assertEqual(1) + done() + }) + + // check worker on function is ok + it('worker_on_test_001', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.on("zhangsan", ()=>{ + times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + + expect(times).assertEqual(1) + }) + + // check worker on function is ok + it('worker_on_test_002', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.on("zhangsan", ()=>{ + times--; + }) + + ss.on("lisi", ()=>{ + times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "lisi"}) + + expect(times).assertEqual(0) + }) + + // check worker on function is ok + it('worker_on_test_003', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.on("zhangsan", ()=>{ + times++; + }) + + for (var i=0;i<10;i++) + { + ss.dispatchEvent({type: "zhangsan"}) + } + console.log("times " + times); + expect(times).assertEqual(10) + }) + + // check worker once function is ok + it('worker_once_test_001', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.once("zhangsan", ()=>{ + times++; + }) + ss.dispatchEvent({type: "zhangsan"}) + expect(times).assertEqual(1) + }) + + // check worker once function is ok + it('worker_once_test_002', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.once("zhangsan", ()=>{ + times++; + }) + + for (var i=0;i<10;i++) + { + ss.dispatchEvent({type: "zhangsan"}) + } + + expect(times).assertEqual(1) + }) + + it('worker_once_test_003', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.once("zhangsan", ()=>{ + times--; + }) + + ss.once("lisi", ()=>{ + times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "lisi"}) + + expect(times).assertEqual(0) + }) + + // check worker addEventListener function is ok + it('worker_addEventListener_test_001', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.addEventListener("zhangsan", ()=>{ + times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "zhangsan"}) + + expect(times).assertEqual(2) + }) + + // check worker addEventListener function is ok + it('worker_addEventListener_test_002', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.addEventListener("zhangsan", ()=>{ + times++; + }) + + ss.addEventListener("lisi", ()=>{ + times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "lisi"}) + + expect(times).assertEqual(2) + }) + + // check worker addEventListener function is ok + it('worker_addEventListener_test_003', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var times = 0; + ss.addEventListener("zhangsan", ()=>{ + times++; + }) + + for (var i=0;i<10;i++) + { + ss.dispatchEvent({type: "zhangsan"}) + } + + expect(times).assertEqual(10) + }) + + // check worker removeEventListener function is ok + it('worker_removeListener_test_001', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var zhangsan_times = 0; + ss.addEventListener("zhangsan", ()=>{ + zhangsan_times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(1) + + ss.removeEventListener("zhangsan") + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(1) + }) + + // check worker removeEventListener function is ok + it('worker_removeListener_test_002', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var zhangsan_times = 0; + ss.addEventListener("zhangsan", ()=>{ + zhangsan_times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(2) + + for (var i=0;i<3;i++) + { + ss.removeEventListener("zhangsan") + } + + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(2) + + }) + + // check worker removeAllListener function is ok + it('worker_removeListener_test_003', 0, function () { + var ss = new worker.Worker("workers/worker.js"); + + var zhangsan_times = 0; + ss.addEventListener("zhangsan", ()=>{ + zhangsan_times++; + }) + + var lisi_times = 0; + ss.addEventListener("lisi", ()=>{ + lisi_times++; + }) + + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(2) + + ss.dispatchEvent({type: "lisi"}) + ss.dispatchEvent({type: "lisi"}) + expect(lisi_times).assertEqual(2) + + ss.removeAllListener() + ss.dispatchEvent({type: "zhangsan"}) + ss.dispatchEvent({type: "zhangsan"}) + expect(zhangsan_times).assertEqual(2) + + ss.dispatchEvent({type: "lisi"}) + ss.dispatchEvent({type: "lisi"}) + expect(lisi_times).assertEqual(2) + }) + + // check parentPort.close is ok + it('worker_parentPortClose_test_001', 0, async function (done) { + var ss = new worker.Worker("workers/worker_008.js"); + var res = 0 + + ss.onmessage = function (e) { + res++; + } + + ss.postMessage("abc") + await PromiseCase() + expect(res).assertEqual(0) + done() + }) + + // check parentPort.close is ok + it('worker_parentPortClose_test_002', 0, async function (done) { + var ss1 = new worker.Worker("workers/worker_008.js"); + var ss2 = new worker.Worker("workers/worker_008.js"); + var res = 0 + var times = 0 + + ss1.onmessage = function (e) { + res++; + } + + ss1.postMessage("abc") + await PromiseCase() + expect(res).assertEqual(0) + + ss2.postMessage("hello world") + await PromiseCase() + expect(res).assertEqual(0) + + done() + }) + + // check parentPort.close is ok + it('worker_parentPortClose_test_003', 0, async function (done) { + var ss1 = new worker.Worker("workers/worker_008.js"); + var ss2 = new worker.Worker("workers/worker_008.js"); + var res = 0 + var times = 0 + + ss1.onmessage = function (e) { + res++; + } + + ss1.postMessage("abc") + await PromiseCase() + expect(res).assertEqual(0) + + ss2.addEventListener("zhangsan", ()=>{ + times++; + }) + + ss2.dispatchEvent({type: "zhangsan"}) + expect(times).assertEqual(1) + done() + }) + + // check parentPort.close is ok + it('worker_parentPortClose_test_004', 0, async function (done) { + var ss = new worker.Worker("workers/worker_008.js"); + var res = 0 + var flag = false; + + ss.onexit = function () { + flag = true + } + + ss.onmessage = function (e) { + res++; + } + + ss.postMessage("abc") + while (!flag) { + await PromiseCase() + } + + ss.postMessage("hello") + await PromiseCase() + expect(res).assertEqual(0) + done() + }) }) \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/resources/base/element/string.json b/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json similarity index 94% rename from compileruntime/worker_lib_standard/project/entry/src/main/resources/base/element/string.json rename to compileruntime/worker_lib_standard/src/main/resources/base/element/string.json index c0dd3a09e..0bae6bd40 100644 --- a/compileruntime/worker_lib_standard/project/entry/src/main/resources/base/element/string.json +++ b/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/project/entry/src/main/resources/base/media/icon.png b/compileruntime/worker_lib_standard/src/main/resources/base/media/icon.png similarity index 100% rename from compileruntime/worker_lib_standard/project/entry/src/main/resources/base/media/icon.png rename to compileruntime/worker_lib_standard/src/main/resources/base/media/icon.png -- GitLab