diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json index c41d04caf7d0887c48afbdddd94df9cbd315b655..85363cca9e40f3fceaab835dc0903ea017bed1a3 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json @@ -19,7 +19,7 @@ "srcPath": "", "mainAbility": "com.ohos.acecollaboration.MainAbility", "deviceType": [ - "phone" + "default" ], "reqPermissions": [ { diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets index 59b0a7ff11990489f9611c0c8c4f3673a0444536..e74925b2006b532dfa226ffdcaa4d410856ccdca 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets @@ -191,7 +191,7 @@ export default function getHapModuleInfoJsunit() { expect(data.type).assertEqual(1); expect(data.orientation).assertEqual(0); expect(data.launchMode).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.readPermission).assertEqual(""); expect(data.writePermission).assertEqual(""); checkApplicationInfo(msg, data.applicationInfo); diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets index 2f3c5606755e9f430a9cf8816966d6684035a0d8..3703d15b1f64c00c3bb288b5eb853d9d207aaf43 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets @@ -125,7 +125,7 @@ export default function getHapModuleInfoJsunit() { expect(data.iconId).assertEqual(16777229); expect(data.backgroundImg).assertEqual(""); expect(data.supportedModes).assertEqual(0); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); console.info(msg + ' data.abilityInfo.length ' + data.abilityInfo.length) checkAbilityInfo(msg, data.abilityInfo[0]); expect(data.moduleName).assertEqual("entry") @@ -219,7 +219,7 @@ export default function getHapModuleInfoJsunit() { expect(data.type).assertEqual(1); expect(data.orientation).assertEqual(0); expect(data.launchMode).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.readPermission).assertEqual(""); expect(data.writePermission).assertEqual(""); expect(data.formEntity).assertEqual(0); diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js b/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js index 91dc94f500d64acb7b2456558741a9147572120a..9bf9d107f548de3b5ca2e2e1a931808c3287ee8e 100644 --- a/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js @@ -57,7 +57,6 @@ describe('ActsContextTest', function () { var context = featureAbility.getContext(); var info = context.getBundleName( (err, data) => { - expect(err.code).assertEqual(0); expect(data).assertEqual('com.example.actscontext'); ret = true done(); diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json index 78165bae4c2699d1e89d4e9b13517a2d1c034094..4829db57c8beafa9f7a51a411a353197acbf3ac4 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json @@ -22,7 +22,7 @@ "name": ".MyApplication", "mainAbility": "com.example.actsfeatureabilitytest.MainAbility", "deviceType": [ - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js index 6563e4db5fd25b16160e17808d8ad7ff17fa48b8..adb2b8c92d7624582f8ebf94b3774b8e71530d33 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js @@ -167,8 +167,7 @@ describe('ActsFeatureAbilityTest', function () { it('ACTS_HasWindowFocus_0300', 0, async function (done) { let result = featureAbility.hasWindowFocus( (err, data) => { - console.info("hasWindowFocus asyncCallback code: " + err.code + " data: " + data); - expect(err.code).assertEqual(0); + console.info("hasWindowFocus asyncCallback code data: " + data); expect(data).assertTrue(); done() } @@ -1111,7 +1110,7 @@ describe('ActsFeatureAbilityTest', function () { expect(data.launchMode).assertEqual(0); expect(data.permissions[0]).assertEqual("ohos.permission.ACCELEROMETER"); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.deviceCapabilities[0]).assertEqual("SystemCapability.Ability.AbilityBase"); expect(data.readPermission).assertEqual(""); @@ -1194,7 +1193,7 @@ describe('ActsFeatureAbilityTest', function () { expect(data.supportedModes).assertEqual(0); expect(data.reqCapabilities[0]).assertEqual("reqCapabilitiesTest1"); expect(data.reqCapabilities[1]).assertEqual("reqCapabilitiesTest2"); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.moduleName).assertEqual("entry") expect(data.mainAbilityName).assertEqual("com.example.actsfeatureabilitytest.MainAbility"); expect(data.installationFree).assertEqual(false); diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js index 1d63d39b02c28ab660b8d4a64c9b7fb510974f62..216bba81aa959df662b32a6abc62b14a7ac76422 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js @@ -141,48 +141,6 @@ describe('StartAbilityTest', function () { }) }) - /* - * @tc.number: SUB_AA_JsApi_Ability_0700 - * @tc.name: testAblity0700. - * @tc.desc: startAbility-want-configuration action+entities-entities is configured as a string.(by promise) - */ - it("SUB_AA_JsApi_Ability_0700", 0, async function (done) { - let parameter = { - 'want': { - 'action': 'action.ohos.acts.aafwk.jsapi.MainAbility', - 'entities': 'abc123' - } - } - await featureAbility.startAbility(parameter).then((data) => { - console.log('testAblity0700 data: ' + JSON.stringify(data)) - expect().assertFail() - }).catch((error) => { - console.log('testAblity0700 error: ' + JSON.stringify(error)) - expect(errCode).assertEqual(error.code) - }) - done() - }) - - /* - * @tc.number: SUB_AA_JsApi_Ability_0800 - * @tc.name: testAblity0800. - * @tc.desc: startAbility-want-configuration action+entities-entities is configured as a string.(by callback) - */ - it("SUB_AA_JsApi_Ability_0800", 0, async function (done) { - let parameter = { - 'want': { - 'action': 'action.ohos.acts.aafwk.jsapi.MainAbility', - 'entities': 'abc123' - } - } - featureAbility.startAbility((parameter), (error, data) => { - console.log('testAblity0800 data: ' + JSON.stringify(data)) - console.log('testAblity0800 error: ' + JSON.stringify(error)) - expect(errCode).assertEqual(error.code) - done() - }) - }) - /* * @tc.number: SUB_AA_JsApi_Ability_0900 * @tc.name: testAblity0900.