!1706 modified dsoftbus

Merge pull request !1706 from jiyong/local-0118

communication/BUILD.gn

@@ -15,7 +15,10 @@ import("//build/ohos_var.gni")
 group("communication") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "wifi_standard:wifi_standard_test" ]
+    deps = [
+      "dsoftbus/rpc:ActsRpcJsTest",
+      "wifi_standard:wifi_standard_test",
+    ]
   } else {
     deps = [ "wifi_standard:wifi_standard_test" ]
   }

communication/dsoftbus/rpc/BUILD.gn

+# 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.
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("ActsRpcJsTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":rpc_js_assets",
+    ":rpc_js_resources",
+  ]
+
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsRpcHapTest"
+}
+ohos_js_assets("rpc_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("rpc_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

communication/dsoftbus/rpc/Test.json

+{
+    "description": "Configuration for rpc Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "60000",
+        "package": "com.ohos.rpctest",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsRpcHapTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}

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

+{
+  "app": {
+    "bundleName": "com.ohos.rpctest",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.ohos.rpctest",
+    "name": "com.ohos.rpc.MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry"
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.ohos.rpc.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "visible":true,
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

communication/dsoftbus/rpc/src/main/js/default/app.js

+/*
+ * 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.
+ */
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

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

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

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

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

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

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

+/*
+ * 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.
+ */
+
+import app from '@system.app'
+
+import {Core} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
+export default {
+   data: {
+       title: ''
+  },
+  onInit() {
+    this.title = this.$t('strings.world');
+  },
+  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/default/test/List.test.js

+/*
+ * 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.
+ */
+
+require('./RpcJsunit.test.js')
\ No newline at end of file

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

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "rpctest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Rpc"
+    }
+  ]
+}
\ No newline at end of file

test_packages.gni

@@ -35,7 +35,6 @@ _all_test_packages = [
   "${ACTS_ROOT}/usb:usb",
   "${ACTS_ROOT}/multimodalinput:multimodalinput",
   "${ACTS_ROOT}/resourceschedule:resourceschedule",
-  "${ACTS_ROOT}/dsoftbus:dsoftbus",
   "${ACTS_ROOT}/telephony:telephony",
 ]