!6426 Adaption code getwant and ActsAbilityDelegatorCaseTest

Merge pull request !6426 from xinking129/master

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/js/test/ActsAbilityDelegatorCaseTest.test.js

@@ -37,14 +37,6 @@ export default function actsStServiceAbilityTest() {
                 done();
             }, gSetTimeout);
         })
-        afterAll((done) => {
-            console.debug('= ACTS_AAAfterAll ====<begin');
-            setTimeout(function () {
-                console.debug('= ACTS_AAAfterAll ====<end');
-                featureAbility.terminateSelf();
-                done();
-            }, gSetTimeout);
-        })
 
         /**
          * @tc.number: ACTS_AExecuteShellCommand_0100

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/js/test/ActsStServiceAbilityClientCaseTest.test.js

@@ -63,14 +63,6 @@ describe('ActsStServiceAbilityTest', function () {
             done();
         }, gSetTimeout);
     })
-    afterAll((done) => {
-        console.debug('= ACTS_AafterAll ====<begin');
-        setTimeout(function () {
-            console.debug('= ACTS_AafterAll ====<end');
-            featureAbility.terminateSelf();
-            done();
-        }, gSetTimeout);
-    })
 
     /*
      * @tc.number  ACTS_AAbilityStartSetting_0100

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json

@@ -6,7 +6,8 @@
         "description": "$string:hap4_desc",
         "mainElement": "Hap4MainAbility1",
         "deviceTypes": [
-            "default"
+            "default",
+            "tablet"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js

@@ -44,15 +44,13 @@ export default {
                     })
                 }else{
                     setTimeout(function(){
-                        console.debug("==========data1 bundleName is==========="
-                                       + JSON.stringify(data.bundleName));
                         featureAbility.terminateSelfWithResult(
                             {
                                 resultCode: 1,
                                 want: data
                             }
                         );
-                    },1000);
+                    },800);
                 }
             }
         )

ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,