适配hvigor框架

Signed-off-by: bWX1145125 <bianjianliang1@huawei.com>

distributedhardware/devicemanagernotest/.gitignore

@@ -0,0 +1,11 @@
+/node_modules
+/oh_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+.cxx
+/.clangd
+/.clang-format
+/.clang-tidy
+**/.test

distributedhardware/devicemanagernotest/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Huawei Device Co., Ltd.
+# Copyright (c) 2024 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
@@ -11,25 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../tools/build/suite.gni")
+import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("DctsSubDeviceJsTest") {
+ohos_js_app_suite("DctsSubdisDeviceJsTest") {
-  hap_profile = "./src/main/config.json"
+  test_hap = true
-  deps = [
+  testonly = true
-    ":distributedjs_assets",
-    ":distributedjs_resources",
-  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "DctsSubDeviceJsTest"
+  hap_name = "DctsSubdisDeviceJsTest"
   subsystem_name = "distributedhardware"
   part_name = "device_manager"
 }
-ohos_js_assets("distributedjs_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
-}
-ohos_resources("distributedjs_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
-}

distributedhardware/devicemanagernotest/Test.json

@@ -1,17 +1,17 @@
 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for sensor js api Tests",
     "driver": {
         "type": "OHJSUnitTest",
-        "bundle-name": "com.ohos.distributedjstest",
+        "test-timeout": "160000",
-        "package-name": "com.ohos.distributedjstest",
+        "shell-timeout": "160000",
-        "test-timeout": "1200000",
+        "bundle-name": "com.ohos.distributedscreenjstest",
-        "testcase-timeout": "6000",
+        "package-name": "com.ohos.distributedscreenjstest",
-        "shell-timeout": "1200000"
+        "testcase-timeout": 70000
     },
     "kits": [
         {
             "test-file-name": [
-                "DctsSubDeviceJsTest.hap"
+                "DctsSubdisDeviceJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributedhardware/devicemanagernotest/build-profile.json5

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "app": {
+    "signingConfigs": [],
+    "products": [
+      {
+        "name": "default",
+        "signingConfig": "default",
+        "compileSdkVersion": 12,
+        "compatibleSdkVersion": 12,
+        "targetSdkVersion": 12,
+        "runtimeOS": "OpenHarmony",
+      }
+    ]
+  },
+  "modules": [
+    {
+      "name": "entry",
+      "srcPath": "./entry",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/.gitignore

@@ -0,0 +1,6 @@
+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test

distributedhardware/devicemanagernotest/entry/build-profile.json5

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "apiType": 'faMode',
+  "buildOption": {
+  },
+  "targets": [
+    {
+      "name": "default",
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/hvigorfile.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { legacyHapTasks } from '@ohos/hvigor-ohos-plugin';

distributedhardware/devicemanagernotest/entry/oh-package.json5

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "license": "",
+  "devDependencies": {},
+  "author": "",
+  "name": "entry",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

distributedhardware/devicemanagernotest/entry/src/main/config.json

@@ -0,0 +1,75 @@
+{
+  "app": {
+    "bundleName": "com.ohos.distributedscreenjstest",
+    "vendor": "acts",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.ohos.distributedscreenjstest",
+    "name": ".entry",
+    "mainAbility": ".MainAbility",
+    "deviceType": [
+      "wearable",
+      "default",
+      "tablet",
+      "2in1"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "reqPermissions": [
+      {
+          "name": "ohos.permission.DISTRIBUTED_DATASYNC",
+          "reason": "need use ohos.permission.DISTRIBUTED_DATASYNC"
+      },
+      {
+          "name": "ohos.permission.ACCESS_SERVICE_DM",
+          "reason": "need use ohos.permission.ACCESS_SERVICE_DM"
+      }
+    ],
+    "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"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}

distributedhardware/devicemanagernotest/entry/src/main/js/MainAbility/app.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 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 hilog from '@ohos.hilog';
+
+export default {
+    onCreate() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onCreate');
+    },
+    onDestroy() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onDestroy');
+    },
+}

distributedhardware/devicemanagernotest/entry/src/main/js/MainAbility/pages/index/index.css

@@ -17,7 +17,7 @@
     margin: 10px;
 }
 
-@media screen and (device-type: phone) and (orientation: landscape) {
+@media screen and (orientation: landscape) {
     .title {
         font-size: 60px;
     }

distributedhardware/devicemanagernotest/entry/src/main/js/MainAbility/pages/index/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,17 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 export default {
     data: {
-      title: ''
+        title: ""
     },
     onInit() {
-      this.title = this.$t('strings.world');
+        this.title = this.$t('strings.world');
-    },
+    }
-    onShow() {
+}
-      console.info('onShow finish')
+
-    },
+
-    onReady() {
+
-    },
-  }

distributedhardware/devicemanagernotest/entry/src/main/resources/base/element/color.json

@@ -0,0 +1,8 @@
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/src/main/resources/base/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/src/main/resources/en_US/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/src/main/resources/zh_CN/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "模块描述"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/src/ohosTest/config.json

@@ -0,0 +1,79 @@
+{
+  "app": {
+    "bundleName": "com.ohos.distributedscreenjstest",
+    "vendor": "acts",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.ohos.distributedscreenjstest",
+    "name": ".entry_test",
+    "mainAbility": ".TestAbility",
+    "deviceType": [
+      "wearable",
+      "default",
+      "tablet",
+      "2in1"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry_test",
+      "moduleType": "feature",
+      "installationFree": false
+    },
+    "reqPermissions": [
+      {
+          "name": "ohos.permission.DISTRIBUTED_DATASYNC",
+          "reason": "need use ohos.permission.DISTRIBUTED_DATASYNC"
+      },
+      {
+          "name": "ohos.permission.ACCESS_SERVICE_DM",
+          "reason": "need use ohos.permission.ACCESS_SERVICE_DM"
+      }
+    ],
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "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": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ],
+    "testRunner": {
+      "name": "OpenHarmonyTestRunner",
+      "srcPath": "TestRunner"
+    }
+  }
+}

distributedhardware/devicemanagernotest/entry/src/ohosTest/js/TestAbility/app.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,20 +12,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import hilog from '@ohos.hilog';
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 import { Hypium } from '@ohos/hypium';
 import testsuite from '../test/List.test';
 
 export default {
     onCreate() {
-        console.info('TestApplication onCreate');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestApplication onCreate');
-        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments();
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-        console.info('start run testcase!!!');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
-        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite);
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
     },
     onDestroy() {
-        console.info("TestApplication onDestroy");
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestApplication onDestroy');
     }
 };

distributedhardware/devicemanagernotest/entry/src/ohosTest/js/TestAbility/pages/index/index.css

@@ -17,7 +17,7 @@
     margin: 10px;
 }
 
-@media screen and (device-type: phone) and (orientation: landscape) {
+@media screen and (orientation: landscape) {
     .title {
         font-size: 60px;
     }

distributedhardware/devicemanagernotest/entry/src/ohosTest/js/TestAbility/pages/index/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,17 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 export default {
     data: {
-      title: ''
+        title: ""
     },
     onInit() {
-      this.title = this.$t('strings.world');
+        this.title = this.$t('strings.world');
-    },
+    }
-    onShow() {
+}
-      console.info('onShow finish')
+
-    },
+
-    onReady() {
+
-    },
-  }

distributedhardware/devicemanagernotest/entry/src/ohosTest/js/TestRunner/OpenHarmonyTestRunner.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 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 hilog from '@ohos.hilog';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
+
+ export default {
+    onPrepare() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare');
+    },
+    onRun() {
+        hilog.info(0x0000, 'testTag', '%{public}s', '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
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', data.stdResult ?? '');
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', data.exitCode ?? '');
+        })
+    }
+};

distributedhardware/devicemanagernotest/entry/src/ohosTest/resources/base/element/string.json

@@ -0,0 +1,12 @@
+{
+  "string": [
+    {
+      "name": "TestAbility_desc",
+      "value": "the test ability"
+    },
+    {
+      "name": "TestAbility_label",
+      "value": "test label"
+    }
+  ]
+}

distributedhardware/devicemanagernotest/entry/src/ohosTest/resources/base/profile/test_pages.json

@@ -0,0 +1,5 @@
+{
+  "src": [
+    "TestAbility/pages/index"
+  ]
+}

distributedhardware/devicemanagernotest/hvigor/hvigor-config.json5

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+{
-<div class="container">
+  "hvigorVersion": "4.0.5",
-    <text class="title">
+  "dependencies": {
-        {{ $t('strings.hello') }} {{title}}
+    "@ohos/hvigor-ohos-plugin": "4.0.5"
-    </text>
+  }
-</div>
+}

distributedhardware/devicemanagernotest/hvigorfile.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { legacyAppTasks } from '@ohos/hvigor-ohos-plugin';

distributedhardware/devicemanagernotest/hvigorw

@@ -0,0 +1,60 @@
+# Copyright (c) 2024 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.
+#!/bin/bash
+
+# ----------------------------------------------------------------------------
+#  Hvigor startup script, version 1.0.0
+# 
+#  Required ENV vars:
+#  ------------------
+#    NODE_HOME - location of a Node home dir
+#    or 
+#    Add /usr/local/nodejs/bin to the PATH environment variable
+# ----------------------------------------------------------------------------
+
+HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
+HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
+warn() {
+	echo ""
+	echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
+}
+
+error() {
+	echo ""
+	echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
+}
+
+fail() {
+	error "$@"
+	exit 1
+}
+
+# Determine node to start hvigor wrapper script
+if [ -n "${NODE_HOME}" ];then
+   EXECUTABLE_NODE="${NODE_HOME}/bin/node"
+   if [ ! -x "$EXECUTABLE_NODE" ];then
+       fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
+   fi
+else
+   EXECUTABLE_NODE="node"
+   which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
+fi
+
+# Check hvigor wrapper script
+if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
+	fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
+fi
+
+# start hvigor-wrapper script
+exec "${EXECUTABLE_NODE}" \
+	"${HVIGOR_WRAPPER_SCRIPT}" "$@"

distributedhardware/devicemanagernotest/hvigorw.bat

@@ -0,0 +1,63 @@
+@rem Copyright (C) 2024 Huawei Device Co., Ltd.
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@echo off
+@rem
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
+@rem
+
+set DIRNAME=%~dp0
+set APP_BASE_NAME=%~n0
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+if not defined NODE_OPTS set NODE_OPTS="--"
+
+@rem Find node.exe
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
+
+%NODE_EXE% --version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
+
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)

distributedhardware/devicemanagernotest/oh-package.json5

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "license": "",
+  "devDependencies": {
+    "@ohos/hypium": "1.0.6"
+  },
+  "author": "",
+  "name": "myapplication",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

distributedhardware/devicemanagernotest/src/main/config.json

@@ -1,100 +0,0 @@
-{
-    "app": {
-        "bundleName": "com.ohos.distributedjstest",
-        "vendor": "example",
-        "version": {
-            "code": 1000000,
-            "name": "1.0.0"
-        },
-        "apiVersion": {
-            "compatible": 10,
-            "target": 10
-        }
-    },
-    "deviceConfig": {},
-    "module": {
-        "reqPermissions": [],
-        "package": "com.ohos.distributedjstest",
-        "name": ".entry",
-        "mainAbility": ".MainAbility",
-        "srcPath": "",
-        "deviceType": [
-            "phone",
-            "tablet",
-            "tv",
-            "wearable",
-            "default",
-            "2in1"
-        ],
-        "distro": {
-            "deliveryWithInstall": true,
-            "moduleName": "entry",
-            "moduleType": "entry",
-            "installationFree": false
-        },
-        "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_description",
-                "label": "$string:app_name",
-                "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": ".MainAbility",
-                "window": {
-                    "designWidth": 720,
-                    "autoDesignWidth": true
-                }
-            },
-            {
-                "pages": [
-                    "pages/index/index"
-                ],
-                "name": ".TestAbility",
-                "window": {
-                    "designWidth": 720,
-                    "autoDesignWidth": false
-                }
-            }
-        ],
-        "testRunner": {
-            "name": "OpenHarmonyTestRunner",
-            "srcPath": "TestRunner"
-        }
-    }
-}

