!9134 【gn 切hvigor】PART4

Merge pull request !9134 from quxianfei/local_new_20230628_00023

account/appaccount/actssetcheckdatasyncenable/BUILD.gn

-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2023 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
@@ -10,27 +10,12 @@
 # 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("ActsSetCheckDataSyncEnableTest") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
+ohos_js_app_suite("ActsSetCheckDataSyncEnableTest") {
+  test_hap = true
+  testonly = true
   hap_name = "ActsSetCheckDataSyncEnableTest"
   subsystem_name = "account"
   part_name = "os_account"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
-}
-
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
+  certificate_profile = "./signature/openharmony_sx.p7b"
 }

account/appaccount/actssetcheckdatasyncenable/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "60000",
-        "bundle-name": "com.example.actssetcheckdatasyncenable",
-        "package-name": "com.example.actssetcheckdatasyncenable",
-        "shell-timeout": "60000"
+	"description":"Configuration for hjunit demo Tests",
+	"driver":{
+		"type":"OHJSUnitTest",
+		"test-timeout":"60000",
+		"bundle-name":"com.example.actssetcheckdatasyncenable",
+		"package-name":"com.example.actssetcheckdatasyncenable_test",
+		"shell-timeout":"60000"
 	},
-    "kits": [
+	"kits":[
 		{
-            "test-file-name": [
+			"test-file-name":[
 				"ActsSetCheckDataSyncEnableTest.hap"
 			],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
+			"type":"AppInstallKit",
+			"cleanup-apps":true
 		}
 	]
 }
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/build-profile.json5

+/**
+* Copyright (c) 2023 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":[
+			
+		],
+		"compileSdkVersion":10,
+		"compatibleSdkVersion":10,
+		"products":[
+			{
+				"name":"default",
+				"signingConfig":"default"
+			}
+		]
+	},
+	"modules":[
+		{
+			"name":"entry",
+			"srcPath":"./entry",
+			"targets":[
+				{
+					"name":"default",
+					"applyToProducts":[
+						"default"
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/build-profile.json5

+/**
+* Copyright (c) 2023 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"
+		}
+	]
+}
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/hvigorfile.ts

+/**
+ * Copyright (c) 2023 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';

account/appaccount/actssetcheckdatasyncenable/entry/oh-package.json5

+/**
+* Copyright (c) 2023 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":{
+		
+	}
+}
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/src/main/config.json

+{
+	"app":{
+		"bundleName":"com.example.actssetcheckdatasyncenable",
+		"vendor":"example",
+		"version":{
+			"code":1,
+			"name":"1.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"com.example.actssetcheckdatasyncenable",
+		"name":".entry",
+		"mainAbility":".MainAbility",
+		"deviceType":[
+			"default",
+			"tablet"
+		],
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry",
+			"moduleType":"entry"
+		},
+		"abilities":[
+			{
+				"description":"$string:MainAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:MainAbility_label",
+				"launchType":"standard",
+				"name":".MainAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"MainAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".MainAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

notification/ces_standard/actsCommonEventManagerTest/src/main/js/MainAbility/app.js → account/appaccount/actssetcheckdatasyncenable/entry/src/main/js/MainAbility/app.js

-/*
+/**
  * Copyright (c) 2023 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.
@@ -12,11 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import hilog from '@ohos.hilog';
+
 export default {
     onCreate() {
-        console.info("============== AceApplication onCreate ==============");
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onCreate');
     },
     onDestroy() {
-        console.info('=============AceApplication onDestroy=============');
-    }
-};
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Application onDestroy');
+    },
+}
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/src/ohosTest/config.json

+{
+	"app":{
+		"bundleName":"com.example.actssetcheckdatasyncenable",
+		"vendor":"example",
+		"version":{
+			"code":1,
+			"name":"1.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"com.example.actssetcheckdatasyncenable_test",
+		"name":".entry_test",
+		"mainAbility":".TestAbility",
+		"deviceType":[
+			"default",
+			"tablet"
+		],
+		"defPermissions": [
+			{
+			  "availableScope": [],
+			  "grantMode": "user_grant",
+			  "name": "ohos.permission.DISTRIBUTED_DATASYNC"
+			}
+		],
+		"reqPermissions":[
+			{
+				"name":"ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+				"reason":"ceshi"
+			},
+			{
+				"name":"ohos.permission.DISTRIBUTED_DATASYNC",
+				"reason":"ceshi"
+			},
+			{
+				"name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+				"reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+			},
+			{
+				"name":"ohos.permission.GET_BUNDLE_INFO",
+				"reason":"need use ohos.permission.GET_BUNDLE_INFO"
+			},
+			{
+				"name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+				"reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+			},
+			{
+				"name":"ohos.permission.REMOVE_CACHE_FILES",
+				"reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+			},
+			{
+				"name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+				"reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
+			}
+		],
+		"testRunner":{
+			"name":"OpenHarmonyTestRunner",
+			"srcPath":"TestRunner"
+		},
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry_test",
+			"moduleType":"feature"
+		},
+		"abilities":[
+			{
+				"description":"$string:TestAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:TestAbility_label",
+				"launchType":"standard",
+				"name":".TestAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"TestAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".TestAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/src/ohosTest/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.app.ability.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");
    }};
\ No newline at end of file

notification/ces_standard/actsCommonEventManagerTest/src/main/js/TestRunner/OpenHarmonyTestRunner.js → account/appaccount/actssetcheckdatasyncenable/entry/src/ohosTest/js/TestRunner/OpenHarmonyTestRunner.js

-/*
+/**
  * Copyright (c) 2023 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.
@@ -12,48 +12,30 @@
  * 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()
-}
+import hilog from '@ohos.hilog';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 
  export default {
     onPrepare() {
-        console.info('OpenHarmonyTestRunner OnPrepare')
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare');
     },
     onRun() {
-        console.log('OpenHarmonyTestRunner onRun run')
+        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
-        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
         var debug = abilityDelegatorArguments.parameters["-D"]
-        console.info('debug value : '+debug)
         if (debug == 'true')
         {
             cmd += ' -D'
         }
-        console.info('cmd : '+cmd)
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', 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);
+            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 ?? '');
         })
     }
 };
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/entry/src/ohosTest/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ActsSetCheckSyncEnable"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+        "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

account/appaccount/actssetcheckdatasyncenable/hvigor/hvigor-config.json5

+/**
+ * Copyright (c) 2023 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.
+ */
+{
+  "hvigorVersion": "2.4.2",
+  "dependencies": {
+    "@ohos/hvigor-ohos-plugin": "2.4.2"
+  }
+}

account/appaccount/actssetcheckdatasyncenable/hvigorfile.ts

+/**
+ * Copyright (c) 2023 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';
\ No newline at end of file

account/appaccount/actssetcheckdatasyncenable/hvigorw

+# Copyright (c) 2023 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}" "$@"

account/appaccount/actssetcheckdatasyncenable/hvigorw.bat

+@rem Copyright (C) 2023 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.
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Hvigor startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+
+goto start
+
+:start
+@rem Find node.exe
+if defined NODE_HOME goto findNodeFromNodeHome
+
+%NODE_EXE% --version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+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.
+
+goto fail
+
+:findNodeFromNodeHome
+set NODE_HOME=%NODE_HOME:"=%
+set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+
+if exist "%NODE_EXE_PATH%" goto execute
+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.
+
+goto fail
+
+:execute
+@rem Execute hvigor
+"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
+
+:fail
+exit /b 1

account/appaccount/actssetcheckdatasyncenable/oh-package.json5

+/**
+ * Copyright (c) 2023 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": "myapplication454434",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

account/appaccount/actssetcheckdatasyncenable/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.actssetcheckdatasyncenable",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.actssetcheckdatasyncenable",
-    "name": ".entry",
-    "mainAbility": ".MainAbility",
-    "srcPath":"",
-    "deviceType": [
-      "default",
-      "tablet"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "defPermissions": [
-      {
-        "availableScope": [],
-        "grantMode": "user_grant",
-        "name": "ohos.permission.DISTRIBUTED_DATASYNC"
-      }
-    ],
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
-        "reason": "ceshi"
-      },
-      {
-        "name": "ohos.permission.DISTRIBUTED_DATASYNC",
-        "reason": "ceshi"
-      },
-      {
-        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
-      },
-      {
-        "name":"ohos.permission.GET_BUNDLE_INFO",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
-      },
-      {
-        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
-        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
-      },
-      {
-        "name":"ohos.permission.REMOVE_CACHE_FILES",
-        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
-      },
-      {
-        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
-        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
-      }
-    ],
-    "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"
-    }
-  }
-}

account/appaccount/actssetcheckdatasyncenable/src/main/js/MainAbility/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');
-    }
-};

account/appaccount/actssetcheckdatasyncenable/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");
-    }
-};

account/appaccount/actssetcheckdatasyncenable/src/main/js/TestAbility/i18n/en-US.json

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

barrierfree/accessiblecaptionconfiguration/BUILD.gn

-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2023 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
@@ -10,26 +10,12 @@
 # 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("ActsAccessibleCaptionConfigurationTest") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
+ohos_js_app_suite("ActsAccessibleCaptionConfigurationTest") {
+  test_hap = true
+  testonly = true
   hap_name = "ActsAccessibleCaptionConfigurationTest"
-  part_name = "accessibility"
   subsystem_name = "barrierfree"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
+  part_name = "accessibility"
+  certificate_profile = "./signature/openharmony_sx.p7b"
 }

barrierfree/accessiblecaptionconfiguration/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "180000",
-        "shell-timeout": "180000",
-        "bundle-name": "com.example.accessiblecaptionconfiguration",
-        "package-name": "com.example.accessiblecaptionconfiguration"
+	"description":"Configuration for hjunit demo Tests",
+	"driver":{
+		"type":"OHJSUnitTest",
+		"test-timeout":"180000",
+		"shell-timeout":"180000",
+		"bundle-name":"com.example.accessiblecaptionconfiguration",
+		"package-name":"com.example.accessiblecaptionconfiguration_test"
 	},
-    "kits": [
+	"kits":[
 		{
-            "test-file-name": [
+			"test-file-name":[
 				"ActsAccessibleCaptionConfigurationTest.hap"
 			],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        },{
-            "type": "ShellKit",
-            "run-command": [
+			"type":"AppInstallKit",
+			"cleanup-apps":true
+		},
+		{
+			"type":"ShellKit",
+			"run-command":[
 				"power-shell wakeup",
 				"power-shell setmode 602"
 			]

barrierfree/accessiblecaptionconfiguration/build-profile.json5

+/**
+* Copyright (c) 2023 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":[
+			
+		],
+		"compileSdkVersion":10,
+		"compatibleSdkVersion":10,
+		"products":[
+			{
+				"name":"default",
+				"signingConfig":"default"
+			}
+		]
+	},
+	"modules":[
+		{
+			"name":"entry",
+			"srcPath":"./entry",
+			"targets":[
+				{
+					"name":"default",
+					"applyToProducts":[
+						"default"
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/build-profile.json5

+/**
+* Copyright (c) 2023 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"
+		}
+	]
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/hvigorfile.ts

+/**
+ * Copyright (c) 2023 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';

barrierfree/accessiblecaptionconfiguration/entry/oh-package.json5

+/**
+* Copyright (c) 2023 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":{
+		
+	}
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/src/main/config.json

+{
+	"app":{
+		"bundleName":"com.example.accessiblecaptionconfiguration",
+		"vendor":"example",
+		"version":{
+			"code":1,
+			"name":"1.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"com.example.accessiblecaptionconfiguration",
+		"name":".entry",
+		"mainAbility":".MainAbility",
+		"deviceType":[
+			"tablet",
+			"default",
+			"phone"
+		],
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry",
+			"moduleType":"entry"
+		},
+		"abilities":[
+			{
+				"description":"$string:MainAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:MainAbility_label",
+				"launchType":"standard",
+				"name":".MainAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"MainAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".MainAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/src/main/js/MainAbility/app.js

+/**
+ * Copyright (c) 2023 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');
+    },
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/src/ohosTest/config.json

+{
+	"app":{
+		"bundleName":"com.example.accessiblecaptionconfiguration",
+		"vendor":"example",
+		"version":{
+			"code":1,
+			"name":"1.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"com.example.accessiblecaptionconfiguration_test",
+		"name":".entry_test",
+		"mainAbility":".TestAbility",
+		"deviceType":[
+			"tablet",
+			"default",
+			"phone"
+		],
+        "defPermissions": [
+            {
+                "availableScope": [],
+                "grantMode": "system_grant",
+                "name": "ohos.permission.DISTRIBUTED_DATASYNC"
+            }
+        ],
+        "reqPermissions": [
+            {
+                "name": "ohos.permission.DISTRIBUTED_DATASYNC",
+                "reason": "ceshi"
+            }
+        ],
+		"testRunner":{
+			"name":"OpenHarmonyTestRunner",
+			"srcPath":"TestRunner"
+		},
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry_test",
+			"moduleType":"feature"
+		},
+		"abilities":[
+			{
+				"description":"$string:TestAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:TestAbility_label",
+				"launchType":"standard",
+				"name":".TestAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"TestAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".TestAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/src/ohosTest/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.app.ability.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");
    }};
\ No newline at end of file

communication/nfc_ErrorCode/src/main/js/TestRunner/OpenHarmonyTestRunner.js → barrierfree/accessiblecaptionconfiguration/entry/src/ohosTest/js/TestRunner/OpenHarmonyTestRunner.js

-/*
+/**
  * Copyright (c) 2023 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.
@@ -12,48 +12,30 @@
  * 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()
-}
+import hilog from '@ohos.hilog';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 
  export default {
     onPrepare() {
-        console.info('OpenHarmonyTestRunner OnPrepare')
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare');
     },
     onRun() {
-        console.info('OpenHarmonyTestRunner onRun run')
+        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
-        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
         var debug = abilityDelegatorArguments.parameters["-D"]
-        console.info('debug value : '+debug)
         if (debug == 'true')
         {
             cmd += ' -D'
         }
-        console.info('cmd : '+cmd)
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', 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);
+            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 ?? '');
         })
     }
 };
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/entry/src/ohosTest/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ActsSetCheckSyncEnable"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+		},
+	{
+		"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

barrierfree/accessiblecaptionconfiguration/hvigor/hvigor-config.json5

+/**
+ * Copyright (c) 2023 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.
+ */
+{
+  "hvigorVersion": "2.4.2",
+  "dependencies": {
+    "@ohos/hvigor-ohos-plugin": "2.4.2"
+  }
+}

barrierfree/accessiblecaptionconfiguration/hvigorfile.ts

+/**
+ * Copyright (c) 2023 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';
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/hvigorw

+# Copyright (c) 2023 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}" "$@"

barrierfree/accessiblecaptionconfiguration/hvigorw.bat

+@rem Copyright (C) 2023 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.
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Hvigor startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
+set NODE_EXE=node.exe
+
+goto start
+
+:start
+@rem Find node.exe
+if defined NODE_HOME goto findNodeFromNodeHome
+
+%NODE_EXE% --version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+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.
+
+goto fail
+
+:findNodeFromNodeHome
+set NODE_HOME=%NODE_HOME:"=%
+set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
+
+if exist "%NODE_EXE_PATH%" goto execute
+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.
+
+goto fail
+
+:execute
+@rem Execute hvigor
+"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
+
+:fail
+exit /b 1

barrierfree/accessiblecaptionconfiguration/oh-package.json5

+/**
+ * Copyright (c) 2023 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": "myapplication454434",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

barrierfree/accessiblecaptionconfiguration/src/main/config.json

-{
-    "app": {
-        "bundleName": "com.example.accessiblecaptionconfiguration",
-        "vendor": "example",
-        "version": {
-            "code": 1,
-            "name": "1.0"
-        },
-        "apiVersion": {
-            "compatible": 4,
-            "target": 5,
-            "releaseType": "Beta1"
-        }
-    },
-    "deviceConfig": {},
-    "module": {
-        "package": "com.example.accessiblecaptionconfiguration",
-        "name": ".entry",
-        "deviceType": [
-      "tablet",
-      "default",
-            "phone"
-        ],
-        "distro": {
-            "deliveryWithInstall": true,
-            "moduleName": "entry",
-            "moduleType": "entry"
-        },
-        "defPermissions": [
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "ohos.permission.DISTRIBUTED_DATASYNC"
-            }
-        ],
-        "reqPermissions": [
-            {
-                "name": "ohos.permission.DISTRIBUTED_DATASYNC",
-                "reason": "ceshi"
-            }
-        ],
-        "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"
-        },
-        "mainAbility": ".MainAbility",
-        "srcPath": ""
-    }
-}
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/src/main/js/MainAbility/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('AccessibilityApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AccessibilityApplication onDestroy');
-    }
-};

barrierfree/accessiblecaptionconfiguration/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");
-    }
-};

barrierfree/accessiblecaptionconfiguration/src/main/js/TestAbility/i18n/zh-CN.json

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

barrierfree/accessiblecaptionconfiguration/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);
-        })
-    }
-};

communication/nfc_Controller/BUILD.gn

@@ -10,26 +10,12 @@
 # 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("ActsNFCJSTest") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":nfc_js_assets",
-    ":nfc_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
+ohos_js_app_suite("ActsNFCJSTest") {
+  test_hap = true
+  testonly = true
   hap_name = "ActsNFCJSTest"
-  part_name = "nfc"
   subsystem_name = "communication"
-}
-ohos_js_assets("nfc_js_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
-}
-ohos_resources("nfc_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
+  part_name = "nfc"
+  certificate_profile = "./signature/openharmony_sx.p7b"
 }

communication/nfc_Controller/Test.json

 {
-    "description": "Configuration for nfc js api Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "shell-timeout": "600000",
-        "testcase-timeout": "600000",
-        "bundle-name": "ohos.acts.communication.nfc.nfcdevice",
-        "package-name": "ohos.acts.communication.nfc.nfcdevice"
+	"description":"Configuration for nfc js api Tests",
+	"driver":{
+		"type":"OHJSUnitTest",
+		"test-timeout":"600000",
+		"shell-timeout":"600000",
+		"testcase-timeout":"600000",
+		"bundle-name":"ohos.acts.communication.nfc.nfcdevice",
+		"package-name":"ohos.acts.communication.nfc.nfcdevice_test"
 	},
-    "kits": [
+	"kits":[
 		{
-            "test-file-name": [
+			"test-file-name":[
 				"ActsNFCJSTest.hap"
 			],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
+			"type":"AppInstallKit",
+			"cleanup-apps":true
 		},
 		{
-            "type": "ShellKit",
-            "run-command": [
+			"type":"ShellKit",
+			"run-command":[
 				"svc nfc enable",
 				"power-shell wakeup",
 				"power-shell setmode 602"

communication/nfc_Controller/build-profile.json5

+/**
+* Copyright (c) 2023 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":[
+			
+		],
+		"compileSdkVersion":10,
+		"compatibleSdkVersion":10,
+		"products":[
+			{
+				"name":"default",
+				"signingConfig":"default"
+			}
+		]
+	},
+	"modules":[
+		{
+			"name":"entry",
+			"srcPath":"./entry",
+			"targets":[
+				{
+					"name":"default",
+					"applyToProducts":[
+						"default"
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file

communication/nfc_Controller/entry/build-profile.json5

+/**
+* Copyright (c) 2023 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"
+		}
+	]
+}
\ No newline at end of file

communication/nfc_Controller/entry/hvigorfile.ts

+/**
+ * Copyright (c) 2023 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';

communication/nfc_Controller/entry/oh-package.json5

+/**
+* Copyright (c) 2023 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":{
+		
+	}
+}
\ No newline at end of file

communication/nfc_Controller/entry/src/main/config.json

+{
+	"app":{
+		"bundleName":"ohos.acts.communication.nfc.nfcdevice",
+		"vendor":"acts",
+		"version":{
+			"code":1000000,
+			"name":"1.0.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"ohos.acts.communication.nfc.nfcdevice",
+		"name":".entry",
+		"mainAbility":".MainAbility",
+		"deviceType":[
+			"tablet",
+			"default",
+			"phone"
+		],
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry",
+			"moduleType":"entry"
+		},
+		"abilities":[
+			{
+				"description":"$string:MainAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:MainAbility_label",
+				"launchType":"standard",
+				"name":".MainAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"MainAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".MainAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

communication/nfc_Controller/entry/src/main/js/MainAbility/app.js

+/**
+ * Copyright (c) 2023 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');
+    },
+}
\ No newline at end of file

communication/nfc_Controller/entry/src/ohosTest/config.json

+{
+	"app":{
+		"bundleName":"ohos.acts.communication.nfc.nfcdevice",
+		"vendor":"acts",
+		"version":{
+			"code":1000000,
+			"name":"1.0.0"
+		}
+	},
+	"deviceConfig":{
+		
+	},
+	"module":{
+		"package":"ohos.acts.communication.nfc.nfcdevice_test",
+		"name":".entry_test",
+		"mainAbility":".TestAbility",
+		"deviceType":[
+			"tablet",
+			"default",
+			"phone"
+		],
+		"reqPermissions":[
+			{
+				"name":"ohos.permission.NFC_CARD_EMULATION",
+				"reason":"use ohos.permission.SET_nfc_INFO"
+			},
+			{
+				"name":"ohos.permission.NFC_TAG",
+				"reason":"use ohos.permission.NFC_TAG"
+			}
+		],
+		"testRunner":{
+			"name":"OpenHarmonyTestRunner",
+			"srcPath":"TestRunner"
+		},
+		"distro":{
+			"deliveryWithInstall":true,
+			"installationFree":false,
+			"moduleName":"entry_test",
+			"moduleType":"feature"
+		},
+		"abilities":[
+			{
+				"description":"$string:TestAbility_desc",
+				"formsEnabled":false,
+				"icon":"$media:icon",
+				"label":"$string:TestAbility_label",
+				"launchType":"standard",
+				"name":".TestAbility",
+				"orientation":"unspecified",
+				"skills":[
+					{
+						"actions":[
+							"action.system.home"
+						],
+						"entities":[
+							"entity.system.home"
+						]
+					}
+				],
+				"srcLanguage":"js",
+				"srcPath":"TestAbility",
+				"type":"page",
+				"visible":true
+			}
+		],
+		"js":[
+			{
+				"name":".TestAbility",
+				"pages":[
+					"pages/index/index"
+				],
+				"window":{
+					"autoDesignWidth":false,
+					"designWidth":720
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

communication/nfc_Controller/entry/src/ohosTest/js/TestAbility/app.js

+/*
 * Copyright (c) 2023 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.app.ability.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");
    }};
\ No newline at end of file

communication/nfc_Controller/src/main/js/TestRunner/OpenHarmonyTestRunner.js → communication/nfc_Controller/entry/src/ohosTest/js/TestRunner/OpenHarmonyTestRunner.js

-/*
+/**
  * Copyright (c) 2023 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.
@@ -12,48 +12,30 @@
  * 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()
-}
+import hilog from '@ohos.hilog';
+import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
 
  export default {
     onPrepare() {
-        console.info('OpenHarmonyTestRunner OnPrepare')
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare');
     },
     onRun() {
-        console.info('OpenHarmonyTestRunner onRun run')
+        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
-        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
         var debug = abilityDelegatorArguments.parameters["-D"]
-        console.info('debug value : '+debug)
         if (debug == 'true')
         {
             cmd += ' -D'
         }
-        console.info('cmd : '+cmd)
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', 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);
+            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 ?? '');
         })
     }
 };
\ No newline at end of file