!1067 Modify test code and change sound empty

Merge pull request !1067 from blackleon/master_1111

aafwk/aafwk_standard/abilitymanager/BUILD.gn

@@ -27,8 +27,8 @@ group("actsabilitymanagertest") {
       "actsamstestfourthscene:ActsAmsTestFourthSceneTest",
       "actsamstestsecondscene:ActsAmsTestSecondSceneTest",
       "actsamstestthirdscene:ActsAmsTestThirdSceneTest",
-      "sceneProject/clearmissionscallback:ClearMissionsCallBack",
-      "sceneProject/clearmissionspromise:ClearMissionsPromise",
+      "clearmissionscallback:ClearMissionsCallBack",
+      "clearmissionspromise:ClearMissionsPromise",
       "sceneProject/simulateEAbility:simulateEAbility",
       "sceneProject/simulateFAbilityFir:simulateFAbilityFir",
       "sceneProject/simulateFAbilitySed:simulateFAbilitySed",

aafwk/aafwk_standard/abilitymanager/sceneProject/clearmissionspromise/src/main/js/default/pages/index/index.js → aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/js/default/pages/index/index.js

@@ -14,7 +14,7 @@
  */
 import file from '@system.file'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
-
+var once = true
 export default {
     data: {
         title: ""
@@ -23,22 +23,25 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish')
+        if (once) {
+            once = false
+            console.info('onShow finish')
 
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        const reportExtend = new ReportExtend(file)
-        core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.init()
+            const core = Core.getInstance()
+            const expectExtend = new ExpectExtend({
+                'id': 'extend'
+            })
+            const reportExtend = new ReportExtend(file)
+            core.addService('expect', expectExtend)
+            core.addService('report', reportExtend)
+            core.init()
 
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
+            const configService = core.getDefaultService('config')
+            configService.setConfig(this)
 
-        require('../../../test/List.test')
-        core.execute()
+            require('../../../test/List.test')
+            core.execute()
+        }
     },
     onReady() {
         console.info('onReady');

aafwk/aafwk_standard/abilitymanager/sceneProject/clearmissionscallback/src/main/js/default/pages/index/index.js → aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/js/default/pages/index/index.js

@@ -14,7 +14,7 @@
  */
 import file from '@system.file'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
-
+var once = true
 export default {
     data: {
         title: ""
@@ -23,22 +23,25 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish')
+        if (once) {
+            once = false
+            console.info('onShow finish')
 
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        const reportExtend = new ReportExtend(file)
-        core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.init()
+            const core = Core.getInstance()
+            const expectExtend = new ExpectExtend({
+                'id': 'extend'
+            })
+            const reportExtend = new ReportExtend(file)
+            core.addService('expect', expectExtend)
+            core.addService('report', reportExtend)
+            core.init()
 
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
+            const configService = core.getDefaultService('config')
+            configService.setConfig(this)
 
-        require('../../../test/List.test')
-        core.execute()
+            require('../../../test/List.test')
+            core.execute()
+        }
     },
     onReady() {
         console.info('onReady');

notification/ans_standard/actsansslottest/actsansgetslottestcallback/entry/src/main/js/test/ExampleJsunit.test.js

@@ -16,6 +16,7 @@ import notification from '@ohos.notification'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
 const TIMEOUT = 2000;
+const SOUNDURL = "file://system/etc/Light.ogg";
 describe('ActsAnsGetSlotTestCallback', function () {
 
     /*
@@ -43,6 +44,7 @@ describe('ActsAnsGetSlotTestCallback', function () {
                 expect(data.bypassDnd).assertEqual(false);
                 expect(data.lockscreenVisibility).assertEqual(2);
                 expect(data.vibrationEnabled).assertEqual(true);
+                expect(data.sound).assertEqual(SOUNDURL);
                 expect(data.lightEnabled).assertEqual(false);
                 expect(data.lightColor).assertEqual(0);
                 console.debug("====>getSlot ActsAnsGetSlotTestCallback_0100 finish====>");
@@ -77,6 +79,7 @@ describe('ActsAnsGetSlotTestCallback', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(2);
             expect(data.vibrationEnabled).assertEqual(true);
+            expect(data.sound).assertEqual(SOUNDURL);
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot ActsAnsGetSlotTestCallback_0200 finish====>");
@@ -118,6 +121,7 @@ describe('ActsAnsGetSlotTestCallback', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot ActsAnsGetSlotTestCallback_0300 finish====>");
@@ -159,6 +163,7 @@ describe('ActsAnsGetSlotTestCallback', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlotActsAnsGetSlotTestCallback_0400 finish====>");
@@ -200,6 +205,7 @@ describe('ActsAnsGetSlotTestCallback', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot ActsAnsGetSlotTestCallback_0500 finish====>");

notification/ans_standard/actsansslottest/actsansgetslottestpromise/entry/src/main/js/test/ExampleJsunit.test.js

@@ -16,6 +16,7 @@ import notification from '@ohos.notification'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
 const TIMEOUT = 2000;
+const SOUNDURL = "file://system/etc/Light.ogg";
 describe('ActsAnsGetSlotTestPromise', function () {
 
     /*
@@ -45,6 +46,7 @@ describe('ActsAnsGetSlotTestPromise', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(2);
             expect(data.vibrationEnabled).assertEqual(true);
+            expect(data.sound).assertEqual(SOUNDURL);
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot ActsAnsGetSlotTestPromise_0100 finish====>");
@@ -87,6 +89,7 @@ describe('ActsAnsGetSlotTestPromise', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(2);
             expect(data.vibrationEnabled).assertEqual(true);
+            expect(data.sound).assertEqual(SOUNDURL);
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot Promise SERVICE_INFORMATION ActsAnsGetSlotTestPromise_0200 finish====>");
@@ -129,6 +132,7 @@ describe('ActsAnsGetSlotTestPromise', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot Promise CONTENT_INFORMATION ActsAnsGetSlotTestPromise_0300 finish====>");
@@ -171,6 +175,7 @@ describe('ActsAnsGetSlotTestPromise', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlot Promise OTHER_TYPES ActsAnsGetSlotTestPromise_0400 finish====>");
@@ -213,6 +218,7 @@ describe('ActsAnsGetSlotTestPromise', function () {
             expect(data.bypassDnd).assertEqual(false);
             expect(data.lockscreenVisibility).assertEqual(3);
             expect(data.vibrationEnabled).assertEqual(false);
+            expect(data.sound).assertEqual("");
             expect(data.lightEnabled).assertEqual(false);
             expect(data.lightColor).assertEqual(0);
             console.debug("====>getSlotPromise UNKNOWN_TYPE ActsAnsGetSlotTestPromise_0500 finish====>");

notification/ans_standard/actsansslottest/actsansremoveslottest/entry/src/main/js/test/ExampleJsunit.test.js

@@ -16,6 +16,7 @@ import notification from '@ohos.notification'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
 const TIMEOUT = 3000;
+const SOUNDURL = "file://system/etc/Light.ogg";
 describe('ActsAnsRemoveSlotTest', function () {
 
     /*
@@ -38,6 +39,7 @@ describe('ActsAnsRemoveSlotTest', function () {
         expect(data.bypassDnd).assertEqual(false);
         expect(data.lockscreenVisibility).assertEqual(2);
         expect(data.vibrationEnabled).assertEqual(true);
+        expect(data.sound).assertEqual(SOUNDURL);
         expect(data.lightEnabled).assertEqual(false);
         expect(data.lightColor).assertEqual(0);
         console.debug("====>getSlot ActsAnsRemoveSlotTest_0100 finish====>");
@@ -82,6 +84,7 @@ describe('ActsAnsRemoveSlotTest', function () {
         expect(data.bypassDnd).assertEqual(false);
         expect(data.lockscreenVisibility).assertEqual(2);
         expect(data.vibrationEnabled).assertEqual(true);
+        expect(data.sound).assertEqual(SOUNDURL);
         expect(data.lightEnabled).assertEqual(false);
         expect(data.lightColor).assertEqual(0);
         console.debug("====>getSlot ActsAnsRemoveSlotTest_0200 finish====>");