distributedhardware/devicemanagernotest/src/main/js/MainAbility/app.js

@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2024 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');
-    }
-};

distributedhardware/devicemanagernotest/src/main/js/MainAbility/pages/index/index.css

@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2024 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;
-}

distributedhardware/devicemanagernotest/src/main/js/MainAbility/pages/index/index.js

@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2024 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');
-  },
-  onShow() {
-    console.info('onShow finish')
-  },
-  onReady() {
-  },
-}

distributedhardware/devicemanagernotest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2024 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);
-        })
-    }
-};

distributedhardware/devicemanagernotest/src/main/resources/base/element/string.json

@@ -1,28 +0,0 @@
-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "distributedscreenjstest"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty device"
-    },
-    {
-      "name": "MainAbility_desc",
-      "value": "distributedscreenjstest"
-    },
-    {
-        "name": "MainAbility_label",
-        "value": "label"
-    },
-    {
-        "name": "TestAbility_desc",
-        "value": "description"
-    },
-    {
-        "name": "TestAbility_label",
-        "value": "label"
-    }
-  ]
-}

distributedhardware/distributeddevicejstest/.gitignore

@@ -0,0 +1,11 @@
+/node_modules
+/oh_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+.cxx
+/.clangd
+/.clang-format
+/.clang-tidy
+**/.test

