!8061 fix xts for bundleType

Merge pull request !8061 from longwei/OpenHarmony-3.2-Release

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
+}

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": {

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": {

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": {

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
+  

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": {

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": {

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

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
+}

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