From 0d07077583b1ebb834177949b16eaa34d689abf9 Mon Sep 17 00:00:00 2001 From: yqhan Date: Wed, 18 Jan 2023 17:01:46 +0800 Subject: [PATCH] Split Worker's test cases for different api versions issue: https://gitee.com/openharmony/xts_acts/issues/I6B0YD Signed-off-by: yqhan --- commonlibrary/ets_utils/BUILD.gn | 1 + .../AppScope/app.json | 21 +++++ .../resources/base/element/string.json | 8 ++ .../resources/base/media/app_icon.png | Bin 0 -> 6790 bytes .../threadWorker_lib_standard/BUILD.gn | 43 ++++++++++ .../threadWorker_lib_standard/Test.json | 19 +++++ .../src/main/ets/Application/AbilityStage.ts | 22 +++++ .../src/main/ets/MainAbility/MainAbility.ts | 51 ++++++++++++ .../src/main/ets/MainAbility/pages/index.ets | 46 +++++++++++ .../src/main/ets/TestAbility/TestAbility.ts | 49 +++++++++++ .../src/main/ets/TestAbility/pages/index.ets | 48 +++++++++++ .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 ++++++++++++++++++ .../entry/src/main/ets/test/List.test.js | 20 +++++ .../src/main/ets/test/ThreadWorker.test.js | 0 .../entry/src/main/ets/workers/newworker.js | 0 .../src/main/ets/workers/newworker_002.js | 0 .../src/main/ets/workers/newworker_003.js | 0 .../src/main/ets/workers/newworker_004.js | 0 .../src/main/ets/workers/newworker_005.js | 0 .../src/main/ets/workers/newworker_006.js | 0 .../src/main/ets/workers/newworker_007.js | 0 .../src/main/ets/workers/newworker_008.js | 0 .../src/main/ets/workers/newworker_009.js | 0 .../src/main/ets/workers/newworker_0091.js | 0 .../src/main/ets/workers/newworker_010.js | 0 .../src/main/ets/workers/newworker_0101.js | 0 .../src/main/ets/workers/newworker_011.js | 0 .../src/main/ets/workers/newworker_0111.js | 0 .../src/main/ets/workers/newworker_012.js | 0 .../src/main/ets/workers/newworker_0121.js | 0 .../src/main/ets/workers/newworker_0122.js | 0 .../src/main/ets/workers/newworker_013.js | 0 .../src/main/ets/workers/newworker_0131.js | 0 .../src/main/ets/workers/newworker_014.js | 0 .../src/main/ets/workers/newworker_0141.js | 0 .../src/main/ets/workers/newworker_015.js | 0 .../src/main/ets/workers/newworker_0151.js | 0 .../src/main/ets/workers/newworker_0152.js | 0 .../entry/src/main/ets/workers/worker_002.js | 23 ++++++ .../entry/src/main/module.json | 40 +++++++++ .../main/resources/base/element/color.json | 8 ++ .../main/resources/base/element/string.json | 24 ++++++ .../src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes .../resources/base/profile/main_pages.json | 5 ++ .../signature/openharmony_sx.p7b | Bin 0 -> 3441 bytes .../entry/src/main/ets/test/List.test.js | 2 - 46 files changed, 506 insertions(+), 2 deletions(-) create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/app.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/element/string.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/AppScope/resources/base/media/app_icon.png create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/BUILD.gn create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/Test.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/Application/AbilityStage.ts create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/MainAbility.ts create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/MainAbility/pages/index.ets create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/TestAbility.ts create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestAbility/pages/index.ets create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/test/List.test.js rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/test/ThreadWorker.test.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_002.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_003.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_004.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_005.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_006.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_007.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_008.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_009.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0091.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_010.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0101.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_011.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0111.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_012.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0121.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0122.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_013.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0131.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_014.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0141.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_015.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0151.js (100%) rename commonlibrary/ets_utils/{worker_lib_standard => threadWorker_lib_standard}/entry/src/main/ets/workers/newworker_0152.js (100%) create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/ets/workers/worker_002.js create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/module.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/color.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/element/string.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/media/icon.png create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/entry/src/main/resources/base/profile/main_pages.json create mode 100644 commonlibrary/ets_utils/threadWorker_lib_standard/signature/openharmony_sx.p7b diff --git a/commonlibrary/ets_utils/BUILD.gn b/commonlibrary/ets_utils/BUILD.gn index 0eb4868af..a07018dc2 100644 --- a/commonlibrary/ets_utils/BUILD.gn +++ b/commonlibrary/ets_utils/BUILD.gn @@ -24,6 +24,7 @@ group("ets_utils") { "intl_lib_standard:intl_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 000000000..f667e0847 --- /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 000000000..79e0b2e3c --- /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 GIT binary patch literal 6790 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 { + 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 000000000..7deb1214c --- /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 000000000..36c9cf978 --- /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 000000000..b93567f96 --- /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 000000000..5d625cef9 --- /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 000000000..715740e18 --- /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 000000000..ab62c6d1f --- /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 000000000..0fb89508f --- /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 000000000..1bbc9aa96 --- /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 000000000..b8416b237 --- /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 GIT binary patch literal 6790 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 literal 0 HcmV?d00001 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 f971dc25f..ce1e1fa82 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 -- GitLab