distributedhardware/distributeddevicejstest/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2022-2024 Huawei Device Co., Ltd.
+# Copyright (c) 2024 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
@@ -11,25 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../tools/build/suite.gni")
+import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("DctsSubdisDeviceJsTest") {
+ohos_js_app_suite("DctsSubDeviceJsTest") {
-  hap_profile = "./src/main/config.json"
+  test_hap = true
-  deps = [
+  testonly = true
-    ":distributedjs_assets",
-    ":distributedjs_resources",
-  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "DctsSubdisDeviceJsTest"
+  hap_name = "DctsSubDeviceJsTest"
   subsystem_name = "distributedhardware"
   part_name = "device_manager"
 }
-ohos_js_assets("distributedjs_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
-}
-ohos_resources("distributedjs_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
-}

distributedhardware/distributeddevicejstest/Test.json

@@ -1,17 +1,17 @@
 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for sensor js api Tests",
     "driver": {
         "type": "OHJSUnitTest",
-        "bundle-name": "com.ohos.distributedscreenjstest",
+        "test-timeout": "160000",
-        "package-name": "com.ohos.distributedscreenjstest",
+        "shell-timeout": "160000",
-        "test-timeout": "1200000",
+        "bundle-name": "com.ohos.distributedjstest",
-        "testcase-timeout": "600000",
+        "package-name": "com.ohos.distributedjstest",
-        "shell-timeout": "1200000"
+        "testcase-timeout": 70000
     },
     "kits": [
         {
             "test-file-name": [
-                "DctsSubdisDeviceJsTest.hap"
+                "DctsSubDeviceJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributedhardware/distributeddevicejstest/build-profile.json5

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "app": {
+    "signingConfigs": [],
+    "products": [
+      {
+        "name": "default",
+        "signingConfig": "default",
+        "compileSdkVersion": 12,
+        "compatibleSdkVersion": 12,
+        "targetSdkVersion": 12,
+        "runtimeOS": "OpenHarmony",
+      }
+    ]
+  },
+  "modules": [
+    {
+      "name": "entry",
+      "srcPath": "./entry",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/.gitignore

@@ -0,0 +1,6 @@
+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test

distributedhardware/distributeddevicejstest/entry/build-profile.json5

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "apiType": 'faMode',
+  "buildOption": {
+  },
+  "targets": [
+    {
+      "name": "default",
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/hvigorfile.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { legacyHapTasks } from '@ohos/hvigor-ohos-plugin';

distributedhardware/distributeddevicejstest/entry/oh-package.json5

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "license": "",
+  "devDependencies": {},
+  "author": "",
+  "name": "entry",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

distributedhardware/distributeddevicejstest/entry/src/main/config.json

@@ -0,0 +1,67 @@
+{
+  "app": {
+    "bundleName": "com.ohos.distributedjstest",
+    "vendor": "acts",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.ohos.distributedjstest",
+    "name": ".entry",
+    "mainAbility": ".MainAbility",
+    "deviceType": [
+      "wearable",
+      "default",
+      "tablet",
+      "2in1"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "reqPermissions": [
+    ],
+    "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"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}

distributedhardware/distributeddevicejstest/entry/src/main/js/MainAbility/app.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 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 hilog from '@ohos.hilog';
+
+export default {
+    onCreate() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onCreate');
+    },
+    onDestroy() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onDestroy');
+    },
+}

distributedhardware/distributeddevicejstest/entry/src/main/js/MainAbility/pages/index/index.css

@@ -0,0 +1,30 @@
+.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;
+    }
+}

distributedhardware/distributeddevicejstest/entry/src/main/js/MainAbility/pages/index/index.hml

@@ -0,0 +1,5 @@
+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

distributedhardware/distributeddevicejstest/entry/src/main/js/MainAbility/pages/index/index.js

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2024 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');
+    }
+}
+
+
+

distributedhardware/distributeddevicejstest/entry/src/main/resources/base/element/color.json

@@ -0,0 +1,8 @@
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/src/main/resources/base/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/src/main/resources/en_US/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/src/main/resources/zh_CN/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "模块描述"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/src/ohosTest/config.json

@@ -0,0 +1,71 @@
+{
+  "app": {
+    "bundleName": "com.ohos.distributedjstest",
+    "vendor": "dcts",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.ohos.distributedjstest",
+    "name": ".entry_test",
+    "mainAbility": ".TestAbility",
+    "deviceType": [
+      "wearable",
+      "default",
+      "tablet",
+      "2in1"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry_test",
+      "moduleType": "feature",
+      "installationFree": false
+    },
+    "reqPermissions": [
+    ],
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "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": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ],
+    "testRunner": {
+      "name": "OpenHarmonyTestRunner",
+      "srcPath": "TestRunner"
+    }
+  }
+}

distributedhardware/distributeddevicejstest/entry/src/ohosTest/js/TestAbility/app.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,20 +12,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import hilog from '@ohos.hilog';
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 import { Hypium } from '@ohos/hypium';
 import testsuite from '../test/List.test';
 
 export default {
     onCreate() {
-        console.info('TestApplication onCreate');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestApplication onCreate');
-        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments();
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-        console.info('start run testcase!!!');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
-        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite);
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
     },
     onDestroy() {
-        console.info("TestApplication onDestroy");
+        hilog.info(0x0000, 'testTag', '%{public}s', 'TestApplication onDestroy');
     }
 };

distributedhardware/distributeddevicejstest/entry/src/ohosTest/js/TestAbility/pages/index/index.css

@@ -0,0 +1,30 @@
+.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;
+    }
+}

distributedhardware/distributeddevicejstest/entry/src/ohosTest/js/TestAbility/pages/index/index.hml

@@ -0,0 +1,5 @@
+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

distributedhardware/distributeddevicejstest/entry/src/ohosTest/js/TestAbility/pages/index/index.js

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2024 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');
+    }
+}
+
+
+

