modiy

Signed-off-by: Nlwx1121892 <liuxueqi3@huawei.com>

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js

@@ -357,6 +357,7 @@ describe('audioCapturer', function () {
         steps.shift();
         let markReachParam = steps[0];
         steps.shift();
+        try {
             audioCap.on('markReach', markReachParam, (position) => {
                 console.log(`${Tag} position: ${JSON.stringify(position)}`);
                 console.log(`${Tag} markReachParam: ${JSON.stringify(markReachParam)}`);
@@ -366,6 +367,16 @@ describe('audioCapturer', function () {
                 }
             });
             toNextStep(audioCap, steps, done);
+        }
+        catch (error) {
+            if (error.code == 401){
+                markReachState = 'invalid_failure';
+                toNextStep(audioCap, steps, done);
+            }else{
+                console.info("err" + error.code);
+                toNextStep(audioCap, steps, done);
+            }
+        }
     });
 
     eventEmitter.on(OFF_MARK_REACH_EVENT, (audioCap, steps, done) => {
@@ -380,6 +391,7 @@ describe('audioCapturer', function () {
         steps.shift();
         let periodReachParam = steps[0];
         steps.shift();
+        try {
             audioCap.on('periodReach', periodReachParam, (position) => {
                 console.log(`${Tag} position: ${JSON.stringify(position)}`);
                 console.log(`${Tag} periodReachParam: ${JSON.stringify(periodReachParam)}`);
@@ -389,6 +401,17 @@ describe('audioCapturer', function () {
                 }
             });
             toNextStep(audioCap, steps, done);
+        }
+        catch (error) {
+            if (error.code == 401){
+                markReachState = 'invalid_failure';
+                toNextStep(audioCap, steps, done);
+            }else{
+                console.info("err" + error.code);
+                toNextStep(audioCap, steps, done);
+            }
+        }
+
     });
     eventEmitter.on(OFF_PERIODR_REACH_EVENT, (audioCap, steps, done) => {
         console.log(`${Tag} emit: ${JSON.stringify(OFF_PERIODR_REACH_EVENT)}`);
@@ -421,7 +444,7 @@ describe('audioCapturer', function () {
         console.info(`${Tag} AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`);
         let permissionName1 = 'ohos.permission.MICROPHONE';
         let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG';
-        let permissionNameList = [permissionName1,permissionName2];
+        let permissionNameList = [permissionName1, permissionName2];
         let appName = 'ohos.acts.multimedia.audio.audiocapturer';
         await audioTestBase.applyPermission(appName, permissionNameList);
         await sleep(100);
@@ -1998,7 +2021,7 @@ describe('audioCapturer', function () {
             console.log(`${Tag} start-getAudioTime-getBufferSize-read-getAudioTimein- err: ${JSON.stringify(err)}`);
             expect(false).assertTrue();
         }
-        try{
+        try {
             await audioCapPromise.stop();
             let audioTime2 = await audioCapPromise.getAudioTime();
             console.log(`${Tag} audioTime2: ${JSON.stringify(audioTime2)}`);
@@ -2899,7 +2922,7 @@ describe('audioCapturer', function () {
 
         let audioCap = null;
         let markReachParam = 0;
-        markReachState = 'invalid_failure';
+        markReachState = 'fail';
         let mySteps = [CREATE_EVENT, AudioCapturerOptions, MARK_REACH_EVENT, markReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_MARK_REACH_EVENT, RELEASE_EVENT, END_EVENT];
         eventEmitter.emit(mySteps[0], audioCap, mySteps, done);
     })
@@ -2963,7 +2986,7 @@ describe('audioCapturer', function () {
 
         let audioCap = null;
         let markReachParam = -2;
-        markReachState = 'invalid_failure';
+        markReachState = 'fail';
         let mySteps = [CREATE_EVENT, AudioCapturerOptions, MARK_REACH_EVENT, markReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_MARK_REACH_EVENT, RELEASE_EVENT, END_EVENT];
         eventEmitter.emit(mySteps[0], audioCap, mySteps, done);
     })
@@ -3059,7 +3082,7 @@ describe('audioCapturer', function () {
 
         let audioCap = null;
         let periodReachParam = -2;
-        periodReachState = 'invalid_failure';
+        periodReachState = 'fail';
         let mySteps = [CREATE_EVENT, AudioCapturerOptions, PERIODR_REACH_EVENT, periodReachParam, START_EVENT, GET_BUFFERSIZE_EVENT, READ_EVENT, OFF_PERIODR_REACH_EVENT, RELEASE_EVENT, END_EVENT];
         eventEmitter.emit(mySteps[0], audioCap, mySteps, done);
     })

multimedia/audio/audio_js_standard/audioInterrupt/src/main/js/test/AudioInterrupt.test.js

@@ -65,7 +65,7 @@ describe('audioInterrupt', function () {
 
     beforeAll(function () {
         console.info('audioRenderInterrupt: beforeAll: Prerequisites at the test suite level');
-        getcreateAVSession();
+        // getcreateAVSession();
     })
 
     beforeEach(async function () {
@@ -150,7 +150,8 @@ describe('audioInterrupt', function () {
         //     console.info('activated == false')
         //     return;
         // }
-        await audioRen.start().then(async function () {
+        console.info('AudioFrameworkRenderLog: AudioRenderer : STATE : ' + audioRen.state);
+        await audioRen.start().then(() => {
             console.info('AudioFrameworkRenderLog: renderInstant started :SUCCESS ');
         }).catch((err) => {
             console.info('AudioFrameworkRenderLog: renderInstant start :ERROR : ' + err.message);