!7984 add bundleType for atomicService

Merge pull request !7984 from 赵淦/master

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/AppScope/app.json

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

ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/AppScope/app.json

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

bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/actsbmsatomicservicetest/AppScope/app.json

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

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");

bundlemanager/bundle_standard/bundlemanager/actsbmsatomicserviceetstest/bmsatomicserviceone/AppScope/app.json

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

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