distributedhardware/distributeddevicejstest/entry/src/ohosTest/js/TestRunner/OpenHarmonyTestRunner.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 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 hilog from '@ohos.hilog';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
+
+ export default {
+    onPrepare() {
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare');
+    },
+    onRun() {
+        hilog.info(0x0000, 'testTag', '%{public}s', '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
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', data.stdResult ?? '');
+            hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', data.exitCode ?? '');
+        })
+    }
+};

distributedhardware/distributeddevicejstest/entry/src/ohosTest/resources/base/element/string.json

@@ -0,0 +1,12 @@
+{
+  "string": [
+    {
+      "name": "TestAbility_desc",
+      "value": "the test ability"
+    },
+    {
+      "name": "TestAbility_label",
+      "value": "test label"
+    }
+  ]
+}

distributedhardware/distributeddevicejstest/entry/src/ohosTest/resources/base/profile/test_pages.json

@@ -0,0 +1,5 @@
+{
+  "src": [
+    "TestAbility/pages/index"
+  ]
+}

distributedhardware/distributeddevicejstest/hvigor/hvigor-config.json5

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (C) 2024 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,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+{
-<div class="container">
+  "hvigorVersion": "4.0.5",
-    <text class="title">
+  "dependencies": {
-        {{ $t('strings.hello') }} {{title}}
+    "@ohos/hvigor-ohos-plugin": "4.0.5"
-    </text>
+  }
-</div>
+}

