tianfenxia1@huawei.com

Signed-off-by: Ntianfenxia <tianfenxia1@huawei.com>

multimedia/audio/audio_js_standard/audioManager/src/main/config.json

@@ -3,26 +3,25 @@
     "bundleName": "ohos.acts.multimedia.audio.audiomanager",
     "vendor": "acts",
     "version": {
-      "code": 1000000,
-      "name": "1.0.0"
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 6,
+      "target": 5
     }
   },
   "deviceConfig": {},
   "module": {
     "package": "ohos.acts.multimedia.audio.audiomanager",
     "name": ".MyApplication",
-    "mainAbility": "ohos.acts.multimedia.audio.audiomanager.MainAbility",
     "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
+      "moduleType": "entry"
     },
     "abilities": [
       {

multimedia/audio/audio_js_standard/audioManager/src/main/java/ohos/acts/multimedia/audio/audiomanager/MainAbility.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audiomanager;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}

multimedia/audio/audio_js_standard/audioManager/src/main/java/ohos/acts/multimedia/audio/audiomanager/MyApplication.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audiomanager;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}

multimedia/audio/audio_js_standard/audioManager/src/main/js/default/pages/index/index.js

@@ -13,11 +13,7 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -32,22 +28,11 @@ export default {
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
-        const reportExtend = new ReportExtend(file)
-        const instrumentLog = new InstrumentLog({
-            'id': 'report',
-            'version': '1.0.3'
-        })
         core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.addService('report', instrumentLog)
         core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
-
+        this.timeout = 60000
         require('../../../test/List.test')
         core.execute()
     },

multimedia/audio/audio_js_standard/audioPlayer/Test.json

@@ -12,7 +12,7 @@
             "pre-push": [
             ],
             "push": [
-                "resource/audio/01.mP3 ->/data/media/",
+                "resource/audio/01.mp3 ->/data/media/",
                 "resource/audio/02.mp3 ->/data/media/",
                 "resource/audio/03.mp3 ->/data/media/",
                 "resource/audio/04.mp3 ->/data/media/",
@@ -38,6 +38,13 @@
                 "resource/audio/98.mp4 ->/data/media/"
             ]
         },
+        {
+            "test-file-name": [
+                "AudioPlayerJsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        },
         {
             "type": "ShellKit",
             "run-command": [
@@ -47,13 +54,6 @@
             "teardown-command":[
                 "setenforce 1"
             ]
-        },
-        {
-            "test-file-name": [
-                "AudioPlayerApiJsTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
         }
     ]
 }
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer/src/main/config.json

@@ -3,26 +3,25 @@
     "bundleName": "ohos.acts.multimedia.audio.audioplayer",
     "vendor": "acts",
     "version": {
-      "code": 1000000,
-      "name": "1.0.0"
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 6,
+      "target": 5
     }
   },
   "deviceConfig": {},
   "module": {
     "package": "ohos.acts.multimedia.audio.audioplayer",
     "name": ".MyApplication",
-    "mainAbility": "ohos.acts.multimedia.audio.audioplayer.MainAbility",
     "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
+      "moduleType": "entry"
     },
     "abilities": [
       {

multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audioplayer;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}

multimedia/audio/audio_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audioplayer;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}

multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.js

@@ -13,11 +13,7 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -32,22 +28,11 @@ export default {
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
-        const reportExtend = new ReportExtend(file)
-        const instrumentLog = new InstrumentLog({
-            'id': 'report',
-            'version': '1.0.3'
-        })
         core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.addService('report', instrumentLog)
         core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
-
+        this.timeout = 60000
         require('../../../test/List.test')
         core.execute()
     },

multimedia/audio/audio_js_standard/audioPlayer_API/Test.json

@@ -12,7 +12,7 @@
             "pre-push": [
             ],
             "push": [
-                "resource/audio/01.mP3 ->/data/media/",
+                "resource/audio/01.mp3 ->/data/media/",
                 "resource/audio/02.mp3 ->/data/media/",
                 "resource/audio/03.mp3 ->/data/media/",
                 "resource/audio/04.mp3 ->/data/media/",
@@ -38,6 +38,13 @@
                 "resource/audio/98.mp4 ->/data/media/"
             ]
         },
+        {
+            "test-file-name": [
+                "AudioPlayerApiJsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        },
         {
             "type": "ShellKit",
             "run-command": [
@@ -47,13 +54,6 @@
             "teardown-command":[
                 "setenforce 1"
             ]
-        },
-        {
-            "test-file-name": [
-                "AudioPlayerApiJsTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
         }
     ]
 }
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/config.json

@@ -3,26 +3,25 @@
     "bundleName": "ohos.acts.multimedia.audio.audioplayerapi",
     "vendor": "acts",
     "version": {
-      "code": 1000000,
-      "name": "1.0.0"
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 6,
+      "target": 5
     }
   },
   "deviceConfig": {},
   "module": {
     "package": "ohos.acts.multimedia.audio.audioplayerapi",
     "name": ".MyApplication",
-    "mainAbility": "ohos.acts.multimedia.audio.audioplayerapi.MainAbility",
     "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
+      "moduleType": "entry"
     },
     "abilities": [
       {

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MainAbility.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audioplayerapi;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MyApplication.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audioplayerapi;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.js

@@ -13,11 +13,7 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -32,22 +28,11 @@ export default {
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
-        const reportExtend = new ReportExtend(file)
-        const instrumentLog = new InstrumentLog({
-            'id': 'report',
-            'version': '1.0.3'
-        })
         core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.addService('report', instrumentLog)
         core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
-
+        this.timeout = 60000
         require('../../../test/List.test')
         core.execute()
     },

multimedia/audio/audio_js_standard/audioRecorder/src/main/config.json

@@ -3,26 +3,25 @@
     "bundleName": "ohos.acts.multimedia.audio.audiorecorder",
     "vendor": "acts",
     "version": {
-      "code": 1000000,
-      "name": "1.0.0"
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 6,
+      "target": 5
     }
   },
   "deviceConfig": {},
   "module": {
     "package": "ohos.acts.multimedia.audio.audiorecorder",
     "name": ".MyApplication",
-    "mainAbility": "ohos.acts.multimedia.audio.audiorecorder.MainAbility",
     "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
+      "moduleType": "entry"
     },
     "abilities": [
       {

multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audiorecorder/MainAbility.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audiorecorder;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}

multimedia/audio/audio_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audiorecorder/MyApplication.java

-/*
- * Copyright (C) 2021 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.
- */
-
-package ohos.acts.multimedia.audio.audiorecorder;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.js

@@ -13,11 +13,7 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -32,25 +28,14 @@ export default {
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
-        const reportExtend = new ReportExtend(file)
-        const instrumentLog = new InstrumentLog({
-            'id': 'report',
-            'version': '1.0.3'
-        })
         core.addService('expect', expectExtend)
-        core.addService('report', reportExtend)
-        core.addService('report', instrumentLog)
         core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
-
+        this.timeout = 60000
         require('../../../test/List.test')
         core.execute()
     },
     onReady() {
     },
-}
+}
\ No newline at end of file