From bafbde212befcb5e875d363aa116619c077007d7 Mon Sep 17 00:00:00 2001 From: lwx1121892 Date: Mon, 31 Oct 2022 12:32:03 +0800 Subject: [PATCH] Signed-off-by: lwx1121892 --- .../audio_js_standard/AudioCapturer/src/main/config.json | 4 ++++ .../AudioCapturer/src/main/js/test/AudioCapturer.test.js | 3 ++- .../AudioCapturerChangeInfo/src/main/config.json | 4 ++++ .../src/main/js/test/AudioCapturerChangeInfo.test.js | 3 ++- .../audio_js_standard/AudioTonePlayer/src/main/config.json | 4 ++++ .../audio/audio_js_standard/audioManager/src/main/config.json | 4 ++++ .../audioManager/src/main/js/test/AudioFramework.test.js | 3 ++- .../audio/audio_js_standard/audioVoip/src/main/config.json | 4 ++++ .../audioVoip/src/main/js/test/AudioVOIP.test.js | 3 ++- multimedia/image/image_js_standard/image/Test.json | 4 +++- multimedia/image/image_js_standard/imageColorspace/Test.json | 4 +++- multimedia/image/image_js_standard/imageCreator/Test.json | 1 + .../image/image_js_standard/imageDecodeOptions/Test.json | 4 +++- multimedia/image/image_js_standard/imageExif/Test.json | 4 +++- .../image/image_js_standard/imageGetImageProperty/Test.json | 3 ++- .../image/image_js_standard/imageModifyProperty/Test.json | 3 ++- multimedia/image/image_js_standard/imagePacking/Test.json | 4 +++- .../image/image_js_standard/imagePixelMapFramework/Test.json | 4 +++- multimedia/image/image_js_standard/imageRGBA/Test.json | 1 + multimedia/image/image_js_standard/imageRaw/Test.json | 3 ++- multimedia/image/image_js_standard/imageReceiver/Test.json | 4 +++- multimedia/image/image_js_standard/imageWebp/Test.json | 4 +++- multimedia/image/image_js_standard/imageYUV/Test.json | 4 +++- multimedia/image/image_js_standard/image_ndk_test/Test.json | 4 +++- 24 files changed, 66 insertions(+), 17 deletions(-) diff --git a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json index a9dc389bc..af03827c1 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json +++ b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json @@ -80,6 +80,10 @@ { "name": "ohos.permission.MICROPHONE", "reason": "use ohos.permission.MICROPHONE" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" } ] diff --git a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js index a342fb572..2ce1b1b10 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js +++ b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/test/AudioCapturer.test.js @@ -420,7 +420,8 @@ describe('audioCapturer', function () { beforeAll(async function () { console.info(`${Tag} AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionNameList = [permissionName1]; + let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; + let permissionNameList = [permissionName1,permissionName2]; let appName = 'ohos.acts.multimedia.audio.audiocapturer'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json index f4ecf85cb..a58ae9400 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json +++ b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json @@ -80,6 +80,10 @@ { "name": "ohos.permission.MICROPHONE", "reason": "use ohos.permission.MICROPHONE" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" } ] } diff --git a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js index d92214059..9322d233b 100644 --- a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js +++ b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/js/test/AudioCapturerChangeInfo.test.js @@ -28,7 +28,8 @@ describe('audioCapturerChange', function () { beforeAll(async function () { console.info(`AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionNameList = [permissionName1]; + let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; + let permissionNameList = [permissionName1,permissionName2]; let appName = 'ohos.acts.multimedia.audio.audiocapturerchangeInfo'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/audio/audio_js_standard/AudioTonePlayer/src/main/config.json b/multimedia/audio/audio_js_standard/AudioTonePlayer/src/main/config.json index da3c21a28..2664f35fa 100644 --- a/multimedia/audio/audio_js_standard/AudioTonePlayer/src/main/config.json +++ b/multimedia/audio/audio_js_standard/AudioTonePlayer/src/main/config.json @@ -80,6 +80,10 @@ { "name": "ohos.permission.MICROPHONE", "reason": "use ohos.permission.MICROPHONE" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" } ] } diff --git a/multimedia/audio/audio_js_standard/audioManager/src/main/config.json b/multimedia/audio/audio_js_standard/audioManager/src/main/config.json index afdbfee30..bf7ae6662 100755 --- a/multimedia/audio/audio_js_standard/audioManager/src/main/config.json +++ b/multimedia/audio/audio_js_standard/audioManager/src/main/config.json @@ -89,6 +89,10 @@ { "name": "ohos.permission.MODIFY_AUDIO_SETTINGS", "reason": "use ohos.permission.MODIFY_AUDIO_SETTINGS" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" } ] } diff --git a/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioFramework.test.js b/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioFramework.test.js index 7851a22d3..7b39f0127 100755 --- a/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioFramework.test.js +++ b/multimedia/audio/audio_js_standard/audioManager/src/main/js/test/AudioFramework.test.js @@ -100,7 +100,8 @@ describe('audioFramework', function () { let permissionName1 = 'ohos.permission.MICROPHONE'; let permissionName2 = 'ohos.permission.ACCESS_NOTIFICATION_POLICY'; let permissionName3 = 'ohos.permission.MODIFY_AUDIO_SETTINGS'; - let permissionNameList = [permissionName1, permissionName2, permissionName3]; + let permissionName4 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; + let permissionNameList = [permissionName1, permissionName2, permissionName3,permissionName4]; let appName = 'ohos.acts.multimedia.audio.audiomanager'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/audio/audio_js_standard/audioVoip/src/main/config.json b/multimedia/audio/audio_js_standard/audioVoip/src/main/config.json index d0c39bfcc..83859ace8 100644 --- a/multimedia/audio/audio_js_standard/audioVoip/src/main/config.json +++ b/multimedia/audio/audio_js_standard/audioVoip/src/main/config.json @@ -80,6 +80,10 @@ { "name": "ohos.permission.MICROPHONE", "reason": "use ohos.permission.MICROPHONE" + }, + { + "name": "ohos.permission.MANAGE_AUDIO_CONFIG", + "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG" } ] } diff --git a/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js b/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js index aa815af90..0105d91da 100644 --- a/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js +++ b/multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js @@ -35,7 +35,8 @@ describe('audioVoip', function () { beforeAll(async function () { console.info(`AudioFrameworkTest: beforeAll: Prerequisites at the test suite level`); let permissionName1 = 'ohos.permission.MICROPHONE'; - let permissionNameList = [permissionName1]; + let permissionName2 = 'ohos.permission.MANAGE_AUDIO_CONFIG'; + let permissionNameList = [permissionName1,permissionName2]; let appName = 'ohos.acts.multimedia.audio.audiovoip'; await audioTestBase.applyPermission(appName, permissionNameList); await sleep(100); diff --git a/multimedia/image/image_js_standard/image/Test.json b/multimedia/image/image_js_standard/image/Test.json index 99a6fb18a..2dd112b09 100644 --- a/multimedia/image/image_js_standard/image/Test.json +++ b/multimedia/image/image_js_standard/image/Test.json @@ -42,7 +42,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command":[ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageColorspace/Test.json b/multimedia/image/image_js_standard/imageColorspace/Test.json index e3b6fa5ce..9b5c2b50f 100644 --- a/multimedia/image/image_js_standard/imageColorspace/Test.json +++ b/multimedia/image/image_js_standard/imageColorspace/Test.json @@ -41,7 +41,9 @@ "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Colorspace/haps/entry/files/DisplayP3.png" ], - "teardown-command": [] + "teardown-command":[ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageCreator/Test.json b/multimedia/image/image_js_standard/imageCreator/Test.json index 6d48feaad..b27298a6f 100644 --- a/multimedia/image/image_js_standard/imageCreator/Test.json +++ b/multimedia/image/image_js_standard/imageCreator/Test.json @@ -34,6 +34,7 @@ "hilog -b D" ], "teardown-command":[ + "hilog -b X" ] } ] diff --git a/multimedia/image/image_js_standard/imageDecodeOptions/Test.json b/multimedia/image/image_js_standard/imageDecodeOptions/Test.json index 564fb6681..2b173092d 100644 --- a/multimedia/image/image_js_standard/imageDecodeOptions/Test.json +++ b/multimedia/image/image_js_standard/imageDecodeOptions/Test.json @@ -43,7 +43,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command":[ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageExif/Test.json b/multimedia/image/image_js_standard/imageExif/Test.json index 87ff5cb09..d6de52d50 100644 --- a/multimedia/image/image_js_standard/imageExif/Test.json +++ b/multimedia/image/image_js_standard/imageExif/Test.json @@ -39,7 +39,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command":[ + "hilog -b X" + ] } ] diff --git a/multimedia/image/image_js_standard/imageGetImageProperty/Test.json b/multimedia/image/image_js_standard/imageGetImageProperty/Test.json index 7f5812012..a2c381e91 100644 --- a/multimedia/image/image_js_standard/imageGetImageProperty/Test.json +++ b/multimedia/image/image_js_standard/imageGetImageProperty/Test.json @@ -40,7 +40,8 @@ "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.GetImageProperty/haps/entry/files/test_exif.jpg" ], "teardown-command": [ - "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.GetImageProperty/haps/entry/files/*" + "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.GetImageProperty/haps/entry/files/*", + "hilog -b X" ] } ] diff --git a/multimedia/image/image_js_standard/imageModifyProperty/Test.json b/multimedia/image/image_js_standard/imageModifyProperty/Test.json index c4c6d812d..4eae04290 100644 --- a/multimedia/image/image_js_standard/imageModifyProperty/Test.json +++ b/multimedia/image/image_js_standard/imageModifyProperty/Test.json @@ -40,7 +40,8 @@ "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/test_exif.jpg" ], "teardown-command": [ - "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/*" + "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/*", + "hilog -b X" ] } ] diff --git a/multimedia/image/image_js_standard/imagePacking/Test.json b/multimedia/image/image_js_standard/imagePacking/Test.json index 71e0ad46b..cf5fefc0c 100644 --- a/multimedia/image/image_js_standard/imagePacking/Test.json +++ b/multimedia/image/image_js_standard/imagePacking/Test.json @@ -37,7 +37,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command": [ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMapFramework/Test.json b/multimedia/image/image_js_standard/imagePixelMapFramework/Test.json index 410ab3ff0..16a249376 100644 --- a/multimedia/image/image_js_standard/imagePixelMapFramework/Test.json +++ b/multimedia/image/image_js_standard/imagePixelMapFramework/Test.json @@ -22,7 +22,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command": [ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageRGBA/Test.json b/multimedia/image/image_js_standard/imageRGBA/Test.json index eea7b947b..178db4aa0 100644 --- a/multimedia/image/image_js_standard/imageRGBA/Test.json +++ b/multimedia/image/image_js_standard/imageRGBA/Test.json @@ -34,6 +34,7 @@ "hilog -b D" ], "teardown-command":[ + "hilog -b X" ] } ] diff --git a/multimedia/image/image_js_standard/imageRaw/Test.json b/multimedia/image/image_js_standard/imageRaw/Test.json index 52ac7754a..e70c75af2 100644 --- a/multimedia/image/image_js_standard/imageRaw/Test.json +++ b/multimedia/image/image_js_standard/imageRaw/Test.json @@ -48,7 +48,8 @@ "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Raw/haps/entry/files/*" ], "teardown-command": [ - "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.Raw/*" + "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.Raw/*", + "hilog -b X" ] } ] diff --git a/multimedia/image/image_js_standard/imageReceiver/Test.json b/multimedia/image/image_js_standard/imageReceiver/Test.json index a43ef8065..f16c0f57b 100644 --- a/multimedia/image/image_js_standard/imageReceiver/Test.json +++ b/multimedia/image/image_js_standard/imageReceiver/Test.json @@ -22,7 +22,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command": [ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageWebp/Test.json b/multimedia/image/image_js_standard/imageWebp/Test.json index b7b3ea6a4..fb789c931 100644 --- a/multimedia/image/image_js_standard/imageWebp/Test.json +++ b/multimedia/image/image_js_standard/imageWebp/Test.json @@ -37,7 +37,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command": [ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageYUV/Test.json b/multimedia/image/image_js_standard/imageYUV/Test.json index e5ea9dccb..1b41aacbd 100644 --- a/multimedia/image/image_js_standard/imageYUV/Test.json +++ b/multimedia/image/image_js_standard/imageYUV/Test.json @@ -22,7 +22,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command": [ + "hilog -b X" + ] } ] } \ No newline at end of file diff --git a/multimedia/image/image_js_standard/image_ndk_test/Test.json b/multimedia/image/image_js_standard/image_ndk_test/Test.json index a58563572..c448950ad 100644 --- a/multimedia/image/image_js_standard/image_ndk_test/Test.json +++ b/multimedia/image/image_js_standard/image_ndk_test/Test.json @@ -21,7 +21,9 @@ "hilog -Q pidoff", "hilog -b D" ], - "teardown-command": [] + "teardown-command":[ + "hilog -b X" + ] } ] } -- GitLab