distributedhardware/distributeddevicejstest/hvigorfile.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { legacyAppTasks } from '@ohos/hvigor-ohos-plugin';

distributedhardware/distributeddevicejstest/hvigorw

@@ -0,0 +1,60 @@
+# Copyright (c) 2024 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.
+#!/bin/bash
+
+# ----------------------------------------------------------------------------
+#  Hvigor startup script, version 1.0.0
+# 
+#  Required ENV vars:
+#  ------------------
+#    NODE_HOME - location of a Node home dir
+#    or 
+#    Add /usr/local/nodejs/bin to the PATH environment variable
+# ----------------------------------------------------------------------------
+
+HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
+HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
+warn() {
+	echo ""
+	echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
+}
+
+error() {
+	echo ""
+	echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
+}
+
+fail() {
+	error "$@"
+	exit 1
+}
+
+# Determine node to start hvigor wrapper script
+if [ -n "${NODE_HOME}" ];then
+   EXECUTABLE_NODE="${NODE_HOME}/bin/node"
+   if [ ! -x "$EXECUTABLE_NODE" ];then
+       fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
+   fi
+else
+   EXECUTABLE_NODE="node"
+   which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
+fi
+
+# Check hvigor wrapper script
+if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
+	fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
+fi
+
+# start hvigor-wrapper script
+exec "${EXECUTABLE_NODE}" \
+	"${HVIGOR_WRAPPER_SCRIPT}" "$@"

