diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json index e9ff23fb9982d00627feac5338d4610b96de117f..16ca7e62b18f27a16ded8692973c73aee7d16a2d 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.different.hmservice", + "bundleType": "atomicService", "vendor": "huawei", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..646b297ee4824c8880e4a1a26231bfc8872c9144 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.qianyiyingyong.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..646b297ee4824c8880e4a1a26231bfc8872c9144 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.qianyiyingyong.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..646b297ee4824c8880e4a1a26231bfc8872c9144 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.qianyiyingyong.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json index 1d8c9524ed9090c76bec92a8516e4a0235e1a0b2..54087155c143ba07f9cbd3f35dd74235445a4c57 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.startAbilityForResult.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,10 +12,9 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "targetBundleList": [ "com.example.qianyiyingyong.hmservice" ] } } - \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..646b297ee4824c8880e4a1a26231bfc8872c9144 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.example.qianyiyingyong.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json index 39ae7839606a167d360d8f238c6bf7f4089afeff..de64586ec7ce0da66c60e3b434acebe94c937302 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json @@ -1,6 +1,7 @@ { "app": { "bundleName": "com.open.harmony.packagemag.hmservice", + "bundleType": "atomicService", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", @@ -11,7 +12,7 @@ "keepAlive": true, "singleUser": true, "minAPIVersion": 9, - "targetAPIVersion": 9, + "targetAPIVersion": 9, "car": { "apiCompatibleVersion": 9, "singleUser": false diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json index 67dd7c880334cba597cdfc6e80d941afd6d38f69..8d332dc64e0fb64d3d31d8e1d121b053973343dd 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json @@ -1,6 +1,7 @@ { "app":{ "bundleName":"ohos.acts.atomic.service.test", + "bundleType": "atomicService", "vendor":"huawei", "versionCode":1000000, "versionName":"1.0.0", @@ -13,10 +14,6 @@ "singleUser":true, "minAPIVersion":9, "targetAPIVersion":9, - "atomicService":{ - "split":true, - "main":"testModule" - }, "car":{ "apiCompatibleVersion":9, "singleUser":false diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/entry/src/main/ets/test/GetBundleInfoForSelf.test.ets b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/entry/src/main/ets/test/GetBundleInfoForSelf.test.ets index af0200e80cf3918025e09fe607d01049efa16d00..5184d7f0a3371d2cece8b154162b6c82d981ee5b 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/entry/src/main/ets/test/GetBundleInfoForSelf.test.ets +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/entry/src/main/ets/test/GetBundleInfoForSelf.test.ets @@ -36,17 +36,13 @@ export default function getBundleInfoForSelf() { console.info("getBundleInfoForSelfApplicationPro : " + i + " ==" + JSON.stringify(data.hapModulesInfo[i])); } expect(data.appInfo.bundleType).assertEqual(bundle.BundleType.ATOMIC_SERVICE); - expect(data.appInfo.split).assertEqual(true); expect(data.hapModulesInfo[0].type).assertEqual(bundle.ModuleType.FEATURE); - expect(data.hapModulesInfo[0].atomicServiceModuleType).assertEqual(bundle.AtomicServiceModuleType.NORMAL); expect(data.hapModulesInfo[0].preloads.length).assertEqual(0); expect(data.hapModulesInfo[0].dependencies.length).assertEqual(0); expect(data.hapModulesInfo[1].type).assertEqual(bundle.ModuleType.SHARED); expect(data.hapModulesInfo[1].preloads.length).assertEqual(0); - expect(data.hapModulesInfo[1].atomicServiceModuleType).assertEqual(bundle.AtomicServiceModuleType.NORMAL); expect(data.hapModulesInfo[1].dependencies.length).assertEqual(0); expect(data.hapModulesInfo[2].type).assertEqual(bundle.ModuleType.ENTRY); - expect(data.hapModulesInfo[2].atomicServiceModuleType).assertEqual(bundle.AtomicServiceModuleType.MAIN); expect(data.hapModulesInfo[2].preloads.length).assertEqual(2); expect(data.hapModulesInfo[2].preloads[0].moduleName).assertEqual("feature"); expect(data.hapModulesInfo[2].preloads[1].moduleName).assertEqual("shared"); diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json index 67dd7c880334cba597cdfc6e80d941afd6d38f69..8d332dc64e0fb64d3d31d8e1d121b053973343dd 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json @@ -1,6 +1,7 @@ { "app":{ "bundleName":"ohos.acts.atomic.service.test", + "bundleType": "atomicService", "vendor":"huawei", "versionCode":1000000, "versionName":"1.0.0", @@ -13,10 +14,6 @@ "singleUser":true, "minAPIVersion":9, "targetAPIVersion":9, - "atomicService":{ - "split":true, - "main":"testModule" - }, "car":{ "apiCompatibleVersion":9, "singleUser":false diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceshared/AppScope/app.json b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceshared/AppScope/app.json index 67dd7c880334cba597cdfc6e80d941afd6d38f69..8df2c24a01e30eef0b3a8d6400d512a8943eb62c 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceshared/AppScope/app.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceshared/AppScope/app.json @@ -13,10 +13,7 @@ "singleUser":true, "minAPIVersion":9, "targetAPIVersion":9, - "atomicService":{ - "split":true, - "main":"testModule" - }, + "bundleType": "atomicService", "car":{ "apiCompatibleVersion":9, "singleUser":false