!6902 avsession主干签名更改

Merge pull request !6902 from 秦莉文/master

multimedia/audio/audio_js_standard/AudioCapturer/Test.json

@@ -20,7 +20,13 @@
             "run-command": [
                 "hilog -Q pidoff",
                 "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry/files",
-                "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry"
+                "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
+                "power-shell setmode 602"
+            ],
+            "teardown-command":[
+                "power-shell setmode 600"
             ],
             "cleanup-apps": true
         },

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

@@ -17,7 +17,7 @@ import audio from '@ohos.multimedia.audio';
 import fileio from '@ohos.fileio';
 import featureAbility from '@ohos.ability.featureAbility';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from '@ohos/hypium';
-import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix } from '@ohos.uitest'
+import { UiDriver, BY } from '@ohos.uitest'
 export default function audioCapturer() {
 
     describe('audioCapturer', function () {

multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/Test.json

@@ -18,7 +18,13 @@
 		{
             "type": "ShellKit",
             "run-command": [
-                "hilog -Q pidoff"
+                "hilog -Q pidoff",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
+                "power-shell setmode 602"
+            ],
+            "teardown-command":[
+                "power-shell setmode 600"
             ]
         }
     ]

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

@@ -16,7 +16,7 @@
 import audio from '@ohos.multimedia.audio';
 import featureAbility from '@ohos.ability.featureAbility';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from '@ohos/hypium';
-import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix } from '@ohos.uitest'
+import { UiDriver, BY } from '@ohos.uitest'
 
 export default function audioCapturerChange() {
 describe('audioCapturerChange', function () {

multimedia/audio/audio_js_standard/AudioTestBase.js

-/*
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
-import bundle from '@ohos.bundle';
-import account from '@ohos.account.osAccount';
-
-
-// apply permission for test hap
-export async function applyPermission(applictionName, permissionNames) {
-    let userId = await account.getAccountManager().getOsAccountLocalIdFromProcess();
-    console.info(`userid is :${userId}`)
-    let appInfo = await bundle.getApplicationInfo(applictionName, 0, userId);
-    let atManager = abilityAccessCtrl.createAtManager();
-    if (atManager != null) {
-        let tokenID = appInfo.accessTokenId;
-        console.info(`[permission] case accessTokenID is ${tokenID}`);
-        for (let i = 0; i < permissionNames.length; i++) {
-            await atManager.grantUserGrantedPermission(tokenID, permissionNames[i], 1).then((result) => {
-                console.info(`[permission] case grantUserGrantedPermission success : ${result}`);
-            }).catch((err) => {
-                console.info(`[permission] case grantUserGrantedPermission failed : ${err}`);
-            });
-        }
-    } else {
-        console.info(`[permission] case apply permission failed, createAtManager failed`);
-    }
-}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioManager/Test.json

@@ -18,7 +18,13 @@
 		{
             "type": "ShellKit",
             "run-command": [
-                "hilog -Q pidoff"
+                "hilog -Q pidoff",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
+                "power-shell setmode 602"
+            ],
+            "teardown-command":[
+                "power-shell setmode 600"
             ]
         }
     ]

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

@@ -16,7 +16,7 @@
 import audio from '@ohos.multimedia.audio';
 import featureAbility from '@ohos.ability.featureAbility';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from '@ohos/hypium';
-import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix } from '@ohos.uitest'
+import { UiDriver, BY } from '@ohos.uitest'
 
 export default function audioFramework() {
 

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

@@ -14,7 +14,6 @@
  */
 
 import audio from '@ohos.multimedia.audio';
-// import * as audioTestBase from '../../../../../AudioTestBase'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 export default function audioManagerApi9() {
 

multimedia/audio/audio_js_standard/audioVoip/Test.json

@@ -21,7 +21,13 @@
             "run-command": [
                 "hilog -Q pidoff",
                 "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audiovoip/haps/entry/files",
-                "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiovoip/haps/entry"
+                "chmod 777 -R /data/app/el2/100/base/ohos.acts.multimedia.audio.audiovoip/haps/entry",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
+                "power-shell setmode 602"
+            ],
+            "teardown-command":[
+                "power-shell setmode 600"
             ],
             "cleanup-apps": true
         },

multimedia/audio/audio_js_standard/audioVoip/src/main/js/test/AudioVOIP.test.js

@@ -17,7 +17,6 @@ import audio from '@ohos.multimedia.audio';
 import fileio from '@ohos.fileio';
 import featureAbility from '@ohos.ability.featureAbility'
 import resourceManager from '@ohos.resourceManager';
-import * as audioTestBase from '../../../../../AudioTestBase'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 import { UiDriver, BY} from '@ohos.uitest'
 

multimedia/camera/camera_js_standard/Test.json

@@ -5,17 +5,21 @@
         "test-timeout": "3000000",
         "bundle-name":"com.open.harmony.multimedia.cameratest",
         "package-name": "com.open.harmony.multimedia.cameratest",
-        "shell-timeout": "60000"
+        "shell-timeout": "60000",
+        "testcase-timeout": 100000
     },
     "kits": [
         {
             "type": "ShellKit",
             "run-command": [
                 "hilog -Q pidoff",
-                "rm -rf /storage/media/100/local/files/Videos/*"
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
+                "power-shell setmode 602"
             ],
             "teardown-command":[
-               
+                "power-shell setmode 600"
             ]
         },
         {

multimedia/media/media_js_standard/audioRecorder/Test.json

@@ -15,6 +15,8 @@
                 "rm -rf /storage/media/100/local/files/Audios/audio_*",
                 "rm -rf /storage/media/100/local/files/Videos/audio_*",
                 "param set persist.ace.testmode.enabled 1",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
                 "power-shell setmode 602"
             ],
             "teardown-command":[

multimedia/media/media_js_standard/recorderFormat/Test.json

@@ -14,6 +14,8 @@
             "run-command": [
                 "rm -rf /storage/media/100/local/files/Audios/COMPATIBILITY*",
                 "param set persist.ace.testmode.enabled 1",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
                 "power-shell setmode 602"
             ],
             "teardown-command": [

multimedia/media/media_js_standard/videoRecorder/Test.json

@@ -21,6 +21,8 @@
             "run-command": [
                 "rm -rf /storage/media/100/local/files/Videos/*",
                 "param set persist.ace.testmode.enabled 1",
+                "power-shell wakeup",
+                "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
                 "power-shell setmode 602"
             ],
             "teardown-command":[