!7361 【媒体子系统】取资源方法修改

Merge pull request !7361 from 秦莉文/master

multimedia/audio/audio_js_standard/AudioCapturer/Test.json

@@ -5,7 +5,7 @@
         "test-timeout": "1500000",
         "bundle-name": "ohos.acts.multimedia.audio.audiocapturer",
         "package-name": "ohos.acts.multimedia.audio.audiocapturer",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

multimedia/media/media_js_standard/MediaTestBase.js

@@ -20,7 +20,7 @@ import mediaLibrary from '@ohos.multimedia.mediaLibrary'
 import fileio from '@ohos.fileio'
 import featureAbility from '@ohos.ability.featureAbility'
 import { UiDriver, BY, PointerMatrix } from '@ohos.uitest'
-
+const CODECMIMEVALUE = ['video/avc', 'audio/mp4a-latm', 'audio/mpeg']
 const context = featureAbility.getContext();
 
 export async function getPermission(permissionNames) {
@@ -58,7 +58,17 @@ export async function getFileDescriptor(fileName) {
     });
     return fileDescriptor;
 }
-
+export async function getStageFileDescriptor(fileName) {
+    let fileDescriptor = undefined;
+    let mgr = globalThis.abilityContext.resourceManager
+    await mgr.getRawFileDescriptor(fileName).then(value => {
+        fileDescriptor = {fd: value.fd, offset: value.offset, length: value.length};
+        console.log('case getRawFileDescriptor success fileName: ' + fileName);
+    }).catch(error => {
+        console.log('case getRawFileDescriptor err: ' + error);
+    });
+    return fileDescriptor;
+}
 export async function closeFileDescriptor(fileName) {
     await resourceManager.getResourceManager().then(async (mgr) => {
         await mgr.closeRawFileDescriptor(fileName).then(()=> {

multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/MainAbility/pages/index/index.ets

@@ -12,11 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file';
-import { Core, ExpectExtend, InstrumentLog, ReportExtend } from "deccjsunit/index"
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
 import testsuite from "../../../test/List.test.ets"
-import featureAbility from "@ohos.ability.featureAbility"
-import { UiDriver, BY } from '@ohos.uitest'
 
 var mXComponentController: XComponentController = new XComponentController()
 var surfaceId: any
@@ -26,7 +24,7 @@ var surfaceId: any
 struct Index {
   aboutToAppear() {
     console.info("start run testcase!!!!");
-}
+  }
   build() {
     Flex() {
       XComponent({
@@ -41,23 +39,10 @@ struct Index {
           surfaceId = mXComponentController.getXComponentSurfaceId()
           globalThis.value = surfaceId
           console.info('CameraModuleTest: XComponent onLoad surfaceId: ' + globalThis.value)
-          const core = Core.getInstance()
-          const expectExtend = new ExpectExtend({
-            'id': 'extend'
-          })
-          core.addService('expect', expectExtend)
-          const reportExtend = new ReportExtend(file)
-
-          core.addService('report', reportExtend)
-          core.init()
-          core.subscribeEvent('task', reportExtend)
-          const configService = core.getDefaultService('config')
-          globalThis.abilityWant.parameters.timeout = 70000;
-          configService.setConfig(globalThis.abilityWant.parameters)
-          console.info('testsuite()---->')
-          testsuite()
-          core.execute()
-          console.info('core.execute()---->')
+          var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+          var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+          console.info('start run testcase!!!')
+          Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
         })
         .width('1920px')
         .height('1080px')

multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHlsFuncTest.test.js

@@ -15,7 +15,7 @@
 import media from '@ohos.multimedia.media'
 import * as mediaTestBase from '../../../../../../MediaTestBase';
 import * as AVPlayerTestBase from '../../../../../../AVPlayerTestBase.js';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function AVPlayerHlsFuncTest() {
     describe('AVPlayerHlsFuncTest', function () {

multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpCompatibilityTest.test.ets

@@ -15,7 +15,7 @@
 
 import {testAVPlayerFun} from '../../../../../../AVPlayerTestBase.js';
 import * as mediaTestBase from '../../../../../../MediaTestBase';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function AVPlayerHttpCompatibilityTest() {
     describe('AVPlayerHttpCompatibilityTest', function () {

multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpSeekTest.test.ets

@@ -15,7 +15,7 @@
 
 import {testAVPlayerSeek} from '../../../../../../AVPlayerTestBase.js';
 import * as mediaTestBase from '../../../../../../MediaTestBase';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function AVPlayerHttpSeekTest() {
     describe('AVPlayerHttpSeekTest', function () {

multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerLocalTest.test.js

@@ -17,7 +17,7 @@ import * as mediaTestBase from '../../../../../../MediaTestBase';
 import media from '@ohos.multimedia.media'
 import audio from '@ohos.multimedia.audio';
 import { testAVPlayerFun, AV_PLAYER_STATE, setSource } from '../../../../../../AVPlayerTestBase.js';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function AVPlayerLocalTest() {
     describe('AVPlayerLocalTest', function () {
@@ -40,13 +40,13 @@ export default function AVPlayerLocalTest() {
 
         beforeAll(async function() {
             console.info('beforeAll case');
-            await mediaTestBase.getFileDescriptor(VIDEO_SOURCE).then((res) => {
+            await mediaTestBase.getStageFileDescriptor(VIDEO_SOURCE).then((res) => {
                 fileDescriptor = res;
             });
-            await mediaTestBase.getFileDescriptor(AUDIO_SOURCE).then((res) => {
+            await mediaTestBase.getStageFileDescriptor(AUDIO_SOURCE).then((res) => {
                 fileDescriptor2 = res;
             });
-            await mediaTestBase.getFileDescriptor(VIDEO_NOAUDIO).then((res) => {
+            await mediaTestBase.getStageFileDescriptor(VIDEO_NOAUDIO).then((res) => {
                 fileDescriptor3 = res;
             });
         })