distributedhardware/distributeddevicejstest/hvigorw.bat

@@ -0,0 +1,63 @@
+@rem Copyright (C) 2024 Huawei Device Co., Ltd.
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@echo off
+@rem
+@rem  -------------------------------------------------------------------
+@rem  Hvigor startup script for Windows, version 1.0.0
+@rem
+@rem  Required ENV vars:
+@rem  ------------------
+@rem    NODE_HOME - location of a Node home dir
+@rem    or
+@rem    Add %NODE_HOME%/bin to the PATH environment variable
+@rem  -------------------------------------------------------------------
+@rem
+
+set DIRNAME=%~dp0
+set APP_BASE_NAME=%~n0
+set NODE_EXE_PATH=""
+set APP_HOME=.
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+@rem set NODE_OPTS="--max-old-space-size=4096"
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+if not defined NODE_OPTS set NODE_OPTS="--"
+
+@rem Find node.exe
+if defined NODE_HOME (
+    set NODE_HOME=%NODE_HOME:"=%
+    set "PATH=%PATH%;%NODE_HOME%"
+    set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+)
+
+%NODE_EXE% --version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" (
+    "%NODE_EXE%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else if exist "%NODE_EXE_PATH%" (
+    "%NODE_EXE_PATH%" "%NODE_OPTS%" "%WRAPPER_MODULE_PATH%" %*
+) else (
+    echo.
+    echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
+    echo.
+    echo Please set the NODE_HOME variable in your environment to match the
+    echo location of your NodeJs installation.
+)
+
+if "%ERRORLEVEL%" == "0"(
+    if "%OS%" == "Windows_NT" endlocal
+) else (
+    exit /b %ERRORLEVEL%
+)

distributedhardware/distributeddevicejstest/oh-package.json5

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+{
+  "license": "",
+  "devDependencies": {
+    "@ohos/hypium": "1.0.6"
+  },
+  "author": "",
+  "name": "myapplication",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

distributedhardware/distributeddevicejstest/src/main/config.json

@@ -1,107 +0,0 @@
-{
-    "app": {
-        "bundleName": "com.ohos.distributedscreenjstest",
-        "vendor": "example",
-        "version": {
-            "code": 1000000,
-            "name": "1.0.0"
-        },
-        "apiVersion": {
-            "compatible": 10,
-            "target": 10
-        }
-    },
-    "deviceConfig": {},
-    "module": {
-        "reqPermissions": [
-            {
-                "name": "ohos.permission.DISTRIBUTED_DATASYNC"
-            },
-            {
-                "name": "ohos.permission.ACCESS_SERVICE_DM"
-            }
-        ],
-        "package": "com.ohos.distributedscreenjstest",
-        "name": ".entry",
-        "mainAbility": ".MainAbility",
-        "srcPath": "",
-        "deviceType": [
-            "phone",
-            "tablet",
-            "tv",
-            "wearable",
-            "default",
-            "2in1"
-        ],
-        "distro": {
-            "deliveryWithInstall": true,
-            "moduleName": "entry",
-            "moduleType": "entry",
-            "installationFree": false
-        },
-        "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_description",
-                "label": "$string:app_name",
-                "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": ".MainAbility",
-                "window": {
-                    "designWidth": 720,
-                    "autoDesignWidth": true
-                }
-            },
-            {
-                "pages": [
-                    "pages/index/index"
-                ],
-                "name": ".TestAbility",
-                "window": {
-                    "designWidth": 720,
-                    "autoDesignWidth": false
-                }
-            }
-        ],
-        "testRunner": {
-            "name": "OpenHarmonyTestRunner",
-            "srcPath": "TestRunner"
-        }
-    }
-}

distributedhardware/distributeddevicejstest/src/main/js/MainAbility/app.js

@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2023-2024 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');
-    }
-};

distributedhardware/distributeddevicejstest/src/main/js/MainAbility/pages/index/index.css

@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2023-2024 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;
-}

distributedhardware/distributeddevicejstest/src/main/js/MainAbility/pages/index/index.js

@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2023-2024 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');
-  },
-  onShow() {
-    console.info('onShow finish')
-  },
-  onReady() {
-  },
-}

distributedhardware/distributeddevicejstest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2023-2024 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);
-        })
-    }
-};

distributedhardware/distributeddevicejstest/src/main/resources/base/element/string.json

@@ -1,28 +0,0 @@
-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "distributedscreenjstest"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty device"
-    },
-    {
-      "name": "MainAbility_desc",
-      "value": "distributedscreenjstest"
-    },
-    {
-        "name": "MainAbility_label",
-        "value": "label"
-    },
-    {
-        "name": "TestAbility_desc",
-        "value": "description"
-    },
-    {
-        "name": "TestAbility_label",
-        "value": "label"
-    }
-  ]
-}