zhaominjie9@huawei.com

Signed-off-by: Nzhaominjie9@huawei.com <zhaominjie9@huawei.com>

ability/dmsfwk/continuationmanagertest/src/main/js/TestAbility/app.js

@@ -15,44 +15,8 @@
 
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { Hypium } from '@ohos/hypium'
-import { UiDriver, BY } from '@ohos.UiTest'
 import testsuite from '../test/List.test'
 
-import featureAbility from '@ohos.ability.featureAbility';
-
-async function requestPermission() {
-    try {
-        let context = featureAbility.getContext();
-        await context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, (data) => {
-            console.info('TestApplication requestPermission data: ' + JSON.stringify(data));
-        });
-    } catch (err) {
-        console.error('TestApplication permission' + JSON.stringify(err));
-    }
-}
-
-async function clickPermission(driver) {
-    console.info("clickPermission begin");
-    await driver.delayMs(2000);
-
-    var data_sync_allow = await driver.findComponent(BY.text("允许"))
-    await driver.delayMs(1000)
-    var wait_count = 0
-    while (data_sync_allow == null || data_sync_allow == undefined) {
-        data_sync_allow = await driver.findComponent(BY.text("允许"))
-        wait_count += 1
-        await driver.delayMs(1000)
-        if (wait_count == 15) {
-            break
-        }
-    }
-    if (data_sync_allow == null) {
-        console.info('应用非首次开启')
-    } else {
-        await data_sync_allow.click()
-        console.log('点击多设备授权框的允许按钮')
-    }
-}
 
 export default {
     onCreate() {
@@ -61,9 +25,6 @@ export default {
         var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
         console.info('start run testcase!!!')
         Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
-        var driver = UiDriver.create()
-        requestPermission()
-        clickPermission(driver)
     },
     onDestroy() {
         console.info("TestApplication onDestroy");

ability/dmsfwk/continuationmanagertest/src/main/js/test/ContinuationManagerJsunit.test.js

@@ -18,16 +18,53 @@ import continuationManager from '@ohos.continuation.continuationManager';
 const TEST_DEVICE_ID = "test_deviceId";
 const TEST_CONNECT_STATUS = continuationManager.DeviceConnectState.CONNECTED;
 let token = -1;
+import featureAbility from '@ohos.ability.featureAbility';
+import { UiDriver, BY } from '@ohos.UiTest'
 
 export default function continuationManagerTest() {
 describe('continuationManagerTest', function() {
 
+    function sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+
+    async function requestPermission() {
+        try {
+            let context = featureAbility.getContext();
+            await context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], 666, (data) => {
+                console.info('TestApplication requestPermission data: ' + JSON.stringify(data));
+            });
+        } catch (err) {
+            console.error('TestApplication permission' + JSON.stringify(err));
+        }
+    }
+
+
+    async function driveFn() {
+        try {
+            let driver = await UiDriver.create();
+            console.info(`come in driveFn`);
+            console.info(`driver is ${JSON.stringify(driver)}`);
+            sleep(2000);
+            let button = await driver.findComponent(BY.text('允许'));
+            console.info(`button is ${JSON.stringify(button)}`);
+            sleep(5000);
+            await button.click();
+        } catch (err) {
+            console.info('err is ' + err);
+            return;
+        }
+    }
+
+
+    
     beforeAll(async function (done) {
         console.info('beforeAll');
-        function sleep(ms) {
-            return new Promise(resolve => setTimeout(resolve, ms));
-        }
-        await sleep(20000)
+        await requestPermission();
+        sleep(5000);
+        await driveFn();
+        sleep(5000);
+
         done();
     })