!1386 Update xts amsmultiapp code

Merge pull request !1386 from blackleon/master_1217

aafwk/aafwk_standard/BUILD.gn

@@ -19,8 +19,8 @@ group("aafwk_standard") {
     deps = [
       "abilitymanager:actsabilitymanagertest",
       "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest",
-      "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton",
-      "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS",
+      "amsabilitymanager/amsMissionSnapshotTestSingleton:ActsAmsMissionSnapshotTestSingleton",
+      "amsabilitymanager/amsMissionSnapshotTestSingletonS:ActsAmsMissionSnapshotTestSingletonS",
       "amsdatauriutils:ActsAmsDataUriUtilsTest",
       "amsmultiapp/MultiAppPage:ActsAmsMultiPageApp",
       "amsmultiapp/MultiAppPageConnectService:ActsAmsMultiPageAppConnectService",
@@ -34,12 +34,12 @@ group("aafwk_standard") {
       "amsmultiapp/MultiAppSimultaneousOnline_test:ActsAmsMultiAppPageClone",
       "amsmultiapp/MultiAppTermination:ActsAmsMultiAppTermination",
       "amsmultiapp/MultiAppTermination_test:ActsAmsMultiAppPageCloneTermination",
-      "amsmultiapp/amsmultiapppageexecutor:MultiAppPageExecutor",
-      "amsmultiapp/amsmultiappserviceexecutor:MultiAppServiceExecutor",
-      "amsmultiapp/amsmultiappservicestarter:MultiAppServiceStarter",
-      "amsmultiapp/amsmultiapptester:MultiAppTester",
-      "amsmultiapp/amsmultidataabilityclone:amsMultiDataAbilityClone",
-      "amsmultiapp/amsmultidataabilityself:amsMultiDataAbilitySelf",
+      "amsmultiapp/amsmultiapppageexecutor:ActsAmsMultiAppPageExecutor",
+      "amsmultiapp/amsmultiappserviceexecutor:ActsAmsMultiAppServiceExecutor",
+      "amsmultiapp/amsmultiappservicestarter:ActsAmsMultiAppServiceStarter",
+      "amsmultiapp/amsmultiapptester:ActsAmsMultiAppTester",
+      "amsmultiapp/amsmultidataabilityclone:ActsAmsMultiDataAbilityClone",
+      "amsmultiapp/amsmultidataabilityself:ActsAmsMultiDataAbilitySelf",
       "amszipfileunzipfilest:ActsAmsZipfileUnzipfileSTest",
       "context:context",
       "featureability:featureability",

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json

@@ -9,9 +9,9 @@
     "kits": [
         {
             "test-file-name": [
-                "amsMissionSnapshotTest.hap",
-		"amsMissionSnapshotTestSingleton.hap",
-                "amsMissionSnapshotTestSingletonS.hap"
+                "ActsAmsMissionSnapshotTest.hap",
+		        "ActsAmsMissionSnapshotTestSingleton.hap",
+                "ActsAmsMissionSnapshotTestSingletonS.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/amsMissionSnapshotTest.test.js

@@ -106,7 +106,7 @@ describe('ActsMissionSnapshotTest', function () {
                         data.snapshot.getPixelBytesNumber().then(function (data){
                             console.debug("=ACTS_MissionSnapshot_0200 ====>"
                             +"(data.snapshot.getPixelBytesNumber()=)" + data)
-                            expect(data != 0).assertEqual(true);
+                            expect(data > 0).assertEqual(true);
                             console.debug('ACTS_MissionSnapshot_0200====<end')
                             done();
                         })
@@ -189,7 +189,7 @@ describe('ActsMissionSnapshotTest', function () {
                             data.snapshot.getPixelBytesNumber().then(function (data){
                                 console.debug("=ACTS_MissionSnapshot_0300 ====> "
                                 +("data.snapshot.getPixelBytesNumber()=" + data))
-                                expect(data != 0).assertEqual(true);
+                                expect(data > 0).assertEqual(true);
                                 unsubscribe(".then() ", subscriber);
                                 console.debug('ACTS_MissionSnapshot_0300====<end')
                                 done();
@@ -301,7 +301,7 @@ describe('ActsMissionSnapshotTest', function () {
                             data.snapshot.getPixelBytesNumber().then(function (data){
                                 console.debug("=ACTS_MissionSnapshot_0500 ====> "
                                 +("data.snapshot.getPixelBytesNumber()=" + data))
-                                expect(data != 0).assertEqual(true);
+                                expect(data > 0).assertEqual(true);
                                 console.debug('ACTS_MissionSnapshot_0500====<end')
                                 done();
                                 })
@@ -310,8 +310,6 @@ describe('ActsMissionSnapshotTest', function () {
                             console.debug('ACTS_MissionSnapshot_0500====<end catch (err) get')
                             done();
                         }
-                        // console.debug('ACTS_MissionSnapshot_0500====<end')
-                        // done();
                     }).catch(function (err) {
                         console.debug("=ACTS_MissionSnapshot_0500 catch err ====>"
                             + ("json err 【") + JSON.stringify(err) + (" 】 "));
@@ -401,7 +399,7 @@ describe('ActsMissionSnapshotTest', function () {
                                 data.snapshot.getPixelBytesNumber().then(function (data){
                                     console.debug("=ACTS_MissionSnapshot_0600 ====> "
                                         +("data.snapshot.getPixelBytesNumber()=" + data))
-                                    expect(data != 0).assertEqual(true);
+                                    expect(data > 0).assertEqual(true);
                                     unsubscribe(".then() ", subscriber);
                                     console.debug('ACTS_MissionSnapshot_0600====<end')
                                     done();

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsMissionSnapshotTestSingleton") {
+ohos_js_hap_suite("ActsAmsMissionSnapshotTestSingleton") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsMissionSnapshotTestSingleton"
+  hap_name = "ActsAmsMissionSnapshotTestSingleton"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsMissionSnapshotTestSingletonS") {
+ohos_js_hap_suite("ActsAmsMissionSnapshotTestSingletonS") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsMissionSnapshotTestSingletonS"
+  hap_name = "ActsAmsMissionSnapshotTestSingletonS"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppPage/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultipageapp",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiPageApp.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPageConnectService/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultipageappconnectservice",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiPageAppConnectService.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPageConnect_Service/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppageconnectservice",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPageConnectService.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPagePermission/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultipageapppermission",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiPageAppPermission.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPagePermission_Page/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppagepermission",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPagePermission.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_PSS/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultipageapps",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiPageAppS.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Page/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppage",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPage.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Service/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultipageappservice",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPageService.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppageontology",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPageOntology.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline_test/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppageclone",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppClone.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapptermination",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppTermination.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination_test/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.actsamsmultiapppageclonetermination",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsMultiAppPageCloneTermination.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultiapppageexecutor/BUILD.gn

@@ -12,9 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("MultiAppPageExecutor") {
+ohos_hap("ActsAmsMultiAppPageExecutor") {
   hap_profile = "./src/main/config.json"
-  hap_name = "MultiAppPageExecutor"
+  hap_name = "ActsAmsMultiAppPageExecutor"
   subsystem_name = XTS_SUITENAME
   final_hap_path =
       "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"

aafwk/aafwk_standard/amsmultiapp/amsmultiapppageexecutor/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultiappserviceexecutor/BUILD.gn

@@ -12,9 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("MultiAppServiceExecutor") {
+ohos_hap("ActsAmsMultiAppServiceExecutor") {
   hap_profile = "./src/main/config.json"
-  hap_name = "MultiAppServiceExecutor"
+  hap_name = "ActsAmsMultiAppServiceExecutor"
   subsystem_name = XTS_SUITENAME
   final_hap_path =
       "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"

aafwk/aafwk_standard/amsmultiapp/amsmultiappserviceexecutor/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultiappservicestarter/BUILD.gn

@@ -12,9 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("MultiAppServiceStarter") {
+ohos_hap("ActsAmsMultiAppServiceStarter") {
   hap_profile = "./src/main/config.json"
-  hap_name = "MultiAppServiceStarter"
+  hap_name = "ActsAmsMultiAppServiceStarter"
   subsystem_name = XTS_SUITENAME
   final_hap_path =
       "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"

aafwk/aafwk_standard/amsmultiapp/amsmultiappservicestarter/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultiapptester/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("MultiAppTester") {
+ohos_js_hap_suite("ActsAmsMultiAppTester") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "MultiAppTester"
+  hap_name = "ActsAmsMultiAppTester"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/amsmultiapptester/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "300000",
-        "package": "com.example.amsmultiapptester",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "MultiAppTester.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityclone/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsMultiDataAbilityClone") {
+ohos_js_hap_suite("ActsAmsMultiDataAbilityClone") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsMultiDataAbilityClone"
+  hap_name = "ActsAmsMultiDataAbilityClone"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityclone/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.amsst.amsmultidataabilityclone",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "amsMultiDataAbility.hap",
-                "./resource/appexecfwk/amsStDataAbility.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-	]
+    "description": "Configuration for hjunit demo Tests"
 }

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityself/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsMultiDataAbilitySelf") {
+ohos_js_hap_suite("ActsAmsMultiDataAbilitySelf") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsMultiDataAbilitySelf"
+  hap_name = "ActsAmsMultiDataAbilitySelf"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityself/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.amsst.amsmultidataabilityself",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "amsMultiDataAbility.hap",
-                "./resource/appexecfwk/amsStDataAbility.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-	]
+    "description": "Configuration for hjunit demo Tests"
 }