diff --git a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentNewTest.js b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentNewTest.js index b5bf698f17432cbba76bc89aadce91909e94532c..2e4e5785ef6d29569c9807d4f94ec632b8e8d568 100644 --- a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentNewTest.js +++ b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentNewTest.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -54,6 +54,13 @@ export default function ActsNotificationWantAgentNewTest() { } } + beforeEach(async function (done) { + console.info(`${TAG} beforeEach START`) + WantAgent = {} + console.info(`${TAG} beforeEachEach END`) + done(); + }) + /* * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0100 * @tc.name : function getWantAgent(info: WantAgentInfo, callback: AsyncCallback): void @@ -62,9 +69,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0100', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0100 START`) WantAgentInfo.operationType = wantAgent.OperationType.UNKNOWN_TYPE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.ONE_TIME_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.ONE_TIME_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -86,9 +93,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0200', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0200 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.NO_BUILD_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.NO_BUILD_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -110,9 +117,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0300', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0300 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITIES - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.CANCEL_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.CANCEL_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -134,9 +141,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0400', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0400 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_SERVICE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -158,9 +165,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0500', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0500 START`) WantAgentInfo.operationType = wantAgent.OperationType.SEND_COMMON_EVENT - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.CONSTANT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.CONSTANT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -182,9 +189,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0600', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0600 START`) WantAgentInfo.operationType = wantAgent.OperationType.UNKNOWN_TYPE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ELEMENT + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ELEMENT] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -206,9 +213,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0700', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0700 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ACTION + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ACTION] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -230,9 +237,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0800', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0800 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITIES - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_URI + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_URI] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -254,9 +261,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0900', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_0900 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_SERVICE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ENTITIES + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ENTITIES] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -278,9 +285,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1000', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1000 START`) WantAgentInfo.operationType = wantAgent.OperationType.SEND_COMMON_EVENT - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_BUNDLE + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_BUNDLE] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -302,7 +309,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1100', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1100 START`) WantAgentInfo.operationType = wantAgent.OperationType.UNKNOWN_TYPE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.ONE_TIME_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.ONE_TIME_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -324,7 +331,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1200', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1200 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.NO_BUILD_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.NO_BUILD_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -346,7 +353,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1300', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1300 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITIES - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.CANCEL_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.CANCEL_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -368,7 +375,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1400', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1400 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_SERVICE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -390,7 +397,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1500', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1500 START`) WantAgentInfo.operationType = wantAgent.OperationType.SEND_COMMON_EVENT - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.CONSTANT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.CONSTANT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -412,7 +419,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1600', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1600 START`) WantAgentInfo.operationType = wantAgent.OperationType.UNKNOWN_TYPE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ELEMENT + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ELEMENT] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -434,7 +441,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1700', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1700 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ACTION + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ACTION] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -456,7 +463,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1800', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1800 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITIES - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_URI + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_URI] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -478,7 +485,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1900', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_1900 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_SERVICE - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_ENTITIES + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_ENTITIES] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -500,7 +507,7 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2000', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2000 START`) WantAgentInfo.operationType = wantAgent.OperationType.SEND_COMMON_EVENT - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.REPLACE_BUNDLE + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.REPLACE_BUNDLE] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) @@ -522,28 +529,26 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2100', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2100 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - } - }) - wantAgent.cancel(WantAgent, (err) => { - if (err.code) { - console.info(`${TAG} cancel AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} cancel AsyncCallback success`) - expect(true).assertTrue() - done() + wantAgent.cancel(WantAgent, (err) => { + if (err.code) { + console.info(`${TAG} cancel AsyncCallback err: ${err.code}`) + expect(false).assertTrue() + done() + } else { + console.info(`${TAG} cancel AsyncCallback success`) + expect(true).assertTrue() + done() + } + }) } }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2100 END`) @@ -557,26 +562,24 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2200', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2200 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() + wantAgent.cancel(WantAgent).then(() => { + console.info(`${TAG} cancel Promise success`) + expect(true).assertTrue() + done() + }).catch((err) => { + console.info(`${TAG} cancel Promise err: ${err.code}`) + expect(false).assertTrue() + done() + }) }).catch((err) => { console.info(`${TAG} getWantAgent Promise err: ${err.code}`) expect(false).assertTrue() done() }) - wantAgent.cancel(WantAgent).then(() => { - console.info(`${TAG} cancel Promise success`) - expect(true).assertTrue() - done() - }).catch((err) => { - console.info(`${TAG} cancel Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2200 END`) }) @@ -588,31 +591,28 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2300', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2300 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - } - }) - wantAgent.getBundleName(WantAgent, (err, data) => { - if (err.code) { - console.info(`${TAG} getBundleName AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} getBundleName AsyncCallback success: ${JSON.stringify(data)}`) - expect(data).assertEqual('com.example.actsnotificationwantagent') - done() + wantAgent.getBundleName(WantAgent, (err, data) => { + if (err.code) { + console.info(`${TAG} getBundleName AsyncCallback err: ${err.code}`) + expect(false).assertTrue() + done() + } else { + console.info(`${TAG} getBundleName AsyncCallback success: ${JSON.stringify(data)}`) + expect(data).assertEqual('com.example.actsnotificationwantagent') + done() + } + }) } }) - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2300 END`) }) @@ -624,18 +624,11 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2400', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2400 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - }).catch((err) => { - console.info(`${TAG} getWantAgent Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) - wantAgent.getBundleName(WantAgent) + wantAgent.getBundleName(WantAgent) .then((data) => { console.info(`${TAG} getBundleName Promise success: ${JSON.stringify(data)}`) expect(data).assertEqual('com.example.actsnotificationwantagent') @@ -646,6 +639,11 @@ export default function ActsNotificationWantAgentNewTest() { expect(false).assertTrue() done() }) + }).catch((err) => { + console.info(`${TAG} getWantAgent Promise err: ${err.code}`) + expect(false).assertTrue() + done() + }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2400 END`) }) @@ -657,28 +655,26 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2500', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2500 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - } - }) - await wantAgent.getUid(WantAgent, (err, data) => { - if (err.code) { - console.info(`${TAG} getUid AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} getUid AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() + wantAgent.getUid(WantAgent, (err, data) => { + if (err.code) { + console.info(`${TAG} getUid AsyncCallback err: ${err.code}`) + expect(false).assertTrue() + done() + } else { + console.info(`${TAG} getUid AsyncCallback success: ${JSON.stringify(data)}`) + expect(true).assertTrue() + done() + } + }) } }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2500 END`) @@ -692,26 +688,24 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2600', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2600 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() + wantAgent.getUid(WantAgent).then((data) => { + console.info(`${TAG} getUid Promise success: ${JSON.stringify(data)}`) + expect(true).assertTrue() + done() + }).catch((err) => { + console.info(`${TAG} getUid Promise err: ${err.code}`) + expect(false).assertTrue() + done() + }) }).catch((err) => { console.info(`${TAG} getWantAgent Promise err: ${err.code}`) expect(false).assertTrue() done() }) - await wantAgent.getUid(WantAgent).then((data) => { - console.info(`${TAG} getUid Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - }).catch((err) => { - console.info(`${TAG} getUid Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2600 END`) }) @@ -723,9 +717,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2700', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2700 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -733,7 +727,6 @@ export default function ActsNotificationWantAgentNewTest() { wantAgentData1 = data wantAgentData2 = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.equal(wantAgentData1, wantAgentData2, (err, data) => { if (err.code) { console.info(`${TAG} equal AsyncCallback err: ${err.code}`) @@ -758,9 +751,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2800', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2800 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -768,7 +761,6 @@ export default function ActsNotificationWantAgentNewTest() { wantAgentData1 = data wantAgentData2 = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.equal(wantAgentData1, wantAgentData2).then((data) => { console.info(`${TAG} equal Promise success: ${JSON.stringify(data)}`) expect(data).assertTrue() @@ -783,7 +775,6 @@ export default function ActsNotificationWantAgentNewTest() { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2800 END`) }) - /* * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2900 * @tc.name : function getOperationType(agent: WantAgent, callback: AsyncCallback): void @@ -792,28 +783,26 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2900', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2900 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - } - }) - await wantAgent.getOperationType(WantAgent, (err, data) => { - if (err.code) { - console.info(`${TAG} getOperationType AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} getOperationType AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() + wantAgent.getOperationType(WantAgent, (err, data) => { + if (err != null) { + console.info(`${TAG} getOperationType AsyncCallback err: ${err.code}`) + expect(false).assertTrue() + done() + } else { + console.info(`${TAG} getOperationType AsyncCallback success: ${JSON.stringify(data)}`) + expect(true).assertTrue() + done() + } + }) } }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_2900 END`) @@ -827,18 +816,11 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3000', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3000 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - }).catch((err) => { - console.info(`${TAG} getWantAgent Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) - await wantAgent.getOperationType(WantAgent) + wantAgent.getOperationType(WantAgent) .then((data) => { console.info(`${TAG} getOperationType Promise success: ${JSON.stringify(data)}`) expect(true).assertTrue() @@ -849,6 +831,11 @@ export default function ActsNotificationWantAgentNewTest() { expect(false).assertTrue() done() }) + }).catch((err) => { + console.info(`${TAG} getWantAgent Promise err: ${err.code}`) + expect(false).assertTrue() + done() + }) console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3000 END`) }) @@ -860,9 +847,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3100', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3100 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() @@ -927,9 +914,9 @@ export default function ActsNotificationWantAgentNewTest() { it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3200', 0, async function (done) { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_NEW_TEST_3200 START`) WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG + WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { + if (err != null) { console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) expect(false).assertTrue() done() diff --git a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js index 15b4d23ee549acac1d8a7c607120fa4a056a7560..e729c69ad2e579aee65c55525b4e8117a2937040 100644 --- a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js +++ b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -57,7 +57,7 @@ export default function ActsNotificationWantAgentTest() { beforeEach(async function (done) { console.info(`${TAG} beforeEach START`) WantAgent = {} - console.info(`${TAG} aftebeforeEachEach END`) + console.info(`${TAG} beforeEachEach END`) done(); }) @@ -538,22 +538,20 @@ export default function ActsNotificationWantAgentTest() { } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() + wantAgent.cancel(WantAgent, (err) => { + if (err.code) { + console.info(`${TAG} cancel AsyncCallback err: ${err.code}`) + expect(false).assertTrue() + done() + } else { + console.info(`${TAG} cancel AsyncCallback success`) + expect(true).assertTrue() + done() + } + }) } - wantAgent.cancel(WantAgent, (err) => { - if (err.code) { - console.info(`${TAG} cancel AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} cancel AsyncCallback success`) - expect(true).assertTrue() - done() - } - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2100 END`) - }) }) + console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2100 END`) }) /* @@ -568,7 +566,6 @@ export default function ActsNotificationWantAgentTest() { wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.cancel(WantAgent).then(() => { console.info(`${TAG} cancel Promise success`) expect(true).assertTrue() @@ -604,7 +601,6 @@ export default function ActsNotificationWantAgentTest() { } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getBundleName(WantAgent, (err, data) => { if (err.code) { console.info(`${TAG} getBundleName AsyncCallback err: ${err.code}`) @@ -633,7 +629,6 @@ export default function ActsNotificationWantAgentTest() { wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getBundleName(WantAgent) .then((data) => { console.info(`${TAG} getBundleName Promise success: ${JSON.stringify(data)}`) @@ -671,7 +666,6 @@ export default function ActsNotificationWantAgentTest() { } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getUid(WantAgent, (err, data) => { if (err.code) { console.info(`${TAG} getUid AsyncCallback err: ${err.code}`) @@ -701,7 +695,6 @@ export default function ActsNotificationWantAgentTest() { wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getUid(WantAgent).then((data) => { console.info(`${TAG} getUid Promise success: ${JSON.stringify(data)}`) expect(true).assertTrue() @@ -738,7 +731,6 @@ export default function ActsNotificationWantAgentTest() { wantAgentData1 = data wantAgentData2 = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.equal(wantAgentData1, wantAgentData2, (err, data) => { if (err.code) { console.info(`${TAG} equal AsyncCallback err: ${err.code}`) @@ -773,7 +765,6 @@ export default function ActsNotificationWantAgentTest() { wantAgentData1 = data wantAgentData2 = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.equal(wantAgentData1, wantAgentData2).then((data) => { console.info(`${TAG} equal Promise success: ${JSON.stringify(data)}`) expect(data).assertTrue() @@ -788,7 +779,6 @@ export default function ActsNotificationWantAgentTest() { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2800 END`) }) - /* * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2900 * @tc.name : function getOperationType(agent: WantAgent, callback: AsyncCallback): void @@ -806,7 +796,6 @@ export default function ActsNotificationWantAgentTest() { } else { WantAgent = data console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getOperationType(WantAgent, (err, data) => { if (err.code) { console.info(`${TAG} getOperationType AsyncCallback err: ${err.code}`) @@ -836,7 +825,6 @@ export default function ActsNotificationWantAgentTest() { wantAgent.getWantAgent(WantAgentInfo).then((data) => { WantAgent = data console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() wantAgent.getOperationType(WantAgent) .then((data) => { console.info(`${TAG} getOperationType Promise success: ${JSON.stringify(data)}`)