!6833 【媒体子系统】更换audio证书

Merge pull request !6833 from 陈佳欢/master

multimedia/audio/audio_js_standard/AudioCapturer/BUILD.gn

@@ -25,7 +25,9 @@ ohos_js_hap_suite("audio_capturer_js_hap") {
   part_name = "multimedia_audio_framework"
 }
 ohos_js_assets("audio_capturer_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("audio_capturer_resources") {
   sources = [ "./src/main/resources" ]

multimedia/audio/audio_js_standard/AudioCapturer/Test.json

 {
     "description": "Configuration for audio manager Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "1500000",
-        "package": "ohos.acts.multimedia.audio.audiocapturer",
+        "bundle-name": "ohos.acts.multimedia.audio.audiocapturer",
+        "package-name": "ohos.acts.multimedia.audio.audiocapturer",
         "shell-timeout": "60000"
     },
     "kits": [
@@ -41,8 +42,7 @@
                 "./resource/audio/audioManager/StarWars10s-2C-22050-2SW.wav ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry/files/",
                 "./resource/audio/audioManager/StarWars10s-2C-24000-3SW.wav ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry/files/",
                 "./resource/audio/audioManager/StarWars10s-2C-48000-4SW.wav ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audiocapturer/haps/entry/files/"
-           
             ]
         }
     ]
