diff --git a/commonlibrary/ets_utils/BUILD.gn b/commonlibrary/ets_utils/BUILD.gn index a2cb0278a64fc59f7aaf9d58acd717145c9489a7..a8cbe43cb9fcea5611f924f3abd98ebb11ca1202 100644 --- a/commonlibrary/ets_utils/BUILD.gn +++ b/commonlibrary/ets_utils/BUILD.gn @@ -23,6 +23,7 @@ group("ets_utils") { "convertxml_lib_standard:convertxml_js_test", "process_lib_standard:process_js_test", "taskpool_lib_standard:taskPool_js_test", + "threadWorker_lib_standard:threadWorker_js_hap", "uri_lib_standard:uri_js_test", "url_lib_standard:url_js_test", "util2_lib_standard:util2_js_test", diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/app.json b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..f667e0847a4561a156d687dba8d10669f3921788 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.example.threadWorkertest", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "$media:icon", + "label": "$string:app_name", + "distributedNotificationEnabled": true, + "debug": false, + "description": "$string:app_name", + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 9, + "targetAPIVersion": 9, + "car": { + "apiCompatibleVersion": 9, + "singleUser": false + } + } +} diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/element/string.json b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..79e0b2e3ccf1bb9a8b3bd8910cafe8f5693aa9a7 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ThreadWorkerTest" + } + ] +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/media/app_icon.png b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/media/app_icon.png differ diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/BUILD.gn b/commonlibrary/ets_utils/threadWorker_lib_standard/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..b33fa9c516e1479cde00b5c8d5ed226355e71efb --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright (c) 2022 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("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("threadWorker_js_hap") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":threadWorkertest_js_assets", + ":threadWorkertest_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsThreadWorkerJsTest" + subsystem_name = "commonlibrary" + part_name = "ets_utils" +} + +ohos_app_scope("threadWorkertest_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("threadWorkertest_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("threadWorkertest_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":threadWorkertest_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/Test.json b/commonlibrary/ets_utils/threadWorker_lib_standard/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4cb21c6f73c55304c448ef6040010081cebdf5ed --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/Test.json @@ -0,0 +1,19 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "800000", + "bundle-name": "com.example.threadWorkertest", + "module-name": "entry", + "shell-timeout": "800000" + }, + "kits": [ + { + "test-file-name": [ + "ActsThreadWorkerJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/Application/AbilityStage.ts b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..6a353d888537cc8ab6a315c8c0fcb9029231ca0c --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2022 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 AbilityStage from "@ohos.app.ability.AbilityStage" + +var printLog0 = 'ThreadWorker:AbilityStage:' +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.info(printLog0 + "onCreate") + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/MainAbility.ts b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..dbd67765b4f91515c2bbb62e3531ec2270973695 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2022 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 Ability from '@ohos.app.ability.UIAbility'; + +var printLog = 'ThreadWorker:MainAbility:' +export default class MainAbility extends Ability { + onCreate(want, launchParam) { + console.info(printLog + 'onCreate') + } + + onDestroy() { + console.info(printLog + 'onDestroy') + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.info(printLog + 'onWindowStageCreate') + + windowStage.loadContent("MainAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + } + + onWindowStageDestroy() { + console.info(printLog + 'onWindowStageDestroy') + } + + onForeground() { + console.info(printLog + 'onForeground') + } + + onBackground() { + console.info(printLog + 'onBackground') + } +}; diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/pages/index.ets b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..7deb1214c6b1d3fe24e70c73438f7493a2cb02ea --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2022 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../test/List.test' + +@Entry +@Component +struct Index { + @State message: string = 'MainAbility ThreadWorker' + + aboutToAppear() { + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/TestAbility.ts b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..36c9cf9784551a8651d0e62081df36744a0f1574 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2022 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 Ability from '@ohos.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/pages/index.ets b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..b93567f962921124b282f78c8ef123965d1460c9 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2022 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('TestAbility index aboutToAppear') + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..5d625cef9acf1a905d52394d7782be6211b9a5b1 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2022 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 TestRunner from '@ohos.application.testRunner' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +function translateParamsToString(parameters) { + const keySet = new Set([ + '-s class', '-s notClass', '-s suite', '-s it', + '-s level', '-s testType', '-s size', '-s timeout', + '-s dryRun' + ]) + let targetParams = ''; + for (const key in parameters) { + if (keySet.has(key)) { + targetParams = `${targetParams} ${key} ${parameters[key]}` + } + } + return targetParams.trim() +} + +async function onAbilityCreateCallback() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.example.threadWorkertest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/List.test.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..715740e18321f29faef0a70a0bffb8218851caf0 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/List.test.js @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2022 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 threadWorkerTest from './ThreadWorker.test.js' + +export default function List() { + threadWorkerTest() +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/ThreadWorker.test.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/ThreadWorker.test.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/ThreadWorker.test.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/ThreadWorker.test.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_002.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_002.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_002.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_002.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_003.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_003.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_003.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_003.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_004.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_004.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_004.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_004.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_005.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_005.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_005.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_005.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_006.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_006.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_006.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_006.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_007.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_007.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_007.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_007.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_008.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_008.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_008.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_008.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_009.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_009.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_009.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_009.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0091.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0091.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0091.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0091.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_010.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_010.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_010.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_010.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0101.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0101.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0101.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0101.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_011.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_011.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_011.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_011.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0111.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0111.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0111.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0111.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_012.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_012.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_012.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_012.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0121.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0121.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0121.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0121.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0122.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0122.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0122.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0122.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_013.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_013.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_013.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_013.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0131.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0131.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0131.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0131.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_014.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_014.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_014.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_014.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0141.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0141.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0141.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0141.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_015.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_015.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_015.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_015.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0151.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0151.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0151.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0151.js diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0152.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0152.js similarity index 100% rename from commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0152.js rename to commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/newworker_0152.js diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/worker_002.js b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/worker_002.js new file mode 100644 index 0000000000000000000000000000000000000000..ab62c6d1fdd1d787497aede7f8c445f5d44ce72f --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/worker_002.js @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2022 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + console.log("worker:: worker receive data " + e.data); + let data = e.data + " worker"; + parentPort.postMessage(data) +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/module.json b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..0fb89508f99c872e3167e7483f7f4fdde5320fea --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/module.json @@ -0,0 +1,40 @@ +{ + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:entry_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "com.example.threadWorkertest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:white", + "visible": true, + "orientation": "portrait", + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/color.json b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/color.json new file mode 100644 index 0000000000000000000000000000000000000000..1bbc9aa9617e97c45440e1d3d66afc1154837012 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "white", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/string.json b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..b8416b237de5fe166d47eb8720d73a089b6d9fe0 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/string.json @@ -0,0 +1,24 @@ +{ + "string": [ + { + "name": "entry_desc", + "value": "description" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "label" + }, + { + "name": "form_FormAbility_desc", + "value": "form_description" + }, + { + "name": "form_FormAbility_label", + "value": "form_label" + } + ] +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/media/icon.png b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/media/icon.png differ diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/profile/main_pages.json b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..c1858c216308ad312862a877139a8ba6908ec3c6 --- /dev/null +++ b/commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "MainAbility/pages/index" + ] +} diff --git a/commonlibrary/ets_utils/threadWorker_lib_standard/signature/openharmony_sx.p7b b/commonlibrary/ets_utils/threadWorker_lib_standard/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..8499a19dbb5a2313b7b25a3d8b004eeacbe60232 Binary files /dev/null and b/commonlibrary/ets_utils/threadWorker_lib_standard/signature/openharmony_sx.p7b differ diff --git a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/List.test.js b/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/List.test.js index f971dc25f7fc086f8fa44fbcf9d9bc6a627c8329..ce1e1fa8266c47797bad75aef904cd3aaf96af90 100644 --- a/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/List.test.js +++ b/commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/List.test.js @@ -14,9 +14,7 @@ */ import WorkerTest from './WorkerTest.test.js' -import threadWorkerTest from './ThreadWorker.test.js' export default function List() { WorkerTest() - threadWorkerTest() } \ No newline at end of file