diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json index e9ff23fb9982d00627feac5338d4610b96de117f..6fadbee927621d7d63957e4bf193361154ab8d5f 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { @@ -17,4 +18,4 @@ "singleUser": false } } -} \ No newline at end of file +} diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..498d4567ca7f34cdaa16f7f2bd57c87a88b1f541 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..498d4567ca7f34cdaa16f7f2bd57c87a88b1f541 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json index c82b4e86496b8cd5ad551a1b75b789082e0f322e..d4da749a6c2d710236a1191faa9d3e9db482ce83 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json @@ -5,11 +5,12 @@ "versionCode": 1000000, "versionName": "1.0.0", "icon": "$media:app_icon", - "label": "$string:app_name", + "label": "$string:app_name", "description": "description_application", "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json index 1d8c9524ed9090c76bec92a8516e4a0235e1a0b2..c99de75aa51e4c0910d2f6b2e579f08f27a64bfb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "targetBundleList": [ @@ -17,4 +18,4 @@ ] } } - \ 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..498d4567ca7f34cdaa16f7f2bd57c87a88b1f541 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json index 39ae7839606a167d360d8f238c6bf7f4089afeff..33d5a976dc89cab1913f4a94cc53899dbeb45f9a 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json @@ -10,6 +10,7 @@ "distributedNotificationEnabled": true, "keepAlive": true, "singleUser": true, + "bundleType": "atomicService", "minAPIVersion": 9, "targetAPIVersion": 9, "car": { diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json index 67dd7c880334cba597cdfc6e80d941afd6d38f69..0143c454f4af3ff336c59215bf37cb4d40002fe1 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/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 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 db40a7d45705425423d3021d608a4aff2f9b5ed6..bdbec8051ceae308bb0842ddd289367fb7f79915 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,14 +36,11 @@ 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(bundle.ModuleType.SHARED).assertEqual(3); 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.ENTRY); - expect(data.hapModulesInfo[1].atomicServiceModuleType).assertEqual(bundle.AtomicServiceModuleType.MAIN); expect(data.hapModulesInfo[1].preloads.length).assertEqual(1); expect(data.hapModulesInfo[1].preloads[0].moduleName).assertEqual("feature"); expect(data.hapModulesInfo[1].dependencies.length).assertEqual(1); @@ -58,4 +55,4 @@ export default function getBundleInfoForSelf() { }) -} \ No newline at end of file +} diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json index 67dd7c880334cba597cdfc6e80d941afd6d38f69..0143c454f4af3ff336c59215bf37cb4d40002fe1 100644 --- a/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/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