From 315ded89ffe6add83e53d0ca36ee7d8c32bcfc60 Mon Sep 17 00:00:00 2001 From: longwei Date: Fri, 17 Mar 2023 08:28:50 +0000 Subject: [PATCH] fix xts for bundleType Change-Id: I394c2fde73df7b06f0a71520044ae83a66139c08 Signed-off-by: longwei --- .../connectdifferentapplication/AppScope/app.json | 3 ++- .../atomizationresultstageentry/AppScope/app.json | 1 + .../atomizationresultstagehm2/AppScope/app.json | 1 + .../atomizationresultstagehnm2/AppScope/app.json | 3 ++- .../stageresultmyapplication1/AppScope/app.json | 3 ++- .../atomizationstageentry/AppScope/app.json | 1 + .../stagemyapplication1/AppScope/app.json | 1 + .../actsbmsatomicservicetest/AppScope/app.json | 5 +---- .../entry/src/main/ets/test/GetBundleInfoForSelf.test.ets | 5 +---- .../bmsatomicserviceone/AppScope/app.json | 5 +---- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json index e9ff23fb9..6fadbee92 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 c82b4e864..498d4567c 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 c82b4e864..498d4567c 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 c82b4e864..d4da749a6 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 1d8c9524e..c99de75aa 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 c82b4e864..498d4567c 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 39ae78396..33d5a976d 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 67dd7c880..0143c454f 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 db40a7d45..bdbec8051 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 67dd7c880..0143c454f 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 -- GitLab