-}
+}
\ No newline at end of file

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

 {
-  "app": {
-    "apiVersion": {
-        "compatible": 6,
-        "releaseType": "Beta1",
-        "target": 7
+    "app": {
+        "bundleName": "ohos.acts.multimedia.audio.audiocapturer",
+        "vendor": "example",
+        "version": {
+            "code": 1,
+            "name": "1.0"
+        },
+        "apiVersion": {
+            "compatible": 5,
+            "target": 5,
+            "releaseType": "Beta1"
+        }
     },
-      "vendor": "acts",
-      "bundleName": "ohos.acts.multimedia.audio.audiocapturer",
-      "version": {
-          "code": 1000000,
-          "name": "1.0.0"
-      }
-  },
-  "deviceConfig": {
-      "default": {
-          "debug": true
-      }
-  },
-  "module": {
-      "abilities": [
-          {
-              "iconId": 16777218,
-              "skills": [
-                  {
-                      "entities": [
-                          "entity.system.home"
-                      ],
-                      "actions": [
-                          "action.system.home"
-                      ]
-                  }
-              ],
-              "descriptionId": 16777217,
-              "visible": true,
-              "labelId": 16777216,
-              "icon": "$media:icon",
-              "name": "ohos.acts.multimedia.audio.audiocapturer.MainAbility",
-              "description": "$string:mainability_description",
-              "label": "$string:entry_MainAbility",
-              "type": "page",
-              "homeAbility": true,
-              "launchType": "standard"
-          }
-      ],
-      "deviceType": [
-      "tablet",
-      "default",
-          "phone",
-          "tablet",
-          "tv",
-          "wearable"
-      ],
-      "mainAbility": "ohos.acts.multimedia.audio.audiocapturer.MainAbility",
-      "distro": {
-          "moduleType": "entry",
-          "installationFree": false,
-          "deliveryWithInstall": true,
-          "moduleName": "entry"
-      },
-      "package": "ohos.acts.multimedia.audio.audiocapturer",
-      "name": ".MyApplication",
-      "js": [
-          {
-              "pages": [
-                  "pages/index/index"
-              ],
-              "name": "default",
-              "window": {
-                  "designWidth": 720,
-                  "autoDesignWidth": true
-              }
-          }
-      ],
-      "reqPermissions": [
-        {
-          "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
-          "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+    "deviceConfig": {},
+    "module": {
+        "package": "ohos.acts.multimedia.audio.audiocapturer",
+        "name": ".entry",
+        "deviceType": [
+            "tablet",
+            "default",
+            "phone"
+        ],
+        "distro": {
+            "deliveryWithInstall": true,
+            "moduleName": "entry",
+            "moduleType": "entry"
         },
-        {
-          "name": "ohos.permission.MICROPHONE",
-          "reason": "use ohos.permission.MICROPHONE"
+        "reqPermissions": [
+            {
+                "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+                "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+            },
+            {
+                "name": "ohos.permission.MICROPHONE",
+                "reason": "use ohos.permission.MICROPHONE"
+            },
+            {
+                "name": "ohos.permission.MANAGE_AUDIO_CONFIG",
+                "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG"
+            }
+        ],
+        "abilities": [
+            {
+                "skills": [
+                    {
+                        "entities": [
+                            "entity.system.home"
+                        ],
+                        "actions": [
+                            "action.system.home"
+                        ]
+                    }
+                ],
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
+                "icon": "$media:icon",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            }
+        ],
+        "js": [
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": "default",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            }
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
         },
-        {
-          "name": "ohos.permission.MANAGE_AUDIO_CONFIG",
-          "reason": "use ohos.permission.MANAGE_AUDIO_CONFIG"
-        }
-       
-      ]
-  }
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
+    }
 }
\ No newline at end of file

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/MainAbility/app.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.
+ */
+export default {
+    onCreate() {
+        console.info("============== AceApplication onCreate ==============");
+    },
+    onDestroy() {
+        console.info('=============AceApplication onDestroy=============');
+    }
+};

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/MainAbility/pages/index/index.css

+/*
+ * 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.
+ */
+ 
+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/MainAbility/pages/index/index.hml

+/*
+ * 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.
+ */
+
+<div class="container">
+    <text class="title">
+        Hello, World!
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/default/pages/index/index.js → multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/MainAbility/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -12,30 +12,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import file from '@system.file'
 
-import {Core, ExpectExtend} from 'deccjsunit/index'
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 
 export default {
-    data: {
-        title: ""
-    },
+   data: {
+       title: ""
+   },
     onInit() {
-        this.title = this.$t('strings.world');
+       this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        this.timeout = 60000
-        configService.setConfig(this)
-        require('../../../test/List.test')
-        core.execute()
+       console.info('onShow finish')
     },
     onReady() {
     },
-}
\ No newline at end of file
+}
+

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestAbility/app.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/default/pages/index/index.css → multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestAbility/pages/index/index.css

 .container {
+    display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    left: 0px;
+    top: 0px;
     width: 100%;
     height: 100%;
 }
 
 .title {
-    font-size: 40px;
-    color: #000000;
-    opacity: 0.9;
-}
-
-@media screen and (device-type: tablet) and (orientation: landscape) {
-    .title {
-        font-size: 100px;
-    }
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
 }
 
-@media screen and (device-type: wearable) {
+@media screen and (device-type: phone) and (orientation: landscape) {
     .title {
-        font-size: 28px;
-        color: #FFFFFF;
+        font-size: 60px;
     }
 }
 
-@media screen and (device-type: tv) {
-    .container {
-        background-image: url("/common/images/Wallpaper.png");
-        background-size: cover;
-        background-repeat: no-repeat;
-        background-position: center;
-    }
-
+@media screen and (device-type: tablet) and (orientation: landscape) {
     .title {
         font-size: 100px;
-        color: #FFFFFF;
     }
-}
-
-@media screen and (device-type: phone) and (orientation: landscape) {
-    .title {
-        font-size: 60px;
-    }
-}
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/default/app.js → multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestAbility/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -14,10 +14,13 @@
  */
 
 export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
+    data: {
+        title: ""
     },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
+    onInit() {
+        this.title = this.$t('strings.world');
     }
-};
+}
+
+
+

multimedia/audio/audio_js_standard/AudioCapturer/src/main/js/TestRunner/OpenHarmonyTestRunner.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

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

@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
-require('./AudioCapturer.test.js')
+ import audioCapturer from './AudioCapturer.test.js'
+ 
+ export default function testsuite() {
+    audioCapturer()
+ }
 
 

multimedia/audio/audio_js_standard/AudioCapturer/src/main/resources/base/element/string.json

 {
   "string": [
     {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
+      "name": "app_name",
+      "value": "JsHelloWorld"
     },
     {
       "name": "mainability_description",
-      "value": "JS_Empty Ability"
+      "value": "hap sample empty page"
+    },
+    {
+        "name": "MainAbility_desc",
+        "value": "description"
+    },
+    {
+        "name": "MainAbility_label",
+        "value": "label"
+    },
+    {
+        "name": "TestAbility_desc",
+        "value": "description"
+    },
+    {
+        "name": "TestAbility_label",
+        "value": "label"
     }
   ]
 }
\ No newline at end of file