!4661 软总线适配新XTS框架

Merge pull request !4661 from 张攀/master

communication/dsoftbus/rpc/BUILD.gn

@@ -23,7 +23,9 @@ ohos_js_hap_suite("ActsRpcJsTest") {
   hap_name = "ActsRpcHapTest"
 }
 ohos_js_assets("rpc_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("rpc_js_resources") {
   sources = [ "./src/main/resources" ]

communication/dsoftbus/rpc/Test.json

 {
     "description": "Configuration for rpc Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "600000",
-        "package": "com.ohos.rpctest",
-	"abilityName": "com.ohos.rpctest.MainAbility",
-        "shell-timeout": "600000"
+        "shell-timeout": "600000",
+        "testcase-timeout": 60000,
+        "bundle-name":"com.ohos.rpctest",
+        "package-name": "com.ohos.rpctest"
+        
     },
     "kits": [
         {

communication/dsoftbus/rpc/src/main/config.json

@@ -13,6 +13,7 @@
   },
   "deviceConfig": {},
   "module": {
+
   "reqPermissions": [
       {
         "name": "ohos.permission.DISTRIBUTED_DATASYNC"
@@ -26,6 +27,8 @@
     ],
     "package": "com.ohos.rpctest",
     "name": "com.ohos.rpctest.MyApplication",
+    "mainAbility": ".MainAbility",
+    "srcPath": "",
     "deviceType": [
       "phone"
     ],
@@ -46,14 +49,31 @@
             ]
           }
         ],
-        "name": "com.ohos.rpctest.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "visible":true,
-        "launchType": "standard"
-      }
+        "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": [
       {
@@ -65,7 +85,21 @@
           "designWidth": 720,
           "autoDesignWidth": false
         }
+      },
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
       }
-    ]
+    ],
+    "testRunner": {
+      "name": "OpenHarmonyTestRunner",
+      "srcPath": "TestRunner"
+  }
   }
 }
\ No newline at end of file

communication/dsoftbus/rpc/src/main/js/default/app.js → communication/dsoftbus/rpc/src/main/js/MainAbility/app.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,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 export default {
     onCreate() {
         console.info('AceApplication onCreate');

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.js → communication/dsoftbus/rpc/src/main/js/MainAbility/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import {Core} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
@@ -27,12 +26,6 @@ export default {
   },
   onShow() {
     console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../test/List.test')
-    core.execute()
   },
   onReady() {
   },

communication/dsoftbus/rpc/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");
+    }
+};

communication/dsoftbus/rpc/src/main/js/TestAbility/i18n/en-US.json

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

communication/dsoftbus/rpc/src/main/js/TestAbility/i18n/zh-CN.json

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

communication/dsoftbus/rpc/src/main/js/TestAbility/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 {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

communication/dsoftbus/rpc/src/main/js/TestAbility/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">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

communication/dsoftbus/rpc/src/main/js/TestAbility/pages/index/index.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 {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

communication/dsoftbus/rpc/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);
+        })
+    }
+};
\ No newline at end of file

communication/dsoftbus/rpc/src/main/js/default/test/List.test.js → communication/dsoftbus/rpc/src/main/js/test/List.test.js

@@ -13,5 +13,8 @@
  * limitations under the License.
  */
 
-require('./RpcJsunit.test.js')
-require('./RpcClientJsunit.test.js')
\ No newline at end of file
+import actsRpcClientJsTest from './RpcClientJsunit.test.js'
+
+export default function testsuite() {
+    actsRpcClientJsTest()
+}

communication/dsoftbus/rpc/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Rpc"
-    }
+    },
+    {
+      "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