diff --git a/ability/dmsfwk/continuationmanagertest/src/main/js/TestAbility/app.js b/ability/dmsfwk/continuationmanagertest/src/main/js/TestAbility/app.js index 05970690e44eb288b3800d0a10ea9dbb285b7d06..31f5de137afc6fdafeea01ca2e309a5576820c7f 100644 --- a/ability/dmsfwk/continuationmanagertest/src/main/js/TestAbility/app.js +++ b/ability/dmsfwk/continuationmanagertest/src/main/js/TestAbility/app.js @@ -15,6 +15,7 @@ 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'; @@ -30,6 +31,29 @@ async function requestPermission() { } } +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 == 3) { + break + } + } + if (data_sync_allow == null) { + console.info('应用非首次开启') + } else { + await data_sync_allow.click() + console.log('点击多设备授权框的允许按钮') + } +} + export default { onCreate() { console.info('TestApplication onCreate') @@ -37,7 +61,9 @@ 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"); diff --git a/ability/dmsfwk/continuationmanagertest/src/main/js/test/ContinuationManagerJsunit.test.js b/ability/dmsfwk/continuationmanagertest/src/main/js/test/ContinuationManagerJsunit.test.js index 6d25d42aef57a2aabde3bac928d291f6df303ab4..895ad1536488fdfece4be52152485658f2ca5c65 100644 --- a/ability/dmsfwk/continuationmanagertest/src/main/js/test/ContinuationManagerJsunit.test.js +++ b/ability/dmsfwk/continuationmanagertest/src/main/js/test/ContinuationManagerJsunit.test.js @@ -13,7 +13,6 @@ * limitations under the License. */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -import { UiDriver, BY } from '@ohos.uitest' import continuationManager from '@ohos.continuation.continuationManager'; const TEST_DEVICE_ID = "test_deviceId"; @@ -25,26 +24,10 @@ describe('continuationManagerTest', function() { beforeAll(async function (done) { console.info('beforeAll'); - var driver = UiDriver.create() - 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 == 3) { - break - } - } - if (data_sync_allow == null) { - console.info('应用非首次开启') - } else { - await data_sync_allow.click() - console.log('点击多设备授权框的允许按钮') + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); } + await sleep(5000) done(); })