!6901 audio medialibrary用例整改

Merge pull request !6901 from 秦莉文/OpenHarmony-3.1-Release

multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioCall.test.js

@@ -411,7 +411,7 @@ describe('audioCall', function () {
 
         var AudioCapturerInfo = {
             source: audio.SourceType.SOURCE_TYPE_MIC,
-            capturerFlags: 1
+            capturerFlags: 0
         }
 
         var AudioCapturerOptions = {
@@ -447,7 +447,7 @@ describe('audioCall', function () {
 
         var AudioCapturerInfo = {
             source: audio.SourceType.SOURCE_TYPE_MIC,
-            capturerFlags: 1
+            capturerFlags: 0
         }
 
         var AudioCapturerOptions = {
@@ -478,12 +478,12 @@ describe('audioCall', function () {
         readpath = 'StarWars10s-1C-44100-2SW.wav';
         await getFdRead(readpath);
         await playbackPromise(AudioRendererOptions, filePath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
-        await sleep(1000);
+        await sleep(2000);
         console.info('AudioFrameworkRecLog: resultFlag : Capturer : ' + resultFlagRec);
         console.info('AudioFrameworkRenderLog: resultFlag : Renderer : ' + resultFlagRen);
 
-        if (resultFlagRec == true) {
-            expect(resultFlagRen).assertTrue();
+        if (resultFlagRec == true && resultFlagRen == true) {
+            expect(true).assertTrue();
         }
         else {
             expect(false).assertTrue();

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

@@ -1981,13 +1981,13 @@ describe('audioCapturer', function () {
 
         let AudioStreamInfo = {
             samplingRate: 44100,
-            channels: 1,
+            channels: 2,
             sampleFormat: 1,
             encodingType: 0
         }
 
         let AudioCapturerInfo = {
-            source: 1,
+            source: 0,
             capturerFlags: 0
         }
 
@@ -2000,7 +2000,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(AudioCapturerOptions, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2021,7 +2021,7 @@ describe('audioCapturer', function () {
             encodingType: audio.AudioEncodingType.ENCODING_TYPE_RAW,
         };
         let audioCapturerInfo44100 = {
-            source: audio.SourceType.SOURCE_TYPE_MIC,
+            source: audio.SourceType.SOURCE_TYPE_VOICE_COMMUNICATION,
             capturerFlags: 0,
         }
         let audioCapturerOptions44100 = {
@@ -2056,7 +2056,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo44100 = {
-            source: 1,
+            source: audio.SourceType.SOURCE_TYPE_VOICE_COMMUNICATION,
             capturerFlags: 0,
         }
         let audioCapturerOptions44100 = {
@@ -2067,7 +2067,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions44100, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2121,7 +2121,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo96000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions96000 = {
@@ -2132,7 +2132,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions96000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2181,11 +2181,11 @@ describe('audioCapturer', function () {
         let audioStreamInfo48000 = {
             samplingRate: 48000,
             channels: 2,
-            sampleFormat: 1,
+            sampleFormat: 3,
             encodingType: 0,
         };
         let audioCapturerInfo48000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions48000 = {
@@ -2196,7 +2196,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions48000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2249,7 +2249,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo8000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions8000 = {
@@ -2261,7 +2261,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions8000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2315,7 +2315,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo11025 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions11025 = {
@@ -2327,7 +2327,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions11025, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2381,7 +2381,7 @@ describe('audioCapturer', function () {
             encodingType: 0
         };
         let audioCapturerInfo12000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions12000 = {
@@ -2393,7 +2393,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions12000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2447,7 +2447,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo16000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions16000 = {
@@ -2459,7 +2459,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions16000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2513,7 +2513,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo22050 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions22050 = {
@@ -2525,7 +2525,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions22050, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2579,7 +2579,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo24000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions24000 = {
@@ -2591,7 +2591,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions24000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2645,7 +2645,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo32000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions32000 = {
@@ -2657,7 +2657,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions32000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -2717,7 +2717,7 @@ describe('audioCapturer', function () {
             encodingType: 0,
         };
         let audioCapturerInfo64000 = {
-            source: 1,
+            source: 0,
             capturerFlags: 0,
         }
         let audioCapturerOptions64000 = {
@@ -2729,7 +2729,7 @@ describe('audioCapturer', function () {
         let resultFlag = await recPromise(audioCapturerOptions64000, dirPath, audio.AudioScene.AUDIO_SCENE_VOICE_CHAT);
         await sleep(100);
         console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
-        expect(resultFlag).assertFalse();
+        expect(resultFlag).assertTrue();
         done();
     })
 
@@ -4151,7 +4151,6 @@ describe('audioCapturer', function () {
             } else {
                 console.info('AudioFrameworkRecLog: AudioCapturer Created : Success:' + data.state);
             }
-
         }).catch((err) => {
             console.info('AudioFrameworkRecLog: AudioCapturer Created : ERROR : ' + err.message);
             expect(true).assertTrue();

multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioRenderer.test.js

@@ -1313,17 +1313,30 @@ describe('audioRenderer', function () {
         console.info('AudioFrameworkRenderLog: CALLBACK : Audio Playback Function');
 
         var audioRen;
+        let isPass = false;
 
         audio.createAudioRenderer(AudioRendererOptions, (err, data) => {
             if (err) {     
-                console.error(`AudioFrameworkRenderLog: AudioRender Created : Error: ${err.message}`);
-                resultFlag = false;
+                LE24 = audio.AudioSampleFormat.SAMPLE_FORMAT_S24LE;
+                LE32 = audio.AudioSampleFormat.SAMPLE_FORMAT_S32LE;
+                let sampleFormat = AudioRendererOptions.streamInfo.sampleFormat;
+                if ((sampleFormat == LE24 || sampleFormat == LE32) && err.code == 202) {
+                    isPass = true;
+                    return;
+                }
+                resultFlag = false
             }
             else {
                 console.info('AudioFrameworkRenderLog: AudioRender Created : Success : SUCCESS');
                 audioRen = data;
             }
         });
+        await sleep(100);
+        console.log(`isPass: ${isPass}`);
+        if (isPass) {
+            resultFlag = true;
+            return resultFlag;
+        }
         if (resultFlag == false) {
             console.info('AudioFrameworkRenderLog: resultFlag : ' + resultFlag);
             return resultFlag;

multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js

@@ -639,8 +639,8 @@ describe('fileAssetTestCallback.test.js', async function() {
         try {
             let fileType = mediaLibrary.MediaType.VIDEO;
             let fileFetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ fileType.toString() ],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ fileType.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fileFetchOp);
             const dataList = await fetchFileResult.getAllObject();
@@ -708,8 +708,8 @@ describe('fileAssetTestCallback.test.js', async function() {
         try {
             let type = mediaLibrary.MediaType.VIDEO;
             let fetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ type.toString() ],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ type.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fetchOp);
             const dataList = await fetchFileResult.getAllObject();
@@ -773,8 +773,8 @@ describe('fileAssetTestCallback.test.js', async function() {
         try {
             let type = mediaLibrary.MediaType.VIDEO;
             let fetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ type.toString() ],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ type.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fetchOp);
             const dataList = await fetchFileResult.getAllObject();

multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js

@@ -458,8 +458,8 @@ describe('fileAssetTestPromise.test.js', async function() {
         try {
             let fileType = mediaLibrary.MediaType.VIDEO;
             let fileFetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ fileType.toString()],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ fileType.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fileFetchOp);
             const dataList = await fetchFileResult.getAllObject();
@@ -517,8 +517,8 @@ describe('fileAssetTestPromise.test.js', async function() {
         try {
             let type = mediaLibrary.MediaType.VIDEO;
             let fetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ type.toString() ],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ type.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fetchOp);
             const dataList = await fetchFileResult.getAllObject();
@@ -561,8 +561,8 @@ describe('fileAssetTestPromise.test.js', async function() {
         try {
             let type = mediaLibrary.MediaType.VIDEO;
             let fetchOp = {
-                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-                selectionArgs : [ type.toString() ],
+                selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+                selectionArgs : [ type.toString(), '01.mp4' ],
             };
             let fetchFileResult = await media.getFileAssets(fetchOp);
             const dataList = await fetchFileResult.getAllObject();

multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js

@@ -29,8 +29,8 @@ let imagesfetchOp = {
     selectionArgs: [imageType.toString()],
 };
 let videosfetchOp = {
-    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-    selectionArgs: [videoType.toString()],
+    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+    selectionArgs: [videoType.toString(), '01.mp4'],
 };
 let audiosfetchOp = {
     selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',

multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js

@@ -40,8 +40,8 @@ let imagesfetchOp = {
     selectionArgs: [imageType.toString()],
 };
 let videosfetchOp = {
-    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-    selectionArgs: [videoType.toString()],
+    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+    selectionArgs: [videoType.toString(), '01.mp4'],
 };
 let audiosfetchOp = {
     selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',

multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js

@@ -40,8 +40,8 @@ let imagesfetchOp = {
     selectionArgs: [imageType.toString()],
 };
 let videosfetchOp = {
-    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?',
-    selectionArgs: [videoType.toString()],
+    selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?',
+    selectionArgs: [videoType.toString(), '01.mp4'],
 };
 let audiosfetchOp = {
     selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?',