!5356 XTS-master元能力代码上库-XTS_AACommandTest用例优化

Merge pull request !5356 from chengxingzhen/master

ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -14,11 +14,70 @@
 */
 
 import Ability from '@ohos.application.Ability'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
 
 export default class MainAbility extends Ability {
-    onCreate(want, launchParam) {
+    async onCreate(want, launchParam) {
         globalThis.abilityContext = this.context;
         console.log('MainAbility onCreate')
+        let cmd: any
+        let abilityDelegatorArguments: any
+        let abilityDelegator: any
+        function sleep(ms) {
+            return new Promise(resolve => setTimeout(resolve, ms));
+        }
+
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+
+        cmd = 'aa test -b com.example.aacommandprintsync -m entry_test  -s class ' +
+            'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0100 -s unittest OpenHarmonyTestRunner'
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.log('ACTS_AACommand_printSync_01_0100 start err: ' + JSON.stringify(err))
+            console.log('ACTS_AACommand_printSync_01_0100 stdResult = ' + data.stdResult)
+            globalThis.stdResult1 = data.stdResult;
+            console.log('ACTS_AACommand_printSync_01_0100 - executeShellCommand: end ')
+        })
+
+        await sleep(3000)
+
+        cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
+            'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0200 -s unittest OpenHarmonyTestRunner'
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.log('ACTS_AACommand_printSync_01_0200 start err: ' + JSON.stringify(err))
+            console.log('ACTS_AACommand_printSync_01_0200 stdResult = ' + data.stdResult)
+            globalThis.stdResult2 = data.stdResult;
+            console.log('ACTS_AACommand_printSync_01_0200 - executeShellCommand: end ')
+        })
+
+        await sleep(3000)
+
+        cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
+            'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0300 -s unittest OpenHarmonyTestRunner'
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.log('ACTS_AACommand_printSync_01_0300 start err: ' + JSON.stringify(err))
+            console.log('ACTS_AACommand_printSync_01_0300 stdResult = ' + data.stdResult)
+            globalThis.stdResult3 = data.stdResult;
+            console.log('ACTS_AACommand_printSync_01_0300 - executeShellCommand: end ')
+        })
+
+        await sleep(3000)
+
+        cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
+            'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0400 -s unittest OpenHarmonyTestRunner'
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.log('ACTS_AACommand_printSync_01_0400 start err: ' + JSON.stringify(err))
+            console.log('ACTS_AACommand_printSync_01_0400 stdResult = ' + data.stdResult)
+            globalThis.stdResult4 = data.stdResult;
+            console.log('ACTS_AACommand_printSync_01_0400 - executeShellCommand: end ')
+        })
+
+        setTimeout(() => {
+            Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+
+        }, 5000)
     }
 
     onDestroy() {

ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/pages/index.ets

@@ -13,83 +13,9 @@
 * limitations under the License.
 */
 
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from '@ohos/hypium'
-import testsuite from '../test/List.test'
-
 @Entry
 @Component
 struct Index {
-  aboutToAppear() {
-    console.info('MainAbility index aboutToAppear')
-    console.info('start run testcase!!!')
-    let cmd: any
-    let abilityDelegatorArguments: any
-    let abilityDelegator: any
-
-    function sleep(delay) {
-      let start = (new Date()).getTime();
-      while ((new Date()).getTime() - start < delay) {
-        continue;
-      }
-    }
-    function test(time) {
-      sleep(time);
-    }
-
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-
-    cmd = 'aa test -b com.example.aacommandprintsync -m entry_test  -s class ' +
-      'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0100 -s unittest OpenHarmonyTestRunner'
-    globalThis.abilityDelegator.executeShellCommand(cmd, (err, data) => {
-      console.log('ACTS_AACommand_printSync_01_0100 start err: ' + JSON.stringify(err))
-      console.log('ACTS_AACommand_printSync_01_0100 stdResult = ' + data.stdResult)
-      globalThis.stdResult1 = data.stdResult;
-      console.log('ACTS_AACommand_printSync_01_0100 - executeShellCommand: end ')
-    })
-
-    test(3000)
-
-    cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
-      'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0200 -s unittest OpenHarmonyTestRunner'
-    globalThis.abilityDelegator.executeShellCommand(cmd, (err, data) => {
-      console.log('ACTS_AACommand_printSync_01_0200 start err: ' + JSON.stringify(err))
-      console.log('ACTS_AACommand_printSync_01_0200 stdResult = ' + data.stdResult)
-      globalThis.stdResult2 = data.stdResult;
-      console.log('ACTS_AACommand_printSync_01_0200 - executeShellCommand: end ')
-    })
-
-    test(3000)
-
-    cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
-      'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0300 -s unittest OpenHarmonyTestRunner'
-    globalThis.abilityDelegator.executeShellCommand(cmd, (err, data) => {
-      console.log('ACTS_AACommand_printSync_01_0300 start err: ' + JSON.stringify(err))
-      console.log('ACTS_AACommand_printSync_01_0300 stdResult = ' + data.stdResult)
-      globalThis.stdResult3 = data.stdResult;
-      console.log('ACTS_AACommand_printSync_01_0300 - executeShellCommand: end ')
-    })
-
-    test(3000)
-
-    cmd = 'aa test -m entry_test -b com.example.aacommandprintsync -s class ' +
-      'ACTS_AACommand_01_3#ACTS_AACommand_printSync_01_0400 -s unittest OpenHarmonyTestRunner'
-    globalThis.abilityDelegator.executeShellCommand(cmd, (err, data) => {
-      console.log('ACTS_AACommand_printSync_01_0400 start err: ' + JSON.stringify(err))
-      console.log('ACTS_AACommand_printSync_01_0400 stdResult = ' + data.stdResult)
-      globalThis.stdResult4 = data.stdResult;
-      console.log('ACTS_AACommand_printSync_01_0400 - executeShellCommand: end ')
-    })
-
-    test(3000)
-
-    setTimeout(() => {
-      Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
-
-    }, 15000)
-
-  }
   @State message: string = 'Hello World'
   build() {
     Row() {