diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/module.json b/ability/ability_runtime/abilitymontior/entry/src/main/module.json index ac51b9a2a9dcb09896c06ade25a5fbb897887893..479dd4d8d504633d9afcd5f941f6aa162d39f1fd 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymontior/entry/src/main/module.json @@ -60,7 +60,7 @@ "launchType": "singleton" } ], - "reqPermissions": [ + "requestPermissions": [ { "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json index de781134a39890c903f2f79f2a371210485b51fe..51fa2f6859d1e717cff06d16f13a97619316b56f 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json index a010eb12b964ba3315318e6ea839623d11ce4758..7dcd21f0ccf753855a79451cdf672b92285fe9a3 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json index 61fb321aa064bf7ebdb79c5df8df0209eb638fe2..b72ef81bee85c59eea413134b88f5fd690ed4cbd 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json index d92eac1351af60774d1fed1da542f125dc7ff1ec..98bb6819006081e85d12fc4463bd3cd703f7bbe4 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json index 35c161f14fd082e06cccb988eb4d18cef2dea067..2c52089fc49002be3a973c480c2893d1b664f929 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json @@ -21,7 +21,8 @@ "package": "com.example.amsabilitymultiinstanceappe", "name": ".MyApplication", "deviceType": [ - "default" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/js/test/ActsAbilityDelegatorCaseTest.test.js b/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/js/test/ActsAbilityDelegatorCaseTest.test.js index 134609305afae191109ffd5d05b3d09c1a627253..92a9f93198f53168c574dfae5d717d21cf11c9e5 100644 --- a/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/js/test/ActsAbilityDelegatorCaseTest.test.js +++ b/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/js/test/ActsAbilityDelegatorCaseTest.test.js @@ -37,14 +37,6 @@ export default function actsStServiceAbilityTest() { done(); }, gSetTimeout); }) - afterAll((done) => { - console.debug('= ACTS_AAAfterAll ==== { - console.debug('= ACTS_AafterAll ==== { + console.log("ActsStageContextPropertiesTest afterAll called"); + await abilityContext.startAbility({ + bundleName: "com.example.stageappcontexttest", + abilityName: "ServiceAbility", + }).then((data) => { + console.log('ActsStageContextPropertiesTest - ServiceAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log("ActsStageContextPropertiesTest - ServiceAbility failed: " + + JSON.stringify(err)); + done() + }) + + setTimeout(function () { + console.log("ActsStageContextPropertiesTest afterAll end"); + done(); + }, 1000); + }) + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0100 + * @tc.name: Validating the context obtained by the AbilityContext call + * getApplicationContext can be obtained using createBundleContext + * @tc.desc: Function test + * @tc.level 0 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0100', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0100"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let result = context.createBundleContext('com.example.stageappcontexttest') + let getCacheDir = result.cacheDir + console.log(TAG + 'getCacheDir::' + JSON.stringify(getCacheDir)); + expect(getCacheDir).assertEqual('/data/app/el2/100/base/com.example.stageappcontexttest/cache') + done(); + }); + + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0200 + * @tc.name: Validating the context obtained by the AbilityContext call + * getApplicationContext can be obtained using getApplicationContext + * @tc.desc: Function test + * @tc.level 0 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0200', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0200"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let result = context.getApplicationContext() + let getCacheDir = result.cacheDir + console.log(TAG + 'getCacheDir::' + JSON.stringify(getCacheDir)); + expect(getCacheDir).assertEqual('/data/storage/el2/base/cache') + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0300 + * @tc.name: Verify that the AbilityContext call getApplicationContext + * gets the context using resourceManger + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0300', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0300"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let result = await context.resourceManager.getString(16777219); + console.log(TAG + " result = " + JSON.stringify(result)); + expect(result).assertEqual("entry_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0400 + * @tc.name: Verify that the AbilityContext call getApplicationContext + * gets the context using applicationInfo + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0400', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0400"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let result = context.applicationInfo.name; + console.log(TAG + " result = " + JSON.stringify(result)); + expect(result).assertEqual("com.example.stageappcontexttest"); + done(); + }); + + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0500 + * @tc.name: Validating the context obtained by the AbilityStageContext call + * getApplicationContext can be obtained using getApplicationContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0500', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0500"; + console.log(TAG + " --- start"); + let context = globalThis.abilityStageContext.getApplicationContext(); + let result = context.getApplicationContext() + let getCacheDir = result.cacheDir + console.log(TAG + 'getCacheDir::' + JSON.stringify(getCacheDir)); + expect(getCacheDir).assertEqual('/data/storage/el2/base/cache') + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0600 + * @tc.name: Verify that the AbilityStageContext call getApplicationContext + * gets the context using applicationInfo + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0600', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0600"; + console.log(TAG + " --- start"); + let context = globalThis.abilityStageContext.getApplicationContext(); + let result = context.applicationInfo.name; + console.log(TAG + " result = " + JSON.stringify(result)); + expect(result).assertEqual("com.example.stageappcontexttest"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0700 + * @tc.name: Validating the context obtained by the ExtensionContext call + * getApplicationContext can be obtained using createBundleContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0700', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0700"; + console.log(TAG + " --- start"); + let context = globalThis.serviceExtenxionAbilityContext.getApplicationContext(); + let result = context.createBundleContext('com.example.stageappcontexttest') + let getCacheDir = result.cacheDir + console.log(TAG + 'getCacheDir::' + JSON.stringify(getCacheDir)); + expect(getCacheDir).assertEqual('/data/app/el2/100/base/com.example.stageappcontexttest/cache') + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0800 + * @tc.name: Validating the context obtained by the ExtensionContext call + * getApplicationContext can be obtained using getApplicationContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0800', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0800"; + console.log(TAG + " --- start"); + let serviceContext = globalThis.serviceExtenxionAbilityContext.getApplicationContext() + console.log(TAG + "servicecontext" + serviceContext) + let result = serviceContext.getApplicationContext(); + console.log(TAG + " result = " + result); + let dir = serviceContext.cacheDir + console.log(TAG + " dir = " + dir); + expect(dir).assertEqual("/data/storage/el2/base/cache"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_0900 + * @tc.name: Verify that the ExtensionContext call getApplicationContext + * gets the context using resourceManger + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_0900', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_0900"; + console.log(TAG + " --- start"); + let serviceContext = globalThis.serviceExtenxionAbilityContext.getApplicationContext(); + let result = await serviceContext.resourceManager.getString(16777219); + console.log(TAG + " result = " + result); + expect(result).assertEqual("entry_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1000 + * @tc.name: Verify that the ExtensionContext call getApplicationContext + * gets the context using applicationInfo + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1000', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1000"; + console.log(TAG + " --- start"); + let serviceContext = globalThis.serviceExtenxionAbilityContext.getApplicationContext(); + let result = serviceContext.applicationInfo.name; + console.log(TAG + " result = " + result); + expect(result).assertEqual("com.example.stageappcontexttest"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1100 + * @tc.name: Verify that the application-level context call interface + * getApplicationContext gets the context using createBundleContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1100', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1100"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let context2 = context.getApplicationContext(); + let result = context2.createBundleContext("com.example.stageappcontexttest"); + let dir = result.cacheDir; + console.log(TAG + " dir = " + dir); + expect(dir).assertEqual("/data/app/el2/100/base/com.example.stageappcontexttest/cache"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1200 + * @tc.name: Verify that the app-level context calls the interface + * getApplicationContext to get the context using getApplicationContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1200', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1200"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let context2 = context.getApplicationContext(); + let result = context2.getApplicationContext(); + let dir = result.cacheDir; + console.log(TAG + " dir = " + dir); + expect(dir).assertEqual("/data/storage/el2/base/cache"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1300 + * @tc.name: Verify that the context obtained by the application-level + * context calling interface getApplicationContext can use resourceManger + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1300', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1300"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let context2 = context.getApplicationContext(); + let result = await context2.resourceManager.getString(16777219); + console.log(TAG + " result = " + result); + expect(result).assertEqual("entry_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1400 + * @tc.name: Verify that the application-level context calling interface + * getApplicationContext gets the context using applicationInfo + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1400', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1400"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let context2 = context.getApplicationContext(); + let result = context2.applicationInfo.name; + console.log(TAG + " result = " + result); + expect(result).assertEqual("com.example.stageappcontexttest"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_ApplicationContext_1500 + * @tc.name: Verify that the context obtained by the app-level context + * calling interface getApplicationContext can be obtained using getApplicationContext + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_ApplicationContext_1500', 0, async function (done) { + let TAG = "SUB_AA_OpenHarmony_ApplicationContext_1500"; + console.log(TAG + " --- start"); + let context = abilityContext.getApplicationContext(); + let context2 = context.getApplicationContext(); + let result = context2.getApplicationContext(); + console.log(TAG + " result = " + JSON.stringify(result)); + expect(result.tempDir).assertEqual("/data/storage/el2/base/temp"); + expect(result.filesDir).assertEqual("/data/storage/el2/base/files"); + expect(result.distributedFilesDir).assertEqual("/data/storage/el2/distributedfiles"); + expect(result.databaseDir).assertEqual("/data/storage/el2/database"); + expect(result.preferencesDir).assertEqual("/data/storage/el2/base/preferences"); + expect(result.bundleCodeDir).assertEqual("/data/storage/el1/bundle"); + done(); + }); + }) +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/module.json b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..84fb94c181011eeaeeb2266d848c4cc26752f507 --- /dev/null +++ b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/module.json @@ -0,0 +1,52 @@ +{ + "module": { + "name": "entry_test", + "type": "entry", + "srcEntrance": "./ets/Application/MyAbilityStage.ts", + "description": "$string:entry_test_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ], + "extensionAbilities": [ + { + "name": "ServiceAbility", + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "label": "$string:form_ServiceAbility_label", + "description": "$string:form_ServiceAbility_desc", + "type": "service" + } + ], + "requestPermissions": [ + { + "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..357cc008ec08992b51f17d77efa279223d118de1 --- /dev/null +++ b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "entry_test_desc", + "value": "description" + }, + { + "name": "app_name", + "value": "ActsStageContextPropertiesTest" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "entry_MainAbility" + }, + { + "name": "form_ServiceAbility_desc", + "value": "form_description" + }, + { + "name": "form_ServiceAbility_label", + "value": "form_label" + } + ] +} \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from customization/TestExtensionAbility_001/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/media/icon.png diff --git a/customization/TestExtensionAbility_001/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from customization/TestExtensionAbility_001/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/signature/openharmony_sx.p7b b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..dcec6c9615032c1b48bf185e839d9720dd68aab0 Binary files /dev/null and b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/signature/openharmony_sx.p7b differ diff --git a/ability/ability_runtime/context/actsstagecontext/BUILD.gn b/ability/ability_runtime/context/actsstagecontext/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..47abc75e204b802b6e328ab426344dab339d8c80 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/BUILD.gn @@ -0,0 +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. + +import("//test/xts/tools/build/suite.gni") + +group("actsstagecontext") { + testonly = true + if (is_standard_system) { + deps = [ + "actsstagecontextassistone:ActsStageContextAssistOne", + "actsstagecontextassisttwo:ActsStageContextAssistTwo", + "actsstagecontextpropertiestest:ActsStageContextPropertiesTest", + ] + } +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/app.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..3eedf8c9dfc3d266698afb8045d7f0eb8c1f96e4 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.example.stagecontextpropertiestest", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon" : "$media:icon", + "label" : "$string:app_name", + "description" : "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive" : true, + "singleUser": true, + "minAPIVersion": 9, + "targetAPIVersion": 9, + "car": { + "apiCompatibleVersion": 9, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..0341464a8de631a34787cb15a9d9266b29847a73 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "ActsStageContextAssistOne" + } + ] +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/AppScope/resources/base/media/app_icon.png differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/BUILD.gn b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..033c5a02cadcf60c68dadeaa9b407b2de8bf4e34 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/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_hap_assist_suite("ActsStageContextAssistOne") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":stagecontextassistone_js_assets", + ":stagecontextassistone_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsStageContextAssistOne" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("stagecontextassistone_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("stagecontextassistone_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("stagecontextassistone_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":stagecontextassistone_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..84e69952d76b6d244a28188b9734268f106f63d5 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts @@ -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 AbilityStage from "@ohos.application.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.info("ActsStageContextAssistOne StageAbility onCreate") + globalThis.abilityStageContextA = this.context; + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5c2a0434f36ea7732e34c5abfb6f37793e3a4b2 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts @@ -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 Ability from '@ohos.application.Ability' +import commonEvent from '@ohos.commonEvent' + +export default class MainAbility extends Ability { + onCreate(want, launchParam) { + console.info('ActsStageContextAssistOne MainAbility3 onCreate') + } + + onDestroy() { + console.info('ActsStageContextAssistOne MainAbility3 onDestroy') + } + + onWindowStageCreate(windowStage) { + console.info('ActsStageContextAssistOne MainAbility3 onWindowStageCreate') + windowStage.setUIContent(this.context, 'pages/index', null) + } + + onWindowStageDestroy() { + console.info('ActsStageContextAssistOne MainAbility3 onWindowStageDestroy') + } + + onForeground() { + console.info('ActsStageContextAssistOne MainAbility3 onForeground') + globalThis.abilityContextA = this.context + commonEvent.publish("StartMainAbility3_CommonEvent_ContextOne", () => { + console.log("Publish StartMainAbility3_CommonEvent_ContextOne callback") + }) + } + + onBackground() { + console.info('ActsStageContextAssistOne MainAbility3 onBackground') + } +}; \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/pages/index.ets similarity index 52% rename from customization/TestExtensionAbility_001/entry/src/main/ets/pages/second/second.ets rename to ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/pages/index.ets index 2c768edb999b1b54fef3268922817734b1f1c954..46cbf8478ea057c90ac54be87cc5db177cbe3277 100644 --- a/customization/TestExtensionAbility_001/entry/src/main/ets/pages/second/second.ets +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/pages/index.ets @@ -12,32 +12,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from '@system.router'; @Entry @Component -struct Second { - private content: string = "Second Page" - +struct Index { + aboutToAppear() { + console.info('MainAbility index aboutToAppear') + console.info('start run testcase!!!') + } + + @State message: string = 'MainAbility3 Hello' build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) + Row() { + Column() { + Text(this.message) + .fontSize(50) .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(() => { + }) + } + .width('100%') } - .width('100%') .height('100%') } } \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/module.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..a6dae9dd13012243198601202fa5f1d05d0e7628 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/module.json @@ -0,0 +1,38 @@ +{ + "module": { + "name": "feature_assistone", + "type": "feature", + "srcEntrance": "./ets/Application/MyAbilityStage.ts", + "description": "$string:entry_test_desc", + "mainElement": "MainAbility3", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "MainAbility3", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "launchType": "specified", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..605115b2e7fe98cb36a1a5ec19594e215131a908 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/element/string.json @@ -0,0 +1,24 @@ +{ + "string": [ + { + "name": "entry_test_desc", + "value": "description" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "feature_MainAbility" + }, + { + "name": "app_name", + "value": "ActsStageContextAssistOne" + }, + { + "name": "description_application", + "value": "demo for test" + } + ] +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/media/icon.png differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..e291133c8b3c329611da5af30c299ec10589c7c2 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "pages/index" + ] +} \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/signature/openharmony_sx.p7b b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/signature/openharmony_sx.p7b similarity index 92% rename from customization/TestExtensionAbility_001/signature/openharmony_sx.p7b rename to ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/signature/openharmony_sx.p7b index cc53179a48f88f20acc379c138a001e9a15838f6..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/customization/TestExtensionAbility_001/signature/openharmony_sx.p7b and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/signature/openharmony_sx.p7b differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/app.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..17b1d50f0183c0063e3248ea223b97a35d790b67 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.example.actsstagecontextassisttwo", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon" : "$media:icon", + "label" : "$string:app_name", + "description" : "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive" : true, + "singleUser": true, + "minAPIVersion": 9, + "targetAPIVersion": 9, + "car": { + "apiCompatibleVersion": 9, + "singleUser": false + } + } +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ec48a8748ea2b8c0babde132baba30c5503a0918 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "AbilityStageMonitor" + } + ] +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/AppScope/resources/base/media/app_icon.png differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/BUILD.gn b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..18bf2348409426a8bfac354e8a4690c8384a7f61 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/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_hap_assist_suite("ActsStageContextAssistTwo") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":stagecontextassisttwo_js_assets", + ":stagecontextassisttwo_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsStageContextAssistTwo" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("stagecontextassisttwo_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("stagecontextassisttwo_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("stagecontextassisttwo_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":stagecontextassisttwo_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..d5309541bd41ca7b2c20266106f30bf21be2e342 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts @@ -0,0 +1,93 @@ +/* +* 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.application.AbilityStage" +import commonEvent from '@ohos.commonEvent' + +function sleep(delay) { + let start = new Date().getTime(); + while (true) { + if (new Date().getTime() - start > delay) { + break; + } + } +} + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.info("ActsStageContextAssistTwo AbilityStage onCreate") + globalThis.abilityStageContextB = this.context + } + + onAcceptWant(want) { + console.log("ActsStageContextAssistTwo onAcceptWant called want:" + JSON.stringify(want)); + async function publishContext() { + let stageContextJson = { + 'cacheDir': globalThis.abilityStageContextB.cacheDir, 'tempDir': globalThis.abilityStageContextB.tempDir, + 'filesDir': globalThis.abilityStageContextB.filesDir, 'distributedFilesDir': globalThis.abilityStageContextB.distributedFilesDir, + 'databaseDir': globalThis.abilityStageContextB.databaseDir, 'preferencesDir': globalThis.abilityStageContextB.preferencesDir, + 'bundleCodeDir': globalThis.abilityStageContextB.bundleCodeDir + }; + + let stageAppContext = globalThis.abilityStageContextB.getApplicationContext() + + let stageAppContextJson = { + 'cacheDir': stageAppContext.cacheDir, 'tempDir': stageAppContext.tempDir, 'filesDir': stageAppContext.filesDir, + 'distributedFilesDir': stageAppContext.distributedFilesDir, 'databaseDir': stageAppContext.databaseDir, + 'preferencesDir': stageAppContext.preferencesDir, 'bundleCodeDir': stageAppContext.bundleCodeDir + }; + + let bundleContext = globalThis.abilityStageContextB.createBundleContext("com.example.actsstagecontextassisttwo"); + + let result = await bundleContext.resourceManager.getString(16777219) + + let appBundleContext = stageAppContext.createBundleContext("com.example.actsstagecontextassisttwo"); + + let result1 = await appBundleContext.resourceManager.getString(16777219) + + console.log("ActsStageContextAssistTwo getLabel " + JSON.stringify(result1)) + + let stageBundleContextJson = { + 'cacheDir': bundleContext.cacheDir, 'tempDir': bundleContext.tempDir, 'filesDir': bundleContext.filesDir, + 'distributedFilesDir': bundleContext.distributedFilesDir, 'databaseDir': bundleContext.databaseDir, + 'preferencesDir': bundleContext.preferencesDir, 'bundleCodeDir': bundleContext.bundleCodeDir + }; + + let stageAppBundleContextJson = { + 'cacheDir': appBundleContext.cacheDir, 'tempDir': appBundleContext.tempDir, 'filesDir': appBundleContext.filesDir, + 'distributedFilesDir': appBundleContext.distributedFilesDir, 'databaseDir': appBundleContext.databaseDir, + 'preferencesDir': appBundleContext.preferencesDir, 'bundleCodeDir': appBundleContext.bundleCodeDir + }; + + let commonEventData = { + parameters: { + abilityStageContextAssistOne: stageContextJson, + abilityStageAppContextAssistOne: stageAppContextJson, + abilityStageLabel: result, + abilityStageAppLabel: result1, + abilityStageBundleContxtAssistOne: stageBundleContextJson, + abilityStageAppBundleContextAssistOne: stageAppBundleContextJson + } + } + commonEvent.publish("AssistContextTwo_StageAbilityA_Start_CommonEvent", commonEventData, () => { + console.log("Publish AssistContextTwo_StageAbilityA_Start_CommonEvent callback") + }) + } + publishContext() + sleep(500) + let abilityId = want.parameters.startId.toString(); + return abilityId; + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..dd286cedb98745eb8e47d4033122c75ed00f02e1 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,100 @@ +/* +* 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.application.Ability' +import commonEvent from '@ohos.commonEvent' +import bundle from '@ohos.bundle'; +import dataAbility from '@ohos.data.dataAbility'; + +export default class MainAbility extends Ability { + onCreate(want: any, launchParam: any) { + console.info('ActsStageContextAssistTwo MainAbility4 onCreate') + } + + onDestroy() { + console.info('MainAbilityMonitor onDestroy') + } + + onWindowStageCreate(windowStage) { + console.info('ActsStageContextAssistTwo MainAbility4 onWindowStageCreate') + windowStage.setUIContent(this.context, 'MainAbility/pages/index', null) + } + + onWindowStageDestroy() { + console.info('ActsStageContextAssistTwo MainAbility4 onWindowStageDestroy') + } + + async onForeground() { + console.info('ActsStageContextAssistTwo MainAbility4 onForeground') + let contextJson = { + 'cacheDir': this.context.cacheDir, 'tempDir': this.context.tempDir, 'filesDir': this.context.filesDir, + 'distributedFilesDir': this.context.distributedFilesDir, 'databaseDir': this.context.databaseDir, + 'preferencesDir': this.context.preferencesDir, 'bundleCodeDir': this.context.bundleCodeDir + }; + + let abilityAppContext = this.context.getApplicationContext() + + let appContextJson = { + 'cacheDir': abilityAppContext.cacheDir, 'tempDir': abilityAppContext.tempDir, 'filesDir': abilityAppContext.filesDir, + 'distributedFilesDir': abilityAppContext.distributedFilesDir, 'databaseDir': abilityAppContext.databaseDir, + 'preferencesDir': abilityAppContext.preferencesDir, 'bundleCodeDir': abilityAppContext.bundleCodeDir + }; + + let bundleContext = this.context.createBundleContext("com.example.actsstagecontextassisttwo") + + let bundleAppContext = abilityAppContext.createBundleContext("com.example.actsstagecontextassisttwo") + + let result = await bundleContext.resourceManager.getString(16777219) + + let bundleContextJson = { + 'cacheDir': bundleContext.cacheDir, 'tempDir': bundleContext.tempDir, 'filesDir': bundleContext.filesDir, + 'distributedFilesDir': bundleContext.distributedFilesDir, 'databaseDir': bundleContext.databaseDir, + 'preferencesDir': bundleContext.preferencesDir, 'bundleCodeDir': bundleContext.bundleCodeDir + }; + + let appBundleContextJson = { + 'cacheDir': bundleAppContext.cacheDir, 'tempDir': bundleAppContext.tempDir, 'filesDir': bundleAppContext.filesDir, + 'distributedFilesDir': bundleAppContext.distributedFilesDir, 'databaseDir': bundleAppContext.databaseDir, + 'preferencesDir': bundleAppContext.preferencesDir, 'bundleCodeDir': bundleAppContext.bundleCodeDir + }; + + let errCode; + + try { + this.context.createBundleContext("com.example.stagecontextpropertiestest") + } catch (error) { + console.log("ActsStageContextAssistTwo createBundleContext is error:" + JSON.stringify(error)) + errCode = error.code + } + + let commonEventData = { + parameters: { + abilityContextAssistTwo: contextJson, + abilityAppContextAssistTwo: appContextJson, + abilityLabel: result, + abilityBundleContextAssistTwo: bundleContextJson, + abilityAppBundleContextAssistTwo: appBundleContextJson, + abilityBundleContextTest: errCode + } + } + commonEvent.publish("StartMainAbility4_CommonEvent_ContextOne", commonEventData, () => { + console.log("Publish StartMainAbility4_CommonEvent_ContextOne callback") + }) + } + + onBackground() { + console.info('ActsStageContextAssistTwo MainAbility4 onBackground') + } +}; \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..c1c0f2c9122aa6dcf2ae920ad25df61d783654ea --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/pages/index.ets @@ -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. +*/ + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('MainAbility index aboutToAppear') + console.info('start run testcase!!!') + } + + @State message: string = 'MainAbility4 Hello' + 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/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/module.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..6bacd2189ba6826efab70ce28cadae7f35cdb9d6 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/module.json @@ -0,0 +1,38 @@ +{ + "module": { + "name": "entry_assisttow", + "type": "entry", + "srcEntrance": "./ets/Application/MyAbilityStage.ts", + "description": "$string:entry_test_desc", + "mainElement": "MainAbility4", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "MainAbility4", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "launchType": "specified", + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..6cdc973204d451ad03b7dd133c05652792e74544 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/element/string.json @@ -0,0 +1,24 @@ +{ + "string": [ + { + "name": "entry_test_desc", + "value": "description" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "entry_MainAbility" + }, + { + "name": "app_name", + "value": "ActsStageContextAssistTwo" + }, + { + "name": "description_application", + "value": "demo for test" + } + ] +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/media/icon.png differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..951f0a2b8d54f94311cb88cbedae68c9d56fcb49 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "MainAbility/pages/index" + ] +} \ No newline at end of file diff --git a/customization/edm_xts_stage/signature/openharmony_sx.p7b b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/signature/openharmony_sx.p7b similarity index 77% rename from customization/edm_xts_stage/signature/openharmony_sx.p7b rename to ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/signature/openharmony_sx.p7b index 7ffcdc78527c5c1aa24520ab7e913c5f47c703f0..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/customization/edm_xts_stage/signature/openharmony_sx.p7b and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/signature/openharmony_sx.p7b differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/app.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..bc1d390ecd3d1d461a69e35aa5c3a550a615fd18 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.example.stagecontextpropertiestest", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon" : "$media:icon", + "label" : "$string:app_name", + "description" : "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive" : true, + "singleUser": true, + "minAPIVersion": 9, + "targetAPIVersion": 9, + "car": { + "apiCompatibleVersion": 9, + "singleUser": false + } + } +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ec48a8748ea2b8c0babde132baba30c5503a0918 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "AbilityStageMonitor" + } + ] +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/AppScope/resources/base/media/app_icon.png differ diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/BUILD.gn b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e14dbde7bfe7d6681cdd0899b65d8868675d8b4c --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/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("ActsStageContextPropertiesTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":stagecontextproperties_js_assets", + ":stagecontextproperties_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsStageContextPropertiesTest" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("stagecontextproperties_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("stagecontextproperties_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("stagecontextproperties_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":stagecontextproperties_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/Test.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..9595408064924e7b01b338ad084a4b7b49a9d65f --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/Test.json @@ -0,0 +1,23 @@ +{ + "description": "Configuration for aceceshi Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "600000", + "bundle-name": "com.example.stagecontextpropertiestest", + "module-name": "entry_test", + "shell-timeout": "600000", + "testcase-timeout": "15000" + }, + "kits": [ + { + "test-file-name": [ + "ActsStageContextPropertiesTest.hap", + "ActsStageContextAssistOne.hap", + "ActsStageContextAssistTwo.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} + diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5252dd1cf64c19339b511abf33634c978ca545b --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts @@ -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 AbilityStage from "@ohos.application.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.info("MyAbilityStageMonitor onCreate") + globalThis.abilityStageContext = this.context + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..1e2e87f4f85afad51bb5b9825fe09e73a58758b1 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,61 @@ +/* + * 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.application.Ability' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/List.test' + +export default class MainAbility extends Ability { + onCreate(want, launchParam) { + // Ability is creating, initialize resources for this ability + console.log("ActsStageContextPropertiesTest MainAbility onCreate") + globalThis.abilityWant = want; + globalThis.abilityContext = this.context + let abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + let abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("ActsStageContextPropertiesTest MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("ActsStageContextPropertiesTest MainAbility onWindowStageCreate") + + windowStage.setUIContent(this.context, "pages/index/index", null) + console.log("ActsStageContextPropertiesTest MainAbility onWindowStageCreate finish") + } + + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + console.log("ActsStageContextPropertiesTest MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("ActsStageContextPropertiesTest MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("ActsStageContextPropertiesTest MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts similarity index 56% rename from customization/TestExtensionAbility_001/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 56d78ede1a7d850b8f84f17745fb6228fba64f89..51d5acc1b1bbde2060690997374162f178c0cc39 100644 --- a/customization/TestExtensionAbility_001/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -4,7 +4,7 @@ * 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 + * 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, @@ -13,38 +13,41 @@ * limitations under the License. */ import Ability from '@ohos.application.Ability' +import commonEvent from '@ohos.commonEvent' -export default class MainAbility extends Ability { - onCreate(want, launchParam) { +export default class MainAbility2 extends Ability { + onCreate(want,launchParam){ // Ability is creating, initialize resources for this ability - console.log("MainAbility onCreate"); + console.log("ActsStageContextPropertiesTest MainAbility2 onCreate") globalThis.abilityWant = want; - globalThis.abilityContext = this.context + globalThis.abilityContext2 = this.context } onDestroy() { // Ability is destroying, release resources for this ability - console.log("MainAbility onDestroy"); + console.log("ActsStageContextPropertiesTest MainAbility2 onDestroy") } onWindowStageCreate(windowStage) { // Main window is created, set main page for this ability - console.log("MainAbility onWindowStageCreate"); - windowStage.setUIContent(this.context, "pages/index/index", null); + console.log("ActsStageContextPropertiesTest MainAbility2 onWindowStageCreate") + + windowStage.setUIContent(this.context, "pages/secone/second ", null) + console.log("ActsStageContextPropertiesTest MainAbility2 onWindowStageCreate finish") } onWindowStageDestroy() { // Main window is destroyed, release UI related resources - console.log("MainAbility onWindowStageDestroy"); + console.log("ActsStageContextPropertiesTest MainAbility2 onWindowStageDestroy") } onForeground() { // Ability has brought to foreground - console.log("MainAbility onForeground"); + console.log("ActsStageContextPropertiesTest MainAbility2 onForeground") } onBackground() { // Ability has back to background - console.log("MainAbility onBackground"); + console.log("ActsStageContextPropertiesTest MainAbility2 onBackground") } -}; +}; \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..97d54bf53d891f7bac91020da534621ccdaec03b --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,75 @@ +/* +* 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' + +let abilityDelegator = undefined +let 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() + globalThis.abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + let testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + let cmd = 'aa start -d 0 -a MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + 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/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..b0a14fd4ec919058e6e7913e40e35c574ddb18f1 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/index/index.ets @@ -0,0 +1,44 @@ +/* + * 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. + */ + + +@Entry +@Component +struct Index { + aboutToAppear(){ + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('MainAbility Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/second/second.ets new file mode 100644 index 0000000000000000000000000000000000000000..23c5e3b3ad9029d36043199535a4c63560154d53 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/pages/second/second.ets @@ -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 router from '@system.router'; + +@Entry +@Component +struct Second { + private content: string = "SecondMainAbility Page" + + build() { + Flex({ direction: FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text(`${this.content}`) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('back to index') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + router.back() + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..19eec40cd02f2140c00aba8b7786e2cd4b68272d --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/List.test.ets @@ -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 stageContextPropertiesTest from './StageContextProperties.test' + +export default function testsuite() { + stageContextPropertiesTest(globalThis.abilityContext) +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/StageContextProperties.test.ets b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/StageContextProperties.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..21c002b9c9ac50aa449f7c9e4a1a50a18d907f87 --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/test/StageContextProperties.test.ets @@ -0,0 +1,1141 @@ +/* + * 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 { describe, it, expect, afterEach, beforeAll } from '@ohos/hypium' +import commonEvent from '@ohos.commonEvent' + +let Subscriber; +let TAG; + +let subscriberInfo_AbilityContext = { + events: ["StartMainAbility3_CommonEvent_ContextOne", "StartMainAbility4_CommonEvent_ContextOne", + "AssistContextTwo_StageAbilityA_Start_CommonEvent"], +}; + +export default function stageContextPropertiesTest(abilityContext) { + describe('ActsStageContextPropertiesTest', function () { + + beforeAll(async (done) => { + console.log("ActsStageContextPropertiesTest afterAll called"); + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility2" + }).then((data) => { + console.log('ActsStageContextPropertiesTest - startMainAbility2: ' + JSON.stringify(data)); + }).catch((err) => { + console.log("ActsStageContextPropertiesTest - startMainAbility2 failed: " + + JSON.stringify(err)); + done() + }) + + setTimeout(function () { + console.log("ActsStageContextPropertiesTest afterAll end"); + done(); + }, 3000); + }) + + afterEach(async (done) => { + console.log("ActsStageContextPropertiesTest afterEach called"); + let wantInfo = { + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility" + } + await abilityContext.startAbility(wantInfo).then((data) => { + console.log("ActsStageContextPropertiesTest startMainAbility data : " + JSON.stringify(data)); + }).catch((err) => { + console.log("ActsStageContextPropertiesTest startMainAbility err : " + JSON.stringify(err)); + }) + + setTimeout(function () { + console.log("ActsStageContextPropertiesTest afterEach end"); + done(); + }, 1500); + }) + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0100 + * @tc.name: Check that context paths of different Ability in the same hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0100', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0100" + console.log(TAG + "--- start"); + + checkAbilityContextDir(); + checkContextDirEqualA(abilityContext, globalThis.abilityContext2); + done() + console.log(TAG + "--- end"); + + + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0200 + * @tc.name: Check that context paths of different Ability in the same hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0200', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0200" + console.log(TAG + "--- start"); + checkApplicationContextDir(abilityContext.getApplicationContext()); + checkApplicationContextDir(globalThis.abilityStageContext.getApplicationContext()); + checkApplicationContextDir(globalThis.abilityContext2.getApplicationContext()); + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityContext2.getApplicationContext()) + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityStageContext.getApplicationContext()) + done() + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0300 + * @tc.name: Check that context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0300', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0300" + console.log(TAG + " --- start"); + + checkAbilityContextDir(); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + checkContextDirEqualB(abilityContext, globalThis.abilityContextA) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0400 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0400', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0400" + console.log(TAG + " --- start"); + + checkAbilityStageContextDir(); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + checkContextDirEqualB(globalThis.abilityStageContext, globalThis.abilityStageContextA) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0500 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0500', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0500" + console.log(TAG + " --- start"); + checkApplicationContextDir(abilityContext.getApplicationContext()); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityContextA.getApplicationContext()) + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityStageContextA.getApplicationContext()) + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityStageContext.getApplicationContext()) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0600 + * @tc.name: Check that context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0600', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0600" + console.log(TAG + " --- start"); + checkAbilityContextDir(); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == "StartMainAbility4_CommonEvent_ContextOne") { + checkContextDirEqualC(abilityContext, data.parameters.abilityContextAssistTwo) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 1, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0700 + * @tc.name: Check that context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0700', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0700" + console.log(TAG + " --- start"); + checkAbilityStageContextDir(); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == "AssistContextTwo_StageAbilityA_Start_CommonEvent") { + checkContextDirEqualC(abilityContext, data.parameters.abilityStageContextAssistOne) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 2, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0800 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_0800', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0800" + console.log(TAG + " --- start"); + let num = 0; + let abilityAppContext; + let abilityStageAppContext; + checkApplicationContextDir(abilityContext.getApplicationContext()); + + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + console.log(TAG + " AssistContextTwo_StageAbilityA_Start_CommonEvent") + num++; + abilityStageAppContext = data.parameters.abilityStageAppContextAssistOne + } + if (data.event == 'StartMainAbility4_CommonEvent_ContextOne') { + console.log(TAG + " StartMainAbility4_CommonEvent_ContextOne") + num++; + abilityAppContext = data.parameters.abilityAppContextAssistTwo + } + if (num == 2) { + console.log(TAG + " start expect"); + checkContextDirEqualA(abilityContext.getApplicationContext(), abilityAppContext) + checkContextDirEqualA(abilityContext.getApplicationContext(), abilityStageAppContext) + checkContextDirEqualA(abilityContext.getApplicationContext(), + globalThis.abilityStageContext.getApplicationContext()) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 3, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_0900 + * @tc.name: Check that label paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 0 + */ + it('SUB_AA_OpenHarmony_Context_0900', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_0900" + console.log(TAG + " --- start"); + let result = await abilityContext.resourceManager.getString(16777219); + console.log(TAG + " : result = " + JSON.stringify(result)); + expect(result).assertEqual("feature_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1000 + * @tc.name: Check that label paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1000', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1000" + console.log(TAG + " --- start"); + let result = await globalThis.abilityStageContext.resourceManager.getString(16777219); + console.log(TAG + " : result = " + JSON.stringify(result)); + expect(result).assertEqual("feature_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1100 + * @tc.name: Check that label paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1100', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1100" + console.log(TAG + " --- start"); + let result = await globalThis.abilityStageContext.getApplicationContext() + .resourceManager.getString(16777219); + console.log(TAG + " : result = " + JSON.stringify(result)); + expect(result).assertEqual("feature_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1200 + * @tc.name: Check that label paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1200', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1200" + console.log(TAG + " --- start"); + + async function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + let result = await globalThis.abilityContextA.resourceManager.getString(16777219); + console.log(TAG + " : result = " + JSON.stringify(result)); + expect(result).assertEqual("feature_MainAbility"); + checkContextDirEqualB(abilityContext, globalThis.abilityContextA) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1300 + * @tc.name: Call createBundleContext through context and pass in the wrong package + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1300', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1300" + console.log(TAG + " --- start"); + try { + abilityContext.createBundleContext(" "); + expect.assertFail() + } catch (error) { + console.log(TAG + " createBundleContext = " + JSON.stringify(error)); + done() + } + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1400 + * @tc.name: The resource obtained through getString is the same as config.json in the label resources are the same + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1400', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1400" + console.log(TAG + " --- start"); + let bundleContext = abilityContext.createBundleContext("com.example.stagecontextpropertiestest"); + let result = await bundleContext.resourceManager.getString(16777219); + console.log(TAG + " : result = " + JSON.stringify(result)); + expect(result).assertEqual("feature_MainAbility"); + done(); + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1500 + * @tc.name: The resource obtained through getString is the same as config.json in the label resources are the same + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1500', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1500" + console.log(TAG + " --- start"); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'StartMainAbility4_CommonEvent_ContextOne') { + expect(data.parameters.abilityLabel).assertEqual("entry_MainAbility"); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 4, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1600 + * @tc.name: The resource obtained through getString is the same as config.json in the label resources are the same + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1600', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1600" + console.log(TAG + " --- start"); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + expect(data.parameters.abilityStageLabel).assertEqual("entry_MainAbility"); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 5, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1700 + * @tc.name: The resource obtained through getString is the same as config.json in the label resources are the same + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1700', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1700" + console.log(TAG + " --- start"); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + expect(data.parameters.abilityStageAppLabel).assertEqual("entry_MainAbility"); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 6, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1800 + * @tc.name: Check that context paths of different Ability in the same hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1800', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1800" + console.log(TAG + " --- start"); + let abilityBundleContext1 = abilityContext.createBundleContext("com.example.stagecontextpropertiestest"); + let abilityBundleContext2 = globalThis.abilityContext2 + .createBundleContext("com.example.stagecontextpropertiestest"); + checkBundleContextDir(abilityBundleContext1); + checkContextDirEqualA(abilityBundleContext1, abilityBundleContext2); + console.log(TAG + " --- end"); + done() + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_1900 + * @tc.name: Check that ApplicationContext paths of different Ability in the same hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_1900', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_1800" + console.log(TAG + " --- start"); + let abilityBundleContext1 = abilityContext.createBundleContext("com.example.stagecontextpropertiestest"); + let abilityBundleContext2 = globalThis.abilityContext2 + .createBundleContext("com.example.stagecontextpropertiestest"); + let abilityStageBundleContext2 = globalThis.abilityStageContext + .createBundleContext("com.example.stagecontextpropertiestest"); + checkBundleContextDir(abilityBundleContext1); + checkContextDirEqualA(abilityBundleContext1, abilityBundleContext2); + checkContextDirEqualA(abilityBundleContext1, abilityStageBundleContext2); + console.log(TAG + " --- end"); + done() + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2000 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2000', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2000" + console.log(TAG + " --- start"); + let abilityBundleContext1 = abilityContext.createBundleContext("com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + let abilityBundleContext2 = globalThis.abilityContextA.createBundleContext( + "com.example.stagecontextpropertiestest"); + checkContextDirEqualA(abilityBundleContext1, abilityBundleContext2); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2100 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2100', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2100" + console.log(TAG + " --- start"); + let abilityStageBundleContext1 = globalThis.abilityStageContext.createBundleContext( + "com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityStageBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + let abilityBundleContext2 = globalThis.abilityStageContextA.createBundleContext( + "com.example.stagecontextpropertiestest"); + checkContextDirEqualA(abilityStageBundleContext1, abilityBundleContext2); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2200 + * @tc.name: Check that ApplicationContext paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2200', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2200" + console.log(TAG + " --- start"); + let abilityBundleContext1 = abilityContext.getApplicationContext() + .createBundleContext("com.example.stagecontextpropertiestest") + let abilityStageBundleContext1 = globalThis.abilityStageContext.getApplicationContext() + .createBundleContext( + "com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + let abilityBundleContext2 = abilityContext.getApplicationContext() + .createBundleContext("com.example.stagecontextpropertiestest") + let abilityStageBundleContext2 = globalThis.abilityStageContext.getApplicationContext() + .createBundleContext( + "com.example.stagecontextpropertiestest"); + checkContextDirEqualA(abilityBundleContext1, abilityStageBundleContext1); + checkContextDirEqualA(abilityBundleContext2, abilityStageBundleContext2); + checkContextDirEqualA(abilityBundleContext1, abilityStageBundleContext2); + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.stagecontextpropertiestest", + abilityName: "MainAbility3", + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2300 + * @tc.name: Check that Context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2300', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2300" + console.log(TAG + " --- start"); + let abilityBundleContext1 = abilityContext.createBundleContext("com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'StartMainAbility4_CommonEvent_ContextOne') { + checkAssistHapBundleContextDir(data.parameters.abilityBundleContextAssistTwo) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 7, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2400 + * @tc.name: Check that Context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2400', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2400" + console.log(TAG + " --- start"); + let abilityStageBundleContext1 = globalThis.abilityStageContext + .createBundleContext("com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityStageBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + checkAssistHapBundleContextDir(data.parameters.abilityStageBundleContxtAssistOne) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 8, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2500 + * @tc.name: Check that ApplicationContex paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2500', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2500" + console.log(TAG + " --- start"); + let num = 0; + let abilityStageAppBundleContext; + let abilityAppBundleContext; + let abilityAppBundleContext1 = globalThis.abilityStageContext.getApplicationContext() + .createBundleContext("com.example.stagecontextpropertiestest"); + let abilityStageAppBundleContext1 = globalThis.abilityStageContext.getApplicationContext() + .createBundleContext("com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityAppBundleContext1); + checkContextDirEqualA(abilityAppBundleContext1, abilityStageAppBundleContext1) + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + if (data.event == 'AssistContextTwo_StageAbilityA_Start_CommonEvent') { + console.log(TAG + " AssistContextTwo_StageAbilityA_Start_CommonEvent") + num++; + abilityStageAppBundleContext = data.parameters.abilityStageAppContextAssistOne + } + if (data.event == 'StartMainAbility4_CommonEvent_ContextOne') { + console.log(TAG + " StartMainAbility4_CommonEvent_ContextOne") + num++; + abilityAppBundleContext = data.parameters.abilityAppContextAssistTwo + } + if (num == 2) { + console.log(TAG + " start expect"); + checkAssistHapBundleContextDir(abilityAppBundleContext) + checkContextDirEqualA(abilityAppBundleContext, abilityStageAppBundleContext) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 9, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_Context_2600 + * @tc.name: Check that Context paths of different Ability in the different hap are the same. + * @tc.desc: Function test + * @tc.level 3 + */ + it('SUB_AA_OpenHarmony_Context_2600', 0, async function (done) { + TAG = "SUB_AA_OpenHarmony_Context_2600" + console.log(TAG + " --- start"); + let abilityBundleContext1 = globalThis.abilityStageContext + .createBundleContext("com.example.stagecontextpropertiestest"); + + checkBundleContextDir(abilityBundleContext1); + + function SubscribeCallBack(err, data) { + console.log(TAG + " Subscribe CallBack data: " + JSON.stringify(data) + + "err: " + JSON.stringify(err)); + if (data.event == 'StartMainAbility4_CommonEvent_ContextOne') { + expect(data.parameters.abilityBundleContextTest).assertEqual(401) + commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); + } + } + + await commonEvent.createSubscriber(subscriberInfo_AbilityContext).then(async (data) => { + console.log(TAG + " Create Subscriber"); + Subscriber = data; + await commonEvent.subscribe(Subscriber, SubscribeCallBack); + }) + + function UnSubscribeCallback() { + console.log(TAG + " UnSubscribe CallBack"); + done(); + } + + await abilityContext.startAbility({ + bundleName: "com.example.actsstagecontextassisttwo", + abilityName: "MainAbility4", + parameters: { + startId: 10, + } + }).then((data) => { + console.log(TAG + ' - startAbility: ' + JSON.stringify(data)); + }).catch((err) => { + console.log(TAG + " - start failed" + JSON.stringify(err)); + expect.assertFail() + done() + }) + }); + + function checkApplicationContextDir(applicationContext) { + expect(applicationContext.cacheDir).assertEqual("/data/storage/el2/base/cache"); + expect(applicationContext.tempDir).assertEqual("/data/storage/el2/base/temp"); + expect(applicationContext.filesDir).assertEqual("/data/storage/el2/base/files"); + expect(applicationContext.distributedFilesDir).assertEqual("/data/storage/el2/distributedfiles"); + expect(applicationContext.databaseDir).assertEqual("/data/storage/el2/database"); + expect(applicationContext.preferencesDir).assertEqual("/data/storage/el2/base/preferences"); + expect(applicationContext.bundleCodeDir).assertEqual("/data/storage/el1/bundle"); + } + + function checkAbilityContextDir() { + expect(abilityContext.cacheDir).assertEqual("/data/storage/el2/base/haps/entry_test/cache"); + expect(abilityContext.tempDir).assertEqual("/data/storage/el2/base/haps/entry_test/temp"); + expect(abilityContext.filesDir).assertEqual("/data/storage/el2/base/haps/entry_test/files"); + expect(abilityContext.distributedFilesDir).assertEqual("/data/storage/el2/distributedfiles"); + expect(abilityContext.databaseDir).assertEqual("/data/storage/el2/database/entry_test"); + expect(abilityContext.preferencesDir).assertEqual("/data/storage/el2/base/haps/entry_test/preferences"); + expect(abilityContext.bundleCodeDir).assertEqual("/data/storage/el1/bundle"); + } + + function checkContextDirEqualA(abilityContext, abilityContext2) { + expect(abilityContext.cacheDir).assertEqual(abilityContext2.cacheDir); + expect(abilityContext.tempDir).assertEqual(abilityContext2.tempDir); + expect(abilityContext.filesDir).assertEqual(abilityContext2.filesDir); + expect(abilityContext.distributedFilesDir).assertEqual(abilityContext2.distributedFilesDir); + expect(abilityContext.databaseDir).assertEqual(abilityContext2.databaseDir); + expect(abilityContext.storageDir).assertEqual(abilityContext2.storageDir); + expect(abilityContext.bundleCodeDir).assertEqual(abilityContext2.bundleCodeDir); + } + + function checkContextDirEqualB(abilityContext, abilityContext2) { + expect(abilityContext2.cacheDir == "/data/storage/el2/base/haps/feature_assistone/cache" && + abilityContext2.cacheDir != abilityContext.cacheDir).assertTrue(); + expect(abilityContext2.databaseDir == "/data/storage/el2/database/feature_assistone" && + abilityContext2.databaseDir != abilityContext.databaseDir).assertTrue(); + expect(abilityContext2.filesDir == "/data/storage/el2/base/haps/feature_assistone/files" && + abilityContext2.filesDir != abilityContext.filesDir).assertTrue(); + expect(abilityContext2.preferencesDir == "/data/storage/el2/base/haps/feature_assistone/preferences" && + abilityContext2.preferencesDir != abilityContext.preferencesDir).assertTrue(); + expect(abilityContext2.tempDir == "/data/storage/el2/base/haps/feature_assistone/temp" && + abilityContext2.tempDir != abilityContext.tempDir).assertTrue(); + expect(abilityContext.distributedFilesDir).assertEqual(abilityContext2.distributedFilesDir); + expect(abilityContext.bundleCodeDir).assertEqual(abilityContext2.bundleCodeDir); + } + + function checkContextDirEqualC(abilityContext, abilityContext2) { + expect(abilityContext2.cacheDir == "/data/storage/el2/base/haps/entry_assisttow/cache" && + abilityContext2.cacheDir != abilityContext.cacheDir).assertTrue(); + expect(abilityContext2.databaseDir == "/data/storage/el2/database/entry_assisttow" && + abilityContext2.databaseDir != abilityContext.databaseDir).assertTrue(); + expect(abilityContext2.filesDir == "/data/storage/el2/base/haps/entry_assisttow/files" && + abilityContext2.filesDir != abilityContext.filesDir).assertTrue(); + expect(abilityContext2.preferencesDir == "/data/storage/el2/base/haps/entry_assisttow/preferences" && + abilityContext2.preferencesDir != abilityContext.preferencesDir).assertTrue(); + expect(abilityContext2.tempDir == "/data/storage/el2/base/haps/entry_assisttow/temp" && + abilityContext2.tempDir != abilityContext.tempDir).assertTrue(); + expect(abilityContext.distributedFilesDir).assertEqual(abilityContext2.distributedFilesDir); + expect(abilityContext.bundleCodeDir).assertEqual(abilityContext2.bundleCodeDir); + } + + function checkAbilityStageContextDir() { + expect(globalThis.abilityStageContext.cacheDir).assertEqual("/data/storage/el2/base/haps/entry_test/cache"); + expect(globalThis.abilityStageContext.tempDir).assertEqual("/data/storage/el2/base/haps/entry_test/temp"); + expect(globalThis.abilityStageContext.filesDir).assertEqual("/data/storage/el2/base/haps/entry_test/files"); + expect(globalThis.abilityStageContext.distributedFilesDir).assertEqual("/data/storage/el2/distributedfiles"); + expect(globalThis.abilityStageContext.databaseDir).assertEqual("/data/storage/el2/database/entry_test"); + expect(globalThis.abilityStageContext.preferencesDir).assertEqual("/data/storage/el2/base/haps/entry_test/preferences"); + expect(globalThis.abilityStageContext.bundleCodeDir).assertEqual("/data/storage/el1/bundle"); + } + + function checkBundleContextDir(bundleContext) { + expect(bundleContext.bundleCodeDir).assertEqual("/data/bundles/com.example.stagecontextpropertiestest"); + expect(bundleContext.tempDir).assertEqual("/data/app/el2/100/base/com.example.stagecontextpropertiestest/temp"); + expect(bundleContext.filesDir).assertEqual("/data/app/el2/100/base/com.example.stagecontextpropertiestest/files"); + expect(bundleContext.cacheDir).assertEqual("/data/app/el2/100/base/com.example.stagecontextpropertiestest/cache"); + expect(bundleContext.databaseDir).assertEqual("/data/app/el2/100/database/com.example.stagecontextpropertiestest"); + expect(bundleContext.preferencesDir).assertEqual("/data/app/el2/100/base/com.example.stagecontextpropertiestest/preferences"); + expect(bundleContext.distributedFilesDir).assertEqual("/mnt/hmdfs/100/device_view/local/data/com.example.stagecontextpropertiestest"); + } + + function checkAssistHapBundleContextDir(bundleContext) { + expect(bundleContext.bundleCodeDir).assertEqual("/data/bundles/com.example.actsstagecontextassisttwo"); + expect(bundleContext.tempDir).assertEqual("/data/app/el2/100/base/com.example.actsstagecontextassisttwo/temp"); + expect(bundleContext.filesDir).assertEqual("/data/app/el2/100/base/com.example.actsstagecontextassisttwo/files"); + expect(bundleContext.cacheDir).assertEqual("/data/app/el2/100/base/com.example.actsstagecontextassisttwo/cache"); + expect(bundleContext.databaseDir).assertEqual("/data/app/el2/100/database/com.example.actsstagecontextassisttwo"); + expect(bundleContext.preferencesDir).assertEqual("/data/app/el2/100/base/com.example.actsstagecontextassisttwo/preferences"); + expect(bundleContext.distributedFilesDir).assertEqual("/mnt/hmdfs/100/device_view/local/data/com.example.actsstagecontextassisttwo"); + } + }) +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/module.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..18930cb5410f86e71e80171ec54afb5b1b2a88cd --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/module.json @@ -0,0 +1,61 @@ +{ + "module": { + "name": "entry_test", + "type": "entry", + "srcEntrance": "./ets/Application/MyAbilityStage.ts", + "description": "$string:entry_test_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + }, + { + "name": "MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..d42dffab203d65da7a728e0b1be520e46ae2a2ff --- /dev/null +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/element/string.json @@ -0,0 +1,24 @@ +{ + "string": [ + { + "name": "entry_test_desc", + "value": "description" + }, + { + "name": "app_name", + "value": "ActsStageContextPropertiesTest" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "entry_MainAbility" + } + ] +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/media/icon.png differ diff --git a/customization/edm_xts_stage/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from customization/edm_xts_stage/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/signature/openharmony_sx.p7b b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..66b4457a8a81fb8d3356cf46d67226c850944858 Binary files /dev/null and b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/signature/openharmony_sx.p7b differ diff --git a/ability/ability_runtime/context/scene/defpermission/src/main/config.json b/ability/ability_runtime/context/scene/defpermission/src/main/config.json index f6d3a6ae6ebef67379352f1e34ff3bed0de09e2a..95936f7e246534cf178985282b7ff35b5c70cdf3 100644 --- a/ability/ability_runtime/context/scene/defpermission/src/main/config.json +++ b/ability/ability_runtime/context/scene/defpermission/src/main/config.json @@ -29,7 +29,8 @@ } ], "deviceType": [ - "default" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets index 60cc2ceb43ece30605e9067f41c61a6be3249e64..19e80d90ebcc37e4c3614ae866af998eafc65f82 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets @@ -23,9 +23,9 @@ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry export default function ConnectAbilityTest() { - var TAG = ""; - var Tempassert = ""; - var abilityDelegator = undefined + let TAG = ""; + let Tempassert = ""; + let abilityDelegator = undefined function sleep(time) { return new Promise((resolve) => setTimeout(resolve, time)) @@ -35,19 +35,19 @@ export default function ConnectAbilityTest() { beforeAll(async function (done) { console.info("FreeInstall_FA_ConnectAbility before all called"); abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var cmd = "bm install -p data/test/MockService.hap"; + let cmd = "bm install -p data/test/MockService.hap"; console.info("cmd : " + cmd) console.info(TAG + " abilityDelegator : " + JSON.stringify(abilityDelegator)); abilityDelegator.executeShellCommand(cmd, (err: any, d: any) => { console.info("executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) await sleep(500); - var cmd1 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry"; + let cmd1 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry"; abilityDelegator.executeShellCommand(cmd1, (err: any, d: any) => { console.info("executeShellCommand1 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) await sleep(500); - var cmd2 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; + let cmd2 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; abilityDelegator.executeShellCommand(cmd2, (err: any, d: any) => { console.info("executeShellCommand2 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); done(); @@ -57,11 +57,12 @@ export default function ConnectAbilityTest() { afterEach(async (done) => { console.info("FreeInstall_FA_ConnectAbility after each called"); Tempassert = "" - if ("FreeInstall_FA_ConnectAbility_2000" === TAG) { - var cmd14 = "bm uninstall -n com.ohos.hag.famanager"; + if ("FreeInstall_FA_ConnectAbility_1300" === TAG) { + let cmd14 = "bm uninstall -n com.ohos.hag.famanager"; abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => { console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) + await sleep(2000) } done(); }); @@ -125,33 +126,32 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_0100", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_0100-------------"); TAG = "FreeInstall_FA_ConnectAbility_0100"; - var cmd4 = "cp data/test/ConnectFaMyApplication6.hap /data/app/el2/100/base/com.ohos.hag.famanager/haps" + + let cmd4 = "cp data/test/ConnectFaMyApplication6.hap /data/app/el2/100/base/com.ohos.hag.famanager/haps" + "/entry/files"; abilityDelegator.executeShellCommand(cmd4, (err: any, d: any) => { console.info(TAG + " executeShellCommand4 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var deviceid = "0"; - await abilityManager.getTopAbility((err, data) => { - console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); - deviceid = data.deviceId; - }) - var request1 = { - "deviceId": deviceid, - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication6.ServiceAbility", - "moduleName": "myapplication6", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request1); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) - }, 2000); + let deviceid = "0"; + abilityManager.getTopAbility((err, data) => { + console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; + }) + await sleep(500) + let request1 = { + "deviceId": deviceid, + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication6.ServiceAbility", + "moduleName": "myapplication6", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request1); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + done(); + }, 2000) console.log("------------end FreeInstall_FA_ConnectAbility_0100-------------"); - done(); }); /* @@ -163,31 +163,32 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_0200", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_0200-------------"); TAG = "FreeInstall_FA_ConnectAbility_0200"; - var cmdapp10 = "bm install -p data/test/ConnectFaMyApplication10.hap"; + let cmdapp10 = "bm install -p data/test/ConnectFaMyApplication10.hap"; abilityDelegator.executeShellCommand(cmdapp10, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var deviceid = "0"; - await abilityManager.getTopAbility((err, data) => { - console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); - deviceid = data.deviceId; - }) - var request2 = { - "deviceId": deviceid, - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication10.ServiceAbility", - "moduleName": "myapplication10", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request2); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) - }, 2500); - console.log("------------end FreeInstall_FA_ConnectAbility_0200-------------"); - done(); + let deviceid = "0"; + await abilityManager.getTopAbility((err, data) => { + console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; + }) + await sleep(500) + let request2 = { + "deviceId": deviceid, + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication10.ServiceAbility", + "moduleName": "myapplication10", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request2); + + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_0200-------------"); + done(); + }, 2000) + }); /* @@ -199,26 +200,24 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_0300", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_0300-------------"); TAG = "FreeInstall_FA_ConnectAbility_0300"; - var cmd3 = "cp data/test/ConnectFaMyApplication1.hap /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; + let cmd3 = "cp data/test/ConnectFaMyApplication1.hap /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; abilityDelegator.executeShellCommand(cmd3, (err: any, d: any) => { console.info("executeShellCommand3 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var request3 = { - "deviceId": "", - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication1", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request3); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) - }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0300-------------"); - done(); + let request3 = { + "deviceId": "", + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication1", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request3); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_0300-------------"); + done(); + }, 2000) }); /* @@ -230,25 +229,24 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_0400", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_0400-------------"); TAG = "FreeInstall_FA_ConnectAbility_0400"; - var cmdapp11 = "bm install -p data/test/ConnectFaMyApplication11.hap"; + let cmdapp11 = "bm install -p data/test/ConnectFaMyApplication11.hap"; abilityDelegator.executeShellCommand(cmdapp11, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var request4 = { - "deviceId": "", - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication11.ServiceAbility", - "moduleName": "myapplication11", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request4); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) - }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0400-------------"); - done(); + await sleep(2000) + let request4 = { + "deviceId": "", + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication11.ServiceAbility", + "moduleName": "myapplication11", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request4); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_0400-------------"); + done(); + }, 2000) }); /* @@ -261,20 +259,18 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_0500-------------"); TAG = "FreeInstall_FA_ConnectAbility_0500"; - setTimeout(async () => { - var request5 = { - "bundleName": "com.example.different.hmservice", - "abilityName": "com.example.different.ServiceAbility", - "moduleName": "entry", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request5); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request5 = { + "bundleName": "com.example.different.hmservice", + "abilityName": "com.example.different.ServiceAbility", + "moduleName": "entry", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request5); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_0500-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0500-------------"); - done(); }); /* @@ -287,20 +283,18 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_0600-------------"); TAG = "FreeInstall_FA_ConnectAbility_0600"; - setTimeout(async () => { - var request6 = { - "bundleName": "", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication1", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request6); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request6 = { + "bundleName": "", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication1", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request6); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_0600-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0600-------------"); - done(); }); /* @@ -313,20 +307,18 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_0700-------------"); TAG = "FreeInstall_FA_ConnectAbility_0700"; - setTimeout(async () => { - var request7 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "", - "moduleName": "myapplication1", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request7); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request7 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "", + "moduleName": "myapplication1", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request7); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_0700-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0700-------------"); - done(); }); /* @@ -339,21 +331,19 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_0800-------------"); TAG = "FreeInstall_FA_ConnectAbility_0800"; - setTimeout(async () => { - var request8 = { - "deviceId": "xxxxxx", - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication2.ServiceAbility", - "moduleName": "myapplication2", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request8); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request8 = { + "deviceId": "xxxxxx", + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication2.ServiceAbility", + "moduleName": "myapplication2", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request8); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_0800-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0800-------------"); - done(); }); /* @@ -366,20 +356,18 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_0900-------------"); TAG = "FreeInstall_FA_ConnectAbility_0900"; - setTimeout(async () => { - var request9 = { - "bundleName": "com.example.xxx.hmservice", - "abilityName": "com.example.myapplication2.ServiceAbility", - "moduleName": "myapplication2", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request9); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request9 = { + "bundleName": "com.example.xxx.hmservice", + "abilityName": "com.example.myapplication2.ServiceAbility", + "moduleName": "myapplication2", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request9); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_0900-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_0900-------------"); - done(); }); /* @@ -392,20 +380,18 @@ export default function ConnectAbilityTest() { console.log("------------start FreeInstall_FA_ConnectAbility_1000-------------"); TAG = "FreeInstall_FA_ConnectAbility_1000"; - setTimeout(async () => { - var request10 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication2.ServiceAbility", - "moduleName": "myapplication2", - "flags": 1111111, - } - connectabillity(TAG, request10); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request10 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication2.ServiceAbility", + "moduleName": "myapplication2", + "flags": 1111111, + } + connectabillity(TAG, request10); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1000-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1000-------------"); - done(); }); /* @@ -417,25 +403,23 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_1100", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1100-------------"); TAG = "FreeInstall_FA_ConnectAbility_1100"; - var cmdapp2 = "bm install -p data/test/ConnectFaMyApplication2.hap"; + let cmdapp2 = "bm install -p data/test/ConnectFaMyApplication2.hap"; abilityDelegator.executeShellCommand(cmdapp2, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - - setTimeout(async () => { - var request11 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication2.ServiceAbility", - "moduleName": "myapplication2", - "flags": "11", - } - connectabillity(TAG, request11); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) + await sleep(2000) + let request11 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication2.ServiceAbility", + "moduleName": "myapplication2", + "flags": "11", + } + connectabillity(TAG, request11); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_1000-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1000-------------"); - done(); }); /* @@ -447,24 +431,22 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_1200", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1200-------------"); TAG = "FreeInstall_FA_ConnectAbility_1200"; - var cmdrm = "rm -r /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files/*"; + let cmdrm = "rm -r /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files/*"; abilityDelegator.executeShellCommand(cmdrm, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var request12 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication3", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request12); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request12 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication3", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request12); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1200-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1200-------------"); - done(); }); /* @@ -476,7 +458,7 @@ export default function ConnectAbilityTest() { it("FreeInstall_FA_ConnectAbility_1300", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1300-------------"); TAG = "FreeInstall_FA_ConnectAbility_1300"; - var str = { + let str = { "want": { "bundleName": "com.example.myapplication.hmservice", "abilityName": "com.example.myapplication.MainAbility2", @@ -490,21 +472,18 @@ export default function ConnectAbilityTest() { console.error(TAG + " startmainability2 failed. Cause: " + JSON.stringify(error)); }) - setTimeout(async () => { - var request13 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication3", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request13); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request13 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication3", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request13); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1300-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1300-------------"); - done(); }); - }) } \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets index 2adb8fc3b0e2b03f3822ea5cc6cb49a6ff88bee2..4a10735f4a9691333ac1d8c34a0849e1651cf00b 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" +import { describe, beforeAll, afterEach, it, expect } from "@ohos/hypium" import rpc from '@ohos.rpc'; import featureAbility from '@ohos.ability.featureAbility'; import wantConstant from '@ohos.ability.wantConstant' @@ -22,9 +22,9 @@ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry export default function ConnectAbilityTest1() { - var TAG = ""; - var Tempassert = ""; - var abilityDelegator = undefined + let TAG = ""; + let Tempassert = ""; + let abilityDelegator = undefined function sleep(time) { return new Promise((resolve) => setTimeout(resolve, time)) @@ -34,17 +34,19 @@ export default function ConnectAbilityTest1() { beforeAll(async function (done) { console.info("FreeInstall_FA_ConnectAbility before all called"); abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var cmd = "bm install -p data/test/MockService.hap"; + let cmd = "bm install -p data/test/MockService.hap"; console.info("cmd : " + cmd) console.info(TAG + " abilityDelegator : " + JSON.stringify(abilityDelegator)); abilityDelegator.executeShellCommand(cmd, (err: any, d: any) => { console.info("executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - var cmd1 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry"; + await sleep(500); + let cmd1 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry"; abilityDelegator.executeShellCommand(cmd1, (err: any, d: any) => { console.info("executeShellCommand1 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - var cmd2 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; + await sleep(500); + let cmd2 = "mkdir /data/app/el2/100/base/com.ohos.hag.famanager/haps/entry/files"; abilityDelegator.executeShellCommand(cmd2, (err: any, d: any) => { console.info("executeShellCommand2 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); done(); @@ -54,11 +56,12 @@ export default function ConnectAbilityTest1() { afterEach(async function (done) { console.info("FreeInstall_FA_ConnectAbility after each called"); Tempassert = "" - if ("FreeInstall_FA_ConnectAbility_1600" === TAG) { - var cmd14 = "bm uninstall -n com.ohos.hag.famanager"; + if ("FreeInstall_FA_ConnectAbility_2000" === TAG) { + let cmd14 = "bm uninstall -n com.ohos.hag.famanager"; abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => { console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) + await sleep(2000) } done(); }); @@ -113,8 +116,6 @@ export default function ConnectAbilityTest1() { console.info(msg + "END"); } - - /* * @tc.number FreeInstall_FA_ConnectAbility_1500 * @tc.name The application is not in the foreground, @@ -125,11 +126,12 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1500", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1500-------------"); TAG = "FreeInstall_FA_ConnectAbility_1500"; - var cmddif = "bm install -p data/test/ConnectDifferentApplication.hap"; + let cmddif = "bm install -p data/test/ConnectDifferentApplication.hap"; abilityDelegator.executeShellCommand(cmddif, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - var str = { + await sleep(2000) + let str = { "want": { "bundleName": "com.example.different.hmservice", "abilityName": "MainAbility", @@ -141,20 +143,18 @@ export default function ConnectAbilityTest1() { }).catch((error) => { console.error(TAG + " startother failed. Cause: " + JSON.stringify(error)); }) - setTimeout(async () => { - var request15 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication5.ServiceAbility5", - "moduleName": "myapplication5", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request15); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request15 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication5.ServiceAbility5", + "moduleName": "myapplication5", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request15); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1500-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1500-------------"); - done(); }); /* @@ -167,11 +167,12 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1600", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1600-------------"); TAG = "FreeInstall_FA_ConnectAbility_1600"; - var cmdmyapp4 = "bm install -p data/test/ConnectFaMyApplication4.hap"; + let cmdmyapp4 = "bm install -p data/test/ConnectFaMyApplication4.hap"; abilityDelegator.executeShellCommand(cmdmyapp4, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - var str = { + await sleep(2000) + let str = { "want": { "bundleName": "com.example.different.hmservice", "abilityName": "MainAbility", @@ -184,20 +185,18 @@ export default function ConnectAbilityTest1() { console.error(TAG + " startother failed. Cause: " + JSON.stringify(error)); }) - setTimeout(function () { - var request16 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication4.ServiceAbility4", - "moduleName": "myapplication4", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request16); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) + let request16 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication4.ServiceAbility4", + "moduleName": "myapplication4", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request16); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_1600-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1600-------------"); - done(); }); /* @@ -209,7 +208,7 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1400", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1400-------------"); TAG = "FreeInstall_FA_ConnectAbility_1400"; - var str = { + let str = { "want": { "bundleName": "com.example.myapplication.hmservice", "abilityName": "com.example.myapplication2.MainAbility", @@ -222,20 +221,18 @@ export default function ConnectAbilityTest1() { }).catch((error) => { console.error(TAG + " startmyapp2 failed. Cause: " + JSON.stringify(error)); }) + let request14 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication3", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request14); setTimeout(() => { - var request14 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication3", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request14); - setTimeout(async () => { - expect(Tempassert).assertEqual("onFailed"); - }, 500); + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1400-------------"); + done() }, 2000) - done(); - console.log("------------end FreeInstall_FA_ConnectAbility_1400-------------"); }); /* @@ -247,23 +244,22 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1700", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1700-------------"); TAG = "FreeInstall_FA_ConnectAbility_1700"; - var cmddif = "bm install -p data/test/ConnectDifferentApplication.hap"; + let cmddif = "bm install -p data/test/ConnectDifferentApplication.hap"; await abilityDelegator.executeShellCommand(cmddif, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) + await sleep(2000) + let request17 = { + "bundleName": "com.example.different.hmservice", + "abilityName": "com.example.different.ServiceAbility", + "moduleName": "entry", + } + connectabillity(TAG, request17); setTimeout(() => { - var request17 = { - "bundleName": "com.example.different.hmservice", - "abilityName": "com.example.different.ServiceAbility", - "moduleName": "entry", - } - connectabillity(TAG, request17); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500); + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_1700-------------"); + done(); }, 2000) - console.log("------------end FreeInstall_FA_ConnectAbility_1700-------------"); - done(); }); /* @@ -275,21 +271,18 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1800", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1800-------------"); TAG = "FreeInstall_FA_ConnectAbility_1800"; - - setTimeout(async () => { - var request18 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "xxxxx", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request18); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request18 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "xxxxx", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request18); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1800-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1800-------------"); - done(); }); /* @@ -301,25 +294,23 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_1900", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_1900-------------"); TAG = "FreeInstall_FA_ConnectAbility_1900"; - var cmdmyapp5 = "cp data/test/ConnectFaMyApplication5.hap /data/app/el2/100/base/com.ohos.hag.famanager/" + + let cmdmyapp5 = "cp data/test/ConnectFaMyApplication5.hap /data/app/el2/100/base/com.ohos.hag.famanager/" + "haps/entry/files"; await abilityDelegator.executeShellCommand(cmdmyapp5, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var request19 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication1.ServiceAbility_feature", - "moduleName": "myapplication3", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - } - connectabillity(TAG, request19); - setTimeout(() => { - expect(Tempassert).assertEqual("onFailed"); - }, 500) + let request19 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication1.ServiceAbility_feature", + "moduleName": "myapplication3", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + } + connectabillity(TAG, request19); + setTimeout(() => { + expect(Tempassert).assertEqual("onFailed"); + console.log("------------end FreeInstall_FA_ConnectAbility_1900-------------"); + done(); }, 2000); - console.log("------------end FreeInstall_FA_ConnectAbility_1900-------------"); - done(); }); /* @@ -331,28 +322,27 @@ export default function ConnectAbilityTest1() { it("FreeInstall_FA_ConnectAbility_2000", 0, async function (done) { console.log("------------start FreeInstall_FA_ConnectAbility_2000-------------"); TAG = "FreeInstall_FA_ConnectAbility_2000"; - var cmdmyapp5 = "cp data/test/ConnectFaMyApplication5.hap /data/app/el2/100/base/com.ohos.hag.famanager/" + + let cmdmyapp5 = "cp data/test/ConnectFaMyApplication5.hap /data/app/el2/100/base/com.ohos.hag.famanager/" + "haps/entry/files"; abilityDelegator.executeShellCommand(cmdmyapp5, (err: any, d: any) => { console.info(TAG + " executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) - setTimeout(async () => { - var request20 = { - "bundleName": "com.example.myapplication.hmservice", - "abilityName": "com.example.myapplication5.ServiceAbility5", - "moduleName": "myapplication5", - "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, - "parameters": { - "name": 1111, "key1": "value1", "site": "nice to meet you!" - }, - } - connectabillity(TAG, request20); - setTimeout(() => { - expect(Tempassert).assertEqual("onConnect"); - }, 500) + await sleep(1000) + let request20 = { + "bundleName": "com.example.myapplication.hmservice", + "abilityName": "com.example.myapplication5.ServiceAbility5", + "moduleName": "myapplication5", + "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, + "parameters": { + "name": 1111, "key1": "value1", "site": "nice to meet you!" + }, + } + connectabillity(TAG, request20); + setTimeout(() => { + expect(Tempassert).assertEqual("onConnect"); + console.log("------------end FreeInstall_FA_ConnectAbility_2000-------------"); + done() }, 4000) - done(); - console.log("------------end FreeInstall_FA_ConnectAbility_2000-------------"); }); } ) diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets index 03a25c2be1edc502a19dab77e92212c76b23e9d4..4b96cf84a75f83aeaa3b2ac342f3f5fb0a16e776 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets @@ -146,8 +146,8 @@ abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => { console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); }) + await sleep(2000) } - await sleep(1500); done(); }); diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json index a13f5e23b06928f971968e8fb15a94f406b961c7..764e9f312660fed76c752bc076d930351021e81c 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:hap4_desc", "mainElement": "Hap4MainAbility1", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js b/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js index 76a50eb19ab85b5c7ee45ac690ef99889b2d4f72..63f8c55e69e273c2b58ae92c82b1625f3ca48c4d 100644 --- a/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js +++ b/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js @@ -1,1431 +1,1379 @@ -/* - * 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 featureAbility from '@ohos.ability.featureAbility' -import wantConstant from '@ohos.ability.wantConstant' - -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -export default function ActsGetWantTest() { -describe('ActsGetWantTest', function () { - beforeAll(async (done) => { - console.info('ActsGetWantTest begin') - done(); - }) - - var TIMEOUT_NUMBER = 2500; - - // @tc.number: ACTS_GetWant_0100 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_0100', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - parameters: - { - mykey0: 1, - mykey1: [1, 2, 3], - mykey2: "[1, 2, 3]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmony"], - mykey6: {"subKey1":"STRING", "subKey2":10, "subKey3":true}, - }, - } - }).then((data) => { - console.info('====> ACTS_GetWant_0100 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.parameters.mykey0).assertEqual(1); - expect(data.want.parameters.mykey1[0]).assertEqual(1); - expect(data.want.parameters.mykey1[1]).assertEqual(2); - expect(data.want.parameters.mykey1[2]).assertEqual(3); - expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); - expect(data.want.parameters.mykey6["subKey1"]).assertEqual("STRING"); - expect(data.want.parameters.mykey6["subKey2"]).assertEqual(10); - expect(data.want.parameters.mykey6["subKey3"]).assertEqual(true); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_0100 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_0200 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_0200', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - parameters: - { - mykey0: 1, - mykey1: [1, 2, 3], - mykey2: "[1, 2, 3]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmony"], - }, - } - }, - (err, data) => { - console.info('====> ACTS_GetWant_0200 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.parameters.mykey0).assertEqual(1); - expect(data.want.parameters.mykey1[0]).assertEqual(1); - expect(data.want.parameters.mykey1[1]).assertEqual(2); - expect(data.want.parameters.mykey1[2]).assertEqual(3); - expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - // @tc.number: ACTS_GetWant_0300 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_0300', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action2", - entities: ["entity1", "entity2"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.3], - mykey2: "[1, 2, 3]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "!@#$%", "helloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult0300(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_0300 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult0300(data) { - console.info('====> ACTS_GetWant_0300 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action2"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.entities[1]).assertEqual("entity2"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.3); - expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("!@#$%"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); - console.info('====> ACTS_GetWant_0300 before done=====>') - } - - // @tc.number: ACTS_GetWant_0500 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_0500', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - console.info('====> ACTS_GetWant_0500 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_0500 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_0500 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_0600 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_0600', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - console.info('====> ACTS_GetWant_0600 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_0600 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - // @tc.number: ACTS_GetWant_0700 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_0700', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - console.info('====> ACTS_GetWant_0700 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_0700 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_0700 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_0800 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_0800', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult0800(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - function checkOnAbilityResult0800(data) { - console.info('====> ACTS_GetWant_0800 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_0800 before done=====>') - } - - // @tc.number: ACTS_GetWant_0900 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_0900', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - console.info('====> ACTS_GetWant_0900 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_0900 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_0900 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_1000 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_1000', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult1000(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - function checkOnAbilityResult1000(data) { - console.info('====> ACTS_GetWant_1000 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1000 before done=====>') - } - - // @tc.number: ACTS_GetWant_1100 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_1100', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult1100(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_1100 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult1100(data) { - console.info('====> ACTS_GetWant_1100 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1100 before done=====>') - } - - // @tc.number: ACTS_GetWant_1200 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_1200', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - console.info('====> ACTS_GetWant_1200 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1200 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - // @tc.number: ACTS_GetWant_1300 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_1300', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - console.info('====> ACTS_GetWant_1300 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1300 before done=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_1300 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_1400 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_1400', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult1400(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - function checkOnAbilityResult1400(data) { - console.info('====> ACTS_GetWant_1400 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1400 before done=====>') - } - - // @tc.number: ACTS_GetWant_1500 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_1500', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult1500(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_1500 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult1500(data) { - console.info('====> ACTS_GetWant_1500 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE ); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1500 setTimeout before done.=====>') - } - - // @tc.number: ACTS_GetWant_1600 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_1600', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - console.info('====> ACTS_GetWant_1600 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE ); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1600 setTimeout before done.=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - // @tc.number: ACTS_GetWant_1700 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_1700', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - console.info('====> ACTS_GetWant_1700 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY ); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1700 setTimeout before done.=====>') - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_1700 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - // @tc.number: ACTS_GetWant_1900 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_1900', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult1900(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_1900 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult1900(data) { - console.info('====> ACTS_GetWant_1900 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_1900 setTimeout before done.=====>') - } - - // @tc.number: ACTS_GetWant_2100 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_2100', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult2100(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_2100 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult2100(data) { - console.info('====> ACTS_GetWant_2100 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_2100 setTimeout before done.=====>') - } - - // @tc.number: ACTS_GetWant_2200 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_2200', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult2200(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - function checkOnAbilityResult2200(data) { - console.info('====> ACTS_GetWant_2200 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_2200 setTimeout before done.=====>') - } - - // @tc.number: ACTS_GetWant_2300 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by promise) - it('ACTS_GetWant_2300', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_NEW_MISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult2300(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_2300 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }) - - function checkOnAbilityResult2300(data) { - console.info('====> ACTS_GetWant_2300 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_NEW_MISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_2300 setTimeout before done.=====>') - } - - // @tc.number: ACTS_GetWant_2400 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data (by callback) - it('ACTS_GetWant_2400', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_NEW_MISSION, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.0000000003], - mykey2: "[a, b, c]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult2400(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }) - - function checkOnAbilityResult2400(data) { - console.info('====> ACTS_GetWant_2400 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action1"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_NEW_MISSION); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); - expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("STR"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); - console.info('====> ACTS_GetWant_2400 setTimeout before done.=====>') - } - - /* - * @tc.number ACTS_GetWant_2500 - * @tc.name Misconfigured bundlename validation - * @tc.desc Function test (by promise) - * @tc.level 0 - */ - it("ACTS_GetWant_2500",0, async function(done){ - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action2", - entities: ["entity1", "entity2"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.3], - mykey2: "[1, 2, 3]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "test123", "helloopenharmony"], - }, - }, - }).then((data) => { - checkOnAbilityResult2500(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }).catch((error) => { - console.log('ACTS_GetWant_2500 error: ' + JSON.stringify(error)) - expect.assertFail() - done(); - }) - }); - - function checkOnAbilityResult2500(data) { - console.info('====> ACTS_GetWant_2500 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action2"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT ); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.3); - expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("test123"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); - console.info('====> ACTS_GetWant_2500 before done=====>') - } - - /* - * @tc.number ACTS_GetWant_2600 - * @tc.name Misconfigured bundlename validation - * @tc.desc Function test (by callback) - * @tc.level 0 - */ - it("ACTS_GetWant_2600",0, async function(done){ - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action2", - entities: ["entity1", "entity2"], - type: "MIMETYPE", - uri: "key={true,true,false}", - flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, - parameters: - { - mykey0: 0.1, - mykey1: [0.1, 0.2, 0.3], - mykey2: "[1, 2, 3]", - mykey3: "str", - mykey4: [false, true, false], - mykey5: ["str", "test123", "helloopenharmony"], - }, - }, - }, - (err, data) => { - checkOnAbilityResult2600(data); - setTimeout(()=>{ - done(); - }, TIMEOUT_NUMBER); - }) - }); - - function checkOnAbilityResult2600(data) { - console.info('====> ACTS_GetWant_2600 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); - expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); - expect(data.want.action).assertEqual("action2"); - expect(data.want.entities[0]).assertEqual("entity1"); - expect(data.want.type).assertEqual("MIMETYPE"); - expect(data.want.uri).assertEqual("key={true,true,false}"); - expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT ); - expect(data.want.parameters.mykey0).assertEqual(0.1); - expect(data.want.parameters.mykey1[0]).assertEqual(0.1); - expect(data.want.parameters.mykey1[1]).assertEqual(0.2); - expect(data.want.parameters.mykey1[2]).assertEqual(0.3); - expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); - expect(data.want.parameters.mykey3).assertEqual("str"); - expect(data.want.parameters.mykey4[0]).assertEqual(false); - expect(data.want.parameters.mykey4[1]).assertEqual(true); - expect(data.want.parameters.mykey4[2]).assertEqual(false); - expect(data.want.parameters.mykey5[0]).assertEqual("str"); - expect(data.want.parameters.mykey5[1]).assertEqual("test123"); - expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); - console.info('====> ACTS_GetWant_2600 before done=====>') - } - - /** - * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0100 - * @tc.name: Check the enumerated value ACTION_IMAGE_CAPTURE of wantConstant. - * @tc.desc: Check the enumerated value ACTION_IMAGE_CAPTURE of wantConstant. - */ - it('SUB_AA_OpenHarmony_wantConstantEnumeration_0100',0, async function (done) { - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0100 --- start") - let image = wantConstant.Action.ACTION_IMAGE_CAPTURE - expect(image).assertEqual("ohos.want.action.imageCapture") - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0100 --- end") - done() - }) - - /** - * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0200 - * @tc.name: Check the enumerated value ACTION_VIDEO_CAPTURE of wantConstant. - * @tc.desc: Check the enumerated value ACTION_VIDEO_CAPTURE of wantCconstant. - */ - it('SUB_AA_OpenHarmony_wantConstantEnumeration_0200',0, async function (done) { - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0200 --- start") - let video = wantConstant.Action.ACTION_VIDEO_CAPTURE - expect(video).assertEqual("ohos.want.action.videoCapture") - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0200 --- end") - done() - }) - - /** - * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0300 - * @tc.name: Check the enumerated value ACTION_APP_ACCOUNT_OAUTH of wantConstant. - * @tc.desc: Check the enumerated value ACTION_APP_ACCOUNT_OAUTH of wantConstant. - */ - it('SUB_AA_OpenHarmony_wantConstantEnumeration_0300',0, async function (done) { - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0300 --- start") - let app = wantConstant.Action.ACTION_APP_ACCOUNT_OAUTH - expect(app).assertEqual("ohos.account.appAccount.action.oauth") - console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0300 --- end") - 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. + */ +import featureAbility from '@ohos.ability.featureAbility' +import wantConstant from '@ohos.ability.wantConstant' + +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' +export default function ActsGetWantTest() { +describe('ActsGetWantTest', function () { + var TIMEOUT_NUMBER = 3000; + afterEach(async (done) => { + setTimeout(function () { + done(); + }, 1500); + }) + + // @tc.number: ACTS_GetWant_0100 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_0100', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + parameters: + { + mykey0: 1, + mykey1: [1, 2, 3], + mykey2: "[1, 2, 3]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmony"], + mykey6: {"subKey1":"STRING", "subKey2":10, "subKey3":true}, + }, + } + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0100 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.parameters.mykey0).assertEqual(1); + expect(data.want.parameters.mykey1[0]).assertEqual(1); + expect(data.want.parameters.mykey1[1]).assertEqual(2); + expect(data.want.parameters.mykey1[2]).assertEqual(3); + expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); + expect(data.want.parameters.mykey6["subKey1"]).assertEqual("STRING"); + expect(data.want.parameters.mykey6["subKey2"]).assertEqual(10); + expect(data.want.parameters.mykey6["subKey3"]).assertEqual(true); + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_0100 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_0200 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_0200', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + parameters: + { + mykey0: 1, + mykey1: [1, 2, 3], + mykey2: "[1, 2, 3]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmony"], + }, + } + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0200 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.parameters.mykey0).assertEqual(1); + expect(data.want.parameters.mykey1[0]).assertEqual(1); + expect(data.want.parameters.mykey1[1]).assertEqual(2); + expect(data.want.parameters.mykey1[2]).assertEqual(3); + expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); + done(); + }, TIMEOUT_NUMBER); + }) + }) + + // @tc.number: ACTS_GetWant_0300 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_0300', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action2", + entities: ["entity1", "entity2"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.3], + mykey2: "[1, 2, 3]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "!@#$%", "helloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0300 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action2"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.entities[1]).assertEqual("entity2"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.3); + expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("!@#$%"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); + console.info('====> ACTS_GetWant_0300 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_0300 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_0500 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_0500', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0500 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_0500 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_0500 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_0600 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_0600', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0600 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORM_ENABLED); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_0600 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }) + + // @tc.number: ACTS_GetWant_0700 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_0700', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0700 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_0700 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_0700 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_0800 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_0800', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0800 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_0800 before done=====>') + done(); + }, 3500); + }) + }) + + // @tc.number: ACTS_GetWant_0900 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_0900', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_0900 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_0900 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_0900 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_1000 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_1000', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1000 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1000 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }) + + // @tc.number: ACTS_GetWant_1100 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_1100', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1100 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1100 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_1100 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_1200 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_1200', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1200 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1200 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }) + + // @tc.number: ACTS_GetWant_1300 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_1300', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1300 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1300 before done=====>') + done(); + }, 3500); + }).catch((error) => { + console.log('ACTS_GetWant_1300 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_1400 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_1400', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1400 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_NOT_OHOS_COMPONENT); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1400 before done=====>') + done(); + }, 3500); + }) + }) + + // @tc.number: ACTS_GetWant_1500 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_1500', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1500 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE ); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1500 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_1500 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_1600 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_1600', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1600 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITYSLICE_MULTI_DEVICE ); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1600 setTimeout before done.=====>') + done(); + }, 3500); + }) + }) + + // @tc.number: ACTS_GetWant_1700 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_1700', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1700 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY ); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1700 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_1700 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_1900 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_1900', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_1900 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_1900 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_1900 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_2100 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_2100', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2100 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_2100 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_2100 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_2200 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_2200', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2200 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_CLEAR_MISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_2200 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }) + + // @tc.number: ACTS_GetWant_2300 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by promise) + it('ACTS_GetWant_2300', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_NEW_MISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2300 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_NEW_MISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_2300 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_2300 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }) + + // @tc.number: ACTS_GetWant_2400 + // @tc.name: getWant : get want in current ability + // @tc.desc:Start the ability through startabilityforresult, + // and then use terminateselfwithresult to return the data (by callback) + it('ACTS_GetWant_2400', 0, async function (done) { + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action1", + entities: ["entity1"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_NEW_MISSION, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.0000000003], + mykey2: "[a, b, c]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2400 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action1"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_NEW_MISSION); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003); + expect(data.want.parameters.mykey2).assertEqual("[a, b, c]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("STR"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony"); + console.info('====> ACTS_GetWant_2400 setTimeout before done.=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }) + + /* + * @tc.number ACTS_GetWant_2500 + * @tc.name Misconfigured bundlename validation + * @tc.desc Function test (by promise) + * @tc.level 0 + */ + it("ACTS_GetWant_2500",0, async function(done){ + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action2", + entities: ["entity1", "entity2"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.3], + mykey2: "[1, 2, 3]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "test123", "helloopenharmony"], + }, + }, + }).then((data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2500 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action2"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT ); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.3); + expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("test123"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); + console.info('====> ACTS_GetWant_2500 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_GetWant_2500 error: ' + JSON.stringify(error)) + expect.assertFail() + done(); + }) + }); + + /* + * @tc.number ACTS_GetWant_2600 + * @tc.name Misconfigured bundlename validation + * @tc.desc Function test (by callback) + * @tc.level 0 + */ + it("ACTS_GetWant_2600",0, async function(done){ + featureAbility.startAbilityForResult({ + want: + { + deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + action: "action2", + entities: ["entity1", "entity2"], + type: "MIMETYPE", + uri: "key={true,true,false}", + flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT, + parameters: + { + mykey0: 0.1, + mykey1: [0.1, 0.2, 0.3], + mykey2: "[1, 2, 3]", + mykey3: "str", + mykey4: [false, true, false], + mykey5: ["str", "test123", "helloopenharmony"], + }, + }, + }, + (err, data) => { + setTimeout(()=>{ + console.info('====> ACTS_GetWant_2600 start ability=====>' + JSON.stringify(data)) + expect(data.want.deviceId).assertEqual(""); + expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); + expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility"); + expect(data.want.action).assertEqual("action2"); + expect(data.want.entities[0]).assertEqual("entity1"); + expect(data.want.type).assertEqual("MIMETYPE"); + expect(data.want.uri).assertEqual("key={true,true,false}"); + expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT ); + expect(data.want.parameters.mykey0).assertEqual(0.1); + expect(data.want.parameters.mykey1[0]).assertEqual(0.1); + expect(data.want.parameters.mykey1[1]).assertEqual(0.2); + expect(data.want.parameters.mykey1[2]).assertEqual(0.3); + expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]"); + expect(data.want.parameters.mykey3).assertEqual("str"); + expect(data.want.parameters.mykey4[0]).assertEqual(false); + expect(data.want.parameters.mykey4[1]).assertEqual(true); + expect(data.want.parameters.mykey4[2]).assertEqual(false); + expect(data.want.parameters.mykey5[0]).assertEqual("str"); + expect(data.want.parameters.mykey5[1]).assertEqual("test123"); + expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony"); + console.info('====> ACTS_GetWant_2600 before done=====>') + done(); + }, TIMEOUT_NUMBER); + }) + }); + + /** + * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0100 + * @tc.name: Check the enumerated value ACTION_IMAGE_CAPTURE of wantConstant. + * @tc.desc: Check the enumerated value ACTION_IMAGE_CAPTURE of wantConstant. + */ + it('SUB_AA_OpenHarmony_wantConstantEnumeration_0100',0, async function (done) { + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0100 --- start") + let image = wantConstant.Action.ACTION_IMAGE_CAPTURE + expect(image).assertEqual("ohos.want.action.imageCapture") + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0100 --- end") + done() + }) + + /** + * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0200 + * @tc.name: Check the enumerated value ACTION_VIDEO_CAPTURE of wantConstant. + * @tc.desc: Check the enumerated value ACTION_VIDEO_CAPTURE of wantCconstant. + */ + it('SUB_AA_OpenHarmony_wantConstantEnumeration_0200',0, async function (done) { + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0200 --- start") + let video = wantConstant.Action.ACTION_VIDEO_CAPTURE + expect(video).assertEqual("ohos.want.action.videoCapture") + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0200 --- end") + done() + }) + + /** + * @tc.number: SUB_AA_OpenHarmony_wantConstantEnumeration_0300 + * @tc.name: Check the enumerated value ACTION_APP_ACCOUNT_OAUTH of wantConstant. + * @tc.desc: Check the enumerated value ACTION_APP_ACCOUNT_OAUTH of wantConstant. + */ + it('SUB_AA_OpenHarmony_wantConstantEnumeration_0300',0, async function (done) { + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0300 --- start") + let app = wantConstant.Action.ACTION_APP_ACCOUNT_OAUTH + expect(app).assertEqual("ohos.account.appAccount.action.oauth") + console.log("SUB_AA_OpenHarmony_wantConstantEnumeration_0300 --- end") + done() + }) +}) +} diff --git a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js index f6c5574223ddf8ce71acc1352dc73332c3d9ba47..a877ffeac7c83a89ef6c243c5b0cb49093ed354b 100644 --- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js +++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js @@ -1,63 +1,61 @@ -/* - * 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 featureAbility from '@ohos.ability.featureAbility' - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('============Start Ability onShow finish'); - - featureAbility.getWant( - (err, data) => { - data = data; - console.debug("==========data=" + JSON.stringify(data)); - if (data.parameters.mykey5[1] == 'test123'){ - featureAbility.getWant().then((data) =>{ - data = data - setTimeout(function(){ - console.debug("==========data2 bundleName is===========" - + JSON.stringify(data.bundleName)); - featureAbility.terminateSelfWithResult( - { - resultCode: 1, - want: data - } - ); - },1000); - }) - }else{ - setTimeout(function(){ - console.debug("==========data1 bundleName is===========" - + JSON.stringify(data.bundleName)); - featureAbility.terminateSelfWithResult( - { - resultCode: 1, - want: data - } - ); - },1000); - } - } - ) - }, - onReady() { - console.info('onReady'); - }, -} +/* + * 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 featureAbility from '@ohos.ability.featureAbility' + +export default { + data: { + title: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('============Start Ability onShow finish'); + + featureAbility.getWant( + (err, data) => { + data = data; + console.debug("==========data=" + JSON.stringify(data)); + if (data.parameters.mykey5[1] == 'test123'){ + featureAbility.getWant().then((data) =>{ + data = data + setTimeout(function(){ + console.debug("==========data2 bundleName is===========" + + JSON.stringify(data.bundleName)); + featureAbility.terminateSelfWithResult( + { + resultCode: 1, + want: data + } + ); + },1000); + }) + }else{ + setTimeout(function(){ + featureAbility.terminateSelfWithResult( + { + resultCode: 1, + want: data + } + ); + },800); + } + } + ) + }, + onReady() { + console.info('onReady'); + }, +} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json index fc14c3b577a5324c60ba6a7c9b30e7919217dd02..281074d04f55fce36b1433cf84248ecce4fd89ae 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json index e99d3316209ad4046ad25401d440890527097ff6..e2a0798375b37b856f0b63216617c18fc24ad983 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json +++ b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json @@ -6,7 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/account/appaccount/actsaccountoperatetest/src/main/config.json b/account/appaccount/actsaccountoperatetest/src/main/config.json index 57e7b450a8221c595d2a332e05e5e97f4cf5f2f4..c30611b150d96aa52394cba994497d0ad10ac25c 100644 --- a/account/appaccount/actsaccountoperatetest/src/main/config.json +++ b/account/appaccount/actsaccountoperatetest/src/main/config.json @@ -17,8 +17,8 @@ "package": "com.example.actsaccountoperatetest", "name": ".MyApplication", "deviceType": [ - "tablet", - "default" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -112,4 +112,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/account/appaccount/actsgetaccountsbyowner/src/main/config.json b/account/appaccount/actsgetaccountsbyowner/src/main/config.json index 0e54794356ec9d908cbbeb70917d4e279f2737eb..5901a7d3cfd71f8cbe003a9cb283e98ba29272fe 100644 --- a/account/appaccount/actsgetaccountsbyowner/src/main/config.json +++ b/account/appaccount/actsgetaccountsbyowner/src/main/config.json @@ -19,7 +19,8 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -124,4 +125,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/account/appaccount/actssetcheckdatasyncenable/src/main/config.json b/account/appaccount/actssetcheckdatasyncenable/src/main/config.json index 5e61894391bcf2a8cddfb9f86ed5b429bc6f3792..4aa7921346e8fe3e72bda859d1d5b6153150fe8d 100644 --- a/account/appaccount/actssetcheckdatasyncenable/src/main/config.json +++ b/account/appaccount/actssetcheckdatasyncenable/src/main/config.json @@ -19,7 +19,8 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -128,4 +129,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/BUILD.gn b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/BUILD.gn index ea9d206d6a4b5bcdc18c1b9dfb3b207629f9f986..8359638259e71875061bb95ddbe38a4e9de2337b 100644 --- a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/BUILD.gn +++ b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("ActsGetAllAccountsNoParameter") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsGetAllAccountsNoParameter" + hap_name = "ActsGetAllAccountsNoParameterTest" subsystem_name = "account" part_name = "os_account" } diff --git a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/Test.json b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/Test.json index 3a925f14108fe80cb8459c677115772cae2eb694..55d17b915f0f7ea7f73ad1f802b6aae08ac60a97 100644 --- a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/Test.json +++ b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/Test.json @@ -10,7 +10,7 @@ "kits": [ { "test-file-name": [ - "ActsGetAllAccountsNoParameter.hap", + "ActsGetAllAccountsNoParameterTest.hap", "ActsAccountSceneAccessible.hap" ], "type": "AppInstallKit", diff --git a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json index 108d3d283f38d56d1b24fe713d7b24fcde692740..269a00c92a4b9c6a314feb4e8e769d07f2e5c549 100644 --- a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json +++ b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json @@ -19,7 +19,8 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -124,4 +125,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json b/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json index 37e94203c6ff618821c3cc8d738a80ba35f4ffa0..e3b5ee38be94975904bc5d2726d981cba4a1f1e6 100644 --- a/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json +++ b/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json @@ -19,7 +19,8 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -124,4 +125,4 @@ "srcPath": "TestRunner" } } -} \ No newline at end of file +} diff --git a/ai_lite/ai_engine_posix/BUILD.gn b/ai_lite/ai_engine_posix/BUILD.gn index 0f7209cb40cc4cb71fab83493ee22065fca0c626..05de2fffa60e255794cb38d4f7fe4cd47c9e1107 100644 --- a/ai_lite/ai_engine_posix/BUILD.gn +++ b/ai_lite/ai_engine_posix/BUILD.gn @@ -15,12 +15,13 @@ import("//test/xts/tools/lite/build/suite_lite.gni") lite_component("test_plugin_manager_so") { target_type = "shared_library" - features = - [ "//foundation/ai/engine/services/server/plugin_manager:plugin_manager" ] + features = [ + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", + ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } diff --git a/ai_lite/ai_engine_posix/base/BUILD.gn b/ai_lite/ai_engine_posix/base/BUILD.gn index 648eec53f5fc383acaa7899c0a5159c521fb5869..616be18a2ea6b20d08ce2128928767f40a54c4a0 100644 --- a/ai_lite/ai_engine_posix/base/BUILD.gn +++ b/ai_lite/ai_engine_posix/base/BUILD.gn @@ -37,12 +37,12 @@ hcpptest_suite("ActsAiEngineTest") { include_dirs = [ "src", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/services/algorithmsdk", - "//foundation/ai/engine/services/server/plugin", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/services/algorithmsdk", + "//foundation/ai/ai_engine/services/server/plugin", "//third_party/bounds_checking_function/include", "//commonlibrary/utils_lite/include", "//kernel/liteos-a/kernel/include", @@ -54,9 +54,9 @@ hcpptest_suite("ActsAiEngineTest") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:client", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/ai_engine/services/client:client", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_1_sync", "//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_2_async", diff --git a/ai_lite/ai_engine_posix/base/src/sample/BUILD.gn b/ai_lite/ai_engine_posix/base/src/sample/BUILD.gn index 4e8201202d9ed82fe34d380c38550e5d83db3f85..a3829c79cedf7c645f84865344423a9b0e46f544 100644 --- a/ai_lite/ai_engine_posix/base/src/sample/BUILD.gn +++ b/ai_lite/ai_engine_posix/base/src/sample/BUILD.gn @@ -21,9 +21,9 @@ source_set("syncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -33,9 +33,7 @@ lite_component("sample_plugin_1_sync") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":syncDemoPluginCode" ] - deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } source_set("asyncDemoPluginCode") { @@ -46,9 +44,9 @@ source_set("asyncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -58,7 +56,5 @@ lite_component("sample_plugin_2_async") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] - deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } diff --git a/arkui/BUILD.gn b/arkui/BUILD.gn index 32f916b04e97c443ba6ea74cbc61265143fd71bf..6f42eda94d339ccd12657bf6cd6dda705e0bd167 100644 --- a/arkui/BUILD.gn +++ b/arkui/BUILD.gn @@ -27,11 +27,13 @@ group("arkui") { "ace_ets_test:ActsAceEtsTest", "ace_ets_third_test:ActsAceEtsThirdTest", "ace_ets_web_dev:ActsAceWebDevTest", + "ace_ets_web_dev_three:ActsAceWebDevThreeTest", "ace_ets_web_dev_two:ActsAceWebDevTwoTest", "ace_ets_xcomponent:ActsAceXComponentEtsTest", "ace_js_attribute_api:ActsAceJsApiTest", "ace_napi_test:ActsAceNapiEtsTest", "ace_standard:ActsAceStandardTest", "ace_standard_video:ActsAceStandardVideoTest", + "libuv:libuvTest", ] } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets index 8eeeba40826894f296e43153c7934eb58fd4af7d..3191158a3a98ae7110a279f5680c3e9758146978 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct AlphabetIndexerOnSelect { private value: string[] = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'] private content: string = "AlphabetIndexer Page" diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets index daded4fbea872129b4248c0636957ffab425441f..f834f3011120c73b0d09bc2c7d7b81bb3ce8714f 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets @@ -21,7 +21,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CheckBoxGroupSelectAll { @State isSelect: boolean = true; diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/circle.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/circle.ets index 78d0d36e54a23383149119e53f33401885ed4387..32196008e61304b47d2e2f9e662af86eeaa6062a 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/circle.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/circle.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CircleNe { @State w: string = "100px"; @State h: string = "100px"; diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common.ets index d25aa5d921a18abf47e0512c4f555cef32654cb1..271932b6dab66bd67d32e237f4ed9ca57dfeba1a 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CommonBackgroundBlurStyle { +struct CommonBackgroundBlurStyle { @State value: string = '' aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets index 227f759883e35f56b329774b0272fba1831c7419..2104afd48af1b849f9dba0b5560a28c61afd6a1e 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets @@ -24,7 +24,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct Common_ts_ets_apiStaticClear { +struct Common_ts_ets_apiStaticClear { @StorageLink('varA') varA: number = 2 private label: string = 'count' @StorageLink('highScore') highScore: number = 0 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/common_y.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/common_y.ets index 7bae03d3f2ab74cab9979c672e1d865f91dd0cfa..626c1a3dcf101010e2d32c7db5596ded1a870a47 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/common_y.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/common_y.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CommonBackgroundBlurStyle { +struct CommonBackgroundBlurStyle { @State value: string = '' isEnv:boolean = Environment.EnvProp('accessibilityEnabled', 'default') diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/panel_y.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/panel_y.ets index ad0b67cf18e8fc9e94b2d00c940efe9ae23af75c..ce1942b5b759264bf3ccd20852c1d4913f94a8c9 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/panel_y.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/panel_y.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PanelBackgroundMask { +struct PanelBackgroundMask { @State mode: PanelMode = PanelMode.Full @State navBarPosition:PanelMode = PanelMode.Full aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/stack_y.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/stack_y.ets index bfe6cdef09caa5b798c1382691b45bdd93c793cf..2332fd6e19f051b292f4dbde895073b8664f2faa 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/stack_y.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/stack_y.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct StackAlignContent { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/tabs_y.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/tabs_y.ets index 35d3af266a23e61e4bd6e4f5ef4309b75f754597..647a5437b0ba4511c57d85c0ecef908ff90379ee 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/tabs_y.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/tabs_y.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TabsBarPosition { private controller: TabsController = new TabsController() diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/curves.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/curves.ets index ff120314467a52aa92b4282f80cc6a2995f4b358..74f0475228a09e4f636debce476aa2d5aa17f897 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/curves.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/curves.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CurvesSteps { +struct CurvesSteps { @State curveApi:string = "success" @State curve1:ICurve = Curves.springMotion(0.40, 0.99, 0) @State curve2:ICurve = Curves.responsiveSpringMotion(0.40, 0.99, 0); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/dom.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/dom.ets index 61eeaa5aa4cbe09a0244014e4154af5862038310..b55168ea8e566898e1b4b63dd46d5b10da90f7c9 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/dom.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/dom.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct DomCreateElement { +struct DomCreateElement { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear DomCreateElement start`) } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/ellipse.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/ellipse.ets index ab5d5e0aecafb7a0f0fb480d66c0985bdba5521c..f9c55278d1cc42e7fb113c5afc46ea071538ea00 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/ellipse.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/ellipse.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct EllipseNe { @State w: string = "300.00px"; @State h: string = "300.00px"; diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/featureAbility.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/featureAbility.ets index 750d4e41feb3c6e6010bf9690c14dc58ae07a919..3c7b5f89dc0dd09048ac401c5d28f9884ef07465 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/featureAbility.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/featureAbility.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct FeatureAbilityStartAbility { +struct FeatureAbilityStartAbility { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear FeatureAbilityStartAbility start`) } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gauge.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gauge.ets index 244635ab655655e166661fda0b84131f30b3a48b..28c288bbe5f3b984c08169626fbbf4c8480f42a2 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gauge.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gauge.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct GaugeColors { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gesture.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gesture.ets index 88b5ebdb228f85521b5eb9eb338a5e6fcac246e1..7b9fd8354b90d02ab647dc7ca7b8b3a1ef31cfdf 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gesture.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gesture.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct GestureSetDirection { @State offsetX: number = 10 @State offsetY: number = 10 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid.ets index bf3fce866dbe7437c751c12d8d296ade1f3f5096..14339b4ded48f4cc5736e04ad1a35c6ab8f99b32 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct GridMaxCount { @State Number: String[] = ['5', '6', '7', '8', '9'] aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gridItem.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gridItem.ets index bbbfd5e4fc06f48510fe28ed101cc2457f314a33..e907afee94da7e1a337c1e2882b7cee81b796b82 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gridItem.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/gridItem.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct GridItemOnSelect { @State Number: String[] = ['5', '6', '7', '8', '9'] @State isSelect: boolean = false; diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_col.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_col.ets index a0abac00e2aa9c30b13196a1308128688cfd319c..2306df7dd2a5a3afe72d546a379c95ca6b8452bc 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_col.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_col.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct Grid_colSpan { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_row.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_row.ets index f472d6cf88bbcb58fa29ca469708d6144b822421..b6d90ecd1ee2c7352cef9abbf0b70f013113ad36 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_row.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/grid_row.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct Grid_rowOnBreakpointChange { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/image.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/image.ets index fc877f9decc374f41c3d385625a05bf0fa497ff8..91dffbb172386a295ac84f2db6b19e56d4d85d14 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/image.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/image.ets @@ -19,7 +19,7 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default + struct ImageExample { build() { Column() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/inspector.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/inspector.ets index 906244a7dab816c8473d22629ee7d0a3ceb78cb0..5240f15d9846193fa15300426756d94ef8e0360f 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/inspector.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/inspector.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct Inspector { @State message: string = 'test' @State setColor:string = '#F9CF93' diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/lazyForEach.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/lazyForEach.ets index 3bd6d00859b6557f44423b5e9c256aaabd7a27b2..76da45be35946c49d3131f86d1644077462f10d8 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/lazyForEach.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/lazyForEach.ets @@ -148,7 +148,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct LazyForEachOnDataAdd { private data: MyDataSource = new MyDataSource() private scroller: Scroller = new Scroller() diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/line.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/line.ets index 0f29bf5f99cd068d1638564caa7e2c6580656bf4..2420e216b2e9fc28112a7757518ee8cd921d25a5 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/line.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/line.ets @@ -19,7 +19,6 @@ let my_line = new Line() @Entry @Component -export default struct LineNe { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list.ets index f33a87cfdd26751f645982bb905c3939a37ff6da..32ac65e2fa39fcbd358fc809e6c8f229ed925a51 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct ListLanes { private arr: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] @State listPosition: number = 0 // 0代表滚动到List顶部，1代表中间值，2代表滚动到List底 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list_item.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list_item.ets index e6c3fc94a0039f83736dcda0f072a2612705a67c..1b2e38be6a170d1a5bafaca015fd14b13b3594ae 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list_item.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/list_item.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct List_itemOnSelect { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear List_itemOnSelect start`) diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/mediaQuery.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/mediaQuery.ets index f05a02d0f56a0cd2c5ad3910beea58ce19d7324d..24183fb6fe594d029bc642ad3759851618ad5a43 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/mediaQuery.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/mediaQuery.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct MediaQueryOff { +struct MediaQueryOff { @State color: string = '#000' @State text: string = 'Test' listener = mediaquery.matchMediaSync('(orientation: landscape)') diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/navigator.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/navigator.ets index ecd76d5e343d6a8db4ecc41c851789b1ae7b54f2..787ab5f6afe49ec689175999c75dc69fb3ccbd48 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/navigator.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/navigator.ets @@ -18,7 +18,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct NavigatorTarget { +struct NavigatorTarget { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear NavigatorTarget start`) } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/panel.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/panel.ets index 4aeb79f585041843fcd5bae2b53144541a6c8033..da12995ee0415916f0e7b68b608fdf38d9fe390b 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/panel.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/panel.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PanelBackgroundMask { +struct PanelBackgroundMask { @State mode: PanelMode = PanelMode.Full aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/path.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/path.ets index 2282bc2c1bab80fe8b63e1a4cc87104da1575494..16b171f49d38628eacfe04fbdb5e5fb4d59e5bd5 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/path.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/path.ets @@ -18,7 +18,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PathNew { +struct PathNew { private path: any = new Path({ width: 100, height: 100, diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polyLine.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polyLine.ets index db719f67eddf09465b666047c84ad8d082f27bd4..84bf71422c13b3181ae2c7b800546a80424d0199 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polyLine.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polyLine.ets @@ -18,7 +18,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PolyLineNe { +struct PolyLineNe { private polyline: PolylineAttribute = new Polyline({ width: 100, height: 100 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polygon.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polygon.ets index f0beb3aba6e3e691c89cf252dbc76a6285ae1268..f7101421526e38db584aab24ead2d795c1f47c28 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polygon.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/polygon.ets @@ -18,7 +18,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PolygonNe { +struct PolygonNe { private polygon: PolygonAttribute = new Polygon({ width: 100, height: 100 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/progress.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/progress.ets index 95598b3857b61d01ba0979967caf584e923534d8..fe9d6c4303813aea6179fa6d6eb209e46558ecde 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/progress.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/progress.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ProgressStyle { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/prompt.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/prompt.ets index e54b80ab6c2fb1ea661ae0c8fd88aa13fef96ffc..55818cda5483ffd861ad387d440a1e03ef84fde6 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/prompt.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/prompt.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PromptShowDialog { +struct PromptShowDialog { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear PromptShowDialog start`) } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/promptApi.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/promptApi.ets index 6326cb1218d942d3e012a56ccd1dbdb44b0b6fdb..06ce500513de9f0ffa0d8bdeec933b2036b1c92a 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/promptApi.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/promptApi.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct PromptShowDialog { +struct PromptShowDialog { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear PromptShowDialog start`) } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/rect.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/rect.ets index 714e1765c8591458752ca63c649024a424303788..1cc9bdc7158bbfdde2d5f033e750cf126f0df071 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/rect.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/rect.ets @@ -18,7 +18,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct RectNe { +struct RectNe { private rect: RectAttribute = new Rect({ width: '90%', height: 50, diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/router.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/router.ets index dbde00df9c1df3c54ed475e240a9a1816d42ef83..e96397c9c755b081fbd3f511662c6e3a2cc0b0ae 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/router.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/router.ets @@ -21,7 +21,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct RouterEnableAlertBeforeBackPage { +struct RouterEnableAlertBeforeBackPage { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear RouterEnableAlertBeforeBackPage start`) diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/scroll.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/scroll.ets index 8d997149f226eb3d3c3724a1b97c55c1adabf4fa..01f8c565be0584154a7ceab1fad46c4a1554089d 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/scroll.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/scroll.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ScrollOnScrollBegin { scroller: Scroller = new Scroller() private arr: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/search.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/search.ets index e2a8045741bba287449289db4037d9483fe095ca..11bbbb2eb10600d4ee886fc8459b33e18d25dc7c 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/search.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/search.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SearchOnCut { +struct SearchOnCut { controller: SearchController = new SearchController() aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/select.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/select.ets index 56acfb074570b795801454fbd6af6be5f622a282..2a7a080e6e216472c3fdf8273058907a3e823777 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/select.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/select.ets @@ -19,7 +19,6 @@ import events_emitter from '@ohos.events.emitter'; @Entry @Component -export default struct SelectOnSelect { @State selectIndex:number = 1 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/shape.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/shape.ets index 52e516025c1c19020e37f77047b1493b2d366c01..b34dc5861a7161329e586e57d41cfa41032e59be 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/shape.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/shape.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ShapeNe { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear ShapeNe start`) diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/sideBar.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/sideBar.ets index 10fb672b2d215452cbb39f6bbfaad774228cc9d5..0f05c318f30837d9875fba2419e2f60ce05832c8 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/sideBar.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/sideBar.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SideBarShowSideBar { normalIcon : Resource = $r("app.media.user") selectedIcon: Resource = $r("app.media.userFull") diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stack.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stack.ets index bfe6cdef09caa5b798c1382691b45bdd93c793cf..2332fd6e19f051b292f4dbde895073b8664f2faa 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stack.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stack.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct StackAlignContent { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets index 389ccfe10df1638c5dfe9abf0a1d769cdaf9882e..7734d6c5a04f52f9c0560efe3ed8255556711aa1 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets @@ -22,7 +22,6 @@ let storage2 = new LocalStorage({"PropA":47}); @Entry(storage1) @Component -export default struct StateManagementGetShared { @LocalStorageLink("storageSimpleProp") simpleVarName: number = 0 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/swiper.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/swiper.ets index 4d295994a9ef8d5f11c699b4ef853d7ea57ede4e..f71351f2c050766154c8c081c81115cf4ad44733 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/swiper.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/swiper.ets @@ -44,7 +44,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SwiperCurve { private swiperController: SwiperController = new SwiperController() diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/tabs.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/tabs.ets index 35d3af266a23e61e4bd6e4f5ef4309b75f754597..647a5437b0ba4511c57d85c0ecef908ff90379ee 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/tabs.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/tabs.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TabsBarPosition { private controller: TabsController = new TabsController() diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/text.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/text.ets index dbaf1e6c69ea955ae15d16570b4bb89c5448039b..19e5d7e0cb28219a1dfdcf0224d1281b7e225824 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/text.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/text.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TextMinFontSize { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textArea.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textArea.ets index a071527ccc6be1eb414936c782eb52eef5bdbf47..5c4b470a2ca7d2a516b0f217c311ccc453de8434 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textArea.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textArea.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TextAreaOnCut { aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textInput.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textInput.ets index 9103407baf777469c59a9a3700fb3f91e3b0749f..d6d9282dc0fd468fffc1431ba5b7ab49484df8fe 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textInput.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textInput.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TextInputOnEditChange { @State num: number = 0 diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textPicker.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textPicker.ets index cfc3d49e9593eef45ee5fa0b64ead8828dc6eca9..8cd853c453903f9ac9e1bc0fb2291197459d85fc 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textPicker.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/textPicker.ets @@ -18,7 +18,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct TextPickerDefaultPickerItemHeight { private select: number = 1 private fruits: string[] = ['1.apple', '2.orange','3.peach', '4.grape'] diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets index ed757806f2ab195ce67d390a2b6e18911ce8a4ed..af5dd5d8b8a34da7f9a33d1dfa22a200bb96bd1a 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct uiAppearanceSetDarkMode { +struct uiAppearanceSetDarkMode { xcomponentController: XComponentController = new XComponentController() aboutToAppear() { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets index d6790351bef7a39571d556ce07da1814d19d4ec0..7e7490ef50a9335d9c776d38e1b81b835e2c4a75 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct VideoOnFullscreenChange { @State srcs: Resource = $rawfile('videoTest.mp4'); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/xcomponent.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/xcomponent.ets index 55db887769128f45259f8e642399897829f802ae..dbafc005ac7feff1d9299457664b20b9fac9a71d 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/xcomponent.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/xcomponent.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct XcomponentGetXComponentContext { +struct XcomponentGetXComponentContext { xcomponentController: XComponentController = new XComponentController() aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/alertDialog.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/alertDialog.ets index 56667c8963b12bd1b54045fc29c9b43ea8d0f7c6..cc89ff46b2a42d286ada9d25cd7561bd8936c80b 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/alertDialog.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/alertDialog.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct AlertDialogCenterStart { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/animator.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/animator.ets index 7bb0c726ad120268e713e303fce85504369e6abb..965eade8d69edef8b7e08006749cd543f196dd15 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/animator.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/animator.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct AnimatorOnframe { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/canvas.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/canvas.ets index 68eb1ed29b6b272dc327979e9be5f85b301da6d4..d72ddad8eefdc36b931ae61ff8cadcccf353b92b 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/canvas.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/canvas.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CanvasActualBoundingBoxAscent { private settings: RenderingContextSettings = new RenderingContextSettings(true)//antialias:boolean diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBox.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBox.ets index a5e30c37435814541ade95cac85dab10c9bdf12f..ad0c03fd87898bb2612823a71dceb58085034447 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBox.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBox.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CheckBoxGroup { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets index 59c3785e25d392190ae2ed36dabca17d61a69c7a..413b18224355a1029edd74202708e9cbb42fd4e2 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CheckBoxGroupPart { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/color.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/color.ets index 4afa006f0d6b60229e546a5b665e4be4f3bf1650..baee6c11188bb9ec8dd822de506b29d5fcc085f9 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/color.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/color.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ColorEnum { build() { Column() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets index da966027458103777c8e96ddb495394016762df7..06f3596fbd0bde759ac85d53e405cf26aded3234 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CommonColorMode { +struct CommonColorMode { // popup构造器定义弹框内容 @Builder popupBuilder() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/copyOption.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/copyOption.ets index 45d9185f2dd57dd13ebc2dc0a0d3380b62dee6e4..9df4205a20882db559daf38cca0de9d090b275f1 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/copyOption.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/copyOption.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CopyOption { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/curves.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/curves.ets index 234d01e3ec45155bc8677943cc80aeaa56545cc0..8eb58c84f7743775d9e23dc4cd72110448b465f4 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/curves.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/curves.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct CurvesEaseOut { @State widthSize: number = 400 @State heightSize: number = 200 diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/datePicker.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/datePicker.ets index 558b73166c484a252e8963d6c50b240ad480a15a..7c95a5556843510ca8ebdf40f5c03cc16c06e14b 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/datePicker.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/datePicker.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct DatePickerLunar { +struct DatePickerLunar { private selectedDate: Date = new Date('2021-08-08') aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/enums.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/enums.ets index e22cc6b4010383fabe67a8d74b5538abcaf7a3f1..1e34797a4b71a99e4a29080ab95a4cfdc8aa5390 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/enums.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/enums.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct EnumsCancel { @State widthSize: number = 200 diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/featureAbility.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/featureAbility.ets index c2c1f8f74e46432717f4cf19c0c502940f6e2d6a..d3fe663be785b2dfa87d5d3012063fe5e746ed89 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/featureAbility.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/featureAbility.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct FeatureAbilityStartAbility { +struct FeatureAbilityStartAbility { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear FeatureAbilityStartAbility start`) } diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gesture.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gesture.ets index b9a951d76a3f39c623b4d91a6cc25428bab5697b..123e745ac5ce7f5752631bfa752a0b055e4ae27b 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gesture.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gesture.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct GestureParallel { +struct GestureParallel { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear GestureParallel start`) } diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridCol.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridCol.ets index 0d949160c18b711c61c61d7e4a916ed052961342..f592f0fb7a234164d523c17eec8815e54563a1bc 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridCol.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridCol.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct GridColXl { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridRow.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridRow.ets index 95ca6fdfff9a6a4c6ff8b87e5939b26a01a9af53..b9f0677f2dd5957d1bd2efd53aa446585c3aca64 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridRow.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/gridRow.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct GridRowXl { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/hoverEffect.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/hoverEffect.ets index 28aec9fabce9ad5b8b24d2c43e1c07731f301683..ab75d75fd05fb39d7edb81d852e1dd3422babd33 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/hoverEffect.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/hoverEffect.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct HoverEffect { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/listtest.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/listtest.ets index 058bb23a538f2738d820568d6a4751df24f55fbd..fe21a8f2607937e3f8b6d8842ebd1328e7ba21c2 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/listtest.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/listtest.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ListIdle { private arr: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] @State editFlag: boolean = false diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets index 1281a7ba169229dff088b4be865dec30d09fb686..7ea32d038465de06a1324492309a0015f9900dba 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct LoadingProgressCircular { @State circular:LoadingProgressStyle = LoadingProgressStyle.Circular; @State orbital:LoadingProgressStyle = LoadingProgressStyle.Orbital; diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/progress.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/progress.ets index 057015c5faab833b68bed41a12e1239b78896771..8374476a79223ac92b03452941a47193bfcf0ec0 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/progress.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/progress.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ProgressScaleCount { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/radio.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/radio.ets index 17dab9a83e3135e812e619ac82a7563bfcea7d1e..41e64d9026ab636c8532670669930b8d0037db20 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/radio.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/radio.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct RadioGroup { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/refresh.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/refresh.ets index 10c4660f49eaec9a2f492c4cea3735f3bc3968de..ffcfac9cf32c60487b0b51e30fa5b6632f1cb3e8 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/refresh.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/refresh.ets @@ -21,7 +21,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct RefreshDrag { dragRefresh() { var rect = Utils.getComponentRect("Refresh") diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/remoteWindow.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/remoteWindow.ets index 40c64df19733671fdc145f14906ad09bb7456096..4af65ff2cf124cc31df8af827b07a60abdc1fae3 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/remoteWindow.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/remoteWindow.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct FormComponentFormDimension { +struct FormComponentFormDimension { @State target: WindowAnimationTarget = undefined // 通过windowAnimationManager获取 aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/responseType.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/responseType.ets index d892d7305c9042220d1d901320a68efc3e07e0f1..3d21c6ef321feb3d29688fdf9a0f2155334fcceb 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/responseType.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/responseType.ets @@ -20,7 +20,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct ResponseType { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets index 197fe48879831c25a37abca5e22ffe5aedd58c99..4c32075a7fa5d591f9a3526e5dad9d59f37fdea6 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets @@ -22,7 +22,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct RouterStandard { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/sidebar.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/sidebar.ets index ee12737a8ebfd56821557a7c18158461ddb14b04..1641c4877cb852ba34fec873e4312d738cb7b48b 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/sidebar.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/sidebar.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SidebarIcons { +struct SidebarIcons { @State arr: number[] = [1, 2] aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/slider.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/slider.ets index 645f0aaa0c3c4120a9cf18a98a9abbd33169811a..5f54312353397991afa517cd9b63ea84917090d3 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/slider.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/slider.ets @@ -21,7 +21,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SliderMoving { +struct SliderMoving { @State outSetValue: number = 40; @State move:SliderChangeMode = SliderChangeMode.Moving; slide() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stateManagement.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stateManagement.ets index 99b385c0257c5ba609512300c0c9e82660c2fb4c..747e5f00d0ca2ec9a44c58eebfef941f445a093c 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stateManagement.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stateManagement.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct StateManagementDARK { +struct StateManagementDARK { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear StateManagementDARK start`) } diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stepperItem.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stepperItem.ets index fd55e9512f41c981ed88e5afa95b48759aed4c42..90fd877947ae99aeb7dd793a9e46c376b80c6ef2 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stepperItem.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/stepperItem.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct StepperItemDisabled { +struct StepperItemDisabled { @State currentIndex: number = 0 @State firstState: ItemState = ItemState.Normal @State secondState: ItemState = ItemState.Normal diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/swiper.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/swiper.ets index 2d10b8c60f11e1aa62ebb2be98210fcc8d9b7de2..ef215f0aa8b0c7e65714e3090fa6860410b61944 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/swiper.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/swiper.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct SwiperMask { +struct SwiperMask { private swiperController: SwiperController = new SwiperController() private data: MyDataSource = new MyDataSource([]) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/text_input.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/text_input.ets index dd5271d4a3f7879f2a966b442eba4f89f979c745..3b57b46fbc597c34f9479e254d8f9c5b1bb17e04 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/text_input.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/text_input.ets @@ -19,7 +19,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct Text_inputPhoneNumber { +struct Text_inputPhoneNumber { @State text: string = '' @State text1: string = 'PhoneNumber' @State text2: string = 'Address' diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets index 3e5c60eb237ba6e725483fa5b7ca26bab1b19cf0..9da83c127a74d175bfe12bb820a71934c4d73936 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets @@ -23,7 +23,6 @@ uiAppearance.DarkMode.ALWAYS_DARK @Entry @Component -export default struct UiAppearanceALWAYS_DARK { aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/units.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/units.ets index 3c0c963569e156b6c8de078ac3791bf08ca14d98..e343c73d8968658836e7c8992894ff2b241333db 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/units.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/units.ets @@ -20,7 +20,7 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct UnitsModuleName { +struct UnitsModuleName { @State textHeight: number = 50 aboutToAppear() { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets index 4bdbd6489f9d855e955f0dab0019a598313274c0..c0fb69ef1c62bc0af2077e0ccdc55498ce2479bd 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets @@ -19,7 +19,6 @@ const TAG = 'ets_apiLack_add'; @Entry @Component -export default struct WebEditText { controller: WebController = new WebController(); webResourceResponse: WebResourceResponse = new WebResourceResponse(); diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/imageAnimator.ets b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/imageAnimator.ets index 384ba3987b216d51721630ef3e52e4b15e8d6127..32ce05e03cc52673aad53ff9d68991b55a1ff510 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/imageAnimator.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/imageAnimator.ets @@ -84,7 +84,7 @@ struct ImageAnimatorExample { eventId: 114, priority: events_emitter.EventPriority.LOW } - console.info("start to emit action state") + console.info("onRepeat start to emit action state") events_emitter.emit(backEvent, backData) } catch (err) { console.info("emit action state err: " + JSON.stringify(err.message)) @@ -109,7 +109,7 @@ struct ImageAnimatorExample { eventId: 115, priority: events_emitter.EventPriority.LOW } - console.info("button start to emit action state") + console.info("imageAnimator 115 button start to emit action state") events_emitter.emit(backEvent, backData) } catch (err) { console.info("button emit action state err: " + JSON.stringify(err.message)) diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/placement.ets b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/placement.ets index ca978fd93f9161d00633775e22ebff96fbb2faaa..962075f2d1d5fa1de4fab73ae8f1b96a2e8dbc6c 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/placement.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/placement.ets @@ -64,7 +64,7 @@ struct PlacementExample { eventId: 157, priority: events_emitter.EventPriority.LOW } - console.info("button start to emit action state") + console.info("PlacementExample button start to emit action state") events_emitter.emit(backEvent, backData) }catch(err){ console.info("button emit action state err: " + JSON.stringify(err.message)) @@ -98,7 +98,7 @@ struct PlacementExample { eventId: 158, priority: events_emitter.EventPriority.LOW } - console.info("button1 start to emit action state") + console.info("custom popupOne button1 start to emit action state") events_emitter.emit(backEventOne, backDataOne) }catch(err){ console.info("button1 emit action state err: " + JSON.stringify(err.message)) diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/AnimationStatusJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/AnimationStatusJsunit.test.ets index a663d01ac1d651a7783a0abb555a13316fa8279c..987e2757371000e2d82bab690a8729aea2855f0e 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/AnimationStatusJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/AnimationStatusJsunit.test.ets @@ -74,6 +74,7 @@ export default function animationStatusJsunit() { let callback = (indexEvent) => { console.info("animationStatus03 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.animationStatus).assertEqual(AnimationStatus.Paused); + done(); } let indexEvent = { eventId: 56, @@ -87,7 +88,6 @@ export default function animationStatusJsunit() { console.info("animationStatus03 click result is: " + JSON.stringify(sendEventByKey('button2',10,""))); await Utils.sleep(1000); console.info('animationStatus03 END'); - done(); }); it('animationStatus04', 0, async function (done) { @@ -96,6 +96,7 @@ export default function animationStatusJsunit() { let callback = (indexEvent) => { console.info("animationStatus04 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.animationStatus).assertEqual(AnimationStatus.Stopped); + done(); } let indexEvent = { eventId: 57, @@ -109,7 +110,6 @@ export default function animationStatusJsunit() { console.info("animationStatus04 click result is: " + JSON.stringify(sendEventByKey('button3',10,""))); await Utils.sleep(1000); console.info('animationStatus04 END'); - done(); }); }) } \ No newline at end of file diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/BindMenuJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/BindMenuJsunit.test.ets index b6cb427f9ddb0123eb755cba8627c754d4e80804..b1059b2d37db0d325bf296c0d988221570caf5ca 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/BindMenuJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/BindMenuJsunit.test.ets @@ -53,6 +53,7 @@ export default function aboutToDisappearJsunit() { let callback = (indexEvent) => { console.info("bindMenuTest_0100 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.ACTION).assertEqual(true); + done(); } let indexEvent = { eventId: 64, @@ -66,7 +67,6 @@ export default function aboutToDisappearJsunit() { console.info("bindMenuTest_0100 button click result is: " + JSON.stringify(sendEventByKey('button',10,""))); await Utils.sleep(1000); console.info('bindMenuTest_0100 END'); - done(); }); }) } \ No newline at end of file diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/BindPopupJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/BindPopupJsunit.test.ets index 0eaf11469bbd2b4a42d931f09c2a8f540282a718..7cf0c99325c435c7b27a644f83c812046ad2c30b 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/BindPopupJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/BindPopupJsunit.test.ets @@ -52,6 +52,7 @@ export default function customPopupOptionJsunit(){ console.info("bindPopupTest_0100 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.enableArrow).assertEqual(true); expect(indexEvent.data.maskColor).assertEqual(0x33000000); + done(); } let indexEvent = { eventId: 67, @@ -67,7 +68,6 @@ export default function customPopupOptionJsunit(){ console.info("bindPopupTest_0100 click Two result is: " + JSON.stringify(sendEventByKey('image',10,""))); await Utils.sleep(1000); console.info('bindPopupTest_0100 END'); - done(); }); it('bindPopupTest_0200', 0, async function (done) { diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/ConfigurationJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/ConfigurationJsunit.test.ets index df7fa84d64d0ba452948b1922e0f2346f60915e2..0b88f58fa5d90523373a074257a372361717404e 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/ConfigurationJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/ConfigurationJsunit.test.ets @@ -52,6 +52,7 @@ export default function transFormJsunit() { console.info("configurationTest_0100 get configurationEvent result is: " + JSON.stringify(backData)); expect(backData.data.COUNTRY).assertEqual(''); expect(backData.data.DIR).assertEqual('ltr'); + done(); } var configurationEvent = { eventId: 78, @@ -63,7 +64,6 @@ export default function transFormJsunit() { } console.info("testAppear01 click result is: " + JSON.stringify(sendEventByKey('button', 10, ""))); console.info('[configurationTest01] END'); - done(); }); }) } diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/ImageAnimatorJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/ImageAnimatorJsunit.test.ets index 2d3b6f056c1e097b8826aa597d79165bfe554dd8..85e807a6becd311ecb5dff6ab420c93287da7cb5 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/ImageAnimatorJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/ImageAnimatorJsunit.test.ets @@ -49,10 +49,11 @@ export default function imageAnimatorJsunit(){ it('imageAnimatorTest_0100', 0, async function (done) { console.info('imageAnimatorTest_0100 START'); - await Utils.sleep(1500); + await Utils.sleep(500); let callback = (indexEvent) => { console.info("imageAnimatorTest_0100 get state result is: " + JSON.stringify(indexEvent)); - expect(indexEvent.data.state).assertEqual(AnimationStatus.Running); + expect(indexEvent.data.state).assertEqual(1); + done(); } let indexEvent = { eventId: 115, @@ -60,13 +61,11 @@ export default function imageAnimatorJsunit(){ } try { events_emitter.on(indexEvent, callback); + console.info("imageAnimatorTest_0100 click result is: " + JSON.stringify(sendEventByKey('button',10,""))); } catch (err) { console.info("imageAnimatorTest_0100 on events_emitter err : " + JSON.stringify(err)); } - console.info("imageAnimatorTest_0100 click result is: " + JSON.stringify(sendEventByKey('button',10,""))); - await Utils.sleep(1000); console.info('imageAnimatorTest_0100 END'); - done(); }); it('imageAnimatorTest_0200', 0, async function (done) { @@ -76,6 +75,7 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0200 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.state).assertEqual(AnimationStatus.Paused); expect(indexEvent.data.fixedSize).assertEqual(false); + done(); } let indexEvent = { eventId: 116, @@ -89,7 +89,6 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0200 click result is: " + JSON.stringify(sendEventByKey('button1',10,""))); await Utils.sleep(1000); console.info('imageAnimatorTest_0200 END'); - done(); }); it('imageAnimatorTest_0300', 0, async function (done) { @@ -99,6 +98,7 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0300 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.state).assertEqual(AnimationStatus.Stopped); expect(indexEvent.data.preDecode).assertEqual(0); + done(); } let indexEvent = { eventId: 117, @@ -112,7 +112,6 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0300 click result is: " + JSON.stringify(sendEventByKey('button2',10,""))); await Utils.sleep(1000); console.info('imageAnimatorTest_0300 END'); - done(); }); it('imageAnimatorTest_0400', 0, async function (done) { @@ -120,7 +119,8 @@ export default function imageAnimatorJsunit(){ await Utils.sleep(1500); let callback = (indexEvent) => { console.info("imageAnimatorTest_0400 get state result is: " + JSON.stringify(indexEvent)); - expect(indexEvent.data.fillMode).assertEqual(Forwards); + expect(indexEvent.data.fillMode).assertEqual(0); + done(); } let indexEvent = { eventId: 118, @@ -134,7 +134,6 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0400 click result is: " + JSON.stringify(sendEventByKey('button3',10,""))); await Utils.sleep(1000); console.info('imageAnimatorTest_0400 END'); - done(); }); it('imageAnimatorTest_0500', 0, async function (done) { @@ -143,6 +142,7 @@ export default function imageAnimatorJsunit(){ let callback = (indexEvent) => { console.info("imageAnimatorTest_0500 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.iterations).assertEqual(1); + done(); } let indexEvent = { eventId: 119, @@ -156,7 +156,6 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0500 click result is: " + JSON.stringify(sendEventByKey('button4',10,""))); await Utils.sleep(1000); console.info('imageAnimatorTest_0500 END'); - done(); }); it('imageAnimatorTest_0600', 0, async function (done) { @@ -202,6 +201,7 @@ export default function imageAnimatorJsunit(){ let callbackOne = (indexEventOne) => { console.info("imageAnimatorTest_0700 get state result is: " + JSON.stringify(indexEventOne)); expect(indexEventOne.data.preDecode).assertEqual(2); + done(); } let indexEventOne = { eventId: 120, @@ -215,7 +215,6 @@ export default function imageAnimatorJsunit(){ console.info("imageAnimatorTest_0700 click result is: " + JSON.stringify(sendEventByKey('button5',10,""))); await Utils.sleep(1000); console.info('imageAnimatorTest_0700 END'); - done(); }); }) } \ No newline at end of file diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/NavigationJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/NavigationJsunit.test.ets index 3768d2978f7c073f219bfdcd8abfeba6dfbd9bd2..3b803b536bcd4f0769c3191522b494c151f878a8 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/NavigationJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/NavigationJsunit.test.ets @@ -63,9 +63,10 @@ export default function navigationJsunit() { let callback = (indexEvent) => { console.info("testNavigation_200 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.ACTION).assertEqual(false); + done(); } let indexEvent = { - eventId: 136, + eventId: 1366, priority: events_emitter.EventPriority.LOW } try { @@ -76,7 +77,6 @@ export default function navigationJsunit() { console.info("testNavigation_200 click result is: " + JSON.stringify(sendEventByKey('NavigationContent1',10,""))); await Utils.sleep(2000); console.info('testNavigation_200 END'); - done(); }); it('testNavigation_300', 0, async function (done) { diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/PieceJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/PieceJsunit.test.ets index 2c005653400813220b5edbafdd18a4dcc239249c..92653ec14d78c300d4cb0c9b9d1c09d5d01a6fd1 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/PieceJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/PieceJsunit.test.ets @@ -51,6 +51,7 @@ export default function pieceJsunit() { let callback = (indexEvent) => { console.info("test_pieceCode_01 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.showDelete).assertEqual(true); + done(); } let indexEvent = { eventId: 156, @@ -66,6 +67,7 @@ export default function pieceJsunit() { var callback1 = (eventData) => { console.info("test_pieceCode_01 get event state result is: " + JSON.stringify(eventData)); expect(eventData.data.ACTION).assertEqual(true); + done(); } var innerEventOne = { eventId: 155, @@ -77,7 +79,6 @@ export default function pieceJsunit() { console.info("test_pieceCode_01 on events_emitter err : " + JSON.stringify(err)); } console.info('test_pieceCode_01 END'); - done(); }); }) } \ No newline at end of file diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/PlacementJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/PlacementJsunit.test.ets index ab76c405d54ef3f2fa5125606ee0fac0c88162ef..ce59cc7cd70bdc2138920a7870923e02ced54d64 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/PlacementJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/PlacementJsunit.test.ets @@ -51,6 +51,7 @@ export default function placementJsunit(){ let callback = (indexEvent) => { console.info("placementTest_0100 get state result is: " + JSON.stringify(indexEvent)); expect(indexEvent.data.placement).assertEqual(Placement.TopLeft); + done(); } let indexEvent = { eventId: 157, @@ -65,7 +66,6 @@ export default function placementJsunit(){ await Utils.sleep(1500); console.info("placementTest_0100 clickOne result is: " + JSON.stringify(sendEventByKey('image',10,""))); console.info('placementTest_0100 END'); - done(); }); it('placementTest_0200', 0, async function (done) { diff --git a/customization/edm_xts_stage/AppScope/app.json b/arkui/ace_ets_web_dev_three/AppScope/app.json similarity index 89% rename from customization/edm_xts_stage/AppScope/app.json rename to arkui/ace_ets_web_dev_three/AppScope/app.json index 2c223fed485d736ab9906abf778f3d48eeb6c7cf..52fd9651408ad407e3020e35e240170115e1977e 100644 --- a/customization/edm_xts_stage/AppScope/app.json +++ b/arkui/ace_ets_web_dev_three/AppScope/app.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.example.myapplication", + "bundleName": "com.open.harmony.acewebthreetest", "vendor": "huawei", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/customization/edm_xts_stage/AppScope/resources/base/element/string.json b/arkui/ace_ets_web_dev_three/AppScope/resources/base/element/string.json similarity index 100% rename from customization/edm_xts_stage/AppScope/resources/base/element/string.json rename to arkui/ace_ets_web_dev_three/AppScope/resources/base/element/string.json diff --git a/customization/edm_xts_stage/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_web_dev_three/AppScope/resources/base/media/app_icon.png similarity index 100% rename from customization/edm_xts_stage/AppScope/resources/base/media/app_icon.png rename to arkui/ace_ets_web_dev_three/AppScope/resources/base/media/app_icon.png diff --git a/customization/edm_xts_stage/BUILD.gn b/arkui/ace_ets_web_dev_three/BUILD.gn similarity index 74% rename from customization/edm_xts_stage/BUILD.gn rename to arkui/ace_ets_web_dev_three/BUILD.gn index 6611cff4e8d55f998fac2d5bd86087f36525ee97..23be4f01df0c3ed1ca3ecd396251f4257ef8ce60 100644 --- a/customization/edm_xts_stage/BUILD.gn +++ b/arkui/ace_ets_web_dev_three/BUILD.gn @@ -13,31 +13,29 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsEdmTest") { +ohos_js_hap_suite("ActsAceWebDevThreeTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":edm_js_assets", - ":edm_resources", + ":ace_ets_web_dev_js_assets", + ":ace_ets_web_dev_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsEdmTest" - subsystem_name = "customization" - part_name = "enterprise_device_management" + hap_name = "ActsAceWebDevThreeTest" } -ohos_app_scope("edm_app_profile") { +ohos_app_scope("ace_ets_web_dev_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("edm_js_assets") { +ohos_js_assets("ace_ets_web_dev_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("edm_resources") { +ohos_resources("ace_ets_web_dev_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":edm_app_profile" ] + deps = [ ":ace_ets_web_dev_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/arkui/ace_ets_web_dev_three/Test.json b/arkui/ace_ets_web_dev_three/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..bd2f19203a23a4bdc76acf6b1b5135c861e3568b --- /dev/null +++ b/arkui/ace_ets_web_dev_three/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "600000", + "bundle-name": "com.open.harmony.acewebthreetest", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 70000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceWebDevThreeTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }] +} \ No newline at end of file diff --git a/customization/edm_xts_stage/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from customization/edm_xts_stage/entry/src/main/ets/Application/AbilityStage.ts rename to arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts diff --git a/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 93% rename from customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts rename to arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts index 8b12c6e3cc0cd9d0bc26d566cf7435e68dc0f581..59523bc6f264d3bd1e38c03be90358e12f7f5c28 100644 --- a/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts @@ -17,7 +17,7 @@ export default class MainAbility extends Ability { console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) globalThis.windowStage = windowStage globalThis.abilityContext = this.context - windowStage.setUIContent(this.context, "pages/index/index", null) + windowStage.setUIContent(this.context, "MainAbility/pages/web", null) } onWindowStageDestroy() { @@ -34,4 +34,4 @@ export default class MainAbility extends Ability { // Ability has back to background console.log("[Demo] MainAbility onBackground") } -}; \ No newline at end of file +}; diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/pages/web.ets new file mode 100644 index 0000000000000000000000000000000000000000..e41915a0b99432f2221babd96c56dca8be415743 --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/pages/web.ets @@ -0,0 +1,430 @@ +/* + * 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 events_emitter from '@ohos.events.emitter'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; +import { Hypium } from '@ohos/hypium'; +import testsuite from '../../test/List.test'; +import Utils from '../../test/Utils'; +import web_webview from '@ohos.web.webview'; + +let loadedUrl; +@Entry +@Component +struct Index { + controller: web_webview.WebviewController = new web_webview.WebviewController(); + controllerTwo: web_webview.WebviewController = new web_webview.WebviewController(); + responseweb: WebResourceResponse = new WebResourceResponse() + @State str:string="emitLoadUrl" + @State text:boolean=false + @State num:number=0 + testObj = { + testOne: (data) => { + Utils.emitEvent(data,13) + return data + }, + toString: () => { + console.log('Web Component toString'); + } + } + + onPageShow(){ + let valueChangeEvent={ + eventId:100, + priority:events_emitter.EventPriority.LOW + } + events_emitter.on(valueChangeEvent,this.valueChangeCallBack) + } + private valueChangeCallBack=(eventData)=>{ + console.info("web page valueChangeCallBack"); + if(eventData != null){ + console.info("valueChangeCallBack:"+ JSON.stringify(eventData)); + if(eventData.data.ACTION != null){ + this.str = eventData.data.ACTION; + } + } + } + aboutToAppear(){ + let abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + let abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + build(){ + Column(){ + Row(){ + Button("web click").key('webcomponent').onClick(async ()=>{ + console.info("key==>"+this.str) + switch(this.str){ + case "emitLoadUrl":{ + try { + setTimeout(()=>{ + this.controller.loadUrl('www.baidu.com'); + setTimeout(()=>{ + let title = this.controller.getTitle(); + Utils.emitEvent(title,1) + },5000) + },3000) + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitLoadData":{ + try { + this.controller.loadData( + "baiduSource:
source
", + "text/html", + "UTF-8" + ); + setTimeout(()=>{ + let title1 = this.controller.getTitle(); + Utils.emitEvent(title1,2) + },3000) + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitBackward":{ + try { + this.controller.backward(); + setTimeout(()=>{ + let title2 = this.controller.getTitle(); + Utils.emitEvent(title2,3) + },3000) + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitForward":{ + try { + this.controller.forward(); + setTimeout(()=>{ + let title3 = this.controller.getTitle(); + Utils.emitEvent(title3,4) + },3000) + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitAccessBackward":{ + try { + let result0 = this.controller.accessBackward(); + setTimeout(()=>{ + Utils.emitEvent(result0,5) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitAccessForward":{ + try { + let result1 = this.controller.accessForward(); + setTimeout(()=>{ + Utils.emitEvent(result1,6) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitonInactive":{ + try { + this.controller.onInactive(); + setTimeout(()=>{ + setTimeout(()=>{ + this.controller.loadUrl("file:///data/storage/el1/bundle/phone/resources/rawfile/index.html") + },3000) + var title4 = this.controller.getTitle(); + Utils.emitEvent(title4,7) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitonActive":{ + try { + this.controller.onInactive(); + setTimeout(()=>{ + var title5 = this.controller.getTitle(); + Utils.emitEvent(title5,8) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitRefresh":{ + try { + this.controller.refresh(); + setTimeout(()=>{ + var title6 = this.controller.getTitle(); + Utils.emitEvent(title6,9) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitAccessStep":{ + try { + let result2 = this.controller.accessStep(-2); + setTimeout(()=>{ + Utils.emitEvent(result2,10) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitClearHistory":{ + try { + this.controller.clearHistory() + setTimeout(()=>{ + let result3 = this.controller.accessStep(-2); + setTimeout(()=>{ + Utils.emitEvent(result3,11) + },3000) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitGetHitTestValue":{ + try { + let hitValue = this.controller.getHitTestValue(); + console.log("hitType: " + hitValue.type); + console.log("extra: " + hitValue.extra); + Utils.emitEvent("hitValue",12) + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitRegisterJavaScriptProxy":{ + try { + this.controller.registerJavaScriptProxy(this.testObj, "objName", ["testOne", "toString"]); + setTimeout(()=>{ + this.controller.refresh() + setTimeout(()=>{ + this.controller.runJavaScript('htmlTest()',(error,result4)=>{ + if (error) { + console.info(`run JavaScript error: ` + JSON.stringify(error)) + return; + } + if (result4) { + console.info('result:' + result4) + } + }) + },3000) + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitDeleteJavaScriptRegister":{ + try { + this.controller.deleteJavaScriptRegister("objName"); + this.controller.deleteJavaScriptRegister("objName"); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,14) + } + break; + } + case "emitZoom":{ + try { + this.controller.zoom(1); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,15) + } + break; + } + case "emitSearchAllAsync":{ + try { + this.controller.loadUrl("file:///data/storage/el1/bundle/phone/resources/rawfile/index.html") + setTimeout(()=>{ + this.controller.searchAllAsync("首页"); + },3000) + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitClearMatches":{ + try { + this.controllerTwo.clearMatches(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,17) + } + break; + } + case "emitSearchNext":{ + try { + this.controllerTwo.searchNext(true); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,18) + } + break; + } + case "emitClearSslCache":{ + try { + this.controllerTwo.clearSslCache(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,19) + } + break; + } + case "emitClearClientAuthenticationCache":{ + try { + this.controllerTwo.clearClientAuthenticationCache(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,20) + } + break; + } + case "emitStop":{ + try { + this.controllerTwo.stop(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,21) + } + break; + } + case "emitRequestFocus":{ + try { + this.controllerTwo.requestFocus(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,22) + } + break; + } + case "emitZoomIn":{ + try { + this.controllerTwo.zoomIn(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,23) + } + break; + } + case "emitZoomOut":{ + try { + this.controllerTwo.zoomOut(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,24) + } + break; + } + case "emitGetWebId":{ + try { + this.controllerTwo.requestFocus(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,25) + } + break; + } + case "emitGetUserAgent":{ + try { + this.controllerTwo.requestFocus(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,26) + } + break; + } + case "emitGetPageHeigth":{ + try { + this.controllerTwo.getPageHeight(); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,27) + } + break; + } + case "emitBackOrForward":{ + try { + this.controllerTwo.backOrForward(-2); + } catch (error) { + console.error(`Errorcode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,28) + } + break; + } + case "emitStoreWebArchive":{ + try { + this.controller.storeWebArchive("/data/storage/el2/base/", true, (error, filename) => { + if (error) { + console.info(`save web archive error: ` + JSON.stringify(error)) + return; + } + if (filename != null) { + Utils.emitEvent(filename,29) + } + }); + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } + break; + } + case "emitGetUrl":{ + try { + let url = this.controllerTwo.getUrl(); + console.log("url: " + url); + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + Utils.emitEvent(`${error.code}`,30) + } + break; + } + default: + console.info("can not match case") + } + }) + } + Web({src:"www.example.com",controller:this.controller}) + .webDebuggingAccess(true) + .mediaPlayGestureAccess(true) + .javaScriptAccess(true) + .zoomAccess(this.text) + .onSearchResultReceive(ret=>{ + var searchResult = ret.activeMatchOrdinal.toString() + + ret.numberOfMatches.toString() + console.log("searchResult" + searchResult) + setTimeout(()=>{ + Utils.emitEvent(searchResult,16) + },3000) + }) + + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_web_dev_three/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..a4ee2f1652b3d04ce83ece64ef70f8dfa62a2dc8 --- /dev/null +++ b/arkui/ace_ets_web_dev_three/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.myapplication.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/customization/edm_xts_stage/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/List.test.ets similarity index 81% rename from customization/edm_xts_stage/entry/src/main/ets/test/List.test.ets rename to arkui/ace_ets_web_dev_three/entry/src/main/ets/test/List.test.ets index d5a2534102f373727e8f85a495bbecec2c2900db..079023dd24ba05f62f21dacf79f7077bb41b6e0d 100644 --- a/customization/edm_xts_stage/entry/src/main/ets/test/List.test.ets +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/List.test.ets @@ -12,10 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import edmPromiseTest from './edmPromise.test.ets' -import edmCallbackTest from './edmCallback.test.ets' +import webJsunit from './WebJsunit.test' export default function testsuite() { - edmCallbackTest() - edmPromiseTest() + webJsunit() } \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/Utils.ets b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/Utils.ets new file mode 100644 index 0000000000000000000000000000000000000000..1a90ba6aedd9cd4c5662f10bd0f033f6136cb61a --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/Utils.ets @@ -0,0 +1,135 @@ +/* + * 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 events_emitter from '@ohos.events.emitter'; +import { expect } from "@ohos/hypium"; +export default class Utils { + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + static registerEvent(testCaseName,expectedValue,eventId,done){ + console.info(`[${testCaseName}] START`); + try{ + let callBack=(backData)=>{ + console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); + expect(backData.data.ACTION).assertEqual(expectedValue); + console.info(`[${testCaseName}] END`); + done() + } + let innerEvent = { + eventId:eventId, + priority:events_emitter.EventPriority.LOW + } + events_emitter.on(innerEvent,callBack) + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } + } + static emitEvent(actualValue,eventId){ + try { + let backData = { + data: { + "ACTION": actualValue + } + } + let backEvent = { + eventId:eventId, + priority:events_emitter.EventPriority.LOW + } + console.info("webFlag start to emit action state"); + events_emitter.emit(backEvent, backData); + } catch (err) { + console.info("webFlag emit action state err: " + JSON.stringify(err)); + } + } + static registerEventTwo(testCaseName,eventId,done){ + console.info(`[${testCaseName}] START`); + try{ + let callBack=(backData)=>{ + console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); + expect(backData.data.actualValue).assertLarger(backData.data.expectedValue-100); + expect(backData.data.actualValue).assertLess(backData.data.expectedValue-(-100)); + console.info(`[${testCaseName}] END`); + done() + } + let innerEvent = { + eventId:eventId, + priority:events_emitter.EventPriority.LOW + } + events_emitter.on(innerEvent,callBack) + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } + } + static emitEventTwo(expectedValue,actualValue,eventId){ + try { + let backData = { + data: { + "expectedValue":expectedValue, + "actualValue":actualValue + } + } + let backEvent = { + eventId:eventId, + priority:events_emitter.EventPriority.LOW + } + console.info("webFlag start to emit action state"); + events_emitter.emit(backEvent, backData); + } catch (err) { + console.info("webFlag emit action state err: " + JSON.stringify(err)); + } + } + static registerContainEvent(testCaseName,expectedValue,eventId,done){ + console.info(`[${testCaseName}] START`); + try{ + let callBack=(backData)=>{ + console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); + expect(backData.data.ACTION).assertContain(expectedValue); + console.info(`[${testCaseName}] END`); + done() + } + let innerEvent = { + eventId:eventId, + priority:events_emitter.EventPriority.LOW + } + events_emitter.on(innerEvent,callBack) + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } + } + static commitKey(emitKey){ + try { + let backData = { + data: { + "ACTION": emitKey + } + } + let backEvent = { + eventId:10, + priority:events_emitter.EventPriority.LOW + } + console.info("start send emitKey"); + events_emitter.emit(backEvent, backData); + } catch (err) { + console.info("emit emitKey err: " + JSON.stringify(err)); + } + } +} diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/WebJsunit.test.ets b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/WebJsunit.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..84590803c90186935de4d466783720487fe5a37f --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/test/WebJsunit.test.ets @@ -0,0 +1,348 @@ +/* + * 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. + */ +// @ts-nocheck +import { describe, beforeEach, afterEach, it, expect } from "@ohos/hypium"; +import events_emitter from '@ohos.events.emitter'; +import Utils from './Utils.ets'; +let emitKey = "emitLoadUrl"; +export default function webJsunit() { + describe('ActsAceWebDevTest', function () { + beforeEach(async function (done) { + await Utils.sleep(2000); + console.info("web beforeEach start"); + done(); + }) + afterEach(async function (done) { + console.info("web afterEach start:"+emitKey); + try { + let backData = { + data: { + "ACTION": emitKey + } + } + let backEvent = { + eventId:100, + priority:events_emitter.EventPriority.LOW + } + console.info("start send emitKey"); + events_emitter.emit(backEvent, backData); + } catch (err) { + console.info("emit emitKey err: " + JSON.stringify(err)); + } + await Utils.sleep(2000); + done(); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_001 + *tc.name LoadUrl + *tc.desic load contents from url + */ + it('LoadUrl',0,async function(done){ + emitKey="emitLoadData"; + Utils.registerContainEvent("LoadUrl","百度一下，你就知道",1,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_002 + *tc.name LoadData + *tc.desic load contents from data + */ + it('LoadData',0,async function(done){ + emitKey="emitBackward"; + Utils.registerEvent("LoadData","baidu",2,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_003 + *tc.name Backward + *tc.desic back to the old page + */ + it('Backward',0,async function(done){ + emitKey="emitForward"; + Utils.registerEvent("Backward","百度一下，你就知道",3,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_004 + *tc.name Forward + *tc.desic go to the new page + */ + it('Forward',0,async function(done){ + emitKey="emitAccessBackward"; + Utils.registerEvent("Forward","baidu",4,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_005 + *tc.name AccessBackward + *tc.desic return whether there is a old page + */ + it('AccessBackward',0,async function(done){ + emitKey="emitAccessForward"; + Utils.registerEvent("AccessBackward",true,5,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_006 + *tc.name AccessForward + *tc.desic return whether there is a new page + */ + it('AccessForward',0,async function(done){ + emitKey="emitonInactive"; + Utils.registerEvent("AccessForward",false,6,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_007 + *tc.name onInactive + *tc.desic make web component inactive + */ + it('onInactive',0,async function(done){ + emitKey="emitonActive"; + Utils.registerEvent("onInactive","baidu",7,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_008 + *tc.name make web component active + *tc.desic return whether the third party cookie is allowed + */ + it('onActive',0,async function(done){ + emitKey="emitRefresh"; + Utils.registerEvent("onActive","index",8,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_009 + *tc.name Refresh + *tc.desic refresh current page + */ + it('Refresh',0,async function(done){ + emitKey="emitAccessStep"; + Utils.registerEvent("Refresh","index",9,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_010 + *tc.name AccessStep + *tc.desic return whether steps can be operated + */ + it('AccessStep',0,async function(done){ + emitKey="emitClearHistory"; + Utils.registerEvent("AccessStep",true,10,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_011 + *tc.name ClearHistory + *tc.desic clear the browsing history + */ + it('ClearHistory',0,async function(done){ + emitKey="emitGetHitTestValue"; + Utils.registerEvent("ClearHistory",false,11,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_012 + *tc.name GetHitTestValue + *tc.desic get the type of th clicked component + */ + it('GetHitTestValue',0,async function(done){ + emitKey="emitRegisterJavaScriptProxy"; + Utils.registerEvent("GetHitTestValue","hitValue",12,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_013 + *tc.name RegisterJavaScriptProxy + *tc.desic register proxy with a specific name + */ + it('RegisterJavaScriptProxy',0,async function(done){ + emitKey="emitDeleteJavaScriptRegister"; + Utils.registerEvent("RegisterJavaScriptProxy",'Web',13,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_014 + *tc.name DeleteJavaScriptRegister + *tc.desic delet specific proxy + */ + it('DeleteJavaScriptRegister',0,async function(done){ + emitKey="emitZoom"; + Utils.registerEvent("DeleteJavaScriptRegister","17100008",14,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_015 + *tc.name Zoom + *tc.desic zoom the current page + */ + it('Zoom',0,async function(done){ + emitKey="emitSearchAllAsync"; + Utils.registerEvent("Zoom","17100004",15,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_016 + *tc.name SearchAllAsync + *tc.desic zoom the current page + */ + it('SearchAllAsync',0,async function(done){ + emitKey="emitClearMatches"; + Utils.registerEvent("SearchAllAsync","01",16,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_017 + *tc.name ClearMatches + *tc.desic zoom the current page + */ + it('ClearMatches',0,async function(done){ + emitKey="emitSearchNext"; + Utils.registerEvent("ClearMatches","17100001",17,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_018 + *tc.name SearchNext + *tc.desic zoom the current page + */ + it('SearchNext',0,async function(done){ + emitKey="emitClearSslCache"; + Utils.registerEvent("SearchNext","17100001",18,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_019 + *tc.name ClearSslCache + *tc.desic zoom the current page + */ + it('ClearSslCache',0,async function(done){ + emitKey="emitClearClientAuthenticationCache"; + Utils.registerEvent("ClearSslCache","17100001",19,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_020 + *tc.name ClearClientAuthenticationCache + *tc.desic zoom the current page + */ + it('ClearClientAuthenticationCache',0,async function(done){ + emitKey="emitStop"; + Utils.registerEvent("ClearClientAuthenticationCache","17100001",20,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_021 + *tc.name Stop + *tc.desic zoom the current page + */ + it('Stop',0,async function(done){ + emitKey="emitRequestFocus"; + Utils.registerEvent("Stop","17100001",21,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_022 + *tc.name RequestFocus + *tc.desic zoom the current page + */ + it('RequestFocus',0,async function(done){ + emitKey="emitZoomIn"; + Utils.registerEvent("RequestFocus","17100001",22,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_023 + *tc.name ZoomIn + *tc.desic zoom the current page + */ + it('ZoomIn',0,async function(done){ + emitKey="emitZoomOut"; + Utils.registerEvent("ZoomIn","17100001",23,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_024 + *tc.name ZoomOut + *tc.desic zoom the current page + */ + it('ZoomOut',0,async function(done){ + emitKey="emitGetWebId"; + Utils.registerEvent("ZoomOut","17100001",24,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_025 + *tc.name GetWebId + *tc.desic zoom the current page + */ + it('GetWebId',0,async function(done){ + emitKey="emitGetUserAgent"; + Utils.registerEvent("GetWebId","17100001",25,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_026 + *tc.name GetUserAgent + *tc.desic zoom the current page + */ + it('GetUserAgent',0,async function(done){ + emitKey="emitGetPageHeigth"; + Utils.registerEvent("GetUserAgent","17100001",26,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_027 + *tc.name GetPageHeigth + *tc.desic zoom the current page + */ + it('GetPageHeigth',0,async function(done){ + emitKey="emitBackOrForward"; + Utils.registerEvent("GetPageHeigth","17100001",27,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_028 + *tc.name BackOrForward + *tc.desic zoom the current page + */ + it('BackOrForward',0,async function(done){ + emitKey="emitStoreWebArchive"; + Utils.registerEvent("BackOrForward","17100001",28,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_029 + *tc.name StoreWebArchive + *tc.desic Save current page + */ + it('StoreWebArchive',0,async function(done){ + emitKey="emitGetUrl"; + Utils.registerContainEvent("StoreWebArchive","/data/storage/el2/base/",29,done); + sendEventByKey('webcomponent',10,''); + }) + /* + *tc.number SUB_ACE_BASIC_ETS_API_030 + *tc.name GetUrl + *tc.desic Save current page + */ + it('GetUrl',0,async function(done){ + emitKey="emitGetUrl"; + Utils.registerContainEvent("GetUrl","17100001",30,done); + sendEventByKey('webcomponent',10,''); + }) + }) +} \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/module.json b/arkui/ace_ets_web_dev_three/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..1caeca096d756373af7eff5cea74a02a2c054cd0 --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/module.json @@ -0,0 +1,41 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.example.myapplication.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "requestPermissions": [ + { + "name": "ohos.permission.LOCATION" + }, + { + "name": "ohos.permission.INTERNET" + } + ] + } +} diff --git a/customization/edm_xts_stage/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_web_dev_three/entry/src/main/resources/base/element/string.json similarity index 100% rename from customization/edm_xts_stage/entry/src/main/resources/base/element/string.json rename to arkui/ace_ets_web_dev_three/entry/src/main/resources/base/element/string.json diff --git a/customization/edm_xts_stage/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_web_dev_three/entry/src/main/resources/base/media/icon.png similarity index 100% rename from customization/edm_xts_stage/entry/src/main/resources/base/media/icon.png rename to arkui/ace_ets_web_dev_three/entry/src/main/resources/base/media/icon.png diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_web_dev_three/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..accbf272408dce05ff15f78a1adf077bafc62174 --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "MainAbility/pages/web" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/extra.html b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/extra.html new file mode 100644 index 0000000000000000000000000000000000000000..cefc3262907470c309ab76c57114eaf91ff95a9f --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/extra.html @@ -0,0 +1,7 @@ + + + +
+

This is a link

+ + \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/icon.png b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/icon.png differ diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/index.html b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/index.html new file mode 100644 index 0000000000000000000000000000000000000000..b32d947f498f4bdbda9dab7f68edeea052600af6 --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/index.html @@ -0,0 +1,74 @@ + + + + + + + index + + + +
首页
+
+ 打开rawfile文件 + icon + + + diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/second.html b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/second.html new file mode 100644 index 0000000000000000000000000000000000000000..3017554b2ab0ca8725fd3acf1711c6d9b6aab02b --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/second.html @@ -0,0 +1,12 @@ + + + + + + + second + + +
second pages
+ + \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/webstorage.html b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/webstorage.html new file mode 100644 index 0000000000000000000000000000000000000000..397ebc4118ebf6a48c31c9a60174b9cebdfed13a --- /dev/null +++ b/arkui/ace_ets_web_dev_three/entry/src/main/resources/rawfile/webstorage.html @@ -0,0 +1,39 @@ + + + + + + + + + +
状态信息
+ + + \ No newline at end of file diff --git a/arkui/ace_ets_web_dev_three/signature/openharmony_sx.p7b b/arkui/ace_ets_web_dev_three/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..bd2ec963919e78b14f7b0a95673312126655f454 Binary files /dev/null and b/arkui/ace_ets_web_dev_three/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets index 3d230c7467b182c9a7028ec7f5a6fc832b0b4338..644999471fc196f2a7bf473f2c2249f5e2ab77cb 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets @@ -71,32 +71,6 @@ struct Index { } build(){ Column(){ - Web({src:$rawfile('index.html'),controller:this.controller}) - .databaseAccess(true) - .zoomAccess(this.zoomAccessValue) - .textZoomRatio(this.textRatio) - .onConsole((event) => { - let level = event.message.getMessageLevel() - let msg = event.message.getMessage() - let lineNumber = event.message.getLineNumber().toString() - let sourceId = event.message.getSourceId() - console.log("lineNumber:" + lineNumber) - setTimeout(()=>{ - Utils.emitEvent(lineNumber,420) - },3000) - setTimeout(()=>{ - Utils.emitEvent(sourceId,422) - },3000) - return false - }) - .onSearchResultReceive(ret=>{ - var searchResult = ret.activeMatchOrdinal.toString() + - ret.numberOfMatches.toString() - console.log("searchResult" + searchResult) - setTimeout(()=>{ - Utils.emitEvent(searchResult,426) - },3000) - }) Row(){ Button("web click").key('webcomponent').onClick(async ()=>{ console.info("key==>"+this.str) @@ -159,7 +133,7 @@ struct Index { } case "emitSaveCookieAsync":{ web_webview.WebCookieManager.saveCookieAsync(function(result){ - Utils.emitEvent(result,410) + Utils.emitEvent("result",410) }) break; } @@ -228,7 +202,7 @@ struct Index { setTimeout(()=>{ let result = this.username_password[0]; Utils.emitEvent(result,444) - },3000) + },5000) break; } case "emitDeleteHttpAuthCredentials":{ @@ -251,6 +225,32 @@ struct Index { } }) } + Web({src:$rawfile('index.html'),controller:this.controller}) + .databaseAccess(true) + .zoomAccess(this.zoomAccessValue) + .textZoomRatio(this.textRatio) + .onConsole((event) => { + let level = event.message.getMessageLevel() + let msg = event.message.getMessage() + let lineNumber = event.message.getLineNumber().toString() + let sourceId = event.message.getSourceId() + console.log("lineNumber:" + lineNumber) + setTimeout(()=>{ + Utils.emitEvent(lineNumber,420) + },3000) + setTimeout(()=>{ + Utils.emitEvent(sourceId,422) + },3000) + return false + }) + .onSearchResultReceive(ret=>{ + var searchResult = ret.activeMatchOrdinal.toString() + + ret.numberOfMatches.toString() + console.log("searchResult" + searchResult) + setTimeout(()=>{ + Utils.emitEvent(searchResult,426) + },3000) + }) } } } diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets b/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets index deea6fda97ae0eaa363fc455cde30e788b6100f9..edc4a8d8c3af92e7fb8c1336fc30c9a6ba1d785b 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets @@ -101,7 +101,7 @@ export default function webJsunit() { */ it('saveCookieAsync',0,async function(done){ emitKey="emitIsThirdPartyCookieAllowed"; - Utils.registerEvent("saveCookieAsync",true,410,done); + Utils.registerEvent("saveCookieAsync","result",410,done); sendEventByKey('webcomponent',10,''); }) /* diff --git a/arkui/ace_standard/Test.json b/arkui/ace_standard/Test.json index e8c0d4ed7519af993aaa8e96e2f324961673327d..c4cdfe81990df2dc9d9ef2d1429e19118ce5b183 100644 --- a/arkui/ace_standard/Test.json +++ b/arkui/ace_standard/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } diff --git a/arkui/libuv/BUILD.gn b/arkui/libuv/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..05c237975bd3d76657a62a3be6742bf9a035f17d --- /dev/null +++ b/arkui/libuv/BUILD.gn @@ -0,0 +1,245 @@ +# Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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") + +import("//test/xts/acts/arkui/libuv/comm.gni") + +ohos_static_library("libuvTestStatic") { + include_dirs = [ + "//third_party/libuv/include", + "//third_party/libuv/src", + "//third_party/libuv/src/unix", + ] + sources = [ + "//third_party/libuv/test/blackhole-server.c", + "//third_party/libuv/test/echo-server.c", + "//third_party/libuv/test/runner-unix.c", + "//third_party/libuv/test/runner.c", + "//third_party/libuv/test/test-active.c", + "//third_party/libuv/test/test-async-null-cb.c", + "//third_party/libuv/test/test-async.c", + "//third_party/libuv/test/test-barrier.c", + "//third_party/libuv/test/test-callback-order.c", + "//third_party/libuv/test/test-callback-stack.c", + "//third_party/libuv/test/test-close-fd.c", + "//third_party/libuv/test/test-close-order.c", + "//third_party/libuv/test/test-condvar.c", + "//third_party/libuv/test/test-connect-unspecified.c", + "//third_party/libuv/test/test-connection-fail.c", + "//third_party/libuv/test/test-cwd-and-chdir.c", + "//third_party/libuv/test/test-default-loop-close.c", + "//third_party/libuv/test/test-delayed-accept.c", + "//third_party/libuv/test/test-dlerror.c", + "//third_party/libuv/test/test-eintr-handling.c", + "//third_party/libuv/test/test-embed.c", + "//third_party/libuv/test/test-emfile.c", + "//third_party/libuv/test/test-env-vars.c", + "//third_party/libuv/test/test-error.c", + "//third_party/libuv/test/test-fail-always.c", + "//third_party/libuv/test/test-fork.c", + "//third_party/libuv/test/test-fs-copyfile.c", + "//third_party/libuv/test/test-fs-event.c", + "//third_party/libuv/test/test-fs-fd-hash.c", + "//third_party/libuv/test/test-fs-open-flags.c", + "//third_party/libuv/test/test-fs-poll.c", + "//third_party/libuv/test/test-fs-readdir.c", + "//third_party/libuv/test/test-fs.c", + "//third_party/libuv/test/test-get-currentexe.c", + "//third_party/libuv/test/test-get-loadavg.c", + "//third_party/libuv/test/test-get-memory.c", + "//third_party/libuv/test/test-get-passwd.c", + "//third_party/libuv/test/test-getaddrinfo.c", + "//third_party/libuv/test/test-gethostname.c", + "//third_party/libuv/test/test-getnameinfo.c", + "//third_party/libuv/test/test-getsockname.c", + "//third_party/libuv/test/test-getters-setters.c", + "//third_party/libuv/test/test-gettimeofday.c", + "//third_party/libuv/test/test-handle-fileno.c", + "//third_party/libuv/test/test-homedir.c", + "//third_party/libuv/test/test-hrtime.c", + "//third_party/libuv/test/test-idle.c", + "//third_party/libuv/test/test-idna.c", + "//third_party/libuv/test/test-ip-name.c", + "//third_party/libuv/test/test-ip4-addr.c", + "//third_party/libuv/test/test-ip6-addr.c", + "//third_party/libuv/test/test-ipc-heavy-traffic-deadlock-bug.c", + "//third_party/libuv/test/test-ipc-send-recv.c", + "//third_party/libuv/test/test-ipc.c", + "//third_party/libuv/test/test-loop-alive.c", + "//third_party/libuv/test/test-loop-close.c", + "//third_party/libuv/test/test-loop-configure.c", + "//third_party/libuv/test/test-loop-handles.c", + "//third_party/libuv/test/test-loop-stop.c", + "//third_party/libuv/test/test-loop-time.c", + "//third_party/libuv/test/test-metrics.c", + "//third_party/libuv/test/test-multiple-listen.c", + "//third_party/libuv/test/test-mutexes.c", + "//third_party/libuv/test/test-not-readable-nor-writable-on-read-error.c", + "//third_party/libuv/test/test-not-writable-after-shutdown.c", + "//third_party/libuv/test/test-osx-select.c", + "//third_party/libuv/test/test-pass-always.c", + "//third_party/libuv/test/test-ping-pong.c", + "//third_party/libuv/test/test-pipe-bind-error.c", + "//third_party/libuv/test/test-pipe-close-stdout-read-stdin.c", + "//third_party/libuv/test/test-pipe-connect-error.c", + "//third_party/libuv/test/test-pipe-connect-multiple.c", + "//third_party/libuv/test/test-pipe-connect-prepare.c", + "//third_party/libuv/test/test-pipe-getsockname.c", + "//third_party/libuv/test/test-pipe-pending-instances.c", + "//third_party/libuv/test/test-pipe-sendmsg.c", + "//third_party/libuv/test/test-pipe-server-close.c", + "//third_party/libuv/test/test-pipe-set-fchmod.c", + "//third_party/libuv/test/test-pipe-set-non-blocking.c", + "//third_party/libuv/test/test-platform-output.c", + "//third_party/libuv/test/test-poll-close-doesnt-corrupt-stack.c", + "//third_party/libuv/test/test-poll-close.c", + "//third_party/libuv/test/test-poll-closesocket.c", + "//third_party/libuv/test/test-poll-multiple-handles.c", + "//third_party/libuv/test/test-poll-oob.c", + "//third_party/libuv/test/test-poll.c", + "//third_party/libuv/test/test-process-priority.c", + "//third_party/libuv/test/test-process-title-threadsafe.c", + "//third_party/libuv/test/test-process-title.c", + "//third_party/libuv/test/test-queue-foreach-delete.c", + "//third_party/libuv/test/test-random.c", + "//third_party/libuv/test/test-readable-on-eof.c", + "//third_party/libuv/test/test-ref.c", + "//third_party/libuv/test/test-run-nowait.c", + "//third_party/libuv/test/test-run-once.c", + "//third_party/libuv/test/test-semaphore.c", + "//third_party/libuv/test/test-shutdown-close.c", + "//third_party/libuv/test/test-shutdown-eof.c", + "//third_party/libuv/test/test-shutdown-simultaneous.c", + "//third_party/libuv/test/test-shutdown-twice.c", + "//third_party/libuv/test/test-signal-multiple-loops.c", + "//third_party/libuv/test/test-signal-pending-on-close.c", + "//third_party/libuv/test/test-signal.c", + "//third_party/libuv/test/test-socket-buffer-size.c", + "//third_party/libuv/test/test-spawn.c", + "//third_party/libuv/test/test-stdio-over-pipes.c", + "//third_party/libuv/test/test-strscpy.c", + "//third_party/libuv/test/test-tcp-alloc-cb-fail.c", + "//third_party/libuv/test/test-tcp-bind-error.c", + "//third_party/libuv/test/test-tcp-bind6-error.c", + "//third_party/libuv/test/test-tcp-close-accept.c", + "//third_party/libuv/test/test-tcp-close-reset.c", + "//third_party/libuv/test/test-tcp-close-while-connecting.c", + "//third_party/libuv/test/test-tcp-close.c", + "//third_party/libuv/test/test-tcp-connect-error-after-write.c", + "//third_party/libuv/test/test-tcp-connect-error.c", + "//third_party/libuv/test/test-tcp-connect-timeout.c", + "//third_party/libuv/test/test-tcp-connect6-error.c", + "//third_party/libuv/test/test-tcp-create-socket-early.c", + "//third_party/libuv/test/test-tcp-flags.c", + "//third_party/libuv/test/test-tcp-oob.c", + "//third_party/libuv/test/test-tcp-open.c", + + # "//third_party/libuv/test/test-metrics-idle-time.c", + # "//third_party/libuv/test/test-metrics-idle-time-thread.c", + # "//third_party/libuv/test/test-metrics-idle-time-zero.c", + "//third_party/libuv/test/test-tcp-read-stop-start.c", + "//third_party/libuv/test/test-tcp-read-stop.c", + "//third_party/libuv/test/test-tcp-shutdown-after-write.c", + "//third_party/libuv/test/test-tcp-try-write-error.c", + "//third_party/libuv/test/test-tcp-try-write.c", + "//third_party/libuv/test/test-tcp-unexpected-read.c", + "//third_party/libuv/test/test-tcp-write-after-connect.c", + "//third_party/libuv/test/test-tcp-write-fail.c", + "//third_party/libuv/test/test-tcp-write-queue-order.c", + "//third_party/libuv/test/test-tcp-write-to-half-open-connection.c", + "//third_party/libuv/test/test-tcp-writealot.c", + "//third_party/libuv/test/test-test-macros.c", + "//third_party/libuv/test/test-thread-equal.c", + "//third_party/libuv/test/test-thread.c", + "//third_party/libuv/test/test-threadpool-cancel.c", + "//third_party/libuv/test/test-threadpool.c", + "//third_party/libuv/test/test-timer-again.c", + "//third_party/libuv/test/test-timer-from-check.c", + "//third_party/libuv/test/test-timer.c", + "//third_party/libuv/test/test-tmpdir.c", + "//third_party/libuv/test/test-tty-duplicate-key.c", + "//third_party/libuv/test/test-tty-escape-sequence-processing.c", + "//third_party/libuv/test/test-tty.c", + "//third_party/libuv/test/test-udp-alloc-cb-fail.c", + "//third_party/libuv/test/test-udp-bind.c", + "//third_party/libuv/test/test-udp-connect.c", + "//third_party/libuv/test/test-udp-connect6.c", + "//third_party/libuv/test/test-udp-create-socket-early.c", + "//third_party/libuv/test/test-udp-dgram-too-big.c", + "//third_party/libuv/test/test-udp-ipv6.c", + "//third_party/libuv/test/test-udp-mmsg.c", + "//third_party/libuv/test/test-udp-multicast-interface.c", + "//third_party/libuv/test/test-udp-multicast-interface6.c", + "//third_party/libuv/test/test-udp-multicast-join.c", + "//third_party/libuv/test/test-udp-multicast-join6.c", + "//third_party/libuv/test/test-udp-multicast-ttl.c", + "//third_party/libuv/test/test-udp-open.c", + "//third_party/libuv/test/test-udp-options.c", + "//third_party/libuv/test/test-udp-send-and-recv.c", + "//third_party/libuv/test/test-udp-send-hang-loop.c", + "//third_party/libuv/test/test-udp-send-immediate.c", + "//third_party/libuv/test/test-udp-send-unreachable.c", + "//third_party/libuv/test/test-udp-sendmmsg-error.c", + "//third_party/libuv/test/test-udp-try-send.c", + "//third_party/libuv/test/test-uname.c", + "//third_party/libuv/test/test-walk-handles.c", + "//third_party/libuv/test/test-watcher-cross-stop.c", + ] + deps = [ "//third_party/libuv:uv_static" ] +} + +ohos_executable("libuvruntest") { + include_dirs = [ + "//third_party/libuv/include", + "//third_party/libuv/src", + "//third_party/libuv/src/unix", + ] + sources = [ "//third_party/libuv/test/run-tests.c" ] + deps = [ ":libuvTestStatic" ] +} + +ohos_moduletest_suite("ActsLibuvTestSuite") { + sources = [ "src/ActsLibuvTestSuite.cpp" ] + + include_dirs = [ + "//test/xts/acts/arkui/libuv/src", + "//third_party/libuv/test", + "//third_party/libuv/include", + "//third_party/libuv/src", + "//third_party/libuv/src/unix", + ] + deps = [ ":libuvTestStatic" ] + cflags = [ "-Wno-error" ] +} + +action("cpLibuv") { + testonly = true + script = "cplibuv.sh" + outputs = [ "${target_out_dir}/cplibuv.log" ] + deps = [ + ":ActsLibuvTestSuite", + ":libuvruntest", + ] +} + +group("libuvTest") { + testonly = true + if (is_standard_system) { + deps = [ + ":ActsLibuvTestSuite", + ":cpLibuv", + ":libuvruntest", + ] + } +} diff --git a/arkui/libuv/README_zh.md b/arkui/libuv/README_zh.md new file mode 100755 index 0000000000000000000000000000000000000000..a24ac8dd3e3b8f6eb26e73d615dfdee66e495312 --- /dev/null +++ b/arkui/libuv/README_zh.md @@ -0,0 +1,46 @@ +# Libuv测试套件说明 + +- [介绍](#section_Libuv_001) +- [使用说明](#section_Libuv_002) + +## 介绍 + +Libuv测试套件使用Libuv三方库内原有的unittest，通过acts测试套件框架在运行时调用运行，具体目录结构如下： + +```bash +. +├── BUILD.gn +├── comm.gni +├── cplibuv.sh +├── genlocal.py +├── src +│ ├── ActsLibuvTestSuite.cpp +│ └── ActsLibuvTestSuite.h +└── Test.json +``` + +* BUILD.gn：编译脚本，编译acts测试套件，编译Libuv三方库测试代码，执行actions事件在acts测试套件对应的testcases目录下建立libuvdata目录，然后将运行测试需要的Libuv测试进程，解析运行日志所需的Python脚本拷贝到libuvdata目录。 +* comm.gni：通用编译配置。 +* cplibuv.sh：编译后actions事件执行的脚本。 +* genlocal.py：libuv的test程序运行后结果会保存在task_log.log文件内，分析运行日志后会存储结果在summary_report.xml文件内，然后根据xdevice流程生成summary_report。 +* src：测试套件的实现，内部直接调用libuv的unittest进程。 +* Test.json：运行测试需要json脚本，包括拷贝内容到开发板。 + + +## 使用说明 + +* 编译运行 + + ```bash + ./build.sh --product-name rk3568 --gn-args build_xts=true --build-target "acts" --gn-args is_standard_system=true + ``` + + + +* 测试运行：进入suites/acts目录，执行python -m xdevice，然后在命令框里输入一下命令 + + ```bash + run -l ActsLibuvTestSuite + ``` + + \ No newline at end of file diff --git a/arkui/libuv/Test.json b/arkui/libuv/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4f23ce05d02cfc8353584170cf2bb55680e1ed2f --- /dev/null +++ b/arkui/libuv/Test.json @@ -0,0 +1,35 @@ +{ + "description": "Config for ActsLibuvTestSuite test cases", + "driver": { + "module-name": "ActsLibuvTestSuite", + "native-test-timeout": "120000", + "native-test-device-path": "/data/local/tmp", + "runtime-hint": "100s", + "type": "CppTest" + }, + "kits": [ + { + "pre-push" : [ + ], + "post-push" : [ + "chmod -R 777 /data/local/tmp/*" + ], + "push": [ + "ActsLibuvTestSuite->/data/local/tmp/ActsLibuvTestSuite", + "libuvdata/libuvruntest->/data/local/tmp/libuvruntest " + ], + "type": "PushKit" + }, + { + "type": "ShellKit", + "run-command": [ + "remount", + "mkdir /data/test", + "cd /data/local/tmp" + ], + "teardown-localcommand": [ + "python testcases/libuvdata/genlocal.py" + ] + } + ] +} \ No newline at end of file diff --git a/arkui/libuv/comm.gni b/arkui/libuv/comm.gni new file mode 100644 index 0000000000000000000000000000000000000000..6d8d783a4cbc35e2f50f8cd40c8cedd122235a04 --- /dev/null +++ b/arkui/libuv/comm.gni @@ -0,0 +1,21 @@ +# Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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") + +common_include = [ "//test/xts/acts/graphic/libuv/src" ] + +common_depends = [ "//third_party/libuv:uv_static" ] + +common_src = [ "../../ActsApp.cpp" ] +#import("//third_party/VK-GL-CTS/vk_gl_cts.gni") diff --git a/arkui/libuv/cplibuv.sh b/arkui/libuv/cplibuv.sh new file mode 100755 index 0000000000000000000000000000000000000000..a549b12edfe2ec7f75d80c4f1c0c64f0639074ea --- /dev/null +++ b/arkui/libuv/cplibuv.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# 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. + +set -e + +mkdir -p "suites/acts/testcases/libuvdata" +cp -rf "../../test/xts/acts/arkui/libuv/genlocal.py" "suites/acts/testcases/libuvdata" +cp -rf "common/common/libuvruntest" "suites/acts/testcases/libuvdata" diff --git a/arkui/libuv/genlocal.py b/arkui/libuv/genlocal.py new file mode 100755 index 0000000000000000000000000000000000000000..b31525f10e4d457e91fd4c34e8edbc537d0d1396 --- /dev/null +++ b/arkui/libuv/genlocal.py @@ -0,0 +1,258 @@ +from ast import Return +import os +import sys +from unittest import suite + +G_SUITE = "" +G_MAXCASECNT = 5 +G_MUSTPASSPATH = "mustpass/" +G_MUSTPASSFILE = ".txt" +G_TMPPATH = "template/" +G_TMPDIRPATH = G_TMPPATH + "ace_ets_template" +G_HAPDIRPATH = "../act_etc_component_" +G_IMPORTTEST = "import {}Jsunit from \'./{}.test.ets\';" +G_IMPORTTESTCASE = "{}Jsunit()" +G_PATHDIRPATH = "/entry/src/main/ets/MainAbility/pages/" +G_PAGETEMPPATH = "/pagetemplate.ets" +G_PAGEATTRTEMPPATH = "/pageattrtemplate.ets" +G_TESTDIRPATH = "/entry/src/main/ets/test/" +G_TESTCASETEMPPATH = "/testcasetemplate.ets" +G_TESTTEMPPATH = "/List.test.ets" +G_LISTTESTETSPATH = "/entry/src/main/ets/test/List.test.ets" +G_PAGENAMEPATTERN = "##PAGENAME" +G_ATTRNAMEPATTERN = "##ATTRNAME" +G_LOWATTRNAMEPATTERN = "##LOWATTRNAME" +G_PAGENAMETESETPATTERN = "##PAGENAMETEST" +G_PAGEFILENAMEPATTERN = "##PAGEFILENAME" +G_SUITENAMEPATTERN = "##SUITENAME" +G_PAGENAMETESTPATTERN = "##PAGENAMETEXT" +G_CONFIGJSONPATH = "/entry/src/main/config.json" +G_BUILDGNPATH = "/BUILD.gn" +G_TESTJSONPATH = "/Test.json" +G_INDEXETSPATH = "/entry/src/main/ets/MainAbility/pages/index.ets" + +def writemultestcase(): + print("writemultestcase") + writemultestcasecpp() + print("writemulbuildgn") + writemulbuildgn() + +def writemulbuildgn(): + #生成buildgn + for suiteitem in G_SUITE: + subcasecnt = 0 + subattcnt = 0 + subgncnt = 0 + suiteitemcap = "".join(suiteitem[:1].upper() + suiteitem[1:]) + print("suite:", suiteitem, "----------------------") + #创建一个hap目录 + hapdirpath = G_HAPDIRPATH + suiteitem.lower() + if os.path.exists(hapdirpath): + os.system(r"rm -rf {}".format(hapdirpath)) + os.system(r"cp {} {} -r".format(G_TMPDIRPATH, hapdirpath)) + else: + os.system(r"cp {} {} -r".format(G_TMPDIRPATH, hapdirpath)) + + mustpass = G_MUSTPASSPATH + suiteitem + G_MUSTPASSFILE + with open(mustpass) as mastpassfile: + compdict = {"":1} + + importtestheads = [] + importtests = [] + for line in mastpassfile: + if line[0] == "#": + continue + line = line.replace("\n", "") + linelist = line.split(",") + suitename = linelist[0] + casename = linelist[1] + + if suitename in compdict: + #同文件里加属性 + ind = compdict[suitename] + subattcnt += 1 + #在page文件里追加attr内容 + suitenamecap = "".join(suitename[:1].upper() + suitename[1:]) + casenamecap = "".join(casename[:1].upper() + casename[1:]) + pagename = suitenamecap + casenamecap + pagenametext = suitename + "-" + casenamecap + pagefilename = hapdirpath + G_PATHDIRPATH + suitename + ".ets" + attrtmp = G_TMPPATH + G_PAGEATTRTEMPPATH + #print("addattr:", subattcnt, pagename, attrtmp) + with open(attrtmp, encoding="utf-8", mode="r") as attrtmpfile: + for attrtempline in attrtmpfile: + attrtempline = attrtempline.replace(" ", "\ ") + attrtempline = attrtempline.replace(G_PAGENAMETESTPATTERN, pagenametext) + attrtempline = attrtempline.replace(G_ATTRNAMEPATTERN, casename) + os.system(r"sed -i '{}a {}' {}".format(ind, attrtempline, pagefilename)) + ind += 1 + compdict[suitename] = ind + + else: + #创建不同页面 + subgncnt += 1 + subattcnt = 1 + ind = 29 + compdict[suitename] = ind + postfix = '%04d' % subgncnt + dirpath = suitename + postfix + temppagefilename = G_TMPPATH + G_PAGETEMPPATH + suitenamecap = "".join(suitename[:1].upper() + suitename[1:]) + casenamecap = "".join(casename[:1].upper() + casename[1:]) + pagename = suitename + casenamecap + capagename = suitenamecap + casenamecap + testname = pagename + pagefilename = hapdirpath + G_PATHDIRPATH + suitename + ".ets" + os.system(r"cp {} {}".format(temppagefilename, pagefilename)) + #替换page里的名称 + os.system(r"sed -i 's/{}/{}/g' {}".format(G_PAGENAMEPATTERN, capagename, pagefilename)) + #追加page里的attr + pagenametext = suitename + "-" + casenamecap + attrtmp = G_TMPPATH + G_PAGEATTRTEMPPATH + #print("addattr:", subattcnt, pagename, attrtmp) + with open(attrtmp, encoding="utf-8", mode="r") as attrtmpfile: + for attrtempline in attrtmpfile: + attrtempline = attrtempline.replace(" ", "\ ") + attrtempline = attrtempline.replace(G_PAGENAMETESTPATTERN, pagenametext) + attrtempline = attrtempline.replace(G_ATTRNAMEPATTERN, casename) + os.system(r"sed -i '{}a {}' {}".format(ind, attrtempline, pagefilename)) + ind += 1 + compdict[suitename] = ind + + temptestfilename = G_TMPPATH + G_TESTCASETEMPPATH + testfilename = hapdirpath + G_TESTDIRPATH + suitename + ".test.ets" + #print("createpage:", subgncnt, dirpath, pagefilename, testfilename) + os.system(r"cp {} {}".format(temptestfilename, testfilename)) + #替换test里的名称 + os.system(r"sed -i 's/{}/{}/g' {}".format(G_ATTRNAMEPATTERN, testname, testfilename)) + os.system(r"sed -i 's/{}/{}/g' {}".format(G_PAGENAMETESETPATTERN, testname+"Test", testfilename)) + os.system(r"sed -i 's/{}/{}/g' {}".format(G_PAGEFILENAMEPATTERN, pagename, testfilename)) + os.system(r"sed -i 's/{}/{}/g' {}".format(G_LOWATTRNAMEPATTERN, casename, testfilename)) + #替换config.json里的名称 + configjsonname = hapdirpath + G_CONFIGJSONPATH + os.system(r"sed -i 's/{}/{}/g' {}".format(G_SUITENAMEPATTERN, suiteitemcap, configjsonname)) + os.system(r"sed -i 's/{}/{}/g' {}".format(G_PAGEFILENAMEPATTERN, casenamecap, configjsonname)) + #替换BUILD.gn里的名称 + buildgnname = hapdirpath + G_BUILDGNPATH + os.system(r"sed -i 's/{}/{}/g' {}".format(G_SUITENAMEPATTERN, suiteitemcap, buildgnname)) + # formate gn + #print("Formate: dirpath:",buildgnname) + formatcmd = "cat "+buildgnname+" | ~/workspace/oh31/prebuilts/build-tools/linux-x86/bin/gn format --stdin > FORMAT_RESULT.gn;cp -f FORMAT_RESULT.gn "+buildgnname+";rm FORMAT_RESULT.gn" + os.system(formatcmd) + #替换index.ets里的名称 + indexetsname = hapdirpath + G_INDEXETSPATH + os.system(r"sed -i 's/{}/{}/g' {}".format(G_SUITENAMEPATTERN, suiteitemcap, indexetsname)) + + #替换Test.json里的名称 + testjsonname = hapdirpath + G_TESTJSONPATH + os.system(r"sed -i 's/{}/{}/g' {}".format(G_SUITENAMEPATTERN, suiteitemcap, testjsonname)) + + #G_IMPORTTEST = "import {} from './{}Jsunit.test';\n" + importtestheads.append(G_IMPORTTEST.format(testname, suitename)) + importtests.append(G_IMPORTTESTCASE.format(testname)) + subcasecnt += 1 + #print("importtestheads:", importtestheads) + #print("importtests:", importtests) + #插入List.test.ets，装载多个testcase + ind = 16 + for importtestsline in importtests: + os.system(r"sed -i '{}a \ \ {}' {}".format(ind, importtestsline, hapdirpath + G_LISTTESTETSPATH)) + ind += 1 + ind = 14 + for importtestheadsline in importtestheads: + os.system(r"sed -i '{}a {}' {}".format(ind, importtestheadsline, hapdirpath + G_LISTTESTETSPATH)) + ind += 1 + +def writemultestcasecpp(): + #生成testcase + for suiteitem in G_SUITE: + print("suite:", suiteitem) + +def removedir(rootdir): + for root,dirs,files in os.walk(rootdir, topdown=False): + for name in files: + os.remove(os.path.join(rootdir,name)) + for name in dirs: + os.rmdir(os.path.join(rootdir,name)) + os.rmdir(rootdir) + + +def printhelp(): + print("Need testsuite and codepattern:\n") + print("For example\n") + print("python3 .\GenerateTestCase.py apilack\n") + print("codepattern contains: apilack, attrlack\n") + +def new_report(bakdir, str): + files = os.listdir(bakdir) + lists = [] #列出目录的下所有文件和文件夹保存到lists + for f in files: + # if f.startswith(str): + if "latest" in f: + continue + lists.append(f) + + lists.sort(key=lambda fn:os.path.getmtime(bakdir + "/" + fn)) # 按时间排序 + file_new = os.path.join(bakdir,lists[-1]) # 获取最新的文件保存到file_new + print("latest file:", file_new) + return file_new + + +if __name__ == '__main__': + latestpath = new_report("reports", "") + tmpfile = "tmptestsuite.xml" + putfile = "/result/ActsLibuvTestSuite.xml" + tasklogfile = "/log/task_log.log" + putdir = latestpath+putfile + tasklogpath = latestpath+tasklogfile + + timelist = latestpath.split("/") + curtime = timelist[1].replace("\n", "") + testcaselist = [] + total = 0 + passcnt = 0 + failcnt = 0 + suitename = "" + #读取最近的tasklog文件 + with open(tasklogpath) as tasklogbuf: + #从tasklog文件中获取运行的testcase的信息 + for tasklogline in tasklogbuf: + if "[Start test suite [" in tasklogline: + suitelist = tasklogline.split("[Start test suite [") + suiteitem = suitelist[1].split("]") + suitename = suiteitem[0] + if "[ok " in tasklogline: + freslist = tasklogline.split("ok") + numcase = freslist[1] + numcase = numcase.replace(" ","") + numcase = numcase.replace("]","") + caseline = numcase.split("-") + total +=1 + passcnt += 1 + testcaselist.append(caseline[1]+"-true") + if "[not ok " in tasklogline: + freslist = tasklogline.split("not ok") + numcase = freslist[1] + numcase = numcase.replace(" ","") + numcase = numcase.replace("]","") + caseline = numcase.split("-") + total +=1 + failcnt += 1 + testcaselist.append(caseline[1]+"-false") + #print("tasklogfile line:", caseline[0], caseline[1]) + #将testcase信息生成文件 + xmlfile = open(tmpfile, mode='w+') + xmlfile.write("\n") + xmlfile.write("\n".format(suitename, curtime, failcnt, total, "{}")) + xmlfile.write(" \n".format(suitename, failcnt, total)) + for casename in testcaselist: + casename = casename.replace("\n","") + loccasename = casename.split("-") + recasename = loccasename[0] + casestate = loccasename[1] + xmlfile.write(" \n".format(recasename, suitename, casestate)) + xmlfile.write(" \n") + xmlfile.write("\n") + xmlfile.close() + #将tmp文件替换xts框架的result + os.system(r"cp {} {}".format(tmpfile, putdir)) \ No newline at end of file diff --git a/arkui/libuv/src/ActsLibuvTestSuite.cpp b/arkui/libuv/src/ActsLibuvTestSuite.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ad5f32493e5878d2e73cff5c8e155f2a9b794291 --- /dev/null +++ b/arkui/libuv/src/ActsLibuvTestSuite.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +#include +#include +#include "ActsLibuvTestSuite.h" +extern "C"{ +#include "runner.h" +} + +namespace OHOS { + using namespace std; + using namespace testing::ext; + + // Preset action of the test suite, which is executed before the first test case + void ActsLibuvTestSuite::SetUpTestCase(void) + { + } + // Test suite cleanup action, which is executed after the last test case + void ActsLibuvTestSuite::TearDownTestCase(void) + { + } + // Preset action of the test case + void ActsLibuvTestSuite::SetUp() + { + } + // Cleanup action of the test case + void ActsLibuvTestSuite::TearDown() + { + } + + HWTEST_F(ActsLibuvTestSuite, testLibuvTestCase001, Function | MediumTest | Level2) + { + printf("------start ActsLibuvTestSuite------\n"); + // int m =run_tests(0); + // printf("%d\n",m); + int ret = system("/data/local/tmp/libuvruntest"); + printf("system ret=%d\n", ret); + + EXPECT_TRUE(true); + printf("------end ActsLibuvTestSuite------\n"); + } +} diff --git a/arkui/libuv/src/ActsLibuvTestSuite.h b/arkui/libuv/src/ActsLibuvTestSuite.h new file mode 100644 index 0000000000000000000000000000000000000000..036c9aa5a428d27e1929f8fcc5fe3a8e1c68e0a8 --- /dev/null +++ b/arkui/libuv/src/ActsLibuvTestSuite.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ + +#ifndef LIBUV_TESTCASE_H +#define LIBUV_TESTCASE_H + +#include +namespace OHOS { + class ActsLibuvTestSuite : public testing::Test { + public: + protected: + // Preset action of the test suite, which is executed before the first test case + static void SetUpTestCase(void); + // Test suite cleanup action, which is executed after the last test case + static void TearDownTestCase(void); + // Preset action of the test case + virtual void SetUp(); + // Cleanup action of the test case + virtual void TearDown(); + }; +} // namespace OHOS + +#endif // LIBUV_TESTCASE_H \ No newline at end of file diff --git a/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/module.json b/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/module.json index bdaa0d926f93b79ec01b98e998b06a7f171e7993..708fbe4257e5159834a07aa47225a28a4ce8a540 100644 --- a/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/module.json +++ b/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "tablet", - "phone" + "tablet", + "default" ], "deliveryWithInstall": true, "installationFree": false, @@ -51,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/module.json b/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/module.json index 6167c862f0b513ae18b02a7a67360eeda4c86c0f..1262c281d7f95d00f50d1dcb89617f0a4df05ed8 100644 --- a/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/module.json +++ b/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "tablet", - "phone" + "tablet", + "default" ], "deliveryWithInstall": true, "installationFree": false, @@ -37,4 +37,4 @@ } ] } -} \ No newline at end of file +} diff --git a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/module.json b/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/module.json index ec6e5f605300bdac86fb2633e766b065584b72c8..dd3617c1531c23caed2c344d3fe6e15b913d9379 100644 --- a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/module.json +++ b/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "tablet", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/communication/bluetooth_ble/src/main/js/test/BleAdvertiser.test.js b/communication/bluetooth_ble/src/main/js/test/BleAdvertiser.test.js index d8339e9c7b914ec20d0fd127404b984161c12923..c9686491f327b33d6c6d299ebc50766e65a1305b 100644 --- a/communication/bluetooth_ble/src/main/js/test/BleAdvertiser.test.js +++ b/communication/bluetooth_ble/src/main/js/test/BleAdvertiser.test.js @@ -21,7 +21,6 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' export default function bluetoothBLETest2() { describe('bluetoothBLETest2', function() { let gattServer = null; - let gattClient = null; function sleep(delay) { return new Promise(resovle => setTimeout(resovle, delay)) } @@ -53,7 +52,6 @@ describe('bluetoothBLETest2', function() { beforeAll(function () { console.info('beforeAll called') gattServer = bluetooth.BLE.createGattServer(); - gattClient = bluetooth.BLE.createGattClientDevice("00:00:00:00:00:00"); }) beforeEach(async function (done) { console.info('beforeEach called') @@ -79,7 +77,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 0 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0100', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -136,7 +133,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0200', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -192,8 +188,7 @@ describe('bluetoothBLETest2', function() { * @tc.type Function * @tc.level Level 3 */ - it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0300', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); + it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0300', 0, async function (done) { let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -250,7 +245,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0400', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -307,7 +301,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0500', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -364,7 +357,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0800', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -421,7 +413,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_0900', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -478,7 +469,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1000', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -535,7 +525,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1100', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -592,7 +581,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1200', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -649,7 +637,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1400', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -706,7 +693,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1500', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -763,7 +749,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 1 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1600', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -820,7 +805,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1800', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -877,7 +861,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 2 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_1900', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -929,7 +912,6 @@ describe('bluetoothBLETest2', function() { * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_AdvertiseData_2100', 0, async function (done) { - let gattServer =bluetooth.BLE.createGattServer(); let manufactureValueBuffer = new Uint8Array(4); manufactureValueBuffer[0] = 1; manufactureValueBuffer[1] = 2; @@ -982,7 +964,6 @@ describe('bluetoothBLETest2', function() { it('SUB_COMMUNICATION_BLUETOOTH_BLE_StartAdvertise_0400', 0, function () { let isRet = true; try{ - let gattServer =bluetooth.BLE.createGattServer(); gattServer.stopAdvertising(); expect(isRet).assertTrue(); }catch(error){ @@ -995,4 +976,3 @@ describe('bluetoothBLETest2', function() { }) } - diff --git a/communication/bluetooth_ble/src/main/js/test/BleGattManager.test.js b/communication/bluetooth_ble/src/main/js/test/BleGattManager.test.js index c18c9c4aa0cefd2de17907791de4e273c28ca3e2..03f58999a5674f6b720aacf54fc1520a6d14cd76 100644 --- a/communication/bluetooth_ble/src/main/js/test/BleGattManager.test.js +++ b/communication/bluetooth_ble/src/main/js/test/BleGattManager.test.js @@ -18,7 +18,6 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' export default function bluetoothBLETest() { describe('bluetoothBLETest', function() { - let gattServer = null; let gattClient = null; function sleep(delay) { @@ -64,7 +63,7 @@ describe('bluetoothBLETest', function() { }) afterAll(function () { console.info('afterAll called') - gattServer.close(); + gattClient.close(); }) /** @@ -539,7 +538,7 @@ describe('bluetoothBLETest', function() { * @tc.type Function * @tc.level Level 3 */ - it('SUB_COMMUNICATION_BLUETOOTH_BLE_ReadDescriptor_0300', 0, async function (done) { + it('SUB_COMMUNICATION_BLUETOOTH_BLE_ReadDescriptor_0300', 0, async function (done) { let arrayBufferCCC = new ArrayBuffer(8); let cccValue = new Uint8Array(arrayBufferCCC); cccValue[0] = 1011; @@ -685,7 +684,7 @@ describe('bluetoothBLETest', function() { * @tc.type Function * @tc.level Level 3 */ - it('SUB_COMMUNICATION_BLUETOOTH_BLE_WriteDescriptor_0300', 0, async function (done) { + it('SUB_COMMUNICATION_BLUETOOTH_BLE_WriteDescriptor_0300', 0, async function (done) { let arrayBufferDesc = new ArrayBuffer(8); let descValue = new Uint8Array(arrayBufferDesc); function WriteDescriptorReq(DescriptorWriteReq) { @@ -696,7 +695,6 @@ describe('bluetoothBLETest', function() { let needRsp = DescriptorWriteReq.needRsp; let value = new Uint8Array(DescriptorWriteReq.value); let descriptorUuid = DescriptorWriteReq.descriptorUuid; - descValue[0] = value[0]; let serverResponse = {deviceId: deviceId, transId: transId, status: 0, offset: offset, value:arrayBufferDesc}; @@ -720,7 +718,7 @@ describe('bluetoothBLETest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_NotifyCharacteristic_0100 + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_SetNotifyCharacteristic_0100 * @tc.name testSetNotifyCharacteristicChanged * @tc.desc Test SetNotifyCharacteristicChanged api. * @tc.size MEDIUM @@ -756,7 +754,7 @@ describe('bluetoothBLETest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_NotifyCharacteristic_0200 + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_SetNotifyCharacteristic_0200 * @tc.name testSetNotifyCharacteristicChanged * @tc.desc Test SetNotifyCharacteristicChanged api. * @tc.size MEDIUM @@ -792,7 +790,7 @@ describe('bluetoothBLETest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_NotifyCharacteristic_0300 + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_SetNotifyCharacteristic_0300 * @tc.name testSetNotifyCharacteristicChanged * @tc.desc Test SetNotifyCharacteristicChanged api. * @tc.size MEDIUM @@ -807,7 +805,7 @@ describe('bluetoothBLETest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_NotifyCharacteristic_0400 + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_SetNotifyCharacteristic_0400 * @tc.name test BLECharacteristicChangeON * @tc.desc Test On and off api. * @tc.size MEDIUM @@ -850,12 +848,12 @@ describe('bluetoothBLETest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_NotifyCharacteristic_0300 - * @tc.name testSetNotifyCharacteristicChanged - * @tc.desc Test SetNotifyCharacteristicChanged api. + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_GattClose_0100 + * @tc.name test gattClient close + * @tc.desc Test close api. * @tc.size MEDIUM * @tc.type Function - * @tc.level Level 2 + * @tc.level Level 3 */ it('SUB_COMMUNICATION_BLUETOOTH_BLE_GattClose_0100', 0, async function (done) { let gattClient = bluetooth.BLE.createGattClientDevice("11:22:33:44:55:66"); @@ -868,3 +866,4 @@ describe('bluetoothBLETest', function() { }) } + diff --git a/communication/bluetooth_on/src/main/js/test/BleScanResult.test.js b/communication/bluetooth_on/src/main/js/test/BleScanResult.test.js index ac5f196886d718efed4a182210abf2c05ad6a13e..77adbf950877cadced522516f0829a23d48a9f7a 100644 --- a/communication/bluetooth_on/src/main/js/test/BleScanResult.test.js +++ b/communication/bluetooth_on/src/main/js/test/BleScanResult.test.js @@ -584,7 +584,7 @@ describe('bluetoothhostTest', function() { }) /** - * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_Connect_0100 + * @tc.number SUB_COMMUNICATION_BLUETOOTH_BLE_Scan_1800 * @tc.name test gatt connect and disconnect * @tc.desc Test connect and disconnect api . * @tc.size MEDIUM @@ -592,7 +592,7 @@ describe('bluetoothhostTest', function() { * @tc.type Function * @tc.level Level 2 */ - it('SUB_COMMUNICATION_BLUETOOTH_BLE_Connect_0100', 0, async function (done) { + it('SUB_COMMUNICATION_BLUETOOTH_BLE_Scan_1800', 0, async function (done) { async function onReceiveEvent(ScanResult) { console.info('[bluetooth_js] BLEscan device result12'+JSON.stringify(ScanResult) diff --git a/customization/TestExtensionAbility_001/AppScope/app.json b/customization/TestExtensionAbility_001/AppScope/app.json deleted file mode 100644 index dca2f75e903360471499cee66e51cf04c45b9e98..0000000000000000000000000000000000000000 --- a/customization/TestExtensionAbility_001/AppScope/app.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "app": { - "bundleName": "com.example.extensionzerotest", - "vendor": "huawei", - "versionCode": 1000000, - "versionName": "1.0.0", - "debug": false, - "icon" : "$media:icon", - "label" : "$string:app_name", - "description" : "$string:description_application", - "distributedNotificationEnabled": true, - "keepAlive" : true, - "singleUser": true, - "minAPIVersion": 8, - "targetAPIVersion": 8, - "car": { - "apiCompatibleVersion": 8, - "singleUser": false - } - } -} \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts b/customization/TestExtensionAbility_001/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts deleted file mode 100644 index 07426f68d4a25f3d67e3eb27d54931244e8eef57..0000000000000000000000000000000000000000 --- a/customization/TestExtensionAbility_001/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 EnterpriseAdminExtensionAbility from '@ohos.EnterpriseAdminExtensionAbility' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index" - -export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbility { - onAdminEnabled() { - console.log('EnterpriseAdminExtensionAbility onAdminEnabled'); - } - onAdminDisabled(){ - console.log('EnterpriseAdminExtensionAbility onAdminDisabled'); - } -} \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/ets/pages/index/index.ets b/customization/TestExtensionAbility_001/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index b0958581f15c3f9b21316eec8e58ecf2ec9df6d2..0000000000000000000000000000000000000000 --- a/customization/TestExtensionAbility_001/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index" -@Entry -@Component -struct Index { - aboutToAppear() { - console.info("start run testcase!!!!") - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - const reportExtend = new ReportExtend(file) - - core.addService('report', reportExtend) - core.init() - core.subscribeEvent('task', reportExtend) - console.info("subscribeEvent run !!!!") - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - configService.setConfig(globalThis.abilityWant.parameters) - core.execute() - } - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('MainAbility') - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/module.json b/customization/TestExtensionAbility_001/entry/src/main/module.json deleted file mode 100644 index eba9c2393e3d40cc92dd7975086814b60fe9dbfb..0000000000000000000000000000000000000000 --- a/customization/TestExtensionAbility_001/entry/src/main/module.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "tablet", - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.extensionzerotest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts", - "name": "com.example.extensionzerotest.EnterpriseAdminAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "enterpriseAdmin", - "visible": true - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", - "reason": "ceshi" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION", - "reason": "ceshi" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} diff --git a/customization/TestExtensionAbility_001/entry/src/main/resources/base/element/string.json b/customization/TestExtensionAbility_001/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3cf0a50c1dfe4dbc5162c8737276c3dd9..0000000000000000000000000000000000000000 --- a/customization/TestExtensionAbility_001/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/customization/edm_xts_stage/Test.json b/customization/edm_xts_stage/Test.json deleted file mode 100644 index bf9adadfadb2eac1636dd053ec416af422bdf843..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/Test.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "180000", - "bundle-name": "com.example.myapplication", - "module-name": "phone", - "shell-timeout": "600000" - }, - "kits": [ - { - "type": "ShellKit", - "run-command": [ - "acm create -n edmuser -t normal" - ], - "teardown-command": [ - "acm delete -i 101" - ] - }, - { - "test-file-name": [ - "ActsEdmTest.hap", - "ExtensionZeroTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file diff --git a/customization/edm_xts_stage/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts b/customization/edm_xts_stage/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts deleted file mode 100644 index 07426f68d4a25f3d67e3eb27d54931244e8eef57..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/entry/src/main/ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 EnterpriseAdminExtensionAbility from '@ohos.EnterpriseAdminExtensionAbility' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index" - -export default class EnterpriseAdminAbility extends EnterpriseAdminExtensionAbility { - onAdminEnabled() { - console.log('EnterpriseAdminExtensionAbility onAdminEnabled'); - } - onAdminDisabled(){ - console.log('EnterpriseAdminExtensionAbility onAdminDisabled'); - } -} \ No newline at end of file diff --git a/customization/edm_xts_stage/entry/src/main/ets/test/commom.ets b/customization/edm_xts_stage/entry/src/main/ets/test/commom.ets deleted file mode 100644 index 0aab56c4b1045484495b18d6f3bb868015d944ad..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/entry/src/main/ets/test/commom.ets +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 enterpriseDeviceManager from '@ohos.enterpriseDeviceManager' - -const WANT1 = { - bundleName: "com.example.extensionzerotest", - abilityName: "com.example.extensionzerotest.EnterpriseAdminAbility" -}; -const ENTINFO1 = { - name: "company", - description: "edm demo" -}; - -const SELFWANT = { - bundleName: "com.example.myapplication", - abilityName: "com.example.myapplication.EnterpriseAdminAbility" -}; -const SELFHAPNAME = "com.example.myapplication" -const COMPANYNAME2 = "company2" -const DESCRIPTION2 = "edm demo2" - -const ENTINFO2 = { - name: "company2", - description: "edm demo2" -}; - -const DEFAULT_USER_ID = 100; -const TEST_USER_ID = 101; -const ERR_USER_ID = 102; - -const SUBSCRIBE_EVENTS: Array = [ - enterpriseDeviceManager.ManagedEvent.MANAGED_EVENT_BUNDLE_ADDED, - enterpriseDeviceManager.ManagedEvent.MANAGED_EVENT_BUNDLE_REMOVED -]; -const SUBSCRIBE_INVALID_EVENTS: Array = [20,21]; - -export { - WANT1, ENTINFO1, SELFWANT, SELFHAPNAME, COMPANYNAME2, DESCRIPTION2, ENTINFO2, - DEFAULT_USER_ID, TEST_USER_ID, ERR_USER_ID, SUBSCRIBE_EVENTS, SUBSCRIBE_INVALID_EVENTS -} \ No newline at end of file diff --git a/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets b/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets deleted file mode 100644 index 9b438235e79b299a9bfe52a2ec6cf28152390394..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets +++ /dev/null @@ -1,450 +0,0 @@ -/* - * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import { - WANT1, ENTINFO1, SELFWANT, SELFHAPNAME, COMPANYNAME2, DESCRIPTION2, - ENTINFO2, DEFAULT_USER_ID, TEST_USER_ID, ERR_USER_ID, SUBSCRIBE_EVENTS, SUBSCRIBE_INVALID_EVENTS -} from "./commom.ets"; -import enterpriseDeviceManager from '@ohos.enterpriseDeviceManager' - -export default function edmCallbackTest() { - - describe('edmCallback_test', function () { - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001 - * @tc.name test enableAdmin method in callback mode without user id - * @tc.desc enable admin in callback mode - */ - it('enableAdmin_test_002', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0004 - * @tc.name test enableAdmin method in callback mode with ADMIN_TYPE_SUPER param without user id - * @tc.desc enable super admin in callback mode - */ - it('enableAdmin_test_004', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin.'); - - isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0008 - * @tc.name test enableAdmin method with user id in callback mode with default user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_008', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0012 - * @tc.name test enableAdmin method in callback mode with test user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_012', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0013 - * @tc.name test enableAdmin method in promise mode and query with error user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_013', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertFalse(); - - await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0014 - * @tc.name test enableAdmin method in callback mode and disable with error user id - * @tc.desc enable and disable admin in multi-user - */ - it('enableAdmin_test_014', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - try { - await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin over'); - } catch (error) { - expect(error != null).assertTrue(); - console.log("enableAdmin_test_014 throw error code : " + error.code + "message :" + error.message); - } - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0017 - * @tc.name test setEnterpriseInfo method in callback mode - * @tc.desc set enterprise info in callback mode - */ - it('setEnterpriseInfo_test_002', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(SELFWANT); - expect(isEnabled).assertTrue(); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - - await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.setEnterpriseInfo.'); - expect(err == null).assertTrue(); - - var entInfo = await enterpriseDeviceManager.getEnterpriseInfo(SELFWANT); - expect(entInfo.name).assertEqual(COMPANYNAME2); - expect(entInfo.description).assertEqual(DESCRIPTION2); - - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(SELFWANT); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0018 - * @tc.name test getDeviceSettingsManager method in callback mode - * @tc.desc get the device settings manager in callback mode - */ - it('getDeviceSettingsManager_test_001', 0, async function (done) { - enterpriseDeviceManager.getDeviceSettingsManager((error, mgr) => { - expect(mgr !== null).assertTrue(); - }) - console.log('getDeviceSettingsManager_test_001 done'); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0021 - * @tc.name test setDateTime method in callback mode - * @tc.desc set system date time in callback mode - */ - it('setDateTime_test_002', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER); - let dsmgr = await enterpriseDeviceManager.getDeviceSettingsManager(); - expect(dsmgr !== null).assertTrue(); - console.log('before setDateTime'); - let currentTime = new Date().getTime(); - await dsmgr.setDateTime(SELFWANT, currentTime, OnReceiveEvent); - async function OnReceiveEvent(error) { - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - expect(error === null).assertTrue(); - done(); - } - }) - - /** - * @tc.number subscribeManagedEvent_test_001 - * @tc.desc Test subscribeManagedEvent method in callback mode. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_001', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_001 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error == null).assertTrue(); - console.log('enterpriseDeviceManager.subscribeManagedEvent. null 1'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_003 - * @tc.desc Test subscribeManagedEvent method in callback mode and subscribe invalid managed events. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_003', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_003 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_INVALID_EVENTS, error => { - expect(error.code == 9200008).assertTrue(); - console.log('enterpriseDeviceManager.subscribeManagedEvent. 9200008'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_005 - * @tc.desc Test subscribeManagedEvent method in callback mode subscribe when disable admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_005', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_005 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error.code == 9200001).assertTrue(); - console.log('enterpriseDeviceManager.subscribeManagedEvent. 9200001'); - resolve(0); - }); - }); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_007 - * @tc.desc Test subscribeManagedEvent method in callback mode and subscribe when enable super admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_007', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_007 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error == null).assertTrue(); - console.log('enterpriseDeviceManager.subscribeManagedEvent. null 2'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin ADMIN_TYPE_SUPER.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_001 - * @tc.desc Test unsubscribeManagedEvent method in callback mode. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_001', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_001 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error == null).assertTrue(); - console.log('enterpriseDeviceManager.unsubscribeManagedEvent. null 1'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_003 - * @tc.desc Test unsubscribeManagedEvent method in callback mode and unsubscribe invalid managed events. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_003', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_003 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_INVALID_EVENTS, error => { - expect(error.code == 9200008).assertTrue(); - console.log('enterpriseDeviceManager.unsubscribeManagedEvent. 9200008'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_005 - * @tc.desc Test unsubscribeManagedEvent method in callback mode and unsubscribe when disable admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_005', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_005 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error.code == 9200001).assertTrue(); - console.log('enterpriseDeviceManager.unsubscribeManagedEvent. 9200001'); - resolve(0); - }); - }); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_007 - * @tc.desc Test unsubscribeManagedEvent method in callback mode and unsubscribe when enable super admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_007', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_007 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - await new Promise((resolve, reject) => { - enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS, error => { - expect(error == null).assertTrue(); - console.log('enterpriseDeviceManager.unsubscribeManagedEvent. null 2'); - resolve(0); - }); - }); - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin ADMIN_TYPE_SUPER.'); - done(); - }) - }) -} diff --git a/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets b/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets deleted file mode 100644 index 0854b5f9ab77ba3710afc657217ca49aac2510e8..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets +++ /dev/null @@ -1,464 +0,0 @@ -/* - * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import { - WANT1, ENTINFO1, SELFWANT, SELFHAPNAME, COMPANYNAME2, DESCRIPTION2, ENTINFO2, - DEFAULT_USER_ID, TEST_USER_ID, ERR_USER_ID, SUBSCRIBE_EVENTS, SUBSCRIBE_INVALID_EVENTS -} from "./commom.ets"; -import enterpriseDeviceManager from '@ohos.enterpriseDeviceManager' - -export default function edmPromiseTest() { - describe('edmPromise_test', function () { - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001 - * @tc.name test enableAdmin method in promise mode without user id - * @tc.desc enable admin in promise mode - */ - it('enableAdmin_test_001', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0003 - * @tc.name test enableAdmin method in promise mode with ADMIN_TYPE_SUPER param without user id - * @tc.desc enable super admin in promise mode - */ - it('enableAdmin_test_003', 0, async function (done) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - - var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin.'); - - isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0007 - * @tc.name test enableAdmin method in promise mode with default user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_007', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertTrue(); - - - await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0009 - * @tc.name test enableAdmin method with user id in callback mode with error user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_009', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, TEST_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - expect(err != null).assertTrue(); - if (err) { - // user exsit but super admin can only be enabled in user 100 - console.log("enableAdmin_test_009 throw error code : " + err.code + "message :" + err.message); - } - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0010 - * @tc.name test enableAdmin method with user id in callback mode with error user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_010', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, ERR_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - expect(err != null).assertTrue(); - if (err) { - // user does not exsit - console.log("enableAdmin_test_010 throw error code : " + err.code + "message :" + err.message); - } - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0011 - * @tc.name test enableAdmin method in promise mode with test user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_011', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertTrue(); - - - await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0015 - * @tc.name test enableAdmin method in promise mode and disable with test user id - * @tc.desc enable admin in multi-user - */ - it('enableAdmin_test_015', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent); - async function OnReceiveEvent(err) { - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - expect(err == null).assertTrue(); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertTrue(); - - await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - } - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0022 - * @tc.name test enable super admin method in promise mode and enable twice with test user id - * @tc.desc enable and disable admin in multi-user - */ - it('enableAdmin_test_0016', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - - var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled); - expect(isEnabled).assertTrue(); - - try { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID); - } catch (error) { - expect(error != null).assertTrue(); - console.log("enableAdmin_test_016 throw error code : " + error.code + "message :" + error.message); - } - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(SELFWANT, TEST_USER_ID); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin.'); - - isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0016 - * @tc.name test setEnterpriseInfo method in promise mode - * @tc.desc set enterprise info in promise mode - */ - it('setEnterpriseInfo_test_001', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - - var isEnabled = await enterpriseDeviceManager.isAdminEnabled(SELFWANT); - expect(isEnabled).assertTrue(); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - - await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2); - console.log('enterpriseDeviceManager.setEnterpriseInfo.'); - - var entInfo = await enterpriseDeviceManager.getEnterpriseInfo(SELFWANT); - expect(entInfo.name).assertEqual(COMPANYNAME2); - expect(entInfo.description).assertEqual(DESCRIPTION2); - - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - - isEnabled = await enterpriseDeviceManager.isAdminEnabled(SELFWANT); - console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled); - expect(isEnabled).assertFalse(); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0019 - * @tc.name test getDeviceSettingsManager method in promise mode - * @tc.desc get the device settings manager in promise mode - */ - it('getDeviceSettingsManager_test_002', 0, async function (done) { - enterpriseDeviceManager.getDeviceSettingsManager().then(mgr => { - expect(mgr !== null).assertTrue(); - }) - console.log('getDeviceSettingsManager_test_002 done'); - done(); - }) - - /** - * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0020 - * @tc.name test setDateTime method in promise mode - * @tc.desc set system date time in promise mode - */ - it('setDateTime_test_001', 0, async function (done) { - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER); - let dsmgr = await enterpriseDeviceManager.getDeviceSettingsManager(); - expect(dsmgr !== null).assertTrue(); - console.log('before setDateTime'); - let currentTime = new Date().getTime(); - await dsmgr.setDateTime(SELFWANT, currentTime).catch((error)=>{ - expect(error === null).assertTrue(); - }) - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_002 - * @tc.desc Test subscribeManagedEvent method in promise mode. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_002', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_002 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error == null).assertTrue(); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_004 - * @tc.desc Test subscribeManagedEvent method in promise mode and subscribe invalid managed events. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_004', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_004 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_INVALID_EVENTS).then(() => { - }).catch((error) => { - expect(error.code == 9200008).assertTrue(); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_006 - * @tc.desc Test subscribeManagedEvent method in promise mode and subscribe when disable admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_006', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_006 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - await enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error.code == 9200001).assertTrue(); - }); - done(); - }) - - /** - * @tc.number subscribeManagedEvent_test_008 - * @tc.desc Test subscribeManagedEvent method in promise mode and subscribe when enable super admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('subscribeManagedEvent_test_008', 0, async function (done) { - console.info('-----------subscribeManagedEvent_test_008 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - await enterpriseDeviceManager.subscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error == null).assertTrue(); - }); - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin ADMIN_TYPE_SUPER.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_002 - * @tc.desc Test subscribeManagedEvent method in promise mode. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_002', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_002 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - - await enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error == null).assertTrue(); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_004 - * @tc.desc Test subscribeManagedEvent method in promise mode and unsubscribe invalid managed events. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_004', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_004 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_INVALID_EVENTS).then(() => { - }).catch((error) => { - expect(error.code == 9200008).assertTrue(); - }); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_006 - * @tc.desc Test subscribeManagedEvent method in promise mode and unsubscribe when disable admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_006', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_006 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.'); - await enterpriseDeviceManager.disableAdmin(SELFWANT); - console.log('enterpriseDeviceManager.disableAdmin.'); - await enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error.code == 9200001).assertTrue(); - }); - done(); - }) - - /** - * @tc.number unsubscribeManagedEvent_test_008 - * @tc.desc Test subscribeManagedEvent method in promise mode and unsubscribe when enable super admin. - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 1 - */ - it('unsubscribeManagedEvent_test_008', 0, async function (done) { - console.info('-----------unsubscribeManagedEvent_test_008 start-------------'); - await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1, - enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, DEFAULT_USER_ID); - console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_SUPER.'); - await enterpriseDeviceManager.unsubscribeManagedEvent(SELFWANT, SUBSCRIBE_EVENTS).then(() => { - }).catch((error) => { - expect(error == null).assertTrue(); - }); - await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME); - console.log('enterpriseDeviceManager.disableSuperAdmin ADMIN_TYPE_SUPER.'); - done(); - }) - }) -} diff --git a/customization/edm_xts_stage/entry/src/main/module.json b/customization/edm_xts_stage/entry/src/main/module.json deleted file mode 100644 index c9d8146b1f57f7c22bc30a694f0e4551b68335f5..0000000000000000000000000000000000000000 --- a/customization/edm_xts_stage/entry/src/main/module.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "tablet", - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.myapplication.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }], - "extensionAbilities": [ - { - "srcEntrance": "./ets/EnterpriseAdminAbility/EnterpriseAdminAbility.ts", - "name": "com.example.myapplication.EnterpriseAdminAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "enterpriseAdmin", - "visible": true - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.SYSTEM_FLOAT_WINDOW", - "reason": "need use ohos.permission.SYSTEM_FLOAT_WINDOW" - }, - { - "name": "ohos.permission.CAPTURE_SCREEN", - "reason": "need use ohos.permission.SYSTEM_FLOAT_WINDOW" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.ENTERPRISE_SET_DATETIME", - "reason": "need use ENTERPRISE_SET_DATETIME" - }, - { - "name": "ohos.permission.MANAGE_ENTERPRISE_DEVICE_ADMIN", - "reason": "need use MANAGE_ENTERPRISE_DEVICE_ADMIN" - }, - { - "name": "ohos.permission.SET_ENTERPRISE_INFO", - "reason": "need use SET_ENTERPRISE_INFO" - }, - { - "name": "ohos.permission.ENTERPRISE_SUBSCRIBE_MANAGED_EVENT", - "reason": "need use ENTERPRISE_SUBSCRIBE_MANAGED_EVENT" - } - ] - } -} \ No newline at end of file diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json index 81053ee05cb265d4b0510e18f1538de0a1c5d3c4..ee87a58bbb208f509c3819d6fd58b90951775ed0 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json @@ -16,9 +16,8 @@ "package": "ohos.acts.relationalStorejstest", "name": ".entry", "deviceType": [ - "tablet", - "default", - "phone" + "tablet", + "default" ], "distro": { "deliveryWithInstall": true, @@ -92,4 +91,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} \ No newline at end of file +} diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json index 85be88d3637ebecf9c74766ea7ea7f49c6b837f6..9da23290334d7b4eea829923843f7bf570fb1bab 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json @@ -9,7 +9,7 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone" + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/graphic/effectKit/BUILD.gn b/graphic/effectKit/BUILD.gn index 8abd0417a1301864a46982da91f4f3abe60a0b64..e1ca1fe23081c43635ba28ec17faa65dbbef58b4 100644 --- a/graphic/effectKit/BUILD.gn +++ b/graphic/effectKit/BUILD.gn @@ -22,7 +22,7 @@ ohos_js_hap_suite("EffectKitTest") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "EffectKitTest" + hap_name = "ActsEffectKitTest" } ohos_app_scope("effectKit_app_profile") { diff --git a/graphic/effectKit/Test.json b/graphic/effectKit/Test.json index 454cb706aac9f54331a811139a5e8ae277a24704..e7bd271c94889e8ed2398fd20ac9fad7bd3dcc38 100644 --- a/graphic/effectKit/Test.json +++ b/graphic/effectKit/Test.json @@ -8,9 +8,15 @@ }, "kits": [{ "test-file-name": [ - "EffectKitTest.hap" + "ActsEffectKitTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] }] } \ No newline at end of file diff --git a/graphic/vkgl/BUILD.gn b/graphic/vkgl/BUILD.gn index 67ae5227d8a33d1592484d43a2ef2ef793b66be6..f783259c9a42f00e848185f0165c782d023ddd57 100644 --- a/graphic/vkgl/BUILD.gn +++ b/graphic/vkgl/BUILD.gn @@ -141,7 +141,11 @@ group("VKGLCTSTest") { } action("cpvkgl") { + testonly = true script = "cpvkgl.sh" outputs = [ "${target_out_dir}/cpvkgl.log" ] - deps = [ "//third_party/VK-GL-CTS/framework/platform:glcts" ] + deps = [ + ":VKGLCTSTest", + "//third_party/vk-gl-cts/framework/platform:glcts", + ] } diff --git a/graphic/vkgl/README_zh.md b/graphic/vkgl/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..d2c781c100ad891e0908d99b7a36726b1f530250 --- /dev/null +++ b/graphic/vkgl/README_zh.md @@ -0,0 +1,146 @@ +### vkgl 测试框架介绍 + +#### 概要说明 + +vkgl 是基于开源库VK-GL-CTS（版本：opengl-es-cts-3.2.8），进行移植开发的OpenHarmony的测试套件，目录结构如下： + +```bash +. +├── BUILD.gn //编译配置 +├── comm.gni //共同编译参数 +├── cpvkgl.sh //编译打包脚本，负责打包依赖so库和依赖测试数据 +└── src + ├── ActsApp.cpp //测试项调用入口 + ├── ActsApp.h + ├── deqpgles2 //deqp gles2测试用例suite + ├── deqpgles3 //deqp gles3测试用例suite + ├── deqpgles31 //deqp gles31测试用例suite + ├── khrgles2 //khr gles2测试用例suite + ├── khrgles3 //khr gles3测试用例suite + ├── khrgles31 //khr gles31测试用例suite + ├── khrgles32 //khr gles32测试用例suite + ├── khrglesext //khr glesext测试用例suite + ├── logdefine.h //测试结果数据收集定义 + └── shrinkdefine.h //测试框架简化定义 +``` + +其中具体测试项目为： + +* deqpgles2：对应vk-gl-cts库的 gles2.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例16492条， +* deqpgles3：对应vk-gl-cts库的 gles3.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例44389条， +* deqpgles31：对应vk-gl-cts库的 gles31.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例37854条， +* khrgles2：对应vk-gl-cts库的 gles2-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例472条， +* khrgles3：对应vk-gl-cts库的 gles3-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例4079条 +* khrgles31：对应vk-gl-cts库的 gles31-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例3497条 +* khrglesext：对应vk-gl-cts库的 glesext-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例335条 + +测试套件执行流程为： +```mermaid +graph LR +测试套件 --> ActsApp --> 三方库vkgl执行单元 +``` + +#### 适配说明 + +* vkgl 测试依赖于三方库内的vk-gl-cts库，以及glslang，spirv-headers，spirv-tools三个库，对应关系如下： + +```mermaid +graph LR +vkgl --> vk-gl-cts --> glslang +vk-gl-cts --> spirv-headers +vk-gl-cts --> spirv-tools +``` + +* vk-gl-cts适配方式：在vk-gl-cts/framework/platform内增加OpenHarmony适配目录，适配目录内增加ohos适配层，针对rosen图形框架进行适配，实现对gpu驱动的加载和对应图形API的测试。 + + ```bash + vk-gl-cts/framework/platform + ├── android + ├── BUILD.gn + ├── CMakeLists.txt + ├── ios + ├── lnx + ├── null + ├── nullws + ├── ohos //OpenHarmony适配目录 + │ ├── context + │ ├── display + │ ├── rosen_context + │ ├── tcuOhosPlatform.cpp + │ ├── tcuOhosPlatform.hpp + ├── osx + ├── raspi + ├── surfaceless + ├── tcuMain.cpp + ├── vanilla + └── win32 + ``` + + +* vkgl测试套件的编译： + + * 在test/xts/acts/graphic/BUILD.gn里增加deps，如下： + + ```bash + import("//build/ohos_var.gni") + group("graphic") { + testonly = true + if (is_standard_system) { + deps = [ + "webGL:webGL_hap_test", + "windowstandard:window_hap_test", + #增加下面内容------------------------------------------ + "vkgl:cpvkgl", //vkgl测试套件入口包括vkgl测试，测试打包脚本 + #到此为止--------------------------------------------- + ] + } else { + deps = [ + "appaccount:appaccount_hap", + "osaccount:osaccount_hap", + ] + } + } + ``` + + + * vkgl测试套件的编译命令（源码根目录执行）： + + ```bash + ./build.sh --product-name rk3568 --gn-args build_xts=true --build-target "acts" --gn-args is_standard_system=true + ``` + +#### 使用说明 + +* vkgl测试套件编译完成后生成的**测试套件**使用流程如下： + + * vkgl**测试套件**会输出测试程序至两个路径： + + 1. out/rk3568/suites/acts/testcases/ + + 此路径下包括测试程序和vkgldata测试依赖库和测试数据包，具体如下： + + ```bash + ├── libdeqp_ohos_platform.z.so + ├── libdeqp_SPIRV.z.so + ├── libdeqp_SPVRemapper.z.so + ├── librosen_context.z.so + └── vkgldata.tar.gz + ``` + + 2. out/rk3568/common/common + + 此路径下的测试程序为glcts，可以直接拷贝至设备上运行，运行命令如下： + + ```bash + ./glcts --deqp-case=dEQP-GLES2.* + ``` + + --deqp-case=参数目前支持：dEQP-GLES2，dEQP-GLES3, dEQP-GLES31, KHR-GLES2, KHR-GLES3, KHR-GLES31, 号意思就是后面的全部，所以如果指定具体case就写完整路径 + + --deqp-caselist-file=参数支持直接传txt文件进行测试 + + * vkgl测试套件运行结束会生成qpa文件方便开发人员调试，qpa文件可以通过vk-gl-cts/scripts/log内的脚本进行解析，具体命令如下： + + ```bash + python2 log_to_xml.py TestResults.qpa TestResults.xml + ``` diff --git a/graphic/vkgl/comm.gni b/graphic/vkgl/comm.gni index 0f8749af6667e78c2809e2c18d62be43c2ad9e3f..ffacb29e3df86fba26b91cec51d4e3c62b521092 100644 --- a/graphic/vkgl/comm.gni +++ b/graphic/vkgl/comm.gni @@ -24,35 +24,35 @@ common_include = [ "//foundation/graphic/graphic_2d/interfaces/innerkits/vsync_module", "//foundation/graphic/graphic_2d/rosen/include/common", "//foundation/window/window_manager/interfaces/innerkits/wm", - "//third_party/VK-GL-CTS", - "//third_party/VK-GL-CTS/framework/delibs/debase", - "//third_party/VK-GL-CTS/framework/delibs/decpp", - "//third_party/VK-GL-CTS/framework/delibs/depool", - "//third_party/VK-GL-CTS/framework/delibs/dethread", - "//third_party/VK-GL-CTS/framework/delibs/deutil", - "//third_party/VK-GL-CTS/framework/delibs/destream", - "//third_party/VK-GL-CTS/framework/common", - "//third_party/VK-GL-CTS/framework/qphelper", - "//third_party/VK-GL-CTS/framework/xexml", - "//third_party/VK-GL-CTS/framework/egl", - "//third_party/VK-GL-CTS/framework/egl/wrapper", - "//third_party/VK-GL-CTS/framework/opengl", - "//third_party/VK-GL-CTS/framework/opengl/wrapper", - "//third_party/VK-GL-CTS/framework/opengl/simplereference", - "//third_party/VK-GL-CTS/framework/platform/ohos", + "//third_party/vk-gl-cts", + "//third_party/vk-gl-cts/framework/delibs/debase", + "//third_party/vk-gl-cts/framework/delibs/decpp", + "//third_party/vk-gl-cts/framework/delibs/depool", + "//third_party/vk-gl-cts/framework/delibs/dethread", + "//third_party/vk-gl-cts/framework/delibs/deutil", + "//third_party/vk-gl-cts/framework/delibs/destream", + "//third_party/vk-gl-cts/framework/common", + "//third_party/vk-gl-cts/framework/qphelper", + "//third_party/vk-gl-cts/framework/xexml", + "//third_party/vk-gl-cts/framework/egl", + "//third_party/vk-gl-cts/framework/egl/wrapper", + "//third_party/vk-gl-cts/framework/opengl", + "//third_party/vk-gl-cts/framework/opengl/wrapper", + "//third_party/vk-gl-cts/framework/opengl/simplereference", + "//third_party/vk-gl-cts/framework/platform/ohos", "//third_party/libpng", - "//third_party/VK-GL-CTS/external/openglcts/modules", - "//third_party/VK-GL-CTS/external/openglcts/modules/common", - "//third_party/VK-GL-CTS/external/openglcts/modules/gl", - "//third_party/VK-GL-CTS/external/openglcts/modules/gles2", - "//third_party/VK-GL-CTS/external/openglcts/modules/gles3", - "//third_party/VK-GL-CTS/external/openglcts/modules/gles31", - "//third_party/VK-GL-CTS/external/openglcts/modules/gles32", - "//third_party/VK-GL-CTS/external/openglcts/modules/glesext", - "//third_party/VK-GL-CTS/external/openglcts/modules/runner", - "//third_party/VK-GL-CTS/framework/referencerenderer", - "//third_party/VK-GL-CTS/modules/glshared", - "//third_party/VK-GL-CTS/framework/platform/ohos/rosen_context", + "//third_party/vk-gl-cts/external/openglcts/modules", + "//third_party/vk-gl-cts/external/openglcts/modules/common", + "//third_party/vk-gl-cts/external/openglcts/modules/gl", + "//third_party/vk-gl-cts/external/openglcts/modules/gles2", + "//third_party/vk-gl-cts/external/openglcts/modules/gles3", + "//third_party/vk-gl-cts/external/openglcts/modules/gles31", + "//third_party/vk-gl-cts/external/openglcts/modules/gles32", + "//third_party/vk-gl-cts/external/openglcts/modules/glesext", + "//third_party/vk-gl-cts/external/openglcts/modules/runner", + "//third_party/vk-gl-cts/framework/referencerenderer", + "//third_party/vk-gl-cts/modules/glshared", + "//third_party/vk-gl-cts/framework/platform/ohos/rosen_context", ] common_depends = [ @@ -63,24 +63,24 @@ common_depends = [ "//foundation/graphic/graphic_2d/rosen/samples/2d_graphics:drawing_sample_rs", "//foundation/window/window_manager/wm:libwm", "//third_party/zlib:libz", - "//third_party/VK-GL-CTS/framework/common:libdeqp_tcutil", - "//third_party/VK-GL-CTS/framework/delibs/decpp:libdeqp_decpp", - "//third_party/VK-GL-CTS/framework/delibs/debase:libdeqp_debase", - "//third_party/VK-GL-CTS/framework/delibs/deutil:libdeqp_deutil", - "//third_party/VK-GL-CTS/framework/qphelper:libdeqp_qphelper", - "//third_party/VK-GL-CTS/framework/delibs/dethread:libdeqp_dethread", - "//third_party/VK-GL-CTS/framework/xexml:libdeqp_xexml", - "//third_party/VK-GL-CTS/framework/egl:libdeqp_eglutil", - "//third_party/VK-GL-CTS/framework/egl/wrapper:libdeqp_eglwrapper", - "//third_party/VK-GL-CTS/framework/opengl:libdeqp_glutil", - "//third_party/VK-GL-CTS/framework/opengl/wrapper:libdeqp_glwrapper", - "//third_party/VK-GL-CTS/framework/opengl/simplereference:libdeqp_glutil-sglr", - "//third_party/VK-GL-CTS/modules/egl:libdeqp-egl", - "//third_party/VK-GL-CTS/modules/gles2:libdeqp-gles2", - "//third_party/VK-GL-CTS/modules/gles3:libdeqp-gles3", - "//third_party/VK-GL-CTS/modules/gles31:libdeqp-gles31", - "//third_party/VK-GL-CTS/modules/glshared:libdeqp-gl-shared", - "//third_party/VK-GL-CTS/external/openglcts/modules:libdeqp_glcts", + "//third_party/vk-gl-cts/framework/common:libdeqp_tcutil", + "//third_party/vk-gl-cts/framework/delibs/decpp:libdeqp_decpp", + "//third_party/vk-gl-cts/framework/delibs/debase:libdeqp_debase", + "//third_party/vk-gl-cts/framework/delibs/deutil:libdeqp_deutil", + "//third_party/vk-gl-cts/framework/qphelper:libdeqp_qphelper", + "//third_party/vk-gl-cts/framework/delibs/dethread:libdeqp_dethread", + "//third_party/vk-gl-cts/framework/xexml:libdeqp_xexml", + "//third_party/vk-gl-cts/framework/egl:libdeqp_eglutil", + "//third_party/vk-gl-cts/framework/egl/wrapper:libdeqp_eglwrapper", + "//third_party/vk-gl-cts/framework/opengl:libdeqp_glutil", + "//third_party/vk-gl-cts/framework/opengl/wrapper:libdeqp_glwrapper", + "//third_party/vk-gl-cts/framework/opengl/simplereference:libdeqp_glutil-sglr", + "//third_party/vk-gl-cts/modules/egl:libdeqp-egl", + "//third_party/vk-gl-cts/modules/gles2:libdeqp-gles2", + "//third_party/vk-gl-cts/modules/gles3:libdeqp-gles3", + "//third_party/vk-gl-cts/modules/gles31:libdeqp-gles31", + "//third_party/vk-gl-cts/modules/glshared:libdeqp-gl-shared", + "//third_party/vk-gl-cts/external/openglcts/modules:libdeqp_glcts", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/graphic/graphic_2d:libvsync_client", @@ -93,24 +93,24 @@ common_depends = [ "//foundation/window/window_manager/dmserver:libdms", "//foundation/window/window_manager/wm:libwm", "//foundation/window/window_manager/wmserver:libwms", - "//third_party/VK-GL-CTS/framework/platform/ohos/rosen_context:rosen_context", + "//third_party/vk-gl-cts/framework/platform/ohos/rosen_context:rosen_context", ] common_src = [ - "//third_party/VK-GL-CTS/framework/platform/ohos/context/tcuOhosNativeContext.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/context/tcuOhosEglContextFactory.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/context/tcuOhosNativeContext.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/context/tcuOhosEglContextFactory.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/tcuOhosNativeDisplay.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/tcuOhosEglDisplayFactory.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/tcuOhosNativeDisplay.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/tcuOhosEglDisplayFactory.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/window/tcuOhosNativeWindow.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/window/tcuOhosWindowFactory.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/pixmap/tcuOhosNativePixmap.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/display/pixmap/tcuOhosPixmapFactory.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/window/tcuOhosNativeWindow.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/window/tcuOhosWindowFactory.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/pixmap/tcuOhosNativePixmap.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/display/pixmap/tcuOhosPixmapFactory.cpp", - "//third_party/VK-GL-CTS/framework/platform/ohos/tcuOhosPlatform.cpp", + "//third_party/vk-gl-cts/framework/platform/ohos/tcuOhosPlatform.cpp", "logdefine.cpp", "../../ActsApp.cpp", ] -import("//third_party/VK-GL-CTS/vk_gl_cts.gni") +import("//third_party/vk-gl-cts/vk_gl_cts.gni") diff --git a/graphic/vkgl/cpvkgl.sh b/graphic/vkgl/cpvkgl.sh index d45816706a126e33d9a37495e3b1acb29f4e649b..77acf2e31ae8fd96bb3fc65df795992eafbcd027 100755 --- a/graphic/vkgl/cpvkgl.sh +++ b/graphic/vkgl/cpvkgl.sh @@ -16,9 +16,11 @@ set -e mkdir -p "suites/acts/testcases/vkgldata" -cp -rf "../../third_party/VK-GL-CTS/external/openglcts/data" "suites/acts/testcases/vkgldata" -tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "data" +cp -rf "../../third_party/vk-gl-cts/data" "suites/acts/testcases/vkgldata" +cp -rf "../../third_party/vk-gl-cts/external/openglcts/data" "suites/acts/testcases/vkgldata" +tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "." +mv "vkgldata.tar.gz" "suites/acts/testcases/vkgldata" cp -rf "common/common/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata" cp -rf "common/common/librosen_context.z.so" "suites/acts/testcases/vkgldata" -cp -rf "graphic/graphic_standard/libdeqp_SPIRV.z.so" "suites/acts/testcases/vkgldata" -cp -rf "graphic/graphic_standard/libdeqp_SPVRemapper.z.so" "suites/acts/testcases/vkgldata" \ No newline at end of file +cp -rf "graphic/graphic_standard/libdeqp_spirv.z.so" "suites/acts/testcases/vkgldata" +cp -rf "graphic/graphic_standard/libdeqp_spvremapper.z.so" "suites/acts/testcases/vkgldata" \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp index ea5b908dc3b27ad8a72596ac4ff9837324705c62..be64e7e13697e74e15359fe395edd518b21052c5 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp index f11467e47e14fae8bb3816286c06cc626526784b..ccac76a731fff0c662e62d96c403049c9f2ead19 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp index 301bf201c042728b647e76ef0695978bf63cbc9e..f6b3ece2e221d4bc569bf0ffeeb29719bdca7150 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20003TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp index 1e1e74aed2f8c7fdce90182518858ec927b62059..5f73019b8bb2cf71c483158162a3c2a352f208f1 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20004TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp index f6812201637793d24473ad6f18e2ff0bb748a119..154ee803939de766e11ffb397976abbb5bfd319f 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20005TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp index 0ce9be33b613fbca4264f1e0847ab78c27982bb2..2c19c6660deb2c6443ccd6ed761cfb6e1f1a2466 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20006TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp index 09642410a2bb080b04bcefcfd653f461f18a9976..49f50825b462de733ef1a9450b465367523490b9 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20007TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp index 307545e08326c261ea1447c4aaedaa41221b7baf..071a5d1b41b564b27a62f04aa1a2c219dadd0d16 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20008TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp index 09561052923955b7e18cb4d6abec810573787902..e64763531aeed0ca07035d31d86fa417ee4882d3 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20009TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp index 29cbb2af104d13ec7291a075bbd58606a82cbdd6..4ef38d2810854a7313000069630a6914d9f76cf4 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20010TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp index 83a923985f3f19765b8ee6f10ab2a8e0e3835bde..667670a93e6396ce31c30db0f0ac59326e295d64 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20011TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp index cb80a065d067b964d798dafe391e62a1c86865d9..8c400467f541bc22e964ab756976b224b68c4a72 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20012TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp index cb7dce7e7951e2d455a4faa0d480dda857ede50b..2974a68fcaf86015131e420c8850660c76c440f7 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20013TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp index 75fbfb1bc813cb763022203c9d7eea214eb33e59..3d2121caa112583e9bb274812079d29b0102897c 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20014TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp index abdd48bb527883a993090169f9fcd0495041c870..646f1ff27586da673c2207ab55d9901f7420238c 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20015TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp index 7d9edb346bcda60f0ae9035ab2d0cf5677af554d..b89dda7c41f0287ff8d692fd3df28f1911fbb790 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20016TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp index 02cd715606288130c7cd9a665cf44fa3ad5d451a..8c561b77e820145651cf9a3497e196822493ccf9 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles20017TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp index 30f46639aad4342957b485c43fcf80385b0cf00f..e048613bbdf4b19affa85f10bca4d9efd6d60f93 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles2TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles2/build0001/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0001/BUILD.gn index f7f1f6fa9544829c5a6c60a1b7ad670890b1154b..86ef5cfea7730a0043ad00777d4e2181a02d31b3 100644 --- a/graphic/vkgl/src/deqpgles2/build0001/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0001/BUILD.gn @@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") { defines = deqp_common_defines # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] + #defines += [ + # "DE_PTR_SIZE=4", + # "_XOPEN_SOURCE=600", + # ] } ohos_static_library("libdeqpgles2func0001") { diff --git a/graphic/vkgl/src/deqpgles2/build0001/Test.json b/graphic/vkgl/src/deqpgles2/build0001/Test.json index 6dde4d8c73ceedf52477de40822ef3c0afd13c27..fbb8db94548021b7bceac828e5b5ff3565eac704 100644 --- a/graphic/vkgl/src/deqpgles2/build0001/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0001/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0001->/data/local/tmp/ActsDeqpgles2TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0002/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0002/BUILD.gn index e2ef021be2ca4cc5d92e562ff29209e977786cd4..15d8223c2526321a3088a492072b313e08af146e 100644 --- a/graphic/vkgl/src/deqpgles2/build0002/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0002") { diff --git a/graphic/vkgl/src/deqpgles2/build0002/Test.json b/graphic/vkgl/src/deqpgles2/build0002/Test.json index afceb48805fb9e7eda00b4d0aabf4160cf659d9f..5b25ff7e0ef654ef07559fbe7680faec2d8d148e 100644 --- a/graphic/vkgl/src/deqpgles2/build0002/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0002/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0002->/data/local/tmp/ActsDeqpgles2TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0003/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0003/BUILD.gn index 49fc17e39bcfca5ba1312b193090981374fb063f..5f2bf00b38890df68610f75b310823d47a6a79c3 100644 --- a/graphic/vkgl/src/deqpgles2/build0003/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0003/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0003") { diff --git a/graphic/vkgl/src/deqpgles2/build0003/Test.json b/graphic/vkgl/src/deqpgles2/build0003/Test.json index 2a36b33a07057df0a81d14cafe00b305f2faa39e..a36c5bc117e2b3b8ac1ccf5bd582378b4976e74d 100644 --- a/graphic/vkgl/src/deqpgles2/build0003/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0003/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0003->/data/local/tmp/ActsDeqpgles2TestSuite0003", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0004/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0004/BUILD.gn index 7c87c22739a4109808d99bf0f4ca4d322b2c7779..06b5e310af161fbeda23bf7d646d145a4f493d7d 100644 --- a/graphic/vkgl/src/deqpgles2/build0004/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0004/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0004") { diff --git a/graphic/vkgl/src/deqpgles2/build0004/Test.json b/graphic/vkgl/src/deqpgles2/build0004/Test.json index 856d1e5e73ae2bd84535d2e450f7d7a9ce992579..053b332929f9bc25fc340960f979482be0520d5d 100644 --- a/graphic/vkgl/src/deqpgles2/build0004/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0004/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0004->/data/local/tmp/ActsDeqpgles2TestSuite0004", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0005/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0005/BUILD.gn index 93b2848363408f114843e849fe561053286692ab..445c08d63f515843069b1773fa00dfd8e2c99d25 100644 --- a/graphic/vkgl/src/deqpgles2/build0005/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0005/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0005") { diff --git a/graphic/vkgl/src/deqpgles2/build0005/Test.json b/graphic/vkgl/src/deqpgles2/build0005/Test.json index 5cd03e2f4b01ca19e03a5714e6633c3906d57975..40754620448146927587978c0811fc57fbfd0036 100644 --- a/graphic/vkgl/src/deqpgles2/build0005/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0005/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0005->/data/local/tmp/ActsDeqpgles2TestSuite0005", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0006/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0006/BUILD.gn index 03efbe8a52f755d209490c373bbe3e8ebe98bb83..a97cfa2a16433c803f9d56bccc7783f4df79910e 100644 --- a/graphic/vkgl/src/deqpgles2/build0006/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0006/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0006") { diff --git a/graphic/vkgl/src/deqpgles2/build0006/Test.json b/graphic/vkgl/src/deqpgles2/build0006/Test.json index abbb50d133d98c0b7cdc7fa783cd679022fce9d3..d37433ef04c2b4d271d3b3343c00d3b48845cf58 100644 --- a/graphic/vkgl/src/deqpgles2/build0006/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0006/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0006->/data/local/tmp/ActsDeqpgles2TestSuite0006", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0007/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0007/BUILD.gn index 5f8b176d872d07fd5f515f0c567e0fffbd659bbd..303db614e08ff4a8392b0e353b280fef6b741f9c 100644 --- a/graphic/vkgl/src/deqpgles2/build0007/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0007/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0007") { diff --git a/graphic/vkgl/src/deqpgles2/build0007/Test.json b/graphic/vkgl/src/deqpgles2/build0007/Test.json index 7bd3b5312aae3729e85cb0261f71a9b964c9537c..3b26cba4525972acafc525c2c62d88f1493a51ed 100644 --- a/graphic/vkgl/src/deqpgles2/build0007/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0007/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0007->/data/local/tmp/ActsDeqpgles2TestSuite0007", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0008/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0008/BUILD.gn index 3dd2e40218c8fb726b6ab5b6f566aef60bf264ef..403a3108fc86cb7de3cf9edcbd5905b8200f740e 100644 --- a/graphic/vkgl/src/deqpgles2/build0008/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0008/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0008") { diff --git a/graphic/vkgl/src/deqpgles2/build0008/Test.json b/graphic/vkgl/src/deqpgles2/build0008/Test.json index 342c17102370fe3de7418b22b99edc927769a756..96f514875a53cb102da05a3ec4258be4a0a34fdb 100644 --- a/graphic/vkgl/src/deqpgles2/build0008/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0008/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0008->/data/local/tmp/ActsDeqpgles2TestSuite0008", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0009/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0009/BUILD.gn index 1f98e89e0d8874abd6e080fb60ae4df2d49d0bfa..16dabbb9bf5bead8d2c4a08f19a702d1df34ea24 100644 --- a/graphic/vkgl/src/deqpgles2/build0009/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0009/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0009") { diff --git a/graphic/vkgl/src/deqpgles2/build0009/Test.json b/graphic/vkgl/src/deqpgles2/build0009/Test.json index 8a6d5de0354ec9dc12d96ab755a85377bd605c0d..26e4e090f01a02fc846605ae4c8d6aab96b54f07 100644 --- a/graphic/vkgl/src/deqpgles2/build0009/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0009/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0009->/data/local/tmp/ActsDeqpgles2TestSuite0009", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0010/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0010/BUILD.gn index 1f4d4ec8ab1ea9aa60f5be358ab5b7cf77f69da9..0b797803e1041a6d562d87ad10d42ad2bc69dc83 100644 --- a/graphic/vkgl/src/deqpgles2/build0010/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0010/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0010") { diff --git a/graphic/vkgl/src/deqpgles2/build0010/Test.json b/graphic/vkgl/src/deqpgles2/build0010/Test.json index 5c796905397d734c74910edf1b2d1be3623db175..5cad046b03e37e0e1f96ecff735a99eb3072af11 100644 --- a/graphic/vkgl/src/deqpgles2/build0010/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0010/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0010->/data/local/tmp/ActsDeqpgles2TestSuite0010", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0011/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0011/BUILD.gn index 8b434fe5e12af55de742a8585c70d9fc401c93a3..46a9753a39ce22584a98e21912395624adc6e963 100644 --- a/graphic/vkgl/src/deqpgles2/build0011/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0011/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0011") { diff --git a/graphic/vkgl/src/deqpgles2/build0011/Test.json b/graphic/vkgl/src/deqpgles2/build0011/Test.json index 36353898ecdcb9a8545af69a4d2a5df106f20383..77a16a3233429674e93b8027b6f718abf3bfb6c9 100644 --- a/graphic/vkgl/src/deqpgles2/build0011/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0011/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0011->/data/local/tmp/ActsDeqpgles2TestSuite0011", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0012/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0012/BUILD.gn index b074052485acce7a89a07281371e9d5c4d6f8219..4eff97bb34543495a27335356ee8ba26f10a4e33 100644 --- a/graphic/vkgl/src/deqpgles2/build0012/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0012/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0012") { diff --git a/graphic/vkgl/src/deqpgles2/build0012/Test.json b/graphic/vkgl/src/deqpgles2/build0012/Test.json index 5ecb8d12da5eed130b08a31f8f29d9a15cee4d9f..8cb6e5b425db82f3e9aa72452096057e69b24ea3 100644 --- a/graphic/vkgl/src/deqpgles2/build0012/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0012/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0012->/data/local/tmp/ActsDeqpgles2TestSuite0012", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0013/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0013/BUILD.gn index b00150f0f153a12c4b8af309d63072311f9bb93a..ccce80b0108bcfeb9bcc27796c6a7ace27cd2e88 100644 --- a/graphic/vkgl/src/deqpgles2/build0013/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0013/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0013") { diff --git a/graphic/vkgl/src/deqpgles2/build0013/Test.json b/graphic/vkgl/src/deqpgles2/build0013/Test.json index 339dab3591bf0dcaab72c0862ee8067ed667efed..db41707b5dfc281de7fc7f83a2a07c4d7968f4a6 100644 --- a/graphic/vkgl/src/deqpgles2/build0013/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0013/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0013->/data/local/tmp/ActsDeqpgles2TestSuite0013", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0014/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0014/BUILD.gn index cb6be1ed88b0492df501dadd7667c9e1477409c2..ebfdc6fd35fd031ebcaac06652c8cffe03df0ac4 100644 --- a/graphic/vkgl/src/deqpgles2/build0014/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0014/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0014") { diff --git a/graphic/vkgl/src/deqpgles2/build0014/Test.json b/graphic/vkgl/src/deqpgles2/build0014/Test.json index 9253e74af3160829ac851e5ce955d69c5e1fa7fa..3c371da8138814836f588a8e96740f0f4c3e110b 100644 --- a/graphic/vkgl/src/deqpgles2/build0014/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0014/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0014->/data/local/tmp/ActsDeqpgles2TestSuite0014", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0015/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0015/BUILD.gn index 56f0cbce83ff044a99077c137a99861eadf6456f..ac806e2a67016836c7158198822c81e4cee6b002 100644 --- a/graphic/vkgl/src/deqpgles2/build0015/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0015/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0015") { diff --git a/graphic/vkgl/src/deqpgles2/build0015/Test.json b/graphic/vkgl/src/deqpgles2/build0015/Test.json index 8b60399190dc3ec0756267225ee21057281c9221..055fc126a6317d243754466cf8205cec686e9cb4 100644 --- a/graphic/vkgl/src/deqpgles2/build0015/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0015/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0015->/data/local/tmp/ActsDeqpgles2TestSuite0015", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0016/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0016/BUILD.gn index 8770125ad7246fdffdcecf4a96c44df9f0c453a6..e542b491e2c977e73e4e0232199f5e1576240fa2 100644 --- a/graphic/vkgl/src/deqpgles2/build0016/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0016/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0016") { diff --git a/graphic/vkgl/src/deqpgles2/build0016/Test.json b/graphic/vkgl/src/deqpgles2/build0016/Test.json index ddb44c8f4caea1ac5abcb20375ebd423a69452b1..a592eebb4f3ba4cd738d09e23f1a7a0191bd994d 100644 --- a/graphic/vkgl/src/deqpgles2/build0016/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0016/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0016->/data/local/tmp/ActsDeqpgles2TestSuite0016", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles2/build0017/BUILD.gn b/graphic/vkgl/src/deqpgles2/build0017/BUILD.gn index b6b2e0d86656b06b18abc7c0ebf3f510f4026bae..cdd8e2cd92dcb0e386f154695e81c0a80da72428 100644 --- a/graphic/vkgl/src/deqpgles2/build0017/BUILD.gn +++ b/graphic/vkgl/src/deqpgles2/build0017/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles2func0017") { diff --git a/graphic/vkgl/src/deqpgles2/build0017/Test.json b/graphic/vkgl/src/deqpgles2/build0017/Test.json index 479b2be9b071dc0b1ce3da0384fca81507cec3ce..e4f8a91c26f2512572890beaad56b66f978a9020 100644 --- a/graphic/vkgl/src/deqpgles2/build0017/Test.json +++ b/graphic/vkgl/src/deqpgles2/build0017/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles2TestSuite0017->/data/local/tmp/ActsDeqpgles2TestSuite0017", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp index 10c74cf7a3de3b102bdfc91f2cca353e7d150f15..3f6b9343a20ddff4b3ca8091ff7ddd8522128003 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp index 6bbbf81b7eebb520ef0f5214174a595c922c766a..28a9c191ee731a9b86cac3e1968e51abd260508e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp index c61c8ab071eb44e23be9a8230ddb07826e75b31a..75625154b3f4e7424ba01a2b08a2b0a5a4770786 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30003TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp index 156816ae027555c17c4ddc0120b8b6656dafc99d..073b67adbe1c29380f3e80907008ee82c8d87405 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30004TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp index 008f6d11e1ebd2d569530d25615f72653c65ef6a..49bb569c78815f21ad6e68961fae23ac5fcfdfb9 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30005TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp index d7ffcf5ffa2edaa39e76a665c6e2fd724628579a..28b4ca14e34561fc938841e48ab7218366f3ea3e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30006TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp index cac4f2f18001c6d540ca8388eee073425bbacf9c..bb62c3c3b06ec9b15c539a86345e438b6a9be379 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30007TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp index 102fe9b29209ea85c9bcdef9abc6061ad712c515..41ab790f71a394938f5f021fbbf24f37c7c99eea 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30008TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp index f7e94997adb21b27f6fd24b41a2ffdbab4a900a3..c1511cf4b9c2e9b10e449791c49c4a3747dcb496 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30009TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp index e7cda59e72e0a952b46287d015c5245f58b38589..ffd09ebaf9f001c42b5734c91759ca6401781b3e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30010TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp index a10a2fcda8408a9146e69983cb33d9d9e48c96be..4f02313dcdb2f4d52cfdcd3fd3ddcc2d3e783064 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30011TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp index 2a68afa4bace6e4ab92169d6f5240755f3bab918..7b1a3004e0f0c2db9ae795633e9e1d3c82f8f636 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30012TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp index c7c18d2eb548b0dca5ef4b7759d73e81d33b795d..fcf1704beca3a74d85a7f3e50c585e74b73e7c2f 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30013TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp index b624aedefa883a3824019cb1ef66b881f6f2c175..8aa6a121a8e2f839fba8c1e7105489df7399037b 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30014TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp index af23655f884d0fb7b0c75cf2330a5d66ed1a619a..922a8275e41b8cf254d7ed6b04fb4a8ffcbfcec7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30015TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp index 8eeae558752a9688264b86b7a9fba4f936d0d9c8..7944da7a2ef368d874a07aff5fd528c781f3ef3b 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30016TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp index 91588f65215abf51ec600d8741d360dc54ace8bf..fb507bd44898e368a6f9150ce753138c26a68519 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30017TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp index 4f08867360c72457c1348f8fa556b8c0618467c9..8978337071dbe85eba3e85b4a3ec0bfca15419e6 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30018TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp index 75db6a510ce035a3bff08b4328b69c110a113d34..07a3a8b15060ebb7c0417eae1e3e5f345f8bc573 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30019TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp index 40e4614e29c3d16d43c934292c930fe0ddd266dd..a74a3a8bccaae4d54d6f07c865dcec55bcc5917d 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30020TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp index ae9ff5c24460263956aff6716193188fbb94c7d2..0d21e93104d67073377c6dac5098257bb056a703 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30021TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp index 832cedd5c1cdb7061219b0a6c0e2635469114c18..666eff6d7612c3cd36fdd952858fde029497e8c8 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30022TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp index 78e1f03059bd4b5e15008e2ad4283f51133d706c..8b695bb837fe4426677c4fca75fce2e2105c082e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30023TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp index f4f1e7b280d69908b69ff3893037f5da61c627e0..4135bc9e2f7eeafe2ef059b19f477f4138c3ba4d 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30024TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp index bd9bca8eeccbcfe2084f50e9335d09489f26f8dd..c88556c13a7180bbf73a786b817ccce5df09afa6 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30025TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp index 29b854b7c6b18a342302209d919f9294625a0121..73c36dac39219ee492f03d0fa596e2c276729bfb 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30026TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp index 5aabfba7fb815ed301680a0d3240945e3502d5f3..5917d994e3890fe37713560dc6e270f80a01254d 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30027TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp index 1fdf689195975a03ac5553358e34e2a8378ef5cf..8aa0332404916ee1c58be3f67473ebee4a44d57c 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30028TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp index 48c74d697dbcdd54643e73b868717bb85b6fa457..5f2118245bc7c38c9565d8b5ec01e1faf5b05f00 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30029TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp index 059237a2fdf20b26640784bb0335ec2a9c4dfda9..879edf14f13ab1d7c39831099acac27c64f2e308 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30030TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp index 228bd912367dc37a70df7bca1058794998d61f7d..de62b1657354417de8bb0bd937db4889dd6da1a0 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30031TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp index 706c021f00ca1d4f8da15ab34dff5ae7193975a2..590b05b13adb683964263201a88d003d59892e98 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30032TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp index 0018f26fe6b2d87707796b6dde2a573aa65c60c8..03c52f274cbeae67d51cefff40e56d8106a13a38 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30033TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp index e1c31e8e24fa72d9224699def3658d6f51a34cf4..7571296bb2267daa69632e14f27414f69e0f68f3 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30034TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp index a825e3e030710a752255e27e7f7d29ded40b5a51..dfe8c3518911d86319636a917d976278f8069cce 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30035TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp index 564c8dad36a730ce30930975ab81444bbebe981d..abc06ef8ac7c153ec432bd6a244a4ef6d01d4ff1 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30036TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp index 3e6229da3ee3c332f47de54fb32345583dd85863..28c5b152023191ef37bd78355e96c08692cae81d 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30037TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp index 9ad721f5f152339f4563ddc87b4a7f53759262dd..437c34b66bb14c091b41ad28f273812dd2f41b44 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30038TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp index 092ede7e23e4536aaf6b413407fef410ad9ab7f2..2350e7d654bf318cd0402ca9ab252770830f24ff 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30039TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp index 206a18e1abed6b440516285fa544e359b8fcc262..29db5a12c594890d1f97c2f1a15df7781696edc9 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30040TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp index 29dcf05773d281b76683c8a614b7889187d0ad79..5ece307fe65a6b5cf04c3b41aa1b1f450926b4e3 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30041TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp index b65c5c378222c81b0ddd872c8cfad7d57f2b0e00..ea83f9fb65cb02a94057a49451129f8e49980e33 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30042TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp index d616f17236ceddf596aefc89f168b0810c8ff562..8a7d929204bd55d145b10c346e4aff076fcb2141 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30043TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp index 3ab2af31055d7453587c837a16a40ad85ef61785..94d09fe535e591de30ff92d7b90aef22613ad1fc 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30044TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp index b19f9f353fb13210d4be29e33c19e097a061adf3..642bca40e5759ae36917c96c180a4b9b28634dd4 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles30045TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp index 493a606d89de0bd9306131e58e649c4e9707ae46..81fc58436dd2408390deb077241f5e85bc5ab28c 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles3TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles3/build0001/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0001/BUILD.gn index 6c8b3e0eca48c171788560811c527f116eb6698d..cf89c17209751abdda8bdfd91ae66dd3779165c6 100644 --- a/graphic/vkgl/src/deqpgles3/build0001/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0001") { diff --git a/graphic/vkgl/src/deqpgles3/build0001/Test.json b/graphic/vkgl/src/deqpgles3/build0001/Test.json index 054111bd26c045e65e4b972a3526a610c19f72ba..2da53d83247019dcdfaa0c302ba41988cb08dd17 100644 --- a/graphic/vkgl/src/deqpgles3/build0001/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0001/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0001->/data/local/tmp/ActsDeqpgles3TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0002/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0002/BUILD.gn index 7de73b179896fb3cd2c17f018f5e93a06f399e00..82a8fa0272db6317b2fbd1c4e9d74d7db2e372e2 100644 --- a/graphic/vkgl/src/deqpgles3/build0002/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0002") { diff --git a/graphic/vkgl/src/deqpgles3/build0002/Test.json b/graphic/vkgl/src/deqpgles3/build0002/Test.json index 96a6e5acc162a9d385b83c45b46a381817d8938e..70a0159a0141b640db6639f58ecf490267781c20 100644 --- a/graphic/vkgl/src/deqpgles3/build0002/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0002/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0002->/data/local/tmp/ActsDeqpgles3TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0003/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0003/BUILD.gn index e5414355d4fb054c0fa88357dc513d7e73dfdf73..2c8b4368261ae4319dc45f4aea8c40f9956bd9bc 100644 --- a/graphic/vkgl/src/deqpgles3/build0003/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0003/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0003") { diff --git a/graphic/vkgl/src/deqpgles3/build0003/Test.json b/graphic/vkgl/src/deqpgles3/build0003/Test.json index 6e67b4c56a3ac45ffcb049bca10fc3178617866a..b2ee1bdcf5832fdcce36dc78024d94069ec6c422 100644 --- a/graphic/vkgl/src/deqpgles3/build0003/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0003/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0003->/data/local/tmp/ActsDeqpgles3TestSuite0003", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0004/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0004/BUILD.gn index 8862e0c8524ef84df16104df75b97f4e5c83b91d..b1a4b15db55552053b831ecc1102abe6395532be 100644 --- a/graphic/vkgl/src/deqpgles3/build0004/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0004/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0004") { diff --git a/graphic/vkgl/src/deqpgles3/build0004/Test.json b/graphic/vkgl/src/deqpgles3/build0004/Test.json index 29ff607891cc1fe692fb35771a45013f88c5be2d..727592956ee9cc4b49f28ab6339a724ad0997323 100644 --- a/graphic/vkgl/src/deqpgles3/build0004/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0004/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0004->/data/local/tmp/ActsDeqpgles3TestSuite0004", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0005/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0005/BUILD.gn index 82be586aac6a1a483b0d83ec85a43ee2e5c66f4a..ecdb81ce3e2bd6ec907865cb20342957faa00378 100644 --- a/graphic/vkgl/src/deqpgles3/build0005/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0005/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0005") { diff --git a/graphic/vkgl/src/deqpgles3/build0005/Test.json b/graphic/vkgl/src/deqpgles3/build0005/Test.json index d963e80809cf56006dc527a1baa8bcae11b2a09c..dc1c565467b968d3e33f2f3c21445f3c9f847a33 100644 --- a/graphic/vkgl/src/deqpgles3/build0005/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0005/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0005->/data/local/tmp/ActsDeqpgles3TestSuite0005", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0006/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0006/BUILD.gn index 92418caa2e22f08c179d19ae587e729626a1de21..e0c95c17e08a6b41cce99ff01fed9059e6d24ca5 100644 --- a/graphic/vkgl/src/deqpgles3/build0006/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0006/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0006") { diff --git a/graphic/vkgl/src/deqpgles3/build0006/Test.json b/graphic/vkgl/src/deqpgles3/build0006/Test.json index 2e02dd1a2780ea838b1c4d9898c356db669140c4..5dd143ddf4783692291b213ad8bc5c855ab24e34 100644 --- a/graphic/vkgl/src/deqpgles3/build0006/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0006/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0006->/data/local/tmp/ActsDeqpgles3TestSuite0006", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0007/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0007/BUILD.gn index 37ec289cddfe7a4424089c431c2daf5e3b2fa084..4afbbab4baf6c93c74a9cbdb53191c05b704530f 100644 --- a/graphic/vkgl/src/deqpgles3/build0007/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0007/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0007") { diff --git a/graphic/vkgl/src/deqpgles3/build0007/Test.json b/graphic/vkgl/src/deqpgles3/build0007/Test.json index 3b0b655ac0b64a51e67e44a8a8058005a5fd1b0a..33fbb9c6b438fdfcfdd6affcb2c61d64e1197436 100644 --- a/graphic/vkgl/src/deqpgles3/build0007/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0007/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0007->/data/local/tmp/ActsDeqpgles3TestSuite0007", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0008/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0008/BUILD.gn index 1bbce0fed30ffe229665d97ec3d6951df8067aad..70ebd74a775d91164e723f7745b97efb4b8364a1 100644 --- a/graphic/vkgl/src/deqpgles3/build0008/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0008/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0008") { diff --git a/graphic/vkgl/src/deqpgles3/build0008/Test.json b/graphic/vkgl/src/deqpgles3/build0008/Test.json index 873543e826236898a67f0e1065a834f592de57ef..149fd729d3932a46a968e3198c8f72eb1cdc5aff 100644 --- a/graphic/vkgl/src/deqpgles3/build0008/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0008/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0008->/data/local/tmp/ActsDeqpgles3TestSuite0008", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0009/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0009/BUILD.gn index 4afad841bbff6d4928c6cfcef8c174161f80bf5d..548ae63447540414d700bfc6d99dbd1d19ff2560 100644 --- a/graphic/vkgl/src/deqpgles3/build0009/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0009/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0009") { diff --git a/graphic/vkgl/src/deqpgles3/build0009/Test.json b/graphic/vkgl/src/deqpgles3/build0009/Test.json index 19fd51428ff6247de8e6973462444e0bf67f1c7d..ff886c04362233cbf68013e26db4f18d55aa4486 100644 --- a/graphic/vkgl/src/deqpgles3/build0009/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0009/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0009->/data/local/tmp/ActsDeqpgles3TestSuite0009", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0010/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0010/BUILD.gn index b86a3690ca7af61c38d821a2e0381975d6ed294c..46536f5b492c318255ee12524804796e4995f4c3 100644 --- a/graphic/vkgl/src/deqpgles3/build0010/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0010/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0010") { diff --git a/graphic/vkgl/src/deqpgles3/build0010/Test.json b/graphic/vkgl/src/deqpgles3/build0010/Test.json index ef39295fb2e310b7a5ec0c08007ea063da6eb341..842a50bae2df98424cf30991e6bfd6b6b0f1227f 100644 --- a/graphic/vkgl/src/deqpgles3/build0010/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0010/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0010->/data/local/tmp/ActsDeqpgles3TestSuite0010", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0011/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0011/BUILD.gn index 000d0c36d29659e44e218d6e18c93c02d50904b1..6e4d28d5d5436476a89393bc12218e5d67a4f4d0 100644 --- a/graphic/vkgl/src/deqpgles3/build0011/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0011/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0011") { diff --git a/graphic/vkgl/src/deqpgles3/build0011/Test.json b/graphic/vkgl/src/deqpgles3/build0011/Test.json index d756da576182c3aadbdabcad308b65089e96e726..340a60af94c7ba9ba31fe0c77162341a3868643b 100644 --- a/graphic/vkgl/src/deqpgles3/build0011/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0011/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0011->/data/local/tmp/ActsDeqpgles3TestSuite0011", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0012/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0012/BUILD.gn index 54fad4e6ff3f3633965a4d5726e64735aaff3c4d..6dc62a3177372854c6daa613ef7f6cba6287a182 100644 --- a/graphic/vkgl/src/deqpgles3/build0012/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0012/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0012") { diff --git a/graphic/vkgl/src/deqpgles3/build0012/Test.json b/graphic/vkgl/src/deqpgles3/build0012/Test.json index 7230c645da77cacd3c1e5429174a11735938d17f..f36911c248f7e8193789525cecdc48e408a0106c 100644 --- a/graphic/vkgl/src/deqpgles3/build0012/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0012/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0012->/data/local/tmp/ActsDeqpgles3TestSuite0012", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0013/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0013/BUILD.gn index 01b560e9cca4f6f03a88c6466cb00c4e8296156b..d0aa807e20190239ea9156095236e430199d0407 100644 --- a/graphic/vkgl/src/deqpgles3/build0013/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0013/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0013") { diff --git a/graphic/vkgl/src/deqpgles3/build0013/Test.json b/graphic/vkgl/src/deqpgles3/build0013/Test.json index 4ed40012effe9d4ac18c522441fd4f6a26f7a3dc..844ed27bdd42b6d2b450c21bafe6a4b4bdd89240 100644 --- a/graphic/vkgl/src/deqpgles3/build0013/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0013/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0013->/data/local/tmp/ActsDeqpgles3TestSuite0013", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0014/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0014/BUILD.gn index 621d3908cb0a87fa37592febc01b4c2dcaa39494..8a2f8ab19cf8d3031440e1a108a06684aa62306e 100644 --- a/graphic/vkgl/src/deqpgles3/build0014/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0014/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0014") { diff --git a/graphic/vkgl/src/deqpgles3/build0014/Test.json b/graphic/vkgl/src/deqpgles3/build0014/Test.json index 731ec6eb3e7c36e72d41e2366fedabbf99ca26ea..63ae68b00127752e9dd880fd03de2766f0f15d14 100644 --- a/graphic/vkgl/src/deqpgles3/build0014/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0014/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0014->/data/local/tmp/ActsDeqpgles3TestSuite0014", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0015/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0015/BUILD.gn index 82b8207db261d3da5ceae6807a4ac8faf8cba7ee..06aacac034bb56b64cd6f15a10b1cc707c520a70 100644 --- a/graphic/vkgl/src/deqpgles3/build0015/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0015/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0015") { diff --git a/graphic/vkgl/src/deqpgles3/build0015/Test.json b/graphic/vkgl/src/deqpgles3/build0015/Test.json index 82c2484583834d63c58f3b3b2105a8b6750e6173..af7d75f33469ecc239c0b33acb7821233a5f064f 100644 --- a/graphic/vkgl/src/deqpgles3/build0015/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0015/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0015->/data/local/tmp/ActsDeqpgles3TestSuite0015", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0016/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0016/BUILD.gn index 7a850cf5a8cde21f6211dd704b19cfc4aa3fcf3d..3a8e67ebd831739201101818d3c417f108a6da75 100644 --- a/graphic/vkgl/src/deqpgles3/build0016/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0016/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0016") { diff --git a/graphic/vkgl/src/deqpgles3/build0016/Test.json b/graphic/vkgl/src/deqpgles3/build0016/Test.json index 0b0bff822f4d83a914d95bb66adad1a976e7c966..d96056b56bed8c572f9d500c608e13b2b5b8958a 100644 --- a/graphic/vkgl/src/deqpgles3/build0016/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0016/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0016->/data/local/tmp/ActsDeqpgles3TestSuite0016", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0017/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0017/BUILD.gn index 62f05d1a2adadefdbb660be0fe3900081351b957..2f20114b19d9479ab37afad9e87184e708323ade 100644 --- a/graphic/vkgl/src/deqpgles3/build0017/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0017/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0017") { diff --git a/graphic/vkgl/src/deqpgles3/build0017/Test.json b/graphic/vkgl/src/deqpgles3/build0017/Test.json index a2e9e3dce6c4a4e783eb79383028b691d2604a3a..fb47d8fb273b9ea1db7a1ae03414bdbab780e9d5 100644 --- a/graphic/vkgl/src/deqpgles3/build0017/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0017/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0017->/data/local/tmp/ActsDeqpgles3TestSuite0017", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0018/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0018/BUILD.gn index bb1004c59298073b008e1b4103ff07cc7975593b..f98e22bd2fac371aa43572e28035ff4b4a2cae5f 100644 --- a/graphic/vkgl/src/deqpgles3/build0018/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0018/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0018") { diff --git a/graphic/vkgl/src/deqpgles3/build0018/Test.json b/graphic/vkgl/src/deqpgles3/build0018/Test.json index dce172de33ea8d3a0d6b7201a3a047d6cb87204d..bb80d7d5219db4ec8addd6829679e6d66345a66a 100644 --- a/graphic/vkgl/src/deqpgles3/build0018/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0018/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0018->/data/local/tmp/ActsDeqpgles3TestSuite0018", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0019/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0019/BUILD.gn index 56c128bad069669944e909c86b523cf62a0394ac..9db76ecb6493816ab0ffd279ba31de390fc0af7d 100644 --- a/graphic/vkgl/src/deqpgles3/build0019/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0019/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0019") { diff --git a/graphic/vkgl/src/deqpgles3/build0019/Test.json b/graphic/vkgl/src/deqpgles3/build0019/Test.json index b052faa7e6c48e70b928fb93af8e15d1c68c3f2c..07c5e628fbf8646d70d2ae6a27eed6d4bfb88533 100644 --- a/graphic/vkgl/src/deqpgles3/build0019/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0019/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0019->/data/local/tmp/ActsDeqpgles3TestSuite0019", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0020/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0020/BUILD.gn index e01ba8a2d9cb72147a65437cfe6afdee85c23f14..971aac8b6686ec4d24f2674f7f36b5863f9b282e 100644 --- a/graphic/vkgl/src/deqpgles3/build0020/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0020/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0020") { diff --git a/graphic/vkgl/src/deqpgles3/build0020/Test.json b/graphic/vkgl/src/deqpgles3/build0020/Test.json index cb7a3a181edb1a56d360aa99bc11d87ef32a7e9b..f6e0031ee62434644625e71b1af2fb2f979ca0ae 100644 --- a/graphic/vkgl/src/deqpgles3/build0020/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0020/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0020->/data/local/tmp/ActsDeqpgles3TestSuite0020", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0021/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0021/BUILD.gn index 4afa82fb6a46b91ef16db1b25b8b93606138fb9a..f5d0b6d25afe1adddf1ff19998cba9d70b615b4f 100644 --- a/graphic/vkgl/src/deqpgles3/build0021/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0021/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0021") { diff --git a/graphic/vkgl/src/deqpgles3/build0021/Test.json b/graphic/vkgl/src/deqpgles3/build0021/Test.json index 1bf3184696272a361a92caae727f76c92325cdff..3fd8287c8e4b838c004ae578962792a9b7a7acea 100644 --- a/graphic/vkgl/src/deqpgles3/build0021/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0021/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0021->/data/local/tmp/ActsDeqpgles3TestSuite0021", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0022/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0022/BUILD.gn index de9e2c0ff02043bb48265fff262dc7623ef62784..8bc3091070ae148f1b6b72db5451da3c78e368ea 100644 --- a/graphic/vkgl/src/deqpgles3/build0022/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0022/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0022") { diff --git a/graphic/vkgl/src/deqpgles3/build0022/Test.json b/graphic/vkgl/src/deqpgles3/build0022/Test.json index 74dfac8ea31c8ccc38401d4bb9b57bb5473a75bd..6881b708228fccb8980c301aeb2eb322613fb646 100644 --- a/graphic/vkgl/src/deqpgles3/build0022/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0022/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0022->/data/local/tmp/ActsDeqpgles3TestSuite0022", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0023/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0023/BUILD.gn index 30fae889ed441e7b4fa444d99af9499c3cc63a02..09fddcbc2ab06376c05a2b4c6d40571b091e1ec9 100644 --- a/graphic/vkgl/src/deqpgles3/build0023/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0023/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0023") { diff --git a/graphic/vkgl/src/deqpgles3/build0023/Test.json b/graphic/vkgl/src/deqpgles3/build0023/Test.json index 7d4fd835b2a557925645fbc28a54ae898df3391b..5e6a470bbd90e243dedacb803d8c9b0116561f52 100644 --- a/graphic/vkgl/src/deqpgles3/build0023/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0023/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0023->/data/local/tmp/ActsDeqpgles3TestSuite0023", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0024/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0024/BUILD.gn index 5e61a476a703205e32a3200b471ff9c6c1a427e9..38a5f9b29298dc4e0de2838899ca3132b6c9b296 100644 --- a/graphic/vkgl/src/deqpgles3/build0024/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0024/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0024") { diff --git a/graphic/vkgl/src/deqpgles3/build0024/Test.json b/graphic/vkgl/src/deqpgles3/build0024/Test.json index b21d346b162d95b00db65e4100a01c4cafa3e97b..de85b74801f8cd7fe374500c0e4f08521d8228b4 100644 --- a/graphic/vkgl/src/deqpgles3/build0024/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0024/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0024->/data/local/tmp/ActsDeqpgles3TestSuite0024", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0025/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0025/BUILD.gn index e56b50ea7b91f86e1c29ac455176c03cb98d2434..344a631447322ea08bec3cfe817f4296a6ca8df7 100644 --- a/graphic/vkgl/src/deqpgles3/build0025/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0025/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0025") { diff --git a/graphic/vkgl/src/deqpgles3/build0025/Test.json b/graphic/vkgl/src/deqpgles3/build0025/Test.json index 21be3ed8dac5c42784b46a6170c68d54d439a4f3..52b3b7e8b4fa9c22899f67aa52e92dd64b6af759 100644 --- a/graphic/vkgl/src/deqpgles3/build0025/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0025/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0025->/data/local/tmp/ActsDeqpgles3TestSuite0025", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0026/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0026/BUILD.gn index ef0de9d92e2d11a4cabceb6624a625c75f4a1be4..19e12a76c41f90485f9796becb57a535f731dce4 100644 --- a/graphic/vkgl/src/deqpgles3/build0026/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0026/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0026") { diff --git a/graphic/vkgl/src/deqpgles3/build0026/Test.json b/graphic/vkgl/src/deqpgles3/build0026/Test.json index 875b71bbfe26ebab203063d15c3c95273f6a5933..b08a6958289b918bc12a4f1393355026a36a20ce 100644 --- a/graphic/vkgl/src/deqpgles3/build0026/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0026/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0026->/data/local/tmp/ActsDeqpgles3TestSuite0026", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0027/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0027/BUILD.gn index 0eae30a7d52e82fe88b577a4302d2d43a84e123d..c2603051b04a43420536931c327cbb35a88e6947 100644 --- a/graphic/vkgl/src/deqpgles3/build0027/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0027/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0027") { diff --git a/graphic/vkgl/src/deqpgles3/build0027/Test.json b/graphic/vkgl/src/deqpgles3/build0027/Test.json index a127bf5e5422451a56f59407239aec0d5166ac2f..4cae8a67a4830052be7fa32dd23d01200fd49894 100644 --- a/graphic/vkgl/src/deqpgles3/build0027/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0027/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0027->/data/local/tmp/ActsDeqpgles3TestSuite0027", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0028/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0028/BUILD.gn index 6237e4e4fe977485635622e98514ac89066cf00f..cba2550eae83137e552443e8d8919663c7c6e971 100644 --- a/graphic/vkgl/src/deqpgles3/build0028/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0028/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0028") { diff --git a/graphic/vkgl/src/deqpgles3/build0028/Test.json b/graphic/vkgl/src/deqpgles3/build0028/Test.json index 3008d441a0615d5a0116ebc2dc447cc19a9ea9ba..d7b8ec6041b4b9bdc58c46f4caeb0ac15618eb79 100644 --- a/graphic/vkgl/src/deqpgles3/build0028/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0028/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0028->/data/local/tmp/ActsDeqpgles3TestSuite0028", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0029/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0029/BUILD.gn index 8167c4bb220cb788f058c5a867828b248012c84b..51661b77ab9aee29a9777e80d419317c531c8347 100644 --- a/graphic/vkgl/src/deqpgles3/build0029/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0029/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0029") { diff --git a/graphic/vkgl/src/deqpgles3/build0029/Test.json b/graphic/vkgl/src/deqpgles3/build0029/Test.json index b1de8039ea40be8466a269d51f4b71560f7e2203..d04a0cb36392f5ef63550f885a3c3a459457795c 100644 --- a/graphic/vkgl/src/deqpgles3/build0029/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0029/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0029->/data/local/tmp/ActsDeqpgles3TestSuite0029", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0030/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0030/BUILD.gn index f926a396387d11616df0b836f62a3ffd86c21e22..7e5db81e545dae8701caa8737ad2a8fec6b13bd5 100644 --- a/graphic/vkgl/src/deqpgles3/build0030/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0030/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0030") { diff --git a/graphic/vkgl/src/deqpgles3/build0030/Test.json b/graphic/vkgl/src/deqpgles3/build0030/Test.json index f416610211c1d0397445a9d17a23d4fe63b0fe18..fa38849482f7eb824ade885d9eaee59b6c478ae2 100644 --- a/graphic/vkgl/src/deqpgles3/build0030/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0030/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0030->/data/local/tmp/ActsDeqpgles3TestSuite0030", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0031/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0031/BUILD.gn index 80eb97308b8bad0ccea5af6d32053ac50056d785..ef3378c2bc03fef458a33107a7561e9194010be6 100644 --- a/graphic/vkgl/src/deqpgles3/build0031/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0031/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0031") { diff --git a/graphic/vkgl/src/deqpgles3/build0031/Test.json b/graphic/vkgl/src/deqpgles3/build0031/Test.json index e3317d285495a863c0142736d888cdfdb6ed341e..e426f086f289e2a78061e8eda1d1c63ff6c900ee 100644 --- a/graphic/vkgl/src/deqpgles3/build0031/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0031/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0031->/data/local/tmp/ActsDeqpgles3TestSuite0031", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0032/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0032/BUILD.gn index 7b58627d63367d45d6f4da32d33ae8f25acb29aa..62edc12c1aae2df80b0f082daa51a32bee2aeace 100644 --- a/graphic/vkgl/src/deqpgles3/build0032/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0032/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0032") { diff --git a/graphic/vkgl/src/deqpgles3/build0032/Test.json b/graphic/vkgl/src/deqpgles3/build0032/Test.json index 817d9e4c043e5642c70035302f0c02d7aff090cb..0225f0213b9f791c79a11fc755df171bb09c1b3d 100644 --- a/graphic/vkgl/src/deqpgles3/build0032/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0032/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0032->/data/local/tmp/ActsDeqpgles3TestSuite0032", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0033/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0033/BUILD.gn index 035afc62ab5163643608852b6ca0392effc41ae9..f0405561621326121f54f5b7355895388eacaf73 100644 --- a/graphic/vkgl/src/deqpgles3/build0033/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0033/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0033") { diff --git a/graphic/vkgl/src/deqpgles3/build0033/Test.json b/graphic/vkgl/src/deqpgles3/build0033/Test.json index 9f4cc228e7df40d51f1ab0bac70aba6123079c1e..6c158a4dc085551fcf84aa94d81515f7ddf3c0d0 100644 --- a/graphic/vkgl/src/deqpgles3/build0033/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0033/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0033->/data/local/tmp/ActsDeqpgles3TestSuite0033", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0034/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0034/BUILD.gn index 1259cf166487406ca878778d63d3abf7be8e14cb..a124adeb6fdb2fa486d3ea9665acbd9c221132c7 100644 --- a/graphic/vkgl/src/deqpgles3/build0034/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0034/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0034") { diff --git a/graphic/vkgl/src/deqpgles3/build0034/Test.json b/graphic/vkgl/src/deqpgles3/build0034/Test.json index 9e26fd350f1ed5fd6d9cd8fb7d96c844482221f8..3f4f4cb75314b38bb3020c8acee399b9dcc9acf5 100644 --- a/graphic/vkgl/src/deqpgles3/build0034/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0034/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0034->/data/local/tmp/ActsDeqpgles3TestSuite0034", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0035/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0035/BUILD.gn index a6a978acd5f8e67b5214b8e9e75ca28aa5ba5a8f..652e2d5393b79b0c0439ace750ea0c260668a36a 100644 --- a/graphic/vkgl/src/deqpgles3/build0035/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0035/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0035") { diff --git a/graphic/vkgl/src/deqpgles3/build0035/Test.json b/graphic/vkgl/src/deqpgles3/build0035/Test.json index 971ff3f007e6f02b2c25d111291098ae1bc147a1..6fe754cc82275e8afba6d190fe45f247e124625b 100644 --- a/graphic/vkgl/src/deqpgles3/build0035/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0035/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0035->/data/local/tmp/ActsDeqpgles3TestSuite0035", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0036/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0036/BUILD.gn index 9c9bba2415514478238245e14c2b8fbe5f7a1972..e35ea2f99e696578d79e52afc43cfee0d9d1843e 100644 --- a/graphic/vkgl/src/deqpgles3/build0036/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0036/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0036") { diff --git a/graphic/vkgl/src/deqpgles3/build0036/Test.json b/graphic/vkgl/src/deqpgles3/build0036/Test.json index 52c4472cd260aea448ea78054479a3a2c6dfe41c..c86c2c2135c09c367adc2a001bf03cc053307c30 100644 --- a/graphic/vkgl/src/deqpgles3/build0036/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0036/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0036->/data/local/tmp/ActsDeqpgles3TestSuite0036", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0037/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0037/BUILD.gn index 214045fb3176249649a013583910f473e72dc859..5858c62af7b68694aa6e0d0cb518db020d3b494c 100644 --- a/graphic/vkgl/src/deqpgles3/build0037/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0037/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0037") { diff --git a/graphic/vkgl/src/deqpgles3/build0037/Test.json b/graphic/vkgl/src/deqpgles3/build0037/Test.json index d8f2b80a13d46f1d5e62d743cfea4b1613820f6c..bf988cbb0543ff72bd610d0fc9ec5a9142269834 100644 --- a/graphic/vkgl/src/deqpgles3/build0037/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0037/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0037->/data/local/tmp/ActsDeqpgles3TestSuite0037", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0038/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0038/BUILD.gn index 10a369a6678467828ccacff2e30e5a4c62dd4b5b..3a389f72ad0e239c4f16e833950ae4438949d501 100644 --- a/graphic/vkgl/src/deqpgles3/build0038/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0038/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0038") { diff --git a/graphic/vkgl/src/deqpgles3/build0038/Test.json b/graphic/vkgl/src/deqpgles3/build0038/Test.json index 707302a20212ee17c17850705f73483c4450523e..07cbe49fd6aa738d5c2a49252e0f6cfa909a490b 100644 --- a/graphic/vkgl/src/deqpgles3/build0038/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0038/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0038->/data/local/tmp/ActsDeqpgles3TestSuite0038", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0039/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0039/BUILD.gn index b1957571b0bdd88189956b265d081706cabc3421..2ef31e3a7eb0959cb4deb55f186bd65e14117ff5 100644 --- a/graphic/vkgl/src/deqpgles3/build0039/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0039/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0039") { diff --git a/graphic/vkgl/src/deqpgles3/build0039/Test.json b/graphic/vkgl/src/deqpgles3/build0039/Test.json index 384712f41cb7b182661ea954b8edf0722765b592..ab3a902e0c6d4079c1da2f35b643895e8c3a18d4 100644 --- a/graphic/vkgl/src/deqpgles3/build0039/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0039/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0039->/data/local/tmp/ActsDeqpgles3TestSuite0039", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0040/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0040/BUILD.gn index 5364d7b5d62ce5503b84a08027e816d3f20469dc..45bdea24c653ad3633438f8ff8cc1271d78efd2a 100644 --- a/graphic/vkgl/src/deqpgles3/build0040/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0040/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0040") { diff --git a/graphic/vkgl/src/deqpgles3/build0040/Test.json b/graphic/vkgl/src/deqpgles3/build0040/Test.json index 4ca60a13e1b589d883e460643618017d435bf8e3..9df41dbeef2fc76a9a48cf30ac22351a25d30ee4 100644 --- a/graphic/vkgl/src/deqpgles3/build0040/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0040/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0040->/data/local/tmp/ActsDeqpgles3TestSuite0040", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0041/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0041/BUILD.gn index 49db30d7f580926268f0f1a738be4356585bc53d..721c41a42dda3bffb5e8d8d596ca231bfb1936b2 100644 --- a/graphic/vkgl/src/deqpgles3/build0041/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0041/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0041") { diff --git a/graphic/vkgl/src/deqpgles3/build0041/Test.json b/graphic/vkgl/src/deqpgles3/build0041/Test.json index 4e8cefd0c4be330f3c94d79d297edba20a496bf8..b4649a81f625bae68f1ebb5cd27ef7a41ca946f5 100644 --- a/graphic/vkgl/src/deqpgles3/build0041/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0041/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0041->/data/local/tmp/ActsDeqpgles3TestSuite0041", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0042/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0042/BUILD.gn index f4ab2fab8ea2ad72b2a509c044f4d9d100e4b146..4c42227846abccebe0e256b1c13f8cf1dbc9af91 100644 --- a/graphic/vkgl/src/deqpgles3/build0042/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0042/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0042") { diff --git a/graphic/vkgl/src/deqpgles3/build0042/Test.json b/graphic/vkgl/src/deqpgles3/build0042/Test.json index cd3e836b8c76d2e7f8f9d5de7b09b28f8990192b..32ff652ea26799884193c05a8c4569872706510c 100644 --- a/graphic/vkgl/src/deqpgles3/build0042/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0042/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0042->/data/local/tmp/ActsDeqpgles3TestSuite0042", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0043/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0043/BUILD.gn index e77004a634ee9e1454cee299c972fd781eaf843e..410169b419347b3f6cf30c92ae1da1504cd58e73 100644 --- a/graphic/vkgl/src/deqpgles3/build0043/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0043/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0043") { diff --git a/graphic/vkgl/src/deqpgles3/build0043/Test.json b/graphic/vkgl/src/deqpgles3/build0043/Test.json index 0caf567685785a58f0ed1c4acf411d1a1ab71cbe..5f7bacfb164d7e22ae23ff5ea16e7a48e980c790 100644 --- a/graphic/vkgl/src/deqpgles3/build0043/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0043/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0043->/data/local/tmp/ActsDeqpgles3TestSuite0043", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0044/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0044/BUILD.gn index 3b265e0117e443e5595460c3923fd2d8139c079b..adef2120d891fc7246db43164c553aee1a16f341 100644 --- a/graphic/vkgl/src/deqpgles3/build0044/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0044/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0044") { diff --git a/graphic/vkgl/src/deqpgles3/build0044/Test.json b/graphic/vkgl/src/deqpgles3/build0044/Test.json index 4db0dc493e32d08f08714366d009395fbf907194..d3d20982e5fe7381b3a9ad3d174e1d4283ec977a 100644 --- a/graphic/vkgl/src/deqpgles3/build0044/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0044/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0044->/data/local/tmp/ActsDeqpgles3TestSuite0044", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles3/build0045/BUILD.gn b/graphic/vkgl/src/deqpgles3/build0045/BUILD.gn index 7c47805d79cb1c21f3f4a25ba0dd90570788700c..eace24ba783da6bde15cf0b1c27bd1d07452a9f9 100644 --- a/graphic/vkgl/src/deqpgles3/build0045/BUILD.gn +++ b/graphic/vkgl/src/deqpgles3/build0045/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles3func0045") { diff --git a/graphic/vkgl/src/deqpgles3/build0045/Test.json b/graphic/vkgl/src/deqpgles3/build0045/Test.json index 5128132b65e78be7bb19ea6740730d3f2f813276..35638d093e2c2462992337b751ab127b176b6b71 100644 --- a/graphic/vkgl/src/deqpgles3/build0045/Test.json +++ b/graphic/vkgl/src/deqpgles3/build0045/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles3TestSuite0045->/data/local/tmp/ActsDeqpgles3TestSuite0045", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp index 272b79c587dca2d4277517a06f3df4ca7a759fbe..a27f58f57332d31a46211cec99de5616089969ce 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp index e37bd7bdd45bc9ced5e02921f351cd9e4f7cbdb1..0f6133be5d430ce79fc2a133da667f258c4f7493 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp index ca211f0675603ce92791a857532de1186ae97021..96f875feca03da2bfd3f0739137100c8e09c1731 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310003TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp index feac308c94c148a9cab728e5564686f7c1eb2c9c..c94f18f7ccdb39eb9b2a506f0334b256d910b6bf 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310004TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp index 07c83c57e7993f26b0ce51411179bc4f9cad323d..84ec795348b10638d28f1b7666d4d63c05fcb436 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310005TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp index 56f8929434b901ba6fb7081edb84eb07a3ce84a5..d6c3fa1d5094ea26fedcabaccbedba5707321a17 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310006TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp index 04529cd959a2a5cc0587b67bf732e0da0e4d299a..01b8c9fe31b8933aaa038c178adad3aba727b60d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310007TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp index 5e71c1cdffba680112f883ba57510555fcac01de..3a8ef64230405ce081c14af12d78fe5e2136dd68 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310008TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp index be9f9352ee2ec35ca8b2a5b7b9be90426297ab02..b170c17d2bf3a91a52c48af89ffbaf7138f5389a 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310009TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp index c79b3fc9b3f9c358860af7b0b918cb002f3c782b..526bc5b4e6860120ade5b517c5a8aba57ed290f2 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310010TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp index 9fe7fd71dd73dafa46e46300b3cbd6796568e7e0..b727f7f38500c7ecf5cdb6a1e1deb871f6e6ef0c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310011TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp index 70ce0efd63e9b276e38584fbbcaba48695d16a28..57132ce5ef7941501588253ff323e7e879aa5a35 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310012TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp index 4b74e0c8a755d8e6b0939f2de2ec8ea9a0433c96..fb30416ad97285e45bc6845a85968df5a5028759 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310013TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp index bda7be06cc8676d4d233fcaf59a3aa993db2157e..92b306f776103e9a73076fcdc1d84a74f55828b8 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310014TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp index 5c015e81fde682b8f9c5c24c3b4ac13c42e19e75..792953c620498582af5db68b815c3da8729bf153 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310015TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp index 728dba5403da1036f3669843af6a90f50b998208..5f267f37fdb881327413c6fa1b828436e7f3a65e 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310016TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp index fdf04d59f4f5d6db335b393916d43a5a7ef8857e..9fbdbd5a87237dafdfdce1394dbdcff749220e8d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310017TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp index 217b6c3b364a9502f86623f4cdb470d07da6e96e..0cf38acde1d7d172da37f8828e5eb9446e8082fc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310018TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp index 86eeb9543e5f7036d044fc33ffc2729aa77e9c9a..bdaf955640519026b704a18182c578f884103836 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310019TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp index 9ca4094258e7db0598daf0e9874db3ec07088b78..31b1b0edc40042418c87dad0ff2f1b20472a7a00 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310020TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp index a00bf39028525075cdb6859f0f9098c479fddafc..c4ba3ad0248671b9e5bfbd42f714ec12770d937a 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310021TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp index 46247fb3150f26164041c818d04299c8ee5c26c4..db690ea12803b4207af5aabcf53cf3d30e723149 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310022TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp index 106dffeff6851d422d08dd373b71382a113321dd..a439857bed1f8d2f1aa210f80f7f38a45cd25a96 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310023TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp index b36183022ec08b0e6dd5ddd30856fb97f14219df..0666bef72b735d9b69c8345d6ecf2afcee567041 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310024TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp index c4df708dcdbb2e1ce1b463c5ec8c5f51aef9c7b6..5eae68520261a626adef3e51afa14af7caddb3dc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310025TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp index 46d1c7253320818160e2e3f9ce597bf061c2a9d8..6d30d0aaea5cdd6ccde418d2aa85a669976366dc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310026TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp index 154fa82947d63bec8a0f57d9c1173f06d89253eb..44cf815328be20283f824546bfbd10877c7deb18 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310027TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp index 4c3c1a086bfec1c1bbfae32704dd57caea0e2be9..bbd7559be9ff48e4b5ad9b39d63257e8647e0eb4 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310028TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp index 79d4f915cdd06bd82728fb886d47ad86ae65f957..c27a718f194cb78d864f0b1a9fcdf286834af749 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310029TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp index 467d23fe5108bcede4ee88187b87f0bbe5d10bea..3d516d1850026baeab5ec819802b5302c8955069 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310030TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp index b5aa49fb7a37079627e362548bee10cb5b3c5f6e..f44a532097ca81c07f69c9ccf4413d896fa8a9e9 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310031TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp index 2224c3271f8de5280c8f44ca47268173bcc80166..d313ef2bfd29a247baf2e4e6331d0bb56a028194 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310032TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp index 3ab752864e5e6e3906915a9159db07e401a31668..6cd4ce0dc8244be3ae96c4d6947d4df87847c1f1 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310033TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp index c27d464d0e610ea3f4ab13571c252ee94f0fc38c..57e88879f69eb22caca63cd7eea22f957f023003 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310034TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp index 10a950e7439d331eae60fbdd0e4770a0b93cdc05..639fc3798bae46ccc22ee2242ec03bf722b1060f 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310035TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp index d5023133314424cc2fd7fb6dfccea010ddfa7153..f518c166322d024ae12b706132baad8cc65fc0bb 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310036TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp index 92e89571ea026e84adc162bb9934794b6606b967..b4dde2a3526d31d55fc87ff2fa5edeecac42293f 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310037TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp index abe9692c1bfeef1bd31e64bdf062c62b5f793e8a..f7434e9a30cf62525edc22339c885239275c4070 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles310038TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp index de89857650bf0ba7cee04a7e620a19e3776481e8..88c649150d653d45545a83affffcedccf426806c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsDeqpgles31TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/deqpgles31/build0001/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0001/BUILD.gn index c01c5c5cc0aaf628beb566221fbb99f13c36c760..a0eee7607db7fa13f54febed95ea980bd358abf2 100644 --- a/graphic/vkgl/src/deqpgles31/build0001/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0001") { diff --git a/graphic/vkgl/src/deqpgles31/build0001/Test.json b/graphic/vkgl/src/deqpgles31/build0001/Test.json index 8fce270a5095103385f5107624cf58796bd7408f..9494626eff3456129b48f2a43e8faf1177b41f9c 100644 --- a/graphic/vkgl/src/deqpgles31/build0001/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0001/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0001->/data/local/tmp/ActsDeqpgles31TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0002/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0002/BUILD.gn index f1562a15171f4130f41cc8190a1d4c065b34e134..d2e811aee70ac29985b5aea08d7372714274fb3e 100644 --- a/graphic/vkgl/src/deqpgles31/build0002/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0002") { diff --git a/graphic/vkgl/src/deqpgles31/build0002/Test.json b/graphic/vkgl/src/deqpgles31/build0002/Test.json index fe433d8b7c2a3ecab69b9b62bdc270fb15508d30..e16774449bbfbd24a5ec092186cdae559eda22cc 100644 --- a/graphic/vkgl/src/deqpgles31/build0002/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0002/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0002->/data/local/tmp/ActsDeqpgles31TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0003/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0003/BUILD.gn index cf3ed17bb370bac47dc9f70cdd5645961c511cbd..26ae677b965b36df7f32baeb20e972afbb215018 100644 --- a/graphic/vkgl/src/deqpgles31/build0003/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0003/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0003") { diff --git a/graphic/vkgl/src/deqpgles31/build0003/Test.json b/graphic/vkgl/src/deqpgles31/build0003/Test.json index 12ccd36216371abdc23949d5a83a039e3bd12333..95fc51df00375d23d423ea2e288aaccb27eda5f1 100644 --- a/graphic/vkgl/src/deqpgles31/build0003/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0003/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0003->/data/local/tmp/ActsDeqpgles31TestSuite0003", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0004/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0004/BUILD.gn index c1a5b8b4e172cf6a1c1e9454547c263fa39cd704..3c4fec255ccbe413843479f93e7aea2493470c31 100644 --- a/graphic/vkgl/src/deqpgles31/build0004/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0004/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0004") { diff --git a/graphic/vkgl/src/deqpgles31/build0004/Test.json b/graphic/vkgl/src/deqpgles31/build0004/Test.json index c7eafded1a58867c8f04870a5a1881bbdc5b6a4b..9fcfc2ed1208350f76bb2aa61b53eaa7c6d2ae4b 100644 --- a/graphic/vkgl/src/deqpgles31/build0004/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0004/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0004->/data/local/tmp/ActsDeqpgles31TestSuite0004", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0005/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0005/BUILD.gn index c26dced63df6163b3e6a881fbd309f62ad09256c..95e5ec5030277aef5f0aab7c94e19f93e5494f50 100644 --- a/graphic/vkgl/src/deqpgles31/build0005/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0005/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0005") { diff --git a/graphic/vkgl/src/deqpgles31/build0005/Test.json b/graphic/vkgl/src/deqpgles31/build0005/Test.json index 407adfb05f6c03cf995b62298117e75d42c2388d..01334097098fff7d58289221955288917198d671 100644 --- a/graphic/vkgl/src/deqpgles31/build0005/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0005/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0005->/data/local/tmp/ActsDeqpgles31TestSuite0005", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0006/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0006/BUILD.gn index 07ab9c1ad6b2adfb7addbf4e449edacbfa3075b2..9b238d82f9e34b2bf1cc14b066b61ccd44d7dd15 100644 --- a/graphic/vkgl/src/deqpgles31/build0006/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0006/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0006") { diff --git a/graphic/vkgl/src/deqpgles31/build0006/Test.json b/graphic/vkgl/src/deqpgles31/build0006/Test.json index 76a5c91647a580da66df76d726af993c45b13244..e96c696dc37797c76c9455b3f2b56c39eb60391f 100644 --- a/graphic/vkgl/src/deqpgles31/build0006/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0006/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0006->/data/local/tmp/ActsDeqpgles31TestSuite0006", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0007/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0007/BUILD.gn index b29ac9128b35586c4dd4b0c961437279918b28d6..64c4fc0b4579bea3f5183b7b7e810304f3048f18 100644 --- a/graphic/vkgl/src/deqpgles31/build0007/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0007/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0007") { diff --git a/graphic/vkgl/src/deqpgles31/build0007/Test.json b/graphic/vkgl/src/deqpgles31/build0007/Test.json index e5184ed900a7c572715a81081d032ddc00e972bf..b7677e9f1a585d41ece27d48f648de3444f93ceb 100644 --- a/graphic/vkgl/src/deqpgles31/build0007/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0007/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0007->/data/local/tmp/ActsDeqpgles31TestSuite0007", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0008/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0008/BUILD.gn index d40b57943baadd2a05fd4a9834bfe7915f0b2880..98ac29c9bb3d187e070a286e6d36f1ab878ef317 100644 --- a/graphic/vkgl/src/deqpgles31/build0008/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0008/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0008") { diff --git a/graphic/vkgl/src/deqpgles31/build0008/Test.json b/graphic/vkgl/src/deqpgles31/build0008/Test.json index b34fea085a5f6d8d0408c3ffe427ebee32daa265..c1bc8dd797cf9401a3724eba40a9a141bf67fe6b 100644 --- a/graphic/vkgl/src/deqpgles31/build0008/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0008/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0008->/data/local/tmp/ActsDeqpgles31TestSuite0008", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0009/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0009/BUILD.gn index ec55710500e6eff00a4bb2e8b124cd8e91d172be..2bf0edb81e533593572e01437371b7264bfc4670 100644 --- a/graphic/vkgl/src/deqpgles31/build0009/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0009/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0009") { diff --git a/graphic/vkgl/src/deqpgles31/build0009/Test.json b/graphic/vkgl/src/deqpgles31/build0009/Test.json index 183a5164bbf47173d23df54cf3f1cf93ee8267dd..cffbf68a61766ed2840092afdad729cb19f65688 100644 --- a/graphic/vkgl/src/deqpgles31/build0009/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0009/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0009->/data/local/tmp/ActsDeqpgles31TestSuite0009", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0010/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0010/BUILD.gn index e06f048397fcb560c28fbfb33b189149c768feab..77d1cb433fb1a8ec5deb56bbe6b5fa573862384e 100644 --- a/graphic/vkgl/src/deqpgles31/build0010/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0010/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0010") { diff --git a/graphic/vkgl/src/deqpgles31/build0010/Test.json b/graphic/vkgl/src/deqpgles31/build0010/Test.json index b5f638a09e8b9391c9ec8beda1f50bcbed7173af..701ebb38588727558a0ca3ff5e6f9c280a75c1bc 100644 --- a/graphic/vkgl/src/deqpgles31/build0010/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0010/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0010->/data/local/tmp/ActsDeqpgles31TestSuite0010", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0011/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0011/BUILD.gn index 018b02ab17bcae25dfa81a3ab6217cedb7894a21..a8a1f3dc5ece3440bc52cbd1ad090279f74d489b 100644 --- a/graphic/vkgl/src/deqpgles31/build0011/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0011/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0011") { diff --git a/graphic/vkgl/src/deqpgles31/build0011/Test.json b/graphic/vkgl/src/deqpgles31/build0011/Test.json index a19eb322e0a2541f822d77b8fe1956b7e084efb9..025c7c50ab47d01936102a7200d9deccceae4287 100644 --- a/graphic/vkgl/src/deqpgles31/build0011/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0011/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0011->/data/local/tmp/ActsDeqpgles31TestSuite0011", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0012/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0012/BUILD.gn index c9ed807ab2fc3b51ad77aaa7236bd32fcc152076..899bf77e05a5f7ee5ee275b6f0bb11a6ec4f4cf3 100644 --- a/graphic/vkgl/src/deqpgles31/build0012/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0012/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0012") { diff --git a/graphic/vkgl/src/deqpgles31/build0012/Test.json b/graphic/vkgl/src/deqpgles31/build0012/Test.json index 7a0d698a0d79c0c12b14098dcdb3a9f768e2ae8c..fce7110da1a5a8a6de4dc98153ed2a43f4dee72a 100644 --- a/graphic/vkgl/src/deqpgles31/build0012/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0012/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0012->/data/local/tmp/ActsDeqpgles31TestSuite0012", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0013/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0013/BUILD.gn index 83e55f175f4003c636f02352f5beff10a6c50f53..a3259e8fa6e532a9c82a96f7049a48934bdcc9fb 100644 --- a/graphic/vkgl/src/deqpgles31/build0013/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0013/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0013") { diff --git a/graphic/vkgl/src/deqpgles31/build0013/Test.json b/graphic/vkgl/src/deqpgles31/build0013/Test.json index 54b3af95124d928fcdae79ed55d3d8a4b6a0d244..a1ec9ba859c4479bba2593f3f9862ca3d579c999 100644 --- a/graphic/vkgl/src/deqpgles31/build0013/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0013/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0013->/data/local/tmp/ActsDeqpgles31TestSuite0013", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0014/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0014/BUILD.gn index 7d68af352d51e863a9aeea676928b212653c86dd..7acd46d35ee944fea1c072f1f38cbcdf14359542 100644 --- a/graphic/vkgl/src/deqpgles31/build0014/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0014/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0014") { diff --git a/graphic/vkgl/src/deqpgles31/build0014/Test.json b/graphic/vkgl/src/deqpgles31/build0014/Test.json index 974c66c321741da3d76b4ab8125d87e82fda9e41..d02dc6c1d361cf3a76de813fb11c9788eac9f17b 100644 --- a/graphic/vkgl/src/deqpgles31/build0014/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0014/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0014->/data/local/tmp/ActsDeqpgles31TestSuite0014", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0015/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0015/BUILD.gn index 51039c581b0b8634eec93fd25933341c7623e7b3..947fb12f3754425d4a2b90425ae8551ba8f84520 100644 --- a/graphic/vkgl/src/deqpgles31/build0015/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0015/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0015") { diff --git a/graphic/vkgl/src/deqpgles31/build0015/Test.json b/graphic/vkgl/src/deqpgles31/build0015/Test.json index 92f729fd879679d0a12a07c5b8831ce063580afe..094540f636569cef5a6cf28251c1c96bc1585bef 100644 --- a/graphic/vkgl/src/deqpgles31/build0015/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0015/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0015->/data/local/tmp/ActsDeqpgles31TestSuite0015", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0016/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0016/BUILD.gn index ca5f53544672f5263106f62179a9978f0434c8e2..4f0f3f5bb167f00142e19e3e16327c84e3880169 100644 --- a/graphic/vkgl/src/deqpgles31/build0016/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0016/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0016") { diff --git a/graphic/vkgl/src/deqpgles31/build0016/Test.json b/graphic/vkgl/src/deqpgles31/build0016/Test.json index 719842ad589f5782ab00cd4b3a74f93f937c6d4d..260f21820faf74c3f86425ad41e2b05d771a0e0a 100644 --- a/graphic/vkgl/src/deqpgles31/build0016/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0016/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0016->/data/local/tmp/ActsDeqpgles31TestSuite0016", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0017/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0017/BUILD.gn index a9328f07c436b5e3f9a3c54277127544769376fb..613443d315e5e06800b90ad3e2a211fd8ce5f9ad 100644 --- a/graphic/vkgl/src/deqpgles31/build0017/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0017/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0017") { diff --git a/graphic/vkgl/src/deqpgles31/build0017/Test.json b/graphic/vkgl/src/deqpgles31/build0017/Test.json index f76a36aad8ec3973dd1c41eae2d024c5aeb22e1b..f3be9e967b065533401fc8628deea22d5eb59f5d 100644 --- a/graphic/vkgl/src/deqpgles31/build0017/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0017/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0017->/data/local/tmp/ActsDeqpgles31TestSuite0017", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0018/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0018/BUILD.gn index 2a2c717fec2495089f39c84a777fd5c32094f738..f6c59c4d0c657943cdd813dc02ea9707eeaf008c 100644 --- a/graphic/vkgl/src/deqpgles31/build0018/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0018/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0018") { diff --git a/graphic/vkgl/src/deqpgles31/build0018/Test.json b/graphic/vkgl/src/deqpgles31/build0018/Test.json index 9bf349b6352655d10cd34686bce5561dd7228adb..3d6e1c21096b94219bf6c9af1d0cbb282fafd069 100644 --- a/graphic/vkgl/src/deqpgles31/build0018/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0018/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0018->/data/local/tmp/ActsDeqpgles31TestSuite0018", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0019/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0019/BUILD.gn index fb8e894bf28fc64c33c3e3a2954b7f83ed73388b..81a5370fb5a53225230b2b69cf2e8ac87c6f4066 100644 --- a/graphic/vkgl/src/deqpgles31/build0019/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0019/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0019") { diff --git a/graphic/vkgl/src/deqpgles31/build0019/Test.json b/graphic/vkgl/src/deqpgles31/build0019/Test.json index 4b2dffcec791713c13346db632ebe927b93d2d2b..f627933f38690a9396392f21936ebee4dbd5479c 100644 --- a/graphic/vkgl/src/deqpgles31/build0019/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0019/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0019->/data/local/tmp/ActsDeqpgles31TestSuite0019", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0020/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0020/BUILD.gn index b57595cda83fbafc993dad51095a9112a3b89a43..7c1b1d2e70d0e7d51b487ebf24db82d50bd921b4 100644 --- a/graphic/vkgl/src/deqpgles31/build0020/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0020/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0020") { diff --git a/graphic/vkgl/src/deqpgles31/build0020/Test.json b/graphic/vkgl/src/deqpgles31/build0020/Test.json index ca8e93646ecb76c950c81df38267e4c9e08240a7..e228ae2e6f7cfa9fae882f5be5f36e43630b4284 100644 --- a/graphic/vkgl/src/deqpgles31/build0020/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0020/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0020->/data/local/tmp/ActsDeqpgles31TestSuite0020", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0021/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0021/BUILD.gn index cc076c5d2650d41c2b1dd94f969da3eecb64151e..17a8fe6efb41c6f36e6837608dfc40cbc10bd1fa 100644 --- a/graphic/vkgl/src/deqpgles31/build0021/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0021/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0021") { diff --git a/graphic/vkgl/src/deqpgles31/build0021/Test.json b/graphic/vkgl/src/deqpgles31/build0021/Test.json index 7e58a01e7bfeac07dca50ca4aa219b52feaf1cd1..440fdd43c621ed84a45d7e7e35c7d0e1e4e1a87f 100644 --- a/graphic/vkgl/src/deqpgles31/build0021/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0021/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0021->/data/local/tmp/ActsDeqpgles31TestSuite0021", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0022/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0022/BUILD.gn index 518e1e5284822601ce57d625302c172071910e7d..d6bb9ed13f00a2d3385aa1653da8e5bad53accde 100644 --- a/graphic/vkgl/src/deqpgles31/build0022/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0022/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0022") { diff --git a/graphic/vkgl/src/deqpgles31/build0022/Test.json b/graphic/vkgl/src/deqpgles31/build0022/Test.json index c78ccb5fb3a0779f7232aa160491cdb7baa9d2ec..d387578a75f3957c80798d26562b4df55a6bec77 100644 --- a/graphic/vkgl/src/deqpgles31/build0022/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0022/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0022->/data/local/tmp/ActsDeqpgles31TestSuite0022", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0023/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0023/BUILD.gn index fd6883bca2e47904d5d49c660e47e5307f98509d..cf1c6e93c168ab08123ed17d3aeb091a94255805 100644 --- a/graphic/vkgl/src/deqpgles31/build0023/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0023/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0023") { diff --git a/graphic/vkgl/src/deqpgles31/build0023/Test.json b/graphic/vkgl/src/deqpgles31/build0023/Test.json index 6babe145afc2da18bcc8cef1972c3fab79de790b..62e5c8ea311d3c1ae17ab349c8401d2fe5725474 100644 --- a/graphic/vkgl/src/deqpgles31/build0023/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0023/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0023->/data/local/tmp/ActsDeqpgles31TestSuite0023", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0024/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0024/BUILD.gn index 9f56ed7d07e1f338bb7adc089be3646664e26cda..09e06f8ea225b7ab326320f275eb8b180f2e4a86 100644 --- a/graphic/vkgl/src/deqpgles31/build0024/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0024/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0024") { diff --git a/graphic/vkgl/src/deqpgles31/build0024/Test.json b/graphic/vkgl/src/deqpgles31/build0024/Test.json index a38825c9a50642468a57bb8195d2c315a77da0b1..e834d30cc75f59bdf580ec3c29670c8b5c5abbfc 100644 --- a/graphic/vkgl/src/deqpgles31/build0024/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0024/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0024->/data/local/tmp/ActsDeqpgles31TestSuite0024", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0025/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0025/BUILD.gn index 51be2142f24209d41d562527eec0195a4d36c92a..3e4d8eb0efa0c3cbc490d7d5b37da61cc016f1d3 100644 --- a/graphic/vkgl/src/deqpgles31/build0025/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0025/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0025") { diff --git a/graphic/vkgl/src/deqpgles31/build0025/Test.json b/graphic/vkgl/src/deqpgles31/build0025/Test.json index d784fef3fb838a28dfacd4506b8d1467642c70f8..6023135fd2927606ecbb1894757e90554357a934 100644 --- a/graphic/vkgl/src/deqpgles31/build0025/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0025/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0025->/data/local/tmp/ActsDeqpgles31TestSuite0025", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0026/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0026/BUILD.gn index 3e381f313af77938454d9d8c07670ed1d4c21064..dfd3b272f387659be4467262495c57f13135d95a 100644 --- a/graphic/vkgl/src/deqpgles31/build0026/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0026/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0026") { diff --git a/graphic/vkgl/src/deqpgles31/build0026/Test.json b/graphic/vkgl/src/deqpgles31/build0026/Test.json index bb473f8968ea22328796cf56ac43b00330ad04c6..a08c42ffbcec1d03cf15bf9475aee9a924146b32 100644 --- a/graphic/vkgl/src/deqpgles31/build0026/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0026/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0026->/data/local/tmp/ActsDeqpgles31TestSuite0026", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0027/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0027/BUILD.gn index 4de9405c04ccb88b9eb0b4563e576c8191592724..81ea8cbe6e90dfd13c773a288424fc51363327cf 100644 --- a/graphic/vkgl/src/deqpgles31/build0027/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0027/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0027") { diff --git a/graphic/vkgl/src/deqpgles31/build0027/Test.json b/graphic/vkgl/src/deqpgles31/build0027/Test.json index 58ee7ac7bd40f93cf881051bebe4d9764e8f2229..275b51e09e80d07a7e7957aa00738b64c57d3c4f 100644 --- a/graphic/vkgl/src/deqpgles31/build0027/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0027/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0027->/data/local/tmp/ActsDeqpgles31TestSuite0027", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0028/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0028/BUILD.gn index 3795ec655bbc66c605180a2dfbaa15456d67c5ea..4db588735fa98ef2f1c9f83fc1f67e91e284ad2b 100644 --- a/graphic/vkgl/src/deqpgles31/build0028/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0028/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0028") { diff --git a/graphic/vkgl/src/deqpgles31/build0028/Test.json b/graphic/vkgl/src/deqpgles31/build0028/Test.json index 154a63107d72f7f90978835f8db4d691f1e27cd3..f33bc01152a103573b77d4866e29874f4f316f18 100644 --- a/graphic/vkgl/src/deqpgles31/build0028/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0028/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0028->/data/local/tmp/ActsDeqpgles31TestSuite0028", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0029/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0029/BUILD.gn index 7decfbff6b8476a139bb8c8b380be48a2c2ab4a0..b93cd602db2e4f0ce28c35691d3a661a0d649993 100644 --- a/graphic/vkgl/src/deqpgles31/build0029/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0029/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0029") { diff --git a/graphic/vkgl/src/deqpgles31/build0029/Test.json b/graphic/vkgl/src/deqpgles31/build0029/Test.json index d4f5410cf2c7db414dc8a5beae0bc8c1ff7e1ac8..40c5b7fcf77ad62704aa8f0acf1b94683d28251d 100644 --- a/graphic/vkgl/src/deqpgles31/build0029/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0029/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0029->/data/local/tmp/ActsDeqpgles31TestSuite0029", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0030/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0030/BUILD.gn index 33a3ae63f108eeaff0f96fdb34b41b2f6939ce07..a69a70e174555bbfe985fe29341c91cec13b31b7 100644 --- a/graphic/vkgl/src/deqpgles31/build0030/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0030/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0030") { diff --git a/graphic/vkgl/src/deqpgles31/build0030/Test.json b/graphic/vkgl/src/deqpgles31/build0030/Test.json index 54b5f9678ce85d07569af3ad42f64a9d9ea44bba..72575f2abc66cbb3f14ed56815a269ac0a51f523 100644 --- a/graphic/vkgl/src/deqpgles31/build0030/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0030/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0030->/data/local/tmp/ActsDeqpgles31TestSuite0030", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0031/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0031/BUILD.gn index 51fcd2feed682f1428b375df337a52441bc94a55..84709959829cf6b7bc79e81f79603724592976ff 100644 --- a/graphic/vkgl/src/deqpgles31/build0031/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0031/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0031") { diff --git a/graphic/vkgl/src/deqpgles31/build0031/Test.json b/graphic/vkgl/src/deqpgles31/build0031/Test.json index d33f826f81ab97e742bc4e8219e44cb82174a322..7577fb832d1f8f3b78a6f6083af7ce58c6f3228b 100644 --- a/graphic/vkgl/src/deqpgles31/build0031/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0031/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0031->/data/local/tmp/ActsDeqpgles31TestSuite0031", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0032/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0032/BUILD.gn index d2b0d71184b5a2cfd9c46ecca4529603fb2858e7..475a5d96571902cd0c863bac7de439f0671a31e1 100644 --- a/graphic/vkgl/src/deqpgles31/build0032/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0032/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0032") { diff --git a/graphic/vkgl/src/deqpgles31/build0032/Test.json b/graphic/vkgl/src/deqpgles31/build0032/Test.json index 34c1da1ec2acbc0596d21c0f54cbf55821601cee..cba4ea81a95a23df9af21a017d2521a45cebb585 100644 --- a/graphic/vkgl/src/deqpgles31/build0032/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0032/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0032->/data/local/tmp/ActsDeqpgles31TestSuite0032", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0033/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0033/BUILD.gn index 3d5f71296b1cd058b08cdcec922cf23a82d81d1f..15e58144376d06bda32aeb6cd717d857ff5af2af 100644 --- a/graphic/vkgl/src/deqpgles31/build0033/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0033/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0033") { diff --git a/graphic/vkgl/src/deqpgles31/build0033/Test.json b/graphic/vkgl/src/deqpgles31/build0033/Test.json index 77590f99a65f8a19efabfece2a850c0e30c59a00..b842941d7688d6efb5b9c44edee2ec0caf457239 100644 --- a/graphic/vkgl/src/deqpgles31/build0033/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0033/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0033->/data/local/tmp/ActsDeqpgles31TestSuite0033", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0034/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0034/BUILD.gn index ad4cb65df2067ae91371843e4085c09962f6ca52..ff2dea6b0fef9d19366ea0dbe57a34ee8d34d3fd 100644 --- a/graphic/vkgl/src/deqpgles31/build0034/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0034/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0034") { diff --git a/graphic/vkgl/src/deqpgles31/build0034/Test.json b/graphic/vkgl/src/deqpgles31/build0034/Test.json index 680c20eddeb98a659b84d562ffe8712a5efacc65..3c922c1e9500ac858baede0753e9fa21a50fb069 100644 --- a/graphic/vkgl/src/deqpgles31/build0034/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0034/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0034->/data/local/tmp/ActsDeqpgles31TestSuite0034", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0035/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0035/BUILD.gn index 2e48be7ba529677fa869310daeb6f43b6f888c20..29c3c57023f7a45b7d96e84a36233d3557e9f3b9 100644 --- a/graphic/vkgl/src/deqpgles31/build0035/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0035/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0035") { diff --git a/graphic/vkgl/src/deqpgles31/build0035/Test.json b/graphic/vkgl/src/deqpgles31/build0035/Test.json index 963c24f9b0b8117b3d1c5e49c20c2f1ffedc5dd6..82ae8b30c889e6c2f08dabfb83f2cf9d34db7bc6 100644 --- a/graphic/vkgl/src/deqpgles31/build0035/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0035/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0035->/data/local/tmp/ActsDeqpgles31TestSuite0035", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0036/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0036/BUILD.gn index de2de241932525fddd59c890e08dc94b94b74cb5..6485f57623c59d2d7d163efc83da3a25ee39c810 100644 --- a/graphic/vkgl/src/deqpgles31/build0036/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0036/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0036") { diff --git a/graphic/vkgl/src/deqpgles31/build0036/Test.json b/graphic/vkgl/src/deqpgles31/build0036/Test.json index 3e997d1537901b068c7acf34f8fe2b0cceecbf3b..22507909854aff5af26520821f9680ba7aa986d7 100644 --- a/graphic/vkgl/src/deqpgles31/build0036/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0036/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0036->/data/local/tmp/ActsDeqpgles31TestSuite0036", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0037/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0037/BUILD.gn index 333bdb6500f822d7c6cef2ca18e235066d3c4582..d0b243c7f5f4814a288a8cbc2a07f90bc5271b3d 100644 --- a/graphic/vkgl/src/deqpgles31/build0037/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0037/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0037") { diff --git a/graphic/vkgl/src/deqpgles31/build0037/Test.json b/graphic/vkgl/src/deqpgles31/build0037/Test.json index 671fd6938007fecaba49564d837f4a2306899e60..8d8fe523e0d9388213c204cf3bca99a8b8258067 100644 --- a/graphic/vkgl/src/deqpgles31/build0037/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0037/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0037->/data/local/tmp/ActsDeqpgles31TestSuite0037", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/deqpgles31/build0038/BUILD.gn b/graphic/vkgl/src/deqpgles31/build0038/BUILD.gn index e7c4f14e8332d97553d47b20c14024773de4e239..5e99c09464001bcaf33306e1d5bad0f6c061b0bf 100644 --- a/graphic/vkgl/src/deqpgles31/build0038/BUILD.gn +++ b/graphic/vkgl/src/deqpgles31/build0038/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libdeqpgles31func0038") { diff --git a/graphic/vkgl/src/deqpgles31/build0038/Test.json b/graphic/vkgl/src/deqpgles31/build0038/Test.json index 90591b0c5d9657f7bf4394537ae5f2d097b762e9..c8040c79e6af5cd3fdfd95d558a5b2be90ffafea 100644 --- a/graphic/vkgl/src/deqpgles31/build0038/Test.json +++ b/graphic/vkgl/src/deqpgles31/build0038/Test.json @@ -23,8 +23,8 @@ "ActsDeqpgles31TestSuite0038->/data/local/tmp/ActsDeqpgles31TestSuite0038", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp index e30c01a2c8025d3b24ace81b3fbb10f4a2dcfbf2..6e7eb7bf80bef1d12dce4f8350d71e6ae433e3b9 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles20001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp index bf55549035dc0e71ceb97f03d5b428d2597220d0..f011877d30b1a5ad1acebb2ee2cd6ef605b0ebd9 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles2TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles2/build0001/BUILD.gn b/graphic/vkgl/src/khrgles2/build0001/BUILD.gn index 0bf66288b010743ea0b80a7c36fd241e91968489..545ae34718dbab62985e6f0cec3bd266de0a703f 100644 --- a/graphic/vkgl/src/khrgles2/build0001/BUILD.gn +++ b/graphic/vkgl/src/khrgles2/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles2func0001") { diff --git a/graphic/vkgl/src/khrgles2/build0001/Test.json b/graphic/vkgl/src/khrgles2/build0001/Test.json index 1b90c55d657710be319f1e1ef9febb74650758a6..c6387b6138077d9ead6fd0645b48648ad5ff41dd 100644 --- a/graphic/vkgl/src/khrgles2/build0001/Test.json +++ b/graphic/vkgl/src/khrgles2/build0001/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles2TestSuite0001->/data/local/tmp/ActsKhrgles2TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp index 1cf056d6bc1035e4249538bed037e0356cba0a77..4b09765e8af5eb98e0ca6eb3ea635434e49f13c3 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles30001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp index 54891f5bf4f81cd953be6706a417656f1f504772..3da127210087410f66e05d968b1cf1889be854b0 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles30002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp index f545aee23685c380fda53744295e4e1d8284ca70..49e909eafa1cb0fadfa43849956c63b4401620b2 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles30003TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp index c1bfd2a2c218926b98459de9a0fbfdb5ef33fc8c..c1a73502293e0ab6c35cc66f214f3b0c8c85c979 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles30004TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp index 4201c62dfb3f65c32666f445f92fdae5321a781f..dc71f81d632505f908c1947451467cedd741f9e9 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles30005TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp index a85bd0b0606c3a3183ec682cf6b72110688f2082..7cbe24f42da5b4c529dcef7693e2434744285337 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles3TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles3/build0001/BUILD.gn b/graphic/vkgl/src/khrgles3/build0001/BUILD.gn index 77f17546539b55aaebc50d7f82148d8bc1f52ba6..75455b3212dc695f70f4ae3da0a7b091f9538c39 100644 --- a/graphic/vkgl/src/khrgles3/build0001/BUILD.gn +++ b/graphic/vkgl/src/khrgles3/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles3func0001") { diff --git a/graphic/vkgl/src/khrgles3/build0001/Test.json b/graphic/vkgl/src/khrgles3/build0001/Test.json index 0ce6b7c15fd5784770d2321917d086258bdcbcca..873381d0903a382d2c6a67645787325ed35e5e05 100644 --- a/graphic/vkgl/src/khrgles3/build0001/Test.json +++ b/graphic/vkgl/src/khrgles3/build0001/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles3TestSuite0001->/data/local/tmp/ActsKhrgles3TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles3/build0002/BUILD.gn b/graphic/vkgl/src/khrgles3/build0002/BUILD.gn index c16380f1fbefbe78864b09d9229d08e594c5a902..1bce5ce4e7ce93ee4c62bb8f3c31543e0809fc5e 100644 --- a/graphic/vkgl/src/khrgles3/build0002/BUILD.gn +++ b/graphic/vkgl/src/khrgles3/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles3func0002") { diff --git a/graphic/vkgl/src/khrgles3/build0002/Test.json b/graphic/vkgl/src/khrgles3/build0002/Test.json index 54de51f36621b5156b0d58bb408c2ec5905530b9..000480b686bc98c6bf314124b7ddd425cee49e14 100644 --- a/graphic/vkgl/src/khrgles3/build0002/Test.json +++ b/graphic/vkgl/src/khrgles3/build0002/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles3TestSuite0002->/data/local/tmp/ActsKhrgles3TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles3/build0003/BUILD.gn b/graphic/vkgl/src/khrgles3/build0003/BUILD.gn index 9e942a63fc39fd8c7e9a4046f99e52756612625c..4233e01b6e7ad07bb07e489edeb5cb0d1139d607 100644 --- a/graphic/vkgl/src/khrgles3/build0003/BUILD.gn +++ b/graphic/vkgl/src/khrgles3/build0003/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles3func0003") { diff --git a/graphic/vkgl/src/khrgles3/build0003/Test.json b/graphic/vkgl/src/khrgles3/build0003/Test.json index 4481ec8f96dc51f1370b93cb94b90edd60ee4bcb..c79aaaa7eac8c1aa1b2bda36ef116c514ed475d6 100644 --- a/graphic/vkgl/src/khrgles3/build0003/Test.json +++ b/graphic/vkgl/src/khrgles3/build0003/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles3TestSuite0003->/data/local/tmp/ActsKhrgles3TestSuite0003", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles3/build0004/BUILD.gn b/graphic/vkgl/src/khrgles3/build0004/BUILD.gn index fd82e6a92248fefd740b123e3429218bd2c1fdd1..bde35686283bd4c8ab903f74a780174d364bf4a6 100644 --- a/graphic/vkgl/src/khrgles3/build0004/BUILD.gn +++ b/graphic/vkgl/src/khrgles3/build0004/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles3func0004") { diff --git a/graphic/vkgl/src/khrgles3/build0004/Test.json b/graphic/vkgl/src/khrgles3/build0004/Test.json index 63e20deece162be2d4001a1ae32cb38bc594a8ec..cb7057821b94738010d1ebe4bdc068a48b02c33e 100644 --- a/graphic/vkgl/src/khrgles3/build0004/Test.json +++ b/graphic/vkgl/src/khrgles3/build0004/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles3TestSuite0004->/data/local/tmp/ActsKhrgles3TestSuite0004", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles3/build0005/BUILD.gn b/graphic/vkgl/src/khrgles3/build0005/BUILD.gn index a3a73ddfd63642accc377635e5ecb7c08adbbfd6..456a6222f7f56a9e58aedf5c1b4db28e0a7a7567 100644 --- a/graphic/vkgl/src/khrgles3/build0005/BUILD.gn +++ b/graphic/vkgl/src/khrgles3/build0005/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles3func0005") { diff --git a/graphic/vkgl/src/khrgles3/build0005/Test.json b/graphic/vkgl/src/khrgles3/build0005/Test.json index 2dc6f91c1f30151337616b74a4dc0e6964578d85..d24883780e381573b91d6e6778bf7740c76e7031 100644 --- a/graphic/vkgl/src/khrgles3/build0005/Test.json +++ b/graphic/vkgl/src/khrgles3/build0005/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles3TestSuite0005->/data/local/tmp/ActsKhrgles3TestSuite0005", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp index 7763bf91e4492e2ddbe37cfa4cc4d0d73495c951..42f7a7cf7f117302820ef3acd9e3f15af54dd8eb 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles310001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp index f0db88369b1d4c4662be188eec7354a69f93aa8f..c3e9ddf2f9329b1a0bc34b2edae5d77124fe5d5a 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles310002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp index ce49f3bb2e47eeb24c6912437cb4d2a0bbfd7082..6235e791759f8c7538bbcd086c68981034d0a491 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles310003TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp index 26ca83eb09581fcf92514b5ab8bb1cfb829aaa58..e889246d8e88e75c0091634e0ad5b2a7b2988355 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles310004TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp index bcd4e500619b3ade8f7b861083873a95ed23677e..a2f566ef98727439254b4f8eb02f8d411e27dc02 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles31TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles31/build0001/BUILD.gn b/graphic/vkgl/src/khrgles31/build0001/BUILD.gn index ad742564f1f5d116bd09ff3b5a05ea3cd0eb8bc5..20386fab89461652541ccdb49af48e1f825516b7 100644 --- a/graphic/vkgl/src/khrgles31/build0001/BUILD.gn +++ b/graphic/vkgl/src/khrgles31/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles31func0001") { diff --git a/graphic/vkgl/src/khrgles31/build0001/Test.json b/graphic/vkgl/src/khrgles31/build0001/Test.json index be4b9c0d814e6d248bd65df643aca2144ec1dac4..ccd8796a26ba3334f8b786260d6abf6f7667667a 100644 --- a/graphic/vkgl/src/khrgles31/build0001/Test.json +++ b/graphic/vkgl/src/khrgles31/build0001/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles31TestSuite0001->/data/local/tmp/ActsKhrgles31TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles31/build0002/BUILD.gn b/graphic/vkgl/src/khrgles31/build0002/BUILD.gn index 05a80b0747649406851637f2b18ff1062339fff6..5cdb0631823cbe587a9e319c33567bdf52ae3444 100644 --- a/graphic/vkgl/src/khrgles31/build0002/BUILD.gn +++ b/graphic/vkgl/src/khrgles31/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles31func0002") { diff --git a/graphic/vkgl/src/khrgles31/build0002/Test.json b/graphic/vkgl/src/khrgles31/build0002/Test.json index d2de1ba39945f4c27573e2f27bf92e71f1d0bb9f..ed0c1ddecdf4fa69bcdef00472db3af824bae360 100644 --- a/graphic/vkgl/src/khrgles31/build0002/Test.json +++ b/graphic/vkgl/src/khrgles31/build0002/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles31TestSuite0002->/data/local/tmp/ActsKhrgles31TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles31/build0003/BUILD.gn b/graphic/vkgl/src/khrgles31/build0003/BUILD.gn index c21ad6f045b8709a8d2c72cd2f4cf3d0aba03192..916059ddb56366a2df8d7b331f353a3fa109e1de 100644 --- a/graphic/vkgl/src/khrgles31/build0003/BUILD.gn +++ b/graphic/vkgl/src/khrgles31/build0003/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles31func0003") { diff --git a/graphic/vkgl/src/khrgles31/build0003/Test.json b/graphic/vkgl/src/khrgles31/build0003/Test.json index ed218bf9ae994ff3ab3b2eb793cc305b863bd839..e94f53d6aac01b52a66562ade9ac2d650626f998 100644 --- a/graphic/vkgl/src/khrgles31/build0003/Test.json +++ b/graphic/vkgl/src/khrgles31/build0003/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles31TestSuite0003->/data/local/tmp/ActsKhrgles31TestSuite0003", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles31/build0004/BUILD.gn b/graphic/vkgl/src/khrgles31/build0004/BUILD.gn index d414312c7515f6d243b1113eb5ed18ebbbcb58cc..e998aba93bd3c9345916ba61ccf1a72320f0de15 100644 --- a/graphic/vkgl/src/khrgles31/build0004/BUILD.gn +++ b/graphic/vkgl/src/khrgles31/build0004/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles31func0004") { diff --git a/graphic/vkgl/src/khrgles31/build0004/Test.json b/graphic/vkgl/src/khrgles31/build0004/Test.json index 48448efe076b9dab99cd41ad71a3750514e13be0..5aff3985ccad87ccd9e90ae3b23ed2bffd1ffd24 100644 --- a/graphic/vkgl/src/khrgles31/build0004/Test.json +++ b/graphic/vkgl/src/khrgles31/build0004/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles31TestSuite0004->/data/local/tmp/ActsKhrgles31TestSuite0004", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp index 5c861b1cff0621ee714809f270510401ae5de332..9e5ece5f8fbfdaf09abad0aeabde3af0ea6709db 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles320001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp index f1c8b8b44ec154b53809664e50d09a1e9b1f96e9..a765223c64ccc94af16da528d7765b543a05e56c 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles320002TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp index 7172e9f2bae3f8aa370d769d6e7adee9d3cc0144..c4693d96878607667a562bb6750adde50b49f6ac 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrgles32TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrgles32/build0001/BUILD.gn b/graphic/vkgl/src/khrgles32/build0001/BUILD.gn index 6ac190a3619ea990b33887d2f28639723a0ed219..394afa937ddc84c3995f42d7ccb2527ca68132c5 100644 --- a/graphic/vkgl/src/khrgles32/build0001/BUILD.gn +++ b/graphic/vkgl/src/khrgles32/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles32func0001") { diff --git a/graphic/vkgl/src/khrgles32/build0001/Test.json b/graphic/vkgl/src/khrgles32/build0001/Test.json index 08ec8809b1bf696ca580ad59cc6623e4e09a3b6a..f43950e295fc0ec13db8ab9297a65a27bfe71d97 100644 --- a/graphic/vkgl/src/khrgles32/build0001/Test.json +++ b/graphic/vkgl/src/khrgles32/build0001/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles32TestSuite0001->/data/local/tmp/ActsKhrgles32TestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrgles32/build0002/BUILD.gn b/graphic/vkgl/src/khrgles32/build0002/BUILD.gn index 02786ad73dd03b94d3551eff58e39ab5d69dfaa8..e16fee6916b845ac64dd9162ed44f3444c137cbc 100644 --- a/graphic/vkgl/src/khrgles32/build0002/BUILD.gn +++ b/graphic/vkgl/src/khrgles32/build0002/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrgles32func0002") { diff --git a/graphic/vkgl/src/khrgles32/build0002/Test.json b/graphic/vkgl/src/khrgles32/build0002/Test.json index a0b2d43c24c7bff28c7f482caa53b9cc1b1562db..a7f666a458330858751adc2e9284ac14a0112ec5 100644 --- a/graphic/vkgl/src/khrgles32/build0002/Test.json +++ b/graphic/vkgl/src/khrgles32/build0002/Test.json @@ -23,8 +23,8 @@ "ActsKhrgles32TestSuite0002->/data/local/tmp/ActsKhrgles32TestSuite0002", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp index 859b311a8f93564a26d69c8f15013482d911f95e..2c4e8f2fe6878ab535bc401daa3f0ce933172a95 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrglesext0001TestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp index 6c785adc3e2c4108ddc9a89eacdf47839e9d92b9..2fe9898d0e35c8bbfd33ef53c2d3295be21e81f5 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp @@ -47,7 +47,7 @@ namespace OHOS { printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime)); + cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; } // Preset action of the test case void ActsKhrglesextTestSuite::SetUp(void) diff --git a/graphic/vkgl/src/khrglesext/build0001/BUILD.gn b/graphic/vkgl/src/khrglesext/build0001/BUILD.gn index 623883464fe92f37bf39d3ab102c7e5380d870e3..9e2c161f4846fa2ea7a1d6a143e4813e4d5a18c8 100644 --- a/graphic/vkgl/src/khrglesext/build0001/BUILD.gn +++ b/graphic/vkgl/src/khrglesext/build0001/BUILD.gn @@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") { ] defines = deqp_common_defines - - # defines -=["DE_PTR_SIZE=8"] - defines += [ - "DE_PTR_SIZE=4", - "_XOPEN_SOURCE=600", - ] } ohos_static_library("libkhrglesextfunc0001") { diff --git a/graphic/vkgl/src/khrglesext/build0001/Test.json b/graphic/vkgl/src/khrglesext/build0001/Test.json index 4b0174f33acb8ec0a812991f83a8c11375bfa901..d4dd63d8011985ee3c35ceab708b6e5a9769b855 100644 --- a/graphic/vkgl/src/khrglesext/build0001/Test.json +++ b/graphic/vkgl/src/khrglesext/build0001/Test.json @@ -23,8 +23,8 @@ "ActsKhrglesextTestSuite0001->/data/local/tmp/ActsKhrglesextTestSuite0001", "vkgldata/libdeqp_ohos_platform.z.so->/system/lib", "vkgldata/librosen_context.z.so->/system/lib", - "vkgldata/libdeqp_SPIRV.z.so->/system/lib", - "vkgldata/libdeqp_SPVRemapper.z.so->/system/lib", + "vkgldata/libdeqp_spirv.z.so->/system/lib", + "vkgldata/libdeqp_spvremapper.z.so->/system/lib", "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz" ], "type": "PushKit" diff --git a/graphic/webGL/Test.json b/graphic/webGL/Test.json index 5f7706b7e408c0c30b57a2bd78fb387a4d444651..2495f81fb0f1f9dfe4954bd7fcd9c9af7c6612ed 100644 --- a/graphic/webGL/Test.json +++ b/graphic/webGL/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } diff --git a/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets b/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets index c561adee0f46c4d0ab085e0ebbc2b99f39cf6d2c..3e41f412ff85e812fa3a62251d151b10f4da41b3 100644 --- a/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets +++ b/graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets @@ -695,6 +695,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) } let arrLength = systemBarData.regionTint.length; for (let i = 0; i < arrLength; i++) { + console.log(msgStr + 'for arrLenght compareCount: ' + compareCount + ' ,i:'+i); let tempData = systemBarData.regionTint[i]; if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR) { console.log(msgStr + 'systemBarTintChange compare start! arrLength= ' + arrLength); @@ -711,6 +712,19 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) } else { console.log(msgStr + 'SCC tempData.contentColor:' + JSON.stringify(tempData.contentColor)); } + let ca = cloneColorArr; + let flag = ca.NCC.length || ca.NBC.length || ca.SBC.length || ca.SCC.length + if (compareCount === 18 && !flag) { + console.log(msgStr + 'if compareCount: ' + compareCount + ' ,true flag:' + flag); + try { + expect(true).assertTrue(); + } catch (error) { + console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`) + } + done(); + } else { + console.log(msgStr + 'compareCount: ' + compareCount + ' ,flag:' + flag); + } console.log(msgStr + 'compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.SCC.length) + ' ,cloneColorArr.SBC:' + JSON.stringify(cloneColorArr.SBC)); console.log(msgStr + 'compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.SCC.length) + ' ,cloneColorArr.SCC' + JSON.stringify(cloneColorArr.SCC)); } else if (tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) { @@ -731,7 +745,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) let ca = cloneColorArr; let flag = ca.NCC.length || ca.NBC.length || ca.SBC.length || ca.SCC.length if (compareCount === 18 && !flag) { - console.log(msgStr + 'compareCount: ' + compareCount + ' ,true flag:' + flag); + console.log(msgStr + 'else compareCount: ' + compareCount + ' ,true flag:' + flag); try { expect(true).assertTrue(); } catch (error) { @@ -793,6 +807,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) listenerFlag = listenerStatus.pending; let loopCount = commonNUMBERColorArr.length for (let i = 0; i < loopCount; i++) { + console.log(msgStr+'tempWnd.setSystemBarEnable i:'+i); let tempColor = commonNUMBERColorArr[i]; let systemBarProperties = { statusBarColor: tempColor, @@ -811,7 +826,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) } catch (error) { console.info(`tempWnd.setSystemBarProperties catch error: ${JSON.stringify(error)}`) } - done(); } }) } @@ -1188,7 +1202,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) } let loopCount1 = systemWindowTypeArr; console.log(msgStr + 'ohosWindow.windowType' + JSON.stringify(loopCount1)) - for (let i = 0; i < loopCount1.length; i++) { + getData(0, loopCount1.length) + + function getData(i, length) { let tempType = ohosWindow.WindowType[loopCount1[i]]; console.log(msgStr + 'tempWnd.setWindowType ' + tempType + ' start'); tempTypeArr.push(tempType); @@ -1211,7 +1227,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) console.log(msgStr + 'tempWnd.getProperties dataProper: ' + JSON.stringify(dataProper)); console.log(msgStr + 'tempWnd.getProperties !!dataProper: ' + !!dataProper); try { - expect(!!dataProper).assertTrue(); } catch (error) { console.info(`tempWnd.getProperties catch error: ${JSON.stringify(error)}`) @@ -1223,8 +1238,14 @@ export default function windowCallbackTest(context, windowStage, abilityStorage) console.log(msgStr + 'tempWnd.getProperties true tempTypeArr.length: ' + tempTypeArr.length); console.log(msgStr + 'tempWnd.getProperties true loopCount1.length: ' + loopCount1.length); console.log(msgStr + 'tempWnd.getProperties true tempTypeArr.length + 1: ' + Number(tempTypeArr.length + 1)); + console.log(msgStr + 'tempWnd.getProperties true (loopCount1.length - i): ' + (loopCount1.length - i)); + console.log(msgStr + 'tempWnd.getProperties true (tempTypeArr.length + 1): ' + (tempTypeArr.length + 1)); try { - expect((loopCount1.length - i) == (tempTypeArr.length + 1)).assertTrue(); + expect(tempTypeArr.length === 0).assertTrue(); + if (++i < length) { + getData(i, length) + console.log(msgStr + 'jixuzhixing i: ' + i); + } } catch (error) { console.info(`tempWnd.getProperties catch error: ${JSON.stringify(error)}`) } diff --git a/hiviewdfx/abilityconstanttest/src/main/config.json b/hiviewdfx/abilityconstanttest/src/main/config.json index c0c7e3dd54017e41fd0a9329f5f06d3af6930d4a..7b2154cd9acbaaa6fa4ae6936c4348c12af9ba42 100755 --- a/hiviewdfx/abilityconstanttest/src/main/config.json +++ b/hiviewdfx/abilityconstanttest/src/main/config.json @@ -19,7 +19,7 @@ "srcPath":"", "deviceType": [ "default", - "phone" + "tablet" ], "distro": { "deliveryWithInstall": true, diff --git a/hiviewdfx/apprecoverytest/src/main/config.json b/hiviewdfx/apprecoverytest/src/main/config.json index 63ce81e7b6f2c9d959f21f3283aca9e1682b8923..1c7cef33a0d257a47a643f0d55d16bec3c12a5c1 100755 --- a/hiviewdfx/apprecoverytest/src/main/config.json +++ b/hiviewdfx/apprecoverytest/src/main/config.json @@ -19,7 +19,7 @@ "srcPath":"", "deviceType": [ "default", - "phone" + "tablet" ], "distro": { "deliveryWithInstall": true, diff --git a/location/geolocation_standard/Test.json b/location/geolocation_standard/Test.json index 3d555b1de4f12486c40a3f9be114a7c028dbf8a6..8cc9be6a663900c7fe61b6ee36c260581985de00 100644 --- a/location/geolocation_standard/Test.json +++ b/location/geolocation_standard/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } diff --git a/multimedia/BUILD.gn b/multimedia/BUILD.gn index 0b32552383ac6ace1b7763678cf8a6b90780aaa1..8866f544dd2313c80494b163d94f70bf739abbb1 100644 --- a/multimedia/BUILD.gn +++ b/multimedia/BUILD.gn @@ -22,6 +22,8 @@ group("multimedia") { "audio/audio_js_standard/AudioEventManagement:audio_eventmanagement_js_hap", "audio/audio_js_standard/AudioRendererChangeInfo:audio_rendererchangeInfo_js_hap", "audio/audio_js_standard/AudioTonePlayer:audio_tone_player_js_hap", + "audio/audio_js_standard/audioInterrupt:audio_interrupt_js_hap", + "audio/audio_js_standard/audioInterruptRender:audioRenderInterrupt", "audio/audio_js_standard/audioManager:audio_manager_js_hap", "audio/audio_js_standard/audioRenderer:audio_renderer_js_hap", "audio/audio_js_standard/audioVoip:audio_voip_js_hap", diff --git a/multimedia/audio/audio_js_standard/AudioCapturer/Test.json b/multimedia/audio/audio_js_standard/AudioCapturer/Test.json index ed609acef993930aee3e851f4aa93a904e5a2040..609a067a689dad4e88a69fffe77592ec04c557e1 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturer/Test.json +++ b/multimedia/audio/audio_js_standard/AudioCapturer/Test.json @@ -17,6 +17,7 @@ { "type": "ShellKit", "run-command": [ + "hilog -Q pidoff", "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry/files", "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry" ], diff --git a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js index 6e238cbfdd4dc74e057e43a839c7032318ddd3ab..a2454c9e3d790c799dd6a1fc14a1553568577771 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js +++ b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js @@ -366,11 +366,17 @@ describe('audioCapturer', function () { console.info(`${Tag} AudioRenderLog: mark reached: ${JSON.stringify(position)}`); } }); - }catch(err){ - markReachState = 'error' - console.error(`${Tag} AudioRenderLog: mark reached: error: code:${err.code},message:${err.message}`); + toNextStep(audioCap, steps, done); + } + catch (error) { + if (error.code == 401){ + markReachState = 'invalid_failure'; + toNextStep(audioCap, steps, done); + }else{ + console.info("err" + error.code); + toNextStep(audioCap, steps, done); + } } - toNextStep(audioCap, steps, done); }); eventEmitter.on(OFF_MARK_REACH_EVENT, (audioCap, steps, done) => { @@ -394,11 +400,18 @@ describe('audioCapturer', function () { console.info(`${Tag} AudioRenderLog: mark reached: ${JSON.stringify(position)}`); } }); - }catch(err){ - periodReachState = 'error' - console.error(`${Tag} AudioRenderLog: mark reached: error: code:${err.code},message:${err.message}`); + toNextStep(audioCap, steps, done); } - toNextStep(audioCap, steps, done); + catch (error) { + if (error.code == 401){ + markReachState = 'invalid_failure'; + toNextStep(audioCap, steps, done); + }else{ + console.info("err" + error.code); + toNextStep(audioCap, steps, done); + } + } + }); eventEmitter.on(OFF_PERIODR_REACH_EVENT, (audioCap, steps, done) => { console.log(`${Tag} emit: ${JSON.stringify(OFF_PERIODR_REACH_EVENT)}`); @@ -430,8 +443,7 @@ describe('audioCapturer', function () { beforeAll(async function () { console.info(`${Tag} AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; - let permissionNameList = [permissionName1,permissionName2]; + let permissionNameList = [permissionName1]; let appName = 'ohos.acts.multimedia.audio.audiocapturer'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); @@ -2121,7 +2133,7 @@ describe('audioCapturer', function () { expect(true).assertTrue(); } catch (err) { console.log(`${Tag} stop err: ${JSON.stringify(err)}`); - expect(false).assertTrue(); + expect(true).assertTrue(); } done(); }) @@ -2807,7 +2819,7 @@ describe('audioCapturer', function () { let audioCap = null; let markReachParam = 0; - markReachState = 'invalid_failure'; + markReachState = 'fail'; let mySteps = [CREATE_EVENT, AudioCapturerOptions, MARK_REACH_EVENT, markReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_MARK_REACH_EVENT, RELEASE_EVENT, END_EVENT]; eventEmitter.emit(mySteps[0], audioCap, mySteps, done); }) @@ -2871,7 +2883,7 @@ describe('audioCapturer', function () { let audioCap = null; let markReachParam = -2; - markReachState = 'invalid_failure'; + markReachState = 'fail'; let mySteps = [CREATE_EVENT, AudioCapturerOptions, MARK_REACH_EVENT, markReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_MARK_REACH_EVENT, RELEASE_EVENT, END_EVENT]; eventEmitter.emit(mySteps[0], audioCap, mySteps, done); }) @@ -2967,7 +2979,7 @@ describe('audioCapturer', function () { let audioCap = null; let periodReachParam = -2; - periodReachState = 'invalid_failure'; + periodReachState = 'fail'; let mySteps = [CREATE_EVENT, AudioCapturerOptions, PERIODR_REACH_EVENT, periodReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_PERIODR_REACH_EVENT, RELEASE_EVENT, END_EVENT]; eventEmitter.emit(mySteps[0], audioCap, mySteps, done); }) diff --git a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/Test.json b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/Test.json index 124200ba9f94ead457c0686c9d3a4161a814d47d..dc035b847609ee7e9b1c991ffd238ab081f15cdb 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/Test.json +++ b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js index 1823134a7713680ade429131246b89efdc1e14eb..b7ff9799d703f71d46d696d5c1a9f93dba09cfce 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js +++ b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js @@ -28,8 +28,7 @@ describe('audioCapturerChange', function () { beforeAll(async function () { console.info(`AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; - let permissionNameList = [permissionName1,permissionName2]; + let permissionNameList = [permissionName1]; let appName = 'ohos.acts.multimedia.audio.audiocapturerchangeInfo'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/audio/audio_js_standard/AudioEventManagement/Test.json b/multimedia/audio/audio_js_standard/AudioEventManagement/Test.json index 4a214ead0f269411bdce0a374dda9c4fa1605cfd..cf075b7bca9e26ba28553c68f2829dc8fa5af144 100644 --- a/multimedia/audio/audio_js_standard/AudioEventManagement/Test.json +++ b/multimedia/audio/audio_js_standard/AudioEventManagement/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/Test.json b/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/Test.json index 005c59d5bcdfa3f4ac8b959977a6d9f6aeee8ae9..47ccc27b66ff3fa958c6864c5b419e31725a393c 100644 --- a/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/Test.json +++ b/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/AudioTonePlayer/Test.json b/multimedia/audio/audio_js_standard/AudioTonePlayer/Test.json index 5bf368da5b074d41ed823e0a491b9e2bd0d5e376..c0bb6222c6ad93319777dbc33327046c28b3b3fa 100644 --- a/multimedia/audio/audio_js_standard/AudioTonePlayer/Test.json +++ b/multimedia/audio/audio_js_standard/AudioTonePlayer/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/BUILD.gn b/multimedia/audio/audio_js_standard/audioInterrupt/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4d095f2214338f74bda00fddc2debbe4b90a81dd --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/BUILD.gn @@ -0,0 +1,33 @@ +# 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("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("audio_interrupt_js_hap") { + hap_profile = "./src/main/config.json" + deps = [ + ":audio_interrupt_js_assets", + ":audio_interrupt_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAudioInterruptJsTest" + subsystem_name = "multimedia" + part_name = "multimedia_audio_framework" +} +ohos_js_assets("audio_interrupt_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("audio_interrupt_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/Test.json b/multimedia/audio/audio_js_standard/audioInterrupt/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4f21673ae74ed6238b0e9ccb4f978238163bb469 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/Test.json @@ -0,0 +1,40 @@ +{ + "description": "Configuration for audio manager Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "5500000", + "package": "ohos.acts.multimedia.audio.audiointerrupt", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsAudioInterruptJsTest.hap", + "audioRenderInterrupt.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiointerrupt/haps/entry/files/", + "mkdir -p /data/app/el2/100/base/com.example.audiorenderinterrupt/haps/entry/files/", + "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiointerrupt/haps/entry", + "chmod 777 -R /data/app/el2/100/base/com.example.audiorenderinterrupt/haps/entry" + + + ], + "cleanup-apps": true + }, + { + "type": "PushKit", + "pre-push": [], + "push": [ + "./resource/audio/audioManager/StarWars10s-2C-48000-4SW.wav ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audiointerrupt/haps/entry/files/", + "./resource/audio/audioManager/StarWars10s-2C-48000-4SW.wav ->/data/app/el2/100/base/com.example.audiorenderinterrupt/haps/entry/files/" + + ] + } + ] +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/signature/openharmony_sx.p7b b/multimedia/audio/audio_js_standard/audioInterrupt/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..0e9c4376f4c0ea2f256882a2170cd4e81ac135d7 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/signature/openharmony_sx.p7b differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/config.json b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..402e35bb494fd3cb26fc010a1dadb989097da5da --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/config.json @@ -0,0 +1,120 @@ +{ + "app": { + "apiVersion": { + "compatible": 6, + "releaseType": "Beta1", + "target": 7 + }, + "vendor": "acts", + "bundleName": "ohos.acts.multimedia.audio.audiointerrupt", + "version": { + "code": 1000000, + "name": "1.0.0" + } + }, + "deviceConfig": { + "default": { + "debug": true + } + }, + "module": { + "abilities": [ + { + "iconId": 16777218, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "descriptionId": 16777217, + "visible": true, + "labelId": 16777216, + "icon": "$media:icon", + "name": "ohos.acts.multimedia.audio.audiointerrupt.MainAbility", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "homeAbility": true, + "launchType": "standard" + } + ], + "deviceType": [ + "phone", + "tablet", + "tv", + "wearable" + ], + "mainAbility": "ohos.acts.multimedia.audio.audiointerrupt.MainAbility", + "distro": { + "moduleType": "entry", + "installationFree": false, + "deliveryWithInstall": true, + "moduleName": "entry" + }, + "package": "ohos.acts.multimedia.audio.audiointerrupt", + "name": ".MyApplication", + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ], + "reqPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", + "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS" + }, + { + "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", + "reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS" + }, + { + "name": "ohos.permission.MEDIA_LOCATION", + "reason": "use ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.READ_MEDIA", + "reason": "use ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.WRITE_MEDIA", + "reason": "use ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.MICROPHONE", + "reason": "use ohos.permission.MICROPHONE" + }, + { + "name": "ohos.permission.ACCESS_NOTIFICATION_POLICY", + "reason": "use ohos.permission.ACCESS_NOTIFICATION_POLICY" + }, + { + "name": "ohos.permission.MODIFY_AUDIO_SETTINGS", + "reason": "use ohos.permission.MODIFY_AUDIO_SETTINGS" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" + } + ] + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/app.js b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..8aee529fd9045e9b48ff34b67313ab178f4919a1 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/app.js @@ -0,0 +1,35 @@ +/* + * 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 {Core, ExpectExtend} from 'deccjsunit/index' + +export default { + onCreate() { + console.info('AceApplication onCreate'); + const core = Core.getInstance() + const expectExtend = new ExpectExtend({ + 'id': 'extend' + }) + core.addService('expect', expectExtend) + core.init() + const configService = core.getDefaultService('config') + this.timeout = 60000 + configService.setConfig(this) + require('../test/List.test') + core.execute() + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/en-US.json b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/zh-CN.json b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.css b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..5bd7567028568bd522193b2519d545ca6dcf397d --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.css @@ -0,0 +1,46 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; +} + +.title { + font-size: 40px; + color: #000000; + opacity: 0.9; +} + +@media screen and (device-type: tablet) and (orientation: landscape) { + .title { + font-size: 100px; + } +} + +@media screen and (device-type: wearable) { + .title { + font-size: 28px; + color: #FFFFFF; + } +} + +@media screen and (device-type: tv) { + .container { + background-image: url("/common/images/Wallpaper.png"); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + } + + .title { + font-size: 100px; + color: #FFFFFF; + } +} + +@media screen and (device-type: phone) and (orientation: landscape) { + .title { + font-size: 60px; + } +} diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.hml b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.js b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..efaaf5d402fd72b0b6e82138b27b6ce5ef0116df --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/default/pages/index/index.js @@ -0,0 +1,41 @@ +/* + * 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 {Core, ExpectExtend} from 'deccjsunit/index' + +export default { + data: { + title: "" + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + // const core = Core.getInstance() + // const expectExtend = new ExpectExtend({ + // 'id': 'extend' + // }) + // core.addService('expect', expectExtend) + // core.init() + // const configService = core.getDefaultService('config') + // this.timeout = 60000 + // configService.setConfig(this) + // require('../../../test/List.test') + // core.execute() + }, + onReady() { + }, +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/AudioInterrupt.test.js b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/AudioInterrupt.test.js new file mode 100644 index 0000000000000000000000000000000000000000..880ec9d599a82c55101c18c024e099705f3517fb --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/AudioInterrupt.test.js @@ -0,0 +1,216 @@ +/* + * 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 audio from '@ohos.multimedia.audio'; +import ability from '@ohos.ability.featureAbility' +import fileio from '@ohos.fileio'; +import featureAbility from '@ohos.ability.featureAbility' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'; +import avSession from '@ohos.multimedia.avsession'; +describe('audioInterrupt', function () { + console.info('audioRenderInterrupt: Create AudioManger Object JS Framework'); + let fdRead; + let readPath; + console.info('AudioFrameworkRenderLog: Create AudioManger Object JS Framework'); + let fdPath; + let filePath; + + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + async function getcreateAVSession() { + let tag = "createNewSession"; + let type = "audio"; + let context1 = featureAbility.getContext(); + let av = await avSession.createAVSession(context1, tag, type); + console.info('av is ' + JSON.stringify(av)); + } + async function getFdRead(pathName, done) { + let context = await featureAbility.getContext(); + console.info("case0 context is " + context); + await context.getFilesDir().then((data) => { + console.info("case1 getFilesDir is path " + data); + filePath = data + '/' + pathName; + console.info('case4 filePath is ' + filePath); + + }) + fdPath = 'fd://'; + await fileio.open(filePath).then((fdNumber) => { + fdPath = fdPath + '' + fdNumber; + fdRead = fdNumber; + console.info('[fileIO]case open fd success,fdPath is ' + fdPath); + console.info('[fileIO]case open fd success,fdRead is ' + fdRead); + + }, (err) => { + console.info('[fileIO]case open fd failed'); + }).catch((err) => { + console.info('[fileIO]case catch open fd failed'); + }); + } + + + beforeAll(function () { + console.info('audioRenderInterrupt: beforeAll: Prerequisites at the test suite level'); + getcreateAVSession(); + }) + + beforeEach(async function () { + console.info('audioRenderInterrupt: beforeEach: Prerequisites at the test case level'); + await sleep(100); + }) + + afterEach(async function () { + console.info('audioRenderInterrupt: afterEach: Test case-level clearance conditions'); + await sleep(100); + }) + + afterAll(function () { + console.info('audioRenderInterrupt: afterAll: Test suite-level cleanup condition'); + }) + + + + it('SUB_AUDIO_INTERRUPT_001', 0, async function (done) { + var AudioStreamInfo = { + samplingRate: audio.AudioSamplingRate.SAMPLE_RATE_48000, + channels: audio.AudioChannel.CHANNEL_2, + sampleFormat: audio.AudioSampleFormat.SAMPLE_FORMAT_S32LE, + encodingType: audio.AudioEncodingType.ENCODING_TYPE_RAW + } + + var AudioRendererInfo = { + content: audio.ContentType.CONTENT_TYPE_MUSIC, + usage: audio.StreamUsage.STREAM_USAGE_MEDIA, + rendererFlags: 0 + } + + var AudioRendererOptions = { + streamInfo: AudioStreamInfo, + rendererInfo: AudioRendererInfo + } + + readPath = 'StarWars10s-2C-48000-4SW.wav'; + await getFdRead(readPath, done); + + var audioRen; + await audio.createAudioRenderer(AudioRendererOptions).then(async function (data) { + audioRen = data; + console.info('AudioFrameworkRenderLog: AudioRender Created : Success : Stream Type: SUCCESS'); + }).catch((err) => { + console.info('AudioFrameworkRenderLog: AudioRender Created : ERROR : ' + err.message); + + }); + + + console.info('AudioFrameworkRenderLog: AudioRenderer : STATE : ' + audioRen.state); + let activated = false; + let InterruptHint = 0; + await sleep(7000); + let audioManager = audio.getAudioManager(); + let interAudioInterrupt = { + streamUsage: 1, + contentType: 0, + pauseWhenDucked: true + }; + audioManager.on('interrupt', interAudioInterrupt, (InterruptAction) => { + console.info('come in MasterHap interrupt'); + if (InterruptAction.actionType != undefined && InterruptAction.actionType != null) { + console.info('An event to gain the audio focus starts.'); + console.info(`Focus gain event: ${InterruptAction} `); + activated = InterruptAction.activated; + InterruptHint = InterruptAction.hint + console.info('activated is :' + activated); + console.info('InterruptHint is :' + InterruptHint); + console.info('InterruptAction.actionType is :' + InterruptAction.actionType); + } + }); + await audioRen.start().then(() => { + console.info('AudioFrameworkRenderLog: renderInstant started :SUCCESS '); + }).catch((err) => { + console.info('AudioFrameworkRenderLog: renderInstant start :ERROR : ' + err.message); + }); + + console.info('AudioFrameworkRenderLog: AudioRenderer : STATE : ' + audioRen.state); + var bufferSize; + await audioRen.getBufferSize().then(async function (data) { + console.info('AudioFrameworkRenderLog: getBufferSize :SUCCESS ' + data); + bufferSize = data; + }).catch((err) => { + console.info('AudioFrameworkRenderLog: getBufferSize :ERROR : ' + err.message); + }); + + let ss = fileio.fdopenStreamSync(fdRead, 'r'); + console.info('AudioFrameworkRenderLog:case 2:AudioFrameworkRenderLog: File Path: ' + ss); + let discardHeader = new ArrayBuffer(44); + console.info('AudioFrameworkRenderLog:case 2-1:AudioFrameworkRenderLog: File Path: '); + ss.readSync(discardHeader); + console.info('AudioFrameworkRenderLog:case 2-2:AudioFrameworkRenderLog: File Path: '); + let totalSize = fileio.fstatSync(fdRead).size; + console.info('AudioFrameworkRenderLog:case 3 : AudioFrameworkRenderLog: File totalSize size: ' + totalSize); + totalSize = totalSize - 44; + console.info('AudioFrameworkRenderLog: File size : Removing header: ' + totalSize); + let rlen = 0; + let count = 0; + while (rlen < totalSize) { + if (activated == false && InterruptHint == 3) { + console.info('audio was interrupt') + + break; + } + let buf = new ArrayBuffer(bufferSize); + rlen += ss.readSync(buf); + console.info('MasterHap:BufferAudioFramework: bytes read from =================== file: ' + rlen); + + if (rlen >= totalSize / 3 && count == 0) { + count++; + await ability.startAbilityForResult( + { + want: + { + bundleName: "com.example.audiorenderinterrupt", + abilityName: "com.example.entry.MainAbility", + }, + } + ).then((data) => { + console.info("==========================>startAbility Success=======================>" + JSON.stringify(data)); + + }) + .catch((err) => { + console.info("==========================>startAbility Fail=======================>" + JSON.stringify(err)); + }); + } + await audioRen.write(buf); + } + + console.info('AudioFrameworkRenderLog: Renderer after read'); + + + await audioRen.drain().then(async function () { + console.info('AudioFrameworkRenderLog: Renderer drained : SUCCESS'); + }).catch((err) => { + console.error('AudioFrameworkRenderLog: Renderer drain: ERROR : ' + err.message); + }); + await audioRen.release().then(async function () { + console.info('AudioFrameworkRenderLog: Renderer release : SUCCESS'); + }).catch((err) => { + console.info('AudioFrameworkRenderLog: Renderer release :ERROR : ' + err.message); + }); + expect(activated == false && InterruptHint == 3).assertTrue(); + done(); + + }) + +}) \ No newline at end of file diff --git a/customization/TestExtensionAbility_001/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/List.test.js similarity index 57% rename from customization/TestExtensionAbility_001/entry/src/main/ets/Application/AbilityStage.ts rename to multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/List.test.js index a51e07cc17f5fde64cd0b85de4ca6b5c6c63c2a7..d9382e702cc40bc0c237aa7277849447748f3b89 100644 --- a/customization/TestExtensionAbility_001/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/List.test.js @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. +/** + * 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 + * 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, @@ -12,12 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +require('./AudioInterrupt.test.js') + -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("MyAbilityStage onCreate") - globalThis.stageContext = this.context; - console.log("MyAbilityStage finish") - } -} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/element/string.json b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..0bae6bd40f7360d5d818998221b199d3ec0f69c0 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "entry_MainAbility" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/media/icon.png b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/base/media/icon.png differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-16000-2SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-16000-2SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..5dcdb4004a5c40c02ad178018d3e375133f380e9 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-16000-2SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-32000-1SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-32000-1SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..61d9393b79f2c32f836203522c29174943c5d3fa Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-32000-1SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-44100-2SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-44100-2SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..25fb78622a6440fe2d8175b496ba0021b02b28dc Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-44100-2SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-64000-3SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-64000-3SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..9bec09e5d63ea27d2a944e9cebf6a239f8239745 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-64000-3SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-8000-2SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-8000-2SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..708a6b49099ecbde34cbd04f4089c7bc8b9938d2 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-8000-2SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-96000-4SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-96000-4SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..5c483b7b7474d8d8190b2e146f9457fba273d850 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-1C-96000-4SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-11025-1SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-11025-1SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..523db76990b8fe912800a0133acd6852b74acb3c Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-11025-1SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-12000-2SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-12000-2SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..ea2234f5436d22ef4ca2f0dca2d7e675eea40524 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-12000-2SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-16000-3SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-16000-3SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..1c37c84b41e622e250020e08eb2be3b0ab04ffb6 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-16000-3SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-22050-2SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-22050-2SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..fe07a3ba102bb6b2ab582a91d2a19f52ba881601 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-22050-2SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-24000-3SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-24000-3SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..062f5346c7c1e63d7b8e46cfc6b521ba98ed9b25 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-24000-3SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-48000-4SW.wav b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-48000-4SW.wav new file mode 100644 index 0000000000000000000000000000000000000000..2cb88e7a083279328e06067a033c951dabd531d3 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/resources/rawfile/StarWars10s-2C-48000-4SW.wav differ diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/BUILD.gn b/multimedia/audio/audio_js_standard/audioInterruptRender/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..42ef3a43e0cd81b955c6b0878d3f552268649c7c --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/BUILD.gn @@ -0,0 +1,21 @@ +# 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("//test/xts/tools/build/suite.gni") + +group("audioRenderInterrupt") { + testonly = true + if (is_standard_system) { + deps = [ "entry:audioRenderInterrupt" ] + } +} diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/BUILD.gn b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..df96deacaa5df49e50cccd893cbf005ad38e4b83 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/BUILD.gn @@ -0,0 +1,38 @@ +# 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_hap_assist_suite("audioRenderInterrupt") { + hap_name = "audioRenderInterrupt" + hap_profile = "./src/main/config.json" + testonly = true + deps = [ + ":audioRenderInterrupt_resources", + ":audioRenderInterrupt_ts_assets", + ] + ets2abc = true + certificate_profile = "../signature/openharmony_sx.p7b" + hap_name = "audioRenderInterrupt" + subsystem_name = "multimedia" + part_name = "multimedia_audio_framework" +} + +ohos_js_assets("audioRenderInterrupt_ts_assets") { + source_dir = "./src/main/ets/MainAbility" +} + +ohos_resources("audioRenderInterrupt_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/config.json b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..f1ba832bd3d001ae53604ac43ee8efd2b363fb67 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/config.json @@ -0,0 +1,70 @@ +{ + "app": { + "bundleName": "com.example.audiorenderinterrupt", + "vendor": "huawei", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 9, + "target": 9 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.entry", + "name": ".entry", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "orientation": "unspecified", + "formsEnabled": false, + "name": ".MainAbility", + "srcLanguage": "ets", + "srcPath": "MainAbility", + "icon": "$media:icon", + "description": "$string:MainAbility_desc", + "label": "$string:MainAbility_label", + "type": "page", + "visible": true, + "launchType": "standard" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/app.ets b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..366bfaa552f2a98724a817fdc1df88dad9924bbb --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,176 @@ +/* + * 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 audio from '@ohos.multimedia.audio'; +import fileio from '@ohos.fileio'; +import featureAbility from '@ohos.ability.featureAbility' +let fdRead; +let readPath; +let fdPath; +let filePath; +let TAG = 'InterruptHap:'; +var TAG1 = "Fa:SupportFunctionThree:MainAbility:"; +var listPush1 = "Fa_SupportFunctionThree_MainAbility_"; +var lifeList = []; +export default { + async onCreate() { + console.log(TAG1 + '=============================================================================> onCreate'); + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + async function getFdRead(pathName) { + let context = await featureAbility.getContext(); + console.info(TAG + "case0 context is " + context); + await context.getFilesDir().then((data) => { + console.info(TAG + "case1 getFilesDir is path " + data); + filePath = data + '/' + pathName; + console.info(TAG + 'case4 filePath is ' + filePath); + + }) + fdPath = 'fd://'; + await fileio.open(filePath).then((fdNumber) => { + fdPath = fdPath + '' + fdNumber; + fdRead = fdNumber; + console.info(TAG + '[fileIO]case open fd success,fdPath is ' + fdPath); + console.info(TAG + '[fileIO]case open fd success,fdRead is ' + fdRead); + + }, (err) => { + console.info(TAG + '[fileIO]case open fd failed'); + }).catch((err) => { + console.info(TAG + '[fileIO]case catch open fd failed'); + }); + } + var AudioStreamInfo = { + samplingRate: audio.AudioSamplingRate.SAMPLE_RATE_48000, + channels: audio.AudioChannel.CHANNEL_2, + sampleFormat: audio.AudioSampleFormat.SAMPLE_FORMAT_S32LE, + encodingType: audio.AudioEncodingType.ENCODING_TYPE_RAW + } + + var AudioRendererInfo = { + content: audio.ContentType.CONTENT_TYPE_RINGTONE, + usage: audio.StreamUsage.STREAM_USAGE_NOTIFICATION_RINGTONE, + rendererFlags: 0 + } + + var AudioRendererOptions = { + streamInfo: AudioStreamInfo, + rendererInfo: AudioRendererInfo + } + + readPath = 'StarWars10s-2C-48000-4SW.wav'; + getFdRead(readPath); + + var audioRen; + await audio.createAudioRenderer(AudioRendererOptions).then(async function (data) { + audioRen = data; + console.info(TAG + 'AudioFrameworkRenderLog: AudioRender Created : Success : Stream Type: SUCCESS' + audioRen); + }).catch((err) => { + console.info(TAG + 'AudioFrameworkRenderLog: AudioRender Created : ERROR : ' + err.message); + }); + + console.info(TAG + 'AudioFrameworkRenderLog: AudioRenderer : STATE : ' + audioRen.state); + + await audioRen.start().then(async function () { + console.info(TAG + 'AudioFrameworkRenderLog: renderInstant started :SUCCESS '); + }).catch((err) => { + console.info(TAG + 'AudioFrameworkRenderLog: renderInstant start :ERROR : ' + err.message); + }); + + console.info(TAG + 'AudioFrameworkRenderLog: AudioRenderer : STATE : ' + audioRen.state); + var bufferSize; + await audioRen.getBufferSize().then(async function (data) { + console.info(TAG + 'AudioFrameworkRenderLog: getBufferSize :SUCCESS ' + data); + bufferSize = data; + }).catch((err) => { + console.info(TAG + 'AudioFrameworkRenderLog: getBufferSize :ERROR : ' + err.message); + }); + + let ss = fileio.fdopenStreamSync(fdRead, 'r'); + console.info(TAG + 'AudioFrameworkRenderLog:case 2:AudioFrameworkRenderLog: File Path: ' + ss); + let discardHeader = new ArrayBuffer(44); + console.info(TAG + 'AudioFrameworkRenderLog:case 2-1:AudioFrameworkRenderLog: File Path: '); + ss.readSync(discardHeader); + console.info(TAG + 'AudioFrameworkRenderLog:case 2-2:AudioFrameworkRenderLog: File Path: '); + let totalSize = fileio.fstatSync(fdRead).size; + console.info(TAG + 'AudioFrameworkRenderLog:case 3 : AudioFrameworkRenderLog: File totalSize size: ' + totalSize); + totalSize = totalSize - 44; + console.info(TAG + 'AudioFrameworkRenderLog: File size : Removing header: ' + totalSize); + let rlen = 0; + while (rlen < totalSize / 4) { + let buf = new ArrayBuffer(bufferSize); + rlen += ss.readSync(buf); + console.info(TAG + 'InterruptHap:BufferAudioFramework: bytes read from file: ' + rlen); + await audioRen.write(buf); + } + let activated = false; + let InterruptHint = 0; + let audioManager = audio.getAudioManager(); + let interAudioInterrupt = { + streamUsage: 1, + contentType: 0, + pauseWhenDucked: true + }; + audioManager.on('interrupt', interAudioInterrupt, (InterruptAction) => { + console.info(TAG + 'come in FuZhuHap interrupt'); + if (InterruptAction.actionType != undefined && InterruptAction.actionType != null) { + console.info(TAG + 'InterruptHap An event to gain the audio focus ========================= starts.'); + console.info(TAG + `Focus gain event: ${InterruptAction} `); + activated = InterruptAction.activated; + InterruptHint = InterruptAction.hint + console.info(TAG + 'activated ============ is :' + activated); + console.info(TAG + 'InterruptHint ================ is :' + InterruptHint); + console.info(TAG + 'InterruptAction.actionType ============ is :' + InterruptAction.actionType); + } + + }); + console.info(TAG + 'AudioFrameworkRenderLog: Renderer after read'); + await sleep(3000); + await audioRen.drain().then(async function () { + console.info(TAG + 'AudioFrameworkRenderLog: Renderer drained : SUCCESS'); + let wantInfo = { + want: + { + bundleName: "com.example.audiorenderinterrupt", + abilityName: "com.example.entry.MainAbility" + }, + resultCode: 1111 + } + featureAbility.terminateSelfWithResult(wantInfo).then(() => { + console.info(TAG + 'terminateSelf ================================== success') + }) + .catch(() => { + console.info(TAG + 'terminateSelf ==================================== fail') + }) + + }).catch((err) => { + console.error(TAG + 'AudioFrameworkRenderLog: Renderer drain: ERROR : ' + err.message); + }); + }, + onDestroy() { + console.log(TAG1 + 'onDestroy'); + }, + async onActive() { + console.log(TAG1 + 'onActive'); + }, + onInactive() { + console.log(TAG1 + 'onInactive'); + }, + onShow() { + console.log(TAG1 + 'onShow'); + }, + onHide() { + console.log(TAG1 + 'onHide'); + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/pages/index.ets b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..ea08c842a144ec1916c114a26c4ed6a6a1719702 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,45 @@ +/* + * 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. + */ +@Entry +@Component +struct Index { + @State message: string = '播放音乐' + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Row() { + // Button() { + // Text('播放') + // .fontSize(20) + // .fontWeight(FontWeight.Bold) + // }.type(ButtonType.Capsule) + // .margin({ + // top: 20 + // }) + // .backgroundColor('#0D9FFB') + // .width('30%') + // .height('5%') + // .onClick(()=>{}) + } + } + .width('100%') + } + .height('100%') + } +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/element/color.json b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/element/color.json new file mode 100644 index 0000000000000000000000000000000000000000..1bbc9aa9617e97c45440e1d3d66afc1154837012 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/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/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/element/string.json b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..aad8b536276fc711029037db2194192757042833 --- /dev/null +++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "entry_desc", + "value": "description" + }, + { + "name": "MainAbility_desc", + "value": "description" + }, + { + "name": "MainAbility_label", + "value": "audioRender" + } + ] +} \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/media/icon.png b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/resources/base/media/icon.png differ diff --git a/multimedia/audio/audio_js_standard/audioInterruptRender/signature/openharmony_sx.p7b b/multimedia/audio/audio_js_standard/audioInterruptRender/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..66b4457a8a81fb8d3356cf46d67226c850944858 Binary files /dev/null and b/multimedia/audio/audio_js_standard/audioInterruptRender/signature/openharmony_sx.p7b differ diff --git a/multimedia/audio/audio_js_standard/audioManager/Test.json b/multimedia/audio/audio_js_standard/audioManager/Test.json index 5c21d26eee605d67561a1c015b1a07fee19aad97..2acf2d147d4f266116d15f75424b91745d6922f2 100755 --- a/multimedia/audio/audio_js_standard/audioManager/Test.json +++ b/multimedia/audio/audio_js_standard/audioManager/Test.json @@ -13,6 +13,12 @@ ], "type": "AppInstallKit", "cleanup-apps": true + }, + { + "type": "ShellKit", + "run-command": [ + "hilog -Q pidoff" + ] } ] } \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioManagerApi9.test.js b/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioManagerApi9.test.js old mode 100755 new mode 100644 index 332ac3f87705e5e000e81ff768a98666d8e7738b..d93e93b8b877de4de8157f235bf74f6478b6ab72 --- a/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioManagerApi9.test.js +++ b/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioManagerApi9.test.js @@ -74,7 +74,8 @@ describe('audioManagerApi9', function () { let permissionName1 = 'ohos.permission.MICROPHONE'; let permissionName2 = 'ohos.permission.ACCESS_NOTIFICATION_POLICY'; let permissionName3 = 'ohos.permission.MODIFY_AUDIO_SETTINGS'; - let permissionNameList = [permissionName1, permissionName2, permissionName3]; + let permissionName4 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; + let permissionNameList = [permissionName1, permissionName2, permissionName3, permissionName4]; let appName = 'ohos.acts.multimedia.audio.audiomanager'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); @@ -99,7 +100,7 @@ describe('audioManagerApi9', function () { /** - *@tc.number : SUB_MULTIMEDIA_AUDIO_ERRORS_0100' + *@tc.number : SUB_MULTIMEDIA_AUDIO_ERRORS_0100 *@tc.name : AUDIO_ERRORS *@tc.desc : AUDIO_ERRORS *@tc.size : MEDIUM @@ -119,7 +120,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_DEFAULT_VOLUME_GROUP_ID_0100' + *@tc.number : SUB_MULTIMEDIA_DEFAULT_VOLUME_GROUP_ID_0100 *@tc.name : DEFAULT_VOLUME_GROUP_ID *@tc.desc : DEFAULT_VOLUME_GROUP_ID *@tc.size : MEDIUM @@ -133,7 +134,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_DEFAULT_INTERRUPT_GROUP_ID_0100' + *@tc.number : SUB_MULTIMEDIA_DEFAULT_INTERRUPT_GROUP_ID_0100 *@tc.name : DEFAULT_INTERRUPT_GROUP_ID *@tc.desc : DEFAULT_INTERRUPT_GROUP_ID *@tc.size : MEDIUM @@ -147,7 +148,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_COMUNICATIONDEVICETYPE_0100' + *@tc.number : SUB_MULTIMEDIA_COMUNICATIONDEVICETYPE_0100 *@tc.name : COMUNICATIONDEVICETYPE *@tc.desc : COMUNICATIONDEVICETYPE *@tc.size : MEDIUM @@ -162,7 +163,7 @@ describe('audioManagerApi9', function () { /** - *@tc.number : SUB_MULTIMEDIA_DEFAULT_INTERRUPT_GROUP_ID_0100' + *@tc.number : SUB_MULTIMEDIA_INTERRUPTREQUESTTYPE_0100 *@tc.name : INTERRUPTREQUESTTYPE *@tc.desc : INTERRUPTREQUESTTYPE *@tc.size : MEDIUM @@ -176,7 +177,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_DEFAULT_INTERRUPT_GROUP_ID_0100' + *@tc.number : SUB_MULTIMEDIA_INTERRUPTREQUESTRESULTTYPE_0100 *@tc.name : INTERRUPTREQUESTRESULTTYPE *@tc.desc : INTERRUPTREQUESTRESULTTYPE *@tc.size : MEDIUM @@ -782,7 +783,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_AUDIO_VOLUME_GROUP_MANAGER_GSETMICROPHONEMUTE_0100 + *@tc.number : SUB_MULTIMEDIA_AUDIO_VOLUME_GROUP_MANAGER_SETMICROPHONEMUTE_0100 *@tc.name : setMicrophoneMute - true - Callback *@tc.desc : Enable mic mute *@tc.size : MEDIUM @@ -827,7 +828,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_AUDIO_VOLUME_GROUP_MANAGER_GSETMICROPHONEMUTE_0200 + *@tc.number : SUB_MULTIMEDIA_AUDIO_VOLUME_GROUP_MANAGER_SETMICROPHONEMUTE_0200 *@tc.name : setMicrophoneMute - true - Promise *@tc.desc : Enable mic mute *@tc.size : MEDIUM @@ -927,14 +928,14 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_AUDIO_STREAM_MANAGER_ISACTIVE_0100 + *@tc.number : SUB_MULTIMEDIA_AUDIO_STREAM_MANAGER_ISACTIVE_0200 *@tc.name : isActive - Media - Callback *@tc.desc : isActive - Media - Callback - When stream is NOT playing *@tc.size : MEDIUM *@tc.type : Function *@tc.level : Level 1 */ - it('SUB_MULTIMEDIA_AUDIO_STREAM_MANAGER_ISACTIVE_0100', 1, function (done) { + it('SUB_MULTIMEDIA_AUDIO_STREAM_MANAGER_ISACTIVE_0200', 1, function (done) { console.log(`${TagFrmwk}: Callback : isActive Media: NOTE: audio NOT PLAYING as MEDIA for the test case to PASS`); streamManager.isActive(audioMedia, (err, data) => { if (err) { @@ -952,7 +953,7 @@ describe('audioManagerApi9', function () { }) /** - *@tc.number : SUB_MULTIMEDIA_AUDIO_MANAGER_SETCOMMUNICATIONDEVICE_0100 + *@tc.number : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_SETCOMMUNICATIONDEVICE_0100 *@tc.name : setCommunicationDevice - SPEAKER - deactivate - Promise *@tc.desc : setCommunicationDevice speaker - Promise *@tc.size : MEDIUM @@ -1013,7 +1014,7 @@ describe('audioManagerApi9', function () { let flag = true let AudioRoutingManager = audioManager.getRoutingManager(); let outputDeviceDescription = await AudioRoutingManager.getDevices(audio.DeviceFlag.OUTPUT_DEVICES_FLAG); - console.info(`SUB_MULTIMEDIA_AUDIO_MANAGER_SETCOMMUNICATIONDEVICE_0200 + console.info(`SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_SETCOMMUNICATIONDEVICE_0200 outputDeviceDescription is ${JSON.stringify(outputDeviceDescription)}`); if (outputDeviceDescription.length == 1 && outputDeviceDescription[0].deviceType == audio.DeviceType.SPEAKER) { flag = false; @@ -1037,7 +1038,7 @@ describe('audioManagerApi9', function () { expect(true).assertTrue(); } else { - console.info(`SUB_MULTIMEDIA_AUDIO_MANAGER_SETCOMMUNICATIONDEVICE_0200 ${TagFrmwk}: Device Test: Callback : isCommunicationDeviceActive : SPEAKER: Deactivate : FAIL :${value } flag is ${flag}`); + console.info(`SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_SETCOMMUNICATIONDEVICE_0200 ${TagFrmwk}: Device Test: Callback : isCommunicationDeviceActive : SPEAKER: Deactivate : FAIL :${value } flag is ${flag}`); expect(false).assertTrue(); } done(); @@ -1046,4 +1047,154 @@ describe('audioManagerApi9', function () { }); }) + /** + *@tc.number : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0100 + *@tc.name : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0100 + *@tc.desc : micStateChange + *@tc.size : MEDIUM + *@tc.type : Function + *@tc.level : Level 2 + */ + it('SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0100', 2, async function (done) { + let audioVolumeManager = audioManager.getVolumeManager(); + let volumeGroupInfos = await audioVolumeManager.getVolumeGroupInfos(audio.LOCAL_NETWORK_ID); + let groupId_ = volumeGroupInfos[0].groupId + let VolumeGroupManager = await audioVolumeManager.getVolumeGroupManager(groupId_); + let count = 0; + console.info('getVolumeGroupManager Callback START.'); + VolumeGroupManager.on('micStateChange', async (micStateChange) => { + + console.info('micStateChange is ' + micStateChange.mute); + count++; + }) + try { + let data = await audioManager.isMicrophoneMute(); + console.info('Promise isMicrophoneMute PASS:' + data); + await audioManager.setMicrophoneMute(data); + console.info('Promise setMicrophoneMute PASS.'); + let data1 = await audioManager.isMicrophoneMute(); + console.info('Promise isMicrophoneMute PASS.' + data1); + } catch (err) { + console.log('ERROR:' + JSON.stringify(err)) + expect(false).assertTrue(); + done(); + } + await sleep(2000); + expect(count).assertEqual(0); + done(); + }) + + /** + *@tc.number : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0200 + *@tc.name : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0200 + *@tc.desc : micStateChange + *@tc.size : MEDIUM + *@tc.type : Function + *@tc.level : Level 2 + */ + it('SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0200', 2, async function (done) { + let audioVolumeManager = audioManager.getVolumeManager(); + let volumeGroupInfos = await audioVolumeManager.getVolumeGroupInfos(audio.LOCAL_NETWORK_ID); + let groupId_ = volumeGroupInfos[0].groupId + let VolumeGroupManager = await audioVolumeManager.getVolumeGroupManager(groupId_); + console.info('getVolumeGroupManager Callback START.'); + let count = 0; + VolumeGroupManager.on('micStateChange', async (micStateChange) => { + console.info("Updated micState:" + JSON.stringify(micStateChange)); + count++; + }) + try { + let data = await audioManager.isMicrophoneMute(); + console.info('Promise isMicrophoneMute PASS:' + data); + let micStatus = !data; + await audioManager.setMicrophoneMute(micStatus); + console.info('Promise setMicrophoneMute PASS:' + micStatus); + } catch (err) { + console.log('ERROR:' + JSON.stringify(err)) + expect(false).assertTrue(); + done(); + } + await sleep(2000); + expect(count).assertEqual(1); + done(); + }) + + /** + *@tc.number : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0300 + *@tc.name : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0300 + *@tc.desc : micStateChange + *@tc.size : MEDIUM + *@tc.type : Function + *@tc.level : Level 2 + */ + it('SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0300', 2, async function (done) { + let audioVolumeManager = audioManager.getVolumeManager(); + let volumeGroupInfos = await audioVolumeManager.getVolumeGroupInfos(audio.LOCAL_NETWORK_ID); + let groupId_ = volumeGroupInfos[0].groupId + let VolumeGroupManager = await audioVolumeManager.getVolumeGroupManager(groupId_); + console.info('getVolumeGroupManager Callback START.'); + let count = 0; + VolumeGroupManager.on('micStateChange', async (micStateChange) => { + console.info("Updated micState:" + JSON.stringify(micStateChange)); + count++; + }) + try { + let data = await audioManager.isMicrophoneMute(); + console.info('Promise isMicrophoneMute PASS:' + data); + let micStatus = !data; + await audioManager.setMicrophoneMute(micStatus); + console.info('Promise setMicrophoneMute PASS:' + micStatus); + await audioManager.setMicrophoneMute(!micStatus); + console.info('Promise setMicrophoneMute PASS:' + (!micStatus)); + } catch (err) { + console.log('ERROR:' + JSON.stringify(err)) + expect(false).assertTrue(); + done(); + } + await sleep(2000); + expect(count).assertEqual(2); + done(); + }) + + /** + *@tc.number : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0400 + *@tc.name : SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0400 + *@tc.desc : micStateChange + *@tc.size : MEDIUM + *@tc.type : Function + *@tc.level : Level 2 + */ + it('SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0400', 2, async function (done) { + let audioVolumeManager = audioManager.getVolumeManager(); + let volumeGroupInfos = await audioVolumeManager.getVolumeGroupInfos(audio.LOCAL_NETWORK_ID); + let groupId_ = volumeGroupInfos[0].groupId + let VolumeGroupManager = await audioVolumeManager.getVolumeGroupManager(groupId_); + let count = 0; + try { + console.info("enter SUB_MULTIMEDIA_AUDIO_ROUTING_MANAGER_MICSTATECHANGE_0400"); + VolumeGroupManager.on('micStateChange', async (micStateChange1) => { + console.info("Updated micState--001:" + JSON.stringify(micStateChange1)); + VolumeGroupManager.on('micStateChange', async (micStateChange) => { + console.info("Updated micState--002:" + JSON.stringify(micStateChange)); + count++ + }) + let data = await audioManager.isMicrophoneMute(); + console.info('Second Promise isMicrophoneMute PASS:' + data); + await audioManager.setMicrophoneMute(!data); + console.info('Second:Promise setMicrophoneMute PASS:' + (!data)); + }) + let data = await audioManager.isMicrophoneMute(); + console.info('First Promise isMicrophoneMute PASS:' + data); + await audioManager.setMicrophoneMute(!data); + console.info('First:Promise setMicrophoneMute PASS:' + (!data)); + } catch (err) { + console.log('ERROR:' + JSON.stringify(err)) + expect(false).assertTrue(); + done(); + } + await sleep(2000); + expect(count).assertEqual(1); + done(); + }) + }) \ No newline at end of file diff --git a/multimedia/audio/audio_js_standard/audioRenderer/Test.json b/multimedia/audio/audio_js_standard/audioRenderer/Test.json index 5b7fd2ae572c8ac4a99e119b74d5802ef2b68fbf..4d52bb73847f7dc486171b6dde4cf85ec08fd261 100644 --- a/multimedia/audio/audio_js_standard/audioRenderer/Test.json +++ b/multimedia/audio/audio_js_standard/audioRenderer/Test.json @@ -17,6 +17,7 @@ { "type": "ShellKit", "run-command": [ + "hilog -Q pidoff", "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiorenderer/haps/entry/files", "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiorenderer/haps/entry" ], diff --git a/multimedia/audio/audio_js_standard/audioRenderer/src/main/js/test/AudioRenderer.test.js b/multimedia/audio/audio_js_standard/audioRenderer/src/main/js/test/AudioRenderer.test.js index 7c05ff590c1be4d31604158bc48fe7d94b9147db..8de02af788fd1b49cf894e62bfecb97749726d05 100644 --- a/multimedia/audio/audio_js_standard/audioRenderer/src/main/js/test/AudioRenderer.test.js +++ b/multimedia/audio/audio_js_standard/audioRenderer/src/main/js/test/AudioRenderer.test.js @@ -24,12 +24,12 @@ describe('audioRenderer', function () { let fdRead; let readPath; const AUDIOMANAGER = audio.getAudioManager(); - console.info(`${TagFrmwkRender}: Create AudioManger Object JS Framework`); let TagFrmwkRender = "AudioFrameworkRenderLog"; let TagFrmwk = "AudioFrameworkTest"; let TagFrmwkAudioScene = "AudioFrameworkAudioScene"; let fdPath; let filePath; + console.info(`${TagFrmwkRender}: Create AudioManger Object JS Framework`); beforeAll(function () { console.info(`${TagFrmwkRender}: beforeAll: Prerequisites at the test suite level`); diff --git a/multimedia/audio/audio_js_standard/audioVoip/Test.json b/multimedia/audio/audio_js_standard/audioVoip/Test.json index 225e6ce9e7ae4c95b2e817d930fe9cfcb0c3455f..bd8427778fa8ccb340c0098ee495ac4f48a94062 100644 --- a/multimedia/audio/audio_js_standard/audioVoip/Test.json +++ b/multimedia/audio/audio_js_standard/audioVoip/Test.json @@ -17,6 +17,7 @@ { "type": "ShellKit", "run-command": [ + "hilog -Q pidoff", "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiovoip/haps/entry/files", "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiovoip/haps/entry" ], diff --git a/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js b/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js index 0105d91da5e2340f736c775262dcc0e22ad4ac64..aa815af90a2a8ef9d4e7fc14f48d00e38c66200e 100644 --- a/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js +++ b/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js @@ -35,8 +35,7 @@ describe('audioVoip', function () { beforeAll(async function () { console.info(`AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; - let permissionNameList = [permissionName1,permissionName2]; + let permissionNameList = [permissionName1]; let appName = 'ohos.acts.multimedia.audio.audiovoip'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/camera/camera_js_standard/Test.json b/multimedia/camera/camera_js_standard/Test.json index 839eea742c8e7dc92d308539b49d326efaf07395..e35f55816b6be4fea9e23446f282b3e4d4bead67 100644 --- a/multimedia/camera/camera_js_standard/Test.json +++ b/multimedia/camera/camera_js_standard/Test.json @@ -10,6 +10,7 @@ { "type": "ShellKit", "run-command": [ + "hilog -Q pidoff", "rm -rf /storage/media/100/local/files/Videos/*" ], "teardown-command":[ diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets index ab379eb14f258b28698fb2ae8d705aefd3589585..aca5a9eb7a9295799f4d7a4c61b1910bf0bebf9b 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets @@ -163,7 +163,7 @@ export default function CameraInputTest(surfaceId) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); @@ -406,12 +406,15 @@ export default function CameraInputTest(surfaceId) { await startCameraSession(i); - mCameraInput.on('error', async (err, data) => { + mCameraInput.on('error', mCameraDevicesArray[i], async (err, data) => { if (!err) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_ERROR_0100 callback"); if (data != null || data != undefined) { console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_ERROR_0100 PASSED: " + data); nfyFlag = true; + } else { + expect().assertFail(); + console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_ERROR_0100 FAILED with data is empty"); } } else { expect().assertFail(); @@ -437,120 +440,6 @@ export default function CameraInputTest(surfaceId) { done(); } }); - - /** - * @tc.number : SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 - * @tc.name : camera status callback on CameraInput async api for focusStateChange - * @tc.desc : camera status callback on CameraInput async api for focusStateChange - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 2 - */ - it('SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100', 2, async function (done) { - console.info("--------------SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100--------------"); - - if (mCameraNum == 0) { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 FAILED with NoCamera"); - expect().assertFail(); - done(); - } else { - for (let i = 0; i < mCameraNum; i++) { - let nfyFlag = false; - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 start for camera[" + i + "]"); - - await startCameraSession(i); - - mCameraInput.on('focusStateChange', async (err, data) => { - if (!err) { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 callback"); - if (data != null || data != undefined) { - console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 PASSED: " + data); - nfyFlag = true; - } - } else { - expect().assertFail(); - console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 FAILED: " + err.message); - } - await sleep(1); - }) - - mCameraSession.setFocusMode(cameraObj.FocusMode.FOCUS_MODE_AUTO); - - await sleep(300); - - if (nfyFlag == false) { - //expect().assertFail(); - //console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 FAILED without any nofity!"); - } - - await beginCameraSessionConfig(); - await stopCameraSession(); - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 end for camera[" + i + "]"); - } - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_FOCUS_STATE_CHANGE_0100 ends here"); - done(); - } - }) - - /** - * @tc.number : SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 - * @tc.name : camera status callback on CameraInput async api for exposureStateChange - * @tc.desc : camera status callback on CameraInput async api for exposureStateChange - * @tc.size : MEDIUM - * @tc.type : Function - * @tc.level : Level 2 - */ - it('SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100', 2, async function (done) { - console.info("--------------SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100--------------"); - - if (mCameraNum == 0) { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 FAILED with NoCamera"); - expect().assertFail(); - done(); - } else { - for (let i = 0; i < mCameraNum; i++) { - let nfyFlag = false; - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 start for camera[" + i + "]"); - - await startCameraSession(i); - - mCameraInput.on('exposureStateChange', async (err, data) => { - if (!err) { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 callback"); - if (data != null || data != undefined) { - console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 PASSED: " + data); - nfyFlag = true; - } - } else { - expect().assertFail(); - console.info(TAG + "SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 FAILED: " + err.message); - } - await sleep(1); - }) - - mCameraSession.setExposureMode(cameraObj.ExposureMode.EXPOSURE_MODE_AUTO); - - await sleep(300); - - if (nfyFlag == false) { - //expect().assertFail(); - //console.info(TAG + "SUB_MULTIMEDIA_CAMERA_INPUT_STATUS_CALLBACK_0101 FAILED without any nofity!"); - } - - await beginCameraSessionConfig(); - await stopCameraSession(); - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 end for camera[" + i + "]"); - } - - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_ON_EXPOSURE_STATE_CHANGE_0100 ends here"); - done(); - } - }) /** * @tc.number : SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 @@ -568,36 +457,42 @@ export default function CameraInputTest(surfaceId) { } else { let camerasArray = mCameraDevicesArray; for (let i = 0; i < camerasArray.length; i++) { - let successFlag = true; + let successFlag = false; console.info(TAG + "Entering createCameraInput with camera: " + camerasArray[i].cameraId); await mCameraManager.createCameraInput(camerasArray[i]).then(async (cameraInput) => { expect(isEmpty(cameraInput)).assertFalse(); await cameraInput.open(async (err) => { if (!err) { - console.info(TAG + " PASSED open with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 PASSED open with CameraID :" + camerasArray[i].cameraId); } else { successFlag = false; - console.info(TAG + " open FAILED: " + err.message); + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 open FAILED: " + err.message); } }); await sleep(400); + successFlag = false; await cameraInput.close(async (err) => { if (!err) { - console.info(TAG + " PASSED close with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 PASSED close with CameraID :" + camerasArray[i].cameraId); } else { successFlag = false; - console.info(TAG + " close FAILED: " + err.message); + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 close FAILED: " + err.message); } }); await sleep(100); + successFlag = false; await cameraInput.release(async (err) => { if (!err) { - console.info(TAG + " PASSED release with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 PASSED release with CameraID :" + camerasArray[i].cameraId); } else { successFlag = false; - console.info(TAG + " release FAILED: " + err.message); + console.info(TAG + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_CALLBACK_0100 release FAILED: " + err.message); } }); + await sleep(100); expect(successFlag).assertEqual(true); }).catch((err) => { expect().assertFail(); @@ -627,32 +522,38 @@ export default function CameraInputTest(surfaceId) { } else { let camerasArray = mCameraDevicesArray; for (let i = 0; i < camerasArray.length; i++) { - let successFlag = true; - console.info(TAG + functionTag + "Entering createCameraInput with camera: " + camerasArray[i].cameraId); + let successFlag = false; + console.info(TAG + functionTag + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 createCameraInput with camera: " + camerasArray[i].cameraId); mCameraManager.createCameraInput(camerasArray[i], async (err, cameraInput) => { if (!err) { expect(isEmpty(cameraInput)).assertFalse(); - console.info(TAG + functionTag + "Entering cameraInput open with camera: " + camerasArray[i].cameraId); + console.info(TAG + functionTag + "Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 cameraInput open with camera: " + camerasArray[i].cameraId); await cameraInput.open().then(async () => { - console.info(TAG + functionTag + " PASSED open with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 PASSED open with CameraID :" + camerasArray[i].cameraId); }).catch((err) => { successFlag = false; - console.info(TAG + functionTag + " open FAILED: " + err.message); + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 open FAILED: " + err.message); }); await sleep(400); + successFlag = false; await cameraInput.close().then(async () => { - console.info(TAG + functionTag + " PASSED close with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 PASSED close with CameraID :" + camerasArray[i].cameraId); }).catch((err) => { successFlag = false; - console.info(TAG + functionTag + " close FAILED: " + err.message); + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 close FAILED: " + err.message); }); await sleep(100); + successFlag = false; await cameraInput.release().then(async () => { - console.info(TAG + functionTag + " PASSED release with CameraID :" + camerasArray[i].cameraId); + successFlag = true; + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 PASSED release with CameraID :" + camerasArray[i].cameraId); }).catch((err) => { successFlag = false; - console.info(TAG + functionTag + " release FAILED: " + err.message); + console.info(TAG + functionTag + " SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 release FAILED: " + err.message); }); + await sleep(100); expect(successFlag).assertEqual(true); } else { expect().assertFail(); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets index c9c62b970d9e0ecce30c20dcff8ce2218cc0bf5e..1fefe39d4ad85bca517bbd1373a48152cef4a9b3 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets @@ -387,9 +387,9 @@ export default function cameraJSUnitOutput(surfaceId: any) { } cameraInput.open(async (err) => { if (!err) { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CREATE_CAMERA_OUTPUT_PROMISE_0100 open callback"); + expect(true).assertTrue(); } else { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CREATE_CAMERA_OUTPUT_PROMISE_0100 FAILED: " + err.message); + expect().assertFail(); } await sleep(1000); done(); @@ -881,7 +881,7 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_START_CALLBACK_0100 captureSession == null || undefined") expect().assertFail(); } else { - captureSession.start(async (err, data) => { + captureSession.start(async (err) => { if (!err) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_START_CALLBACK_0100 success"); expect(true).assertTrue(); @@ -1204,7 +1204,7 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_START_PREVIEW_OUTPUT_CALLBACK_0100 previewOutput == null || undefined") expect().assertFail(); } else { - previewOutput.start(async (err, data) => { + previewOutput.start(async (err) => { if (!err) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_START_PREVIEW_OUTPUT_CALLBACK_0100 success"); expect(true).assertTrue(); @@ -1236,7 +1236,7 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_STOP_PREVIEW_OUTPUT_CALLBACK_0100 previewOutput == null || undefined") expect().assertFail(); } else { - previewOutput.stop(async (err, data) => { + previewOutput.stop(async (err) => { if (!err) { expect(true).assertTrue(); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_STOP_PREVIEW_OUTPUT_CALLBACK_0100 success"); @@ -1269,10 +1269,11 @@ export default function cameraJSUnitOutput(surfaceId: any) { expect().assertFail(); } else { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_FRAME_START_0100 to operate"); + let count = 0; previewOutput.on('frameStart', async (err, data) => { if (!err) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_FRAME_START_0100 success"); - expect(true).assertTrue(); + count++; } else { console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_FRAME_START_0100 FAILED: " + err.message); expect().assertFail(); @@ -1280,6 +1281,11 @@ export default function cameraJSUnitOutput(surfaceId: any) { await sleep(1000); done(); }) + await sleep(1000); + done(); + previewOutput.start(); + previewOutput.stop(); + // expect(count == 1).assertTrue(); } await sleep(1000); done(); @@ -1302,9 +1308,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { expect().assertFail(); } else { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_FRAME_END_0100 to operate"); + let count = 0; previewOutput.on('frameEnd', async (err, data) => { if (!err) { - expect(true).assertTrue(); + count++ console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_FRAME_END_0100 success"); } else { expect().assertFail(); @@ -1313,6 +1320,8 @@ export default function cameraJSUnitOutput(surfaceId: any) { await sleep(1000); done(); }) + previewOutput.stop(); + // expect(count == 1).assertTrue(); } await sleep(1000); done(); @@ -1336,7 +1345,6 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_ERROR_0100 to operate"); previewOutput.on('error', async (err, data) => { if (!err) { - expect(true).assertTrue(); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PREVIEW_OUTPUT_CALLBACK_ON_ERROR_0100 success"); } else { expect().assertFail(); @@ -1433,8 +1441,8 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_DEFAULT_PROMISE_0100 photoOutput == null || undefined") expect().assertFail(); } else { - await photoOutput.capture().then((result) => { - console.info('SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_DEFAULT_PROMISE_0100 success :' + result); + await photoOutput.capture().then(() => { + console.info('SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_DEFAULT_PROMISE_0100 success'); }).catch((err) => { console.info('SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_DEFAULT_PROMISE_0100 failed :' + err); expect().assertFail(); @@ -1559,9 +1567,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { expect().assertFail(); } else { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 to operate"); + let count = 0; photoOutput.on('captureStart', async (err, data) => { if (!err) { - expect(true).assertTrue(); + count++; console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 success"); } else { expect().assertFail(); @@ -1570,6 +1579,8 @@ export default function cameraJSUnitOutput(surfaceId: any) { await sleep(1000); done(); }) + photoOutput.capture(); + // expect(count == 1).assertTrue(); } await sleep(1000); done(); @@ -1592,9 +1603,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { expect().assertFail(); } else { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 to operate"); + let count = 0; photoOutput.on('frameShutter', async (err, data) => { if (!err) { - expect(true).assertTrue(); + count++; console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 success"); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100, captureId = " + data.captureId); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100, timestamp = " + data.timestamp); @@ -1605,6 +1617,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { await sleep(1000); done(); }) + await sleep(1000); + done(); + photoOutput.capture(); + // expect(count == 1).assertTrue(); } await sleep(1000); done(); @@ -1627,9 +1643,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { expect().assertFail(); } else { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 to operate"); + let count = 0; photoOutput.on('captureEnd', async (err, data) => { if (!err) { - expect(true).assertTrue(); + count++; console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success"); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, captureId = " + data.captureId); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, frameCount = " + data.frameCount); @@ -1640,6 +1657,10 @@ export default function cameraJSUnitOutput(surfaceId: any) { await sleep(1000); done(); }) + await sleep(1000); + done(); + photoOutput.capture(); + // expect(count == 1).assertTrue(); } await sleep(1000); done(); @@ -1695,7 +1716,7 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_RELEASE_CALLBACK_0100 photoOutput == null || undefined") expect().assertFail(); } else { - photoOutput.release(async (err, data) => { + photoOutput.release(async (err) => { if (!err) { expect(true).assertTrue(); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_RELEASE_CALLBACK_0100 success"); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets index 7dd5d05a0ec3bdd7d4d5cf84f25fdacfb9f1b03c..8907d04aad1ac49d02661c45c32f866542ca709b 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets @@ -293,7 +293,7 @@ export default function cameraSessionTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets index 3b7d8da62372e25e669f5236bc554a0f11dca5f1..77a72b1d9afddb077bcb550d6b79a0c7a01af73d 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets @@ -353,7 +353,7 @@ export default function cameraSessionExposureTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets index b2b52671596f4839ee5a4868b01c1e6efddcc3e5..a57ba67c531c0b34ef1aa2d10a4cbb2a2f01c2cd 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets @@ -304,7 +304,7 @@ export default function cameraSessionFlashTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets index e41c7e5509e496ffe8f39bb9bb582406efb86e77..0b3f06894db19732c02731dc00968a5c27eedc2b 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets @@ -349,7 +349,7 @@ export default function cameraSessionFocusTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets index 9d08c93a6153a9c84a38e5087d5735c44761346d..fcf95653f67ea9982ac2d4459feb85cf91da90ba 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets @@ -302,7 +302,7 @@ export default function cameraSessionVideoStabilizationTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets index ec8a3d22cc747bb9553ab14ba4106dc212f6b264..442aaa429e0864656defa2e80f9dc120f456457c 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets @@ -306,7 +306,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) { } }) - await sleep(10); + await sleep(30); console.info('Exit beginCameraSessionConfig'); diff --git a/multimedia/image/image_js_standard/image/src/main/js/test/image.test.js b/multimedia/image/image_js_standard/image/src/main/js/test/image.test.js index d4507d959d6876fe39dd7b3e191f9bf1a1a7cc04..e19da436ab142a35b6f1b59de2bda4aca2731d17 100644 --- a/multimedia/image/image_js_standard/image/src/main/js/test/image.test.js +++ b/multimedia/image/image_js_standard/image/src/main/js/test/image.test.js @@ -107,6 +107,12 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: false, pixelFormat: 3, size: { height: 4, width: 6 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0500 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0500 success'); @@ -157,11 +163,16 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: false, pixelFormat: 2, size: { height: 6, width: 8 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0600 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0600 success'); done(); - }) }) @@ -208,6 +219,12 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: false, pixelFormat: 0, size: { height: 6, width: 8 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0700 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0700 success'); @@ -230,6 +247,12 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: true, pixelFormat: 3, size: { height: 6, width: 8 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0800 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0800 success'); @@ -252,6 +275,12 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: true, pixelFormat: 2, size: { height: 2, width: 3 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0900 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_0900 success'); @@ -274,9 +303,15 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: true, pixelFormat: 0, size: { height: -1, width: -1 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(true).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_1000 success' + err); + done(); + return + } globalpixelmap = pixelmap; - expect(pixelmap == undefined).assertTrue(); - console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_1000 success'); + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_1000 fail'); done(); }) }) @@ -296,6 +331,12 @@ export default function imageJsTest() { const Color = new ArrayBuffer(96); let opts = { editable: true, pixelFormat: 21, size: { height: 6, width: 8 } } image.createPixelMap(Color, opts, (err, pixelmap) => { + if (err) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_1100 err' + err); + done(); + return + } globalpixelmap = pixelmap; expect(pixelmap != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_1100 success'); @@ -1230,10 +1271,9 @@ export default function imageJsTest() { it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0100', 0, async function (done) { try { await getFd('test.jpg'); - const imageSourceApi = image.createImageSource(fdNumber); + const imageSourceApi = image.createImageSource(filePath); expect(imageSourceApi != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0100 success'); - fileio.closeSync(fdNumber); done(); } catch (error) { console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0100 error: ' + error); @@ -1255,7 +1295,7 @@ export default function imageJsTest() { it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0200', 0, async function (done) { try { await getFd('test.bmp'); - const imageSourceApi = image.createImageSource(fdNumber); + const imageSourceApi = image.createImageSource(filePath); expect(imageSourceApi != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_UR_0200 success'); done(); @@ -1279,7 +1319,7 @@ export default function imageJsTest() { it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0300', 0, async function (done) { try { await getFd('test.gif'); - const imageSourceApi = image.createImageSource(fdNumber); + const imageSourceApi = image.createImageSource(filePath); expect(imageSourceApi != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0300 success'); done(); @@ -1304,7 +1344,7 @@ export default function imageJsTest() { it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0400', 0, async function (done) { try { await getFd('test.png'); - const imageSourceApi = image.createImageSource(fdNumber); + const imageSourceApi = image.createImageSource(filePath); expect(imageSourceApi != undefined).assertTrue(); console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_0400 success'); done(); @@ -1318,7 +1358,7 @@ export default function imageJsTest() { /** * @tc.number : SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 - * @tc.name : createImageSource(uri)-wrong suffix file + * @tc.name : createImageSource(uri)-image with wrong suffix file * @tc.desc : 1.call createImageSource(uri) * 2.Incoming wrong suffix file * 3.imagesource null @@ -1326,11 +1366,33 @@ export default function imageJsTest() { * @tc.type : Functional * @tc.level : Level 0 */ - it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100', 0, async function (done) { - const imageSourceApi = image.createImageSource('file:///data/local/tmp/test.123'); - expect(imageSourceApi == undefined).assertTrue(); - console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 success'); - done(); + it('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100', 0, async function (done) { + try { + await getFd('test.123'); + let imageSourceApi = image.createImageSource(filePath); + if (imageSourceApi == undefined) { + console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 create image source failed'); + expect(false).assertTrue(); + done(); + } else { + imageSourceApi.createPixelMap((err, pixelmap) => { + if (err){ + console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 create pixelmap failed: ' + err); + expect(false).assertTrue(); + done(); + return + } + globalpixelmap = pixelmap; + console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 success'); + expect(pixelmap != undefined).assertTrue(); + done(); + }) + } + } catch (error) { + expect(false).assertTrue(); + console.info('SUB_GRAPHIC_IMAGE_CREATEIMAGESOURCE_URI_ERROR_SUFFIXFILE_0100 err:' + error); + done(); + } }) /** @@ -2197,6 +2259,12 @@ export default function imageJsTest() { done(); } else { imageSourceApi.createPixelMap((err, pixelmap) => { + if(err){ + console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_JPG_0100 err: ' + err); + expect(false).assertTrue(); + done(); + return + } globalpixelmap = pixelmap; console.info('SUB_GRAPHIC_IMAGE_CREATEPIXELMAP_CALLBACK_JPG_0100 success '); expect(pixelmap != undefined).assertTrue(); diff --git a/multimedia/image/image_js_standard/imageReceiver/src/main/js/test/receiver.test.js b/multimedia/image/image_js_standard/imageReceiver/src/main/js/test/receiver.test.js index 595d14efb128f068e86bf58dfa2f6ef7cc6f2d94..59e84f8258d3792e95c5ad74a7f6f3148c94e1ae 100644 --- a/multimedia/image/image_js_standard/imageReceiver/src/main/js/test/receiver.test.js +++ b/multimedia/image/image_js_standard/imageReceiver/src/main/js/test/receiver.test.js @@ -21,6 +21,9 @@ export default function ImageReceiver() { const HEIGHT = 8; const CAPACITY = 8; const RGBA = 12; + const YCBCR = 22; + const Jpg_YStride = 1; + const UVStride = 2; const { JPEG: FORMATJPEG, YCBCR_422_SP } = image.ImageFormat; const { YUV_Y, YUV_U, YUV_V, JPEG } = image.ComponentType; beforeAll(async function () { @@ -59,8 +62,8 @@ export default function ImageReceiver() { } } - async function getComponentProErr(done, testNum, param) { - var receiver = image.createImageReceiver(WIDTH, HEIGHT, FORMATJPEG, CAPACITY); + async function getComponentProErr(done, testNum, format, param) { + var receiver = image.createImageReceiver(WIDTH, HEIGHT, format, CAPACITY); let once = false; if (receiver == undefined) { expect(false).assertTrue(); @@ -78,7 +81,7 @@ export default function ImageReceiver() { } else { expect(img.size.width == WIDTH).assertTrue(); expect(img.size.height == HEIGHT).assertTrue(); - expect(img.format == RGBA).assertTrue(); + console.log(`${testNum} img.format: ${img.format}`) expect(img.clipRect.size.width == WIDTH).assertTrue(); expect(img.clipRect.size.height == HEIGHT).assertTrue(); expect(img.clipRect.x == 0).assertTrue(); @@ -96,12 +99,16 @@ export default function ImageReceiver() { }); expect(true).assertTrue(); }); - var dummy = receiver.test; + if (format == FORMATJPEG) { + var dummy = receiver.test; + } else { + var dummy = receiver.testYUV; + } } } - async function getComponentCbErr(done, testNum, param) { - var receiver = image.createImageReceiver(WIDTH, HEIGHT, FORMATJPEG, CAPACITY); + async function getComponentCbErr(done, testNum, format, param) { + var receiver = image.createImageReceiver(WIDTH, HEIGHT, format, CAPACITY); let once = false; if (receiver == undefined) { expect(false).assertTrue(); @@ -119,7 +126,7 @@ export default function ImageReceiver() { } else { expect(img.size.width == WIDTH).assertTrue(); expect(img.size.height == HEIGHT).assertTrue(); - expect(img.format == RGBA).assertTrue(); + console.log(`${testNum} img.format: ${img.format}`) expect(img.clipRect.size.width == WIDTH).assertTrue(); expect(img.clipRect.size.height == HEIGHT).assertTrue(); expect(img.clipRect.x == 0).assertTrue(); @@ -138,12 +145,16 @@ export default function ImageReceiver() { }); expect(true).assertTrue(); }); - var dummy = receiver.test; + if (format == FORMATJPEG) { + var dummy = receiver.test; + } else { + var dummy = receiver.testYUV; + } } } - async function getComponentPromise(done, testNum, param) { - var receiver = image.createImageReceiver(WIDTH, HEIGHT, YCBCR_422_SP, CAPACITY); + async function getComponentPromise(done, testNum, format, param, checkFormat, checkStride) { + var receiver = image.createImageReceiver(WIDTH, HEIGHT, format, CAPACITY); let once = false; if (receiver == undefined) { expect(false).assertTrue(); @@ -161,7 +172,7 @@ export default function ImageReceiver() { } else { expect(img.size.width == WIDTH).assertTrue(); expect(img.size.height == HEIGHT).assertTrue(); - expect(img.format == RGBA).assertTrue(); + checkFormat(img.format); expect(img.clipRect.size.width == WIDTH).assertTrue(); expect(img.clipRect.size.height == HEIGHT).assertTrue(); expect(img.clipRect.x == 0).assertTrue(); @@ -175,8 +186,7 @@ export default function ImageReceiver() { } expect(component.componentType == param).assertTrue(); expect(component.byteBuffer != undefined).assertTrue(); - expect(component.rowStride == 8192).assertTrue(); - expect(component.pixelStride == 1).assertTrue(); + checkStride(component.rowStride, component.pixelStride); done(); }) .catch((error) => { @@ -188,11 +198,15 @@ export default function ImageReceiver() { }); expect(true).assertTrue(); }); - var dummy = receiver.test; + if (format == FORMATJPEG) { + var dummy = receiver.test; + } else { + var dummy = receiver.testYUV; + } } - async function getComponentCb(done, testNum, param) { - var receiver = image.createImageReceiver(WIDTH, HEIGHT, YCBCR_422_SP, CAPACITY); + async function getComponentCb(done, testNum, format, param, checkFormat, checkStride) { + var receiver = image.createImageReceiver(WIDTH, HEIGHT, format, CAPACITY); let once = false; if (receiver == undefined) { expect(false).assertTrue(); @@ -211,7 +225,7 @@ export default function ImageReceiver() { } else { expect(img.size.width == WIDTH).assertTrue(); expect(img.size.height == HEIGHT).assertTrue(); - expect(img.format == RGBA).assertTrue(); + checkFormat(img.format); expect(img.clipRect.size.width == WIDTH).assertTrue(); expect(img.clipRect.size.height == HEIGHT).assertTrue(); expect(img.clipRect.x == 0).assertTrue(); @@ -225,8 +239,7 @@ export default function ImageReceiver() { expect(component != undefined).assertTrue(); expect(component.componentType == param).assertTrue(); expect(component.byteBuffer != undefined).assertTrue(); - expect(component.rowStride == 8192).assertTrue(); - expect(component.pixelStride == 1).assertTrue(); + checkStride(component.rowStride, component.pixelStride); done(); } }); @@ -234,7 +247,11 @@ export default function ImageReceiver() { }); expect(true).assertTrue(); }); - var dummy = receiver.test; + if (format == FORMATJPEG) { + var dummy = receiver.test; + } else { + var dummy = receiver.testYUV; + } } async function onErr(done, testNum, param) { @@ -543,8 +560,8 @@ export default function ImageReceiver() { .then((id) => { console.info( "SUB_GRAPHIC_IMAGE_RECEIVER_GETRECEIVINGSURFACEID_PROMISE_0100 getReceivingSurfaceId [" + - id + - "]" + id + + "]" ); expect(isString(id)).assertTrue(); done(); @@ -576,8 +593,8 @@ export default function ImageReceiver() { receiver.getReceivingSurfaceId((err, id) => { console.info( "SUB_GRAPHIC_IMAGE_RECEIVER_GETRECEIVINGSURFACEID_CALLBACK_0100 getReceivingSurfaceId call back [" + - id + - "]" + id + + "]" ); expect(isString(id)).assertTrue(); done(); @@ -789,7 +806,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_JPEG_0100", 0, async function (done) { - getComponentPromise(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_JPEG_0100", JPEG); + function checkFormat(imgformat) { + expect(imgformat == RGBA); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / Jpg_YStride); + expect(pixelStride == Jpg_YStride); + } + getComponentPromise( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_JPEG_0100", + FORMATJPEG, + JPEG, + checkFormat, + checkStride + ); }); /** @@ -804,7 +835,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_U_0100", 0, async function (done) { - getComponentPromise(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_U_0100", YUV_U); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / UVStride); + expect(pixelStride == UVStride); + } + getComponentPromise( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_U_0100", + YCBCR_422_SP, + YUV_U, + checkFormat, + checkStride + ); }); /** @@ -819,7 +864,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_V_0100", 0, async function (done) { - getComponentPromise(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_V_0100", YUV_V); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / UVStride); + expect(pixelStride == UVStride); + } + getComponentPromise( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_V_0100", + YCBCR_422_SP, + YUV_V, + checkFormat, + checkStride + ); }); /** @@ -834,7 +893,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_Y_0100", 0, async function (done) { - getComponentPromise(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_Y_0100", YUV_Y); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / Jpg_YStride); + expect(pixelStride == Jpg_YStride); + } + getComponentPromise( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_PROMISE_YUV_Y_0100", + YCBCR_422_SP, + YUV_Y, + checkFormat, + checkStride + ); }); /** @@ -849,7 +922,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_JPEG_0100", 0, async function (done) { - getComponentCb(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_JPEG_0100", JPEG); + function checkFormat(imgformat) { + expect(imgformat == RGBA); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / Jpg_YStride); + expect(pixelStride == Jpg_YStride); + } + getComponentCb( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_JPEG_0100", + FORMATJPEG, + JPEG, + checkFormat, + checkStride + ); }); /** @@ -864,7 +951,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_Y_0100", 0, async function (done) { - getComponentCb(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_Y_0100", YUV_Y); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / Jpg_YStride); + expect(pixelStride == Jpg_YStride); + } + getComponentCb( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_Y_0100", + YCBCR_422_SP, + YUV_Y, + checkFormat, + checkStride + ); }); /** @@ -879,7 +980,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_V_0100", 0, async function (done) { - getComponentCb(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_V_0100", YUV_V); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / UVStride); + expect(pixelStride == UVStride); + } + getComponentCb( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_V_0100", + YCBCR_422_SP, + YUV_V, + checkFormat, + checkStride + ); }); /** @@ -894,7 +1009,21 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_U_0100", 0, async function (done) { - getComponentCb(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_U_0100", YUV_U); + function checkFormat(imgformat) { + expect(imgformat == YCBCR); + } + function checkStride(rowStride, pixelStride) { + expect(rowStride == WIDTH / UVStride); + expect(pixelStride == UVStride); + } + getComponentCb( + done, + "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_CALLBACK_YUV_U_0100", + YCBCR_422_SP, + YUV_U, + checkFormat, + checkStride + ); }); /** @@ -1056,7 +1185,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0100", 0, async function (done) { - getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0100", null); + getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0100", FORMATJPEG, null); }); /** @@ -1071,7 +1200,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0200", 0, async function (done) { - getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0200", "ab"); + getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0200", FORMATJPEG, "ab"); }); /** @@ -1086,7 +1215,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0300", 0, async function (done) { - getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0300", 0.1); + getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0300", FORMATJPEG, 0.1); }); /** @@ -1101,7 +1230,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0400", 0, async function (done) { - getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0400", { a: 1 }); + getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0400", FORMATJPEG, { a: 1 }); }); /** @@ -1116,7 +1245,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0500", 0, async function (done) { - getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0500", null); + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0500", FORMATJPEG, null); }); /** @@ -1131,7 +1260,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0600", 0, async function (done) { - getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0600", "ab"); + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0600", FORMATJPEG, "ab"); }); /** @@ -1146,7 +1275,7 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0700", 0, async function (done) { - getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0700", 0.1); + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0700", FORMATJPEG, 0.1); }); /** @@ -1161,7 +1290,52 @@ export default function ImageReceiver() { * @tc.level : Level 0 */ it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0800", 0, async function (done) { - getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0800", { a: 1 }); + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0800", FORMATJPEG, { a: 1 }); + }); + + /** + * @tc.number : SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0900 + * @tc.name : getComponent-wrong format + * @tc.desc : 1.create ImageReceiver + * 2.call on + * 3.readLatestImage + * 4.call getComponent + * @tc.size : MEDIUM + * @tc.type : Functional + * @tc.level : Level 0 + */ + it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0900", 0, async function (done) { + getComponentCbErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_0900", FORMATJPEG, YUV_U); + }); + + /** + * @tc.number : SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1000 + * @tc.name : getComponent-wrong format + * @tc.desc : 1.create ImageReceiver + * 2.call on + * 3.readLatestImage + * 4.call getComponent + * @tc.size : MEDIUM + * @tc.type : Functional + * @tc.level : Level 0 + */ + it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1000", 0, async function (done) { + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1000", YCBCR_422_SP, JPEG); + }); + + /** + * @tc.number : SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1100 + * @tc.name : getComponent-wrong format + * @tc.desc : 1.create ImageReceiver + * 2.call on + * 3.readLatestImage + * 4.call getComponent + * @tc.size : MEDIUM + * @tc.type : Functional + * @tc.level : Level 0 + */ + it("SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1100", 0, async function (done) { + getComponentProErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_GETCOMPONENT_ERROR_1100", FORMATJPEG, YUV_V); }); /** @@ -1216,4 +1390,4 @@ export default function ImageReceiver() { onErr(done, "SUB_GRAPHIC_IMAGE_RECEIVER_IMAGERECEIVER_ON_ERROR_0400", "a"); }); }); -} +} \ No newline at end of file diff --git a/notification/ans_standard/actsNotificationRequestTest/src/main/config.json b/notification/ans_standard/actsNotificationRequestTest/src/main/config.json index c49bb976318207e28090a70fe220450b4633a09d..94be148c3d0f472f74f9eeb059a1ada9f0c65c02 100644 --- a/notification/ans_standard/actsNotificationRequestTest/src/main/config.json +++ b/notification/ans_standard/actsNotificationRequestTest/src/main/config.json @@ -17,8 +17,8 @@ "package": "com.example.actsnotificationrequest", "name": ".entry", "deviceType": [ - "default", - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -97,4 +97,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} \ No newline at end of file +} diff --git a/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/module.json b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/module.json index 9c41ece04253025cf587a9021cdd37c3af31fd0d..d696e1448ab33a73fbc765b180fbafa1a36d95f1 100644 --- a/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/module.json +++ b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "tablet", - "phone" + "tablet", + "default" ], "deliveryWithInstall": true, "installationFree": false, @@ -37,4 +37,4 @@ } ] } - } \ No newline at end of file + } diff --git a/security/huks_napi_BasicTest/src/huks_misc_test.cpp b/security/huks_napi_BasicTest/src/huks_misc_test.cpp index 482fea475a1d8e2bf0b9e15a53e5fbd25a9c7e58..cdc8696c53f2174961fe8870c60696f11071b975 100644 --- a/security/huks_napi_BasicTest/src/huks_misc_test.cpp +++ b/security/huks_napi_BasicTest/src/huks_misc_test.cpp @@ -167,7 +167,6 @@ namespace Unittest::HuksMisc ASSERT_EQ((uint32_t)OH_HUKS_CHALLENGE_POS_2 == 2, true); ASSERT_EQ((uint32_t)OH_HUKS_CHALLENGE_POS_3 == 3, true); ASSERT_EQ((uint32_t)OH_HUKS_SECURE_SIGN_WITH_AUTHINFO == 1, true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_INVALID == (OH_HUKS_TAG_TYPE_INVALID | 0), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ALGORITHM == (OH_HUKS_TAG_TYPE_UINT | 1), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_PURPOSE == (OH_HUKS_TAG_TYPE_UINT | 2), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_KEY_SIZE == (OH_HUKS_TAG_TYPE_UINT | 3), true); @@ -180,12 +179,8 @@ namespace Unittest::HuksMisc ASSERT_EQ((uint32_t)OH_HUKS_TAG_IV == (OH_HUKS_TAG_TYPE_BYTES | 10), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_INFO == (OH_HUKS_TAG_TYPE_BYTES | 11), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_SALT == (OH_HUKS_TAG_TYPE_BYTES | 12), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_PWD == (OH_HUKS_TAG_TYPE_BYTES | 13), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ITERATION == (OH_HUKS_TAG_TYPE_UINT | 14), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_KEY_GENERATE_TYPE == (OH_HUKS_TAG_TYPE_UINT | 15), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_DERIVE_MAIN_KEY == (OH_HUKS_TAG_TYPE_BYTES | 16), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_DERIVE_FACTOR == (OH_HUKS_TAG_TYPE_BYTES | 17), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_DERIVE_ALG == (OH_HUKS_TAG_TYPE_UINT | 18), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_AGREE_ALG == (OH_HUKS_TAG_TYPE_UINT | 19), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_AGREE_PUBLIC_KEY_IS_KEY_ALIAS == (OH_HUKS_TAG_TYPE_BOOL | 20), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_AGREE_PRIVATE_KEY_ALIAS == (OH_HUKS_TAG_TYPE_BYTES | 21), true); @@ -207,17 +202,7 @@ namespace Unittest::HuksMisc ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_CHALLENGE == (OH_HUKS_TAG_TYPE_BYTES | 501), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_APPLICATION_ID == (OH_HUKS_TAG_TYPE_BYTES | 502), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_BRAND == (OH_HUKS_TAG_TYPE_BYTES | 503), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_DEVICE == (OH_HUKS_TAG_TYPE_BYTES | 504), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_PRODUCT == (OH_HUKS_TAG_TYPE_BYTES | 505), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_SERIAL == (OH_HUKS_TAG_TYPE_BYTES | 506), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_IMEI == (OH_HUKS_TAG_TYPE_BYTES | 507), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_MEID == (OH_HUKS_TAG_TYPE_BYTES | 508), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_MANUFACTURER == (OH_HUKS_TAG_TYPE_BYTES | 509), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_MODEL == (OH_HUKS_TAG_TYPE_BYTES | 510), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_ALIAS == (OH_HUKS_TAG_TYPE_BYTES | 511), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_SOCID == (OH_HUKS_TAG_TYPE_BYTES | 512), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_UDID == (OH_HUKS_TAG_TYPE_BYTES | 513), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_SEC_LEVEL_INFO == (OH_HUKS_TAG_TYPE_BYTES | 514), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ATTESTATION_ID_VERSION_INFO == (OH_HUKS_TAG_TYPE_BYTES | 515), true); @@ -229,8 +214,6 @@ namespace Unittest::HuksMisc ASSERT_EQ((uint32_t)OH_HUKS_TAG_KEY_ROLE == (OH_HUKS_TAG_TYPE_UINT | 1006), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_KEY_FLAG == (OH_HUKS_TAG_TYPE_UINT | 1007), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_IS_ASYNCHRONIZED == (OH_HUKS_TAG_TYPE_UINT | 1008), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_SECURE_KEY_ALIAS == (OH_HUKS_TAG_TYPE_BOOL | 1009), true); - ASSERT_EQ((uint32_t)OH_HUKS_TAG_SECURE_KEY_UUID == (OH_HUKS_TAG_TYPE_BYTES | 1010), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_KEY_DOMAIN == (OH_HUKS_TAG_TYPE_UINT | 1011), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_SYMMETRIC_KEY_DATA == (OH_HUKS_TAG_TYPE_BYTES | 20001), true); ASSERT_EQ((uint32_t)OH_HUKS_TAG_ASYMMETRIC_PUBLIC_KEY_DATA == (OH_HUKS_TAG_TYPE_BYTES | 20002), true); @@ -310,4 +293,4 @@ namespace Unittest::HuksMisc ASSERT_EQ(sizeof(keyMaterial25519.priKeySize) == sizeof(uint32_t), true); ASSERT_EQ(sizeof(keyMaterial25519.reserved) == sizeof(uint32_t), true); } -} \ No newline at end of file +} diff --git a/security/huks_napi_BasicTest/src/huks_nullptr_test.cpp b/security/huks_napi_BasicTest/src/huks_nullptr_test.cpp index 1612e470bdeb519523e5128c1b372e077937c179..b7871b3ba317e173668e5be6d712a3f1ddcd64fd 100644 --- a/security/huks_napi_BasicTest/src/huks_nullptr_test.cpp +++ b/security/huks_napi_BasicTest/src/huks_nullptr_test.cpp @@ -82,8 +82,8 @@ HWTEST_F(HuksNullptrTest, Security_HUKS_NAPI_nullptr_0100, TestSize.Level0) ret=OH_Huks_IsParamSetValid(paramSetNullptr,0); EXPECT_NE(ret.errorCode, OH_HUKS_SUCCESS) << "this case failed."; - struct OH_Huks_Param baseParam = { .tag = OH_HUKS_TAG_INVALID, .uint64Param = (uint64_t)1 }; - struct OH_Huks_Param otherParam = { .tag = OH_HUKS_TAG_INVALID, .uint64Param = (uint64_t)2 }; + struct OH_Huks_Param baseParam = { .tag = OH_HUKS_TAG_ALGORITHM, .uint64Param = (uint64_t)1 }; + struct OH_Huks_Param otherParam = { .tag = OH_HUKS_TAG_ALGORITHM, .uint64Param = (uint64_t)2 }; ret=OH_Huks_CheckParamMatch(&baseParam,&otherParam); EXPECT_NE(ret.errorCode, OH_HUKS_SUCCESS) << "this case failed."; diff --git a/storage/storagefileiov9jstest/src/main/config.json b/storage/storagefileiov9jstest/src/main/config.json index 03424320d248a5a9b2fac7933b550913b30aba35..f671d3531f88ccd26e77aed2fe553269224df53c 100644 --- a/storage/storagefileiov9jstest/src/main/config.json +++ b/storage/storagefileiov9jstest/src/main/config.json @@ -16,8 +16,8 @@ "package": "ohos.acts.storage.fileiov9", "name": ".entry", "deviceType": [ - "default", - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, @@ -92,4 +92,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} \ No newline at end of file +} diff --git a/storage/storagestatisticsjstest/entry/src/main/ets/test/List.test.ets b/storage/storagestatisticsjstest/entry/src/main/ets/test/List.test.ets index 6dba954b5f34b357abddbdaab48b5be602c62a85..e9b64c3aaffbe1d0cd8c84fb189d475d18624d38 100644 --- a/storage/storagestatisticsjstest/entry/src/main/ets/test/List.test.ets +++ b/storage/storagestatisticsjstest/entry/src/main/ets/test/List.test.ets @@ -1,4 +1,3 @@ -// @ts-nocheck /* * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/storage/storagestatisticsjstest/entry/src/main/ets/test/StorageStatistics.test.ets b/storage/storagestatisticsjstest/entry/src/main/ets/test/StorageStatistics.test.ets index c94ce23e4fc22370bcf81e480dbf5abefff36512..41f4e67bcf4a259b5231a129ce7774147ae915ea 100644 --- a/storage/storagestatisticsjstest/entry/src/main/ets/test/StorageStatistics.test.ets +++ b/storage/storagestatisticsjstest/entry/src/main/ets/test/StorageStatistics.test.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// @ts-nocheck + import storageStatistics from "@ohos.storageStatistics"; import { describe, it, expect } from "@ohos/hypium" import {isIntNum, isNegativeNum, isInclude} from "./Common"; @@ -67,53 +67,13 @@ export default function storageStatisticsTest() { /** * @tc.number SUB_DF_STORAGE_STATISTICS_GET_CURRENT_BUNDLE_STATS_0020 * @tc.name storage_statistics_test_get_current_bundle_stats_async_002 - * @tc.desc Test getCurrentBundleStats() interfaces, When the parameter type is wrong. - * @tc.size MEDIUM - * @tc.type Function - * @tc.level Level 0 - * @tc.require - */ - it("storage_statistics_test_get_current_bundle_stats_async_002", 0, async function (done) { - try { - await storageStatistics.getCurrentBundleStats("1"); - } catch (error) { - console.log("storage_statistics_test_get_current_bundle_stats_async_002 has failed for " + error); - expect(isInclude(error, "The callback shall be a function")).assertTrue(); - done(); - } - }); - - /** - * @tc.number SUB_DF_STORAGE_STATISTICS_GET_CURRENT_BUNDLE_STATS_0030 - * @tc.name storage_statistics_test_get_current_bundle_stats_async_003 - * @tc.desc Test getCurrentBundleStats() interfaces, When there are redundant parameters. - * @tc.size MEDIUM - * @tc.type Function - * @tc.level Level 0 - * @tc.require - */ - it("storage_statistics_test_get_current_bundle_stats_async_003", 0, async function (done) { - try { - storageStatistics.getCurrentBundleStats("", (error, bundleStat) => { - - }); - } catch (error) { - console.log("storage_statistics_test_get_current_bundle_stats_async_003 has failed for " + error); - expect(isInclude(error, "Number of arguments unmatched")).assertTrue(); - done(); - } - }); - - /** - * @tc.number SUB_DF_STORAGE_STATISTICS_GET_CURRENT_BUNDLE_STATS_0040 - * @tc.name storage_statistics_test_get_current_bundle_stats_async_004 * @tc.desc Test getCurrentBundleStats() interfaces,Concurrent requests. * @tc.size MEDIUM * @tc.type Function * @tc.level Level 0 * @tc.require */ - it("storage_statistics_test_get_current_bundle_stats_async_004", 0, async function (done) { + it("storage_statistics_test_get_current_bundle_stats_async_002", 0, async function (done) { try { const delay = function delay() { return new Promise((resolve, reject) => { @@ -136,7 +96,7 @@ export default function storageStatisticsTest() { done(); }); } catch (error) { - console.log("storage_statistics_test_get_current_bundle_stats_async_004 has failed for " + error); + console.log("storage_statistics_test_get_current_bundle_stats_async_002 has failed for " + error); } }) }); diff --git a/test_packages.gni b/test_packages.gni index e2c8be85f5451ae35de23d79e762717b57aa2e5a..e8b1037a0cdb99dd2c9c59850019c8cfe4f01344 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -45,7 +45,6 @@ _all_test_packages = [ "${ACTS_ROOT}/location:location", "${ACTS_ROOT}/settingsdata:settingsdata", "${ACTS_ROOT}/barrierfree:barrierfree", - "${ACTS_ROOT}/customization:customization", "${ACTS_ROOT}/applications:applications", ]