!4845 【杂散】【ALL】将JS框架改成ets框架，增加子系统和部件名称

Merge pull request !4845 from 张育帅/master

distributeddatamgr/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,16 +16,15 @@ group("distributeddatamgr") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "dataObjectjstest/hap:dataObject_js_test",
-      "dataShare:dataShare",
-      "kvStorejstest/hap:kvStore_js_test",
-      "preferencesjstest/hap:preferences_js_test",
-      "relationalStorejstest/hap:relationalstore_js_test",
+      "appdatamgrjstest/hap:appdatamgr_js_test",
+      "distributeddataObjectjstest/hap:distributeddataObject_js_test",
+      "distributeddatamgrjstest/hap:distributeddatamgr_js_test",
+      "windowStage:windowStage",
     ]
   } else {
     deps = [
-      "kvStorejstest/hap:distributeddatamgrfunctest_hap",
-      "relationalStorejstest/hap:appdatamgrfunctest_hap",
+      "appdatamgrtest/hap:appdatamgrfunctest_hap",
+      "distributeddatamgrtest/hap:distributeddatamgrfunctest_hap",
       "searchtest/hap:searchfunctest_hap",
     ]
   }
@@ -33,5 +32,5 @@ group("distributeddatamgr") {
 
 group("pasteboard") {
   testonly = true
-  deps = [ "Pasteboardjsapitest:ActsPasteBoardJSApiTest" ]
+  deps = [ "Pasteboardjsapitest:ActsPasteBoardETSApiTest" ]
 }

distributeddatamgr/Pasteboardjsapitest/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,21 +11,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build/ohos.gni")
 import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("ActsPasteBoardJSApiTest") {
+ohos_js_hap_suite("ActsPasteBoardETSApiTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
+    ":pasteBoard_ets_assets",
+    ":pasteBoard_ets_resources",
+    ":pasteBoard_ets_test_assets",
   ]
+  ets2abc = true
+  subsystem_name = "distributeddatamgr"
+  part_name = "pasteboard"
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsPasteBoardJSApiTest"
+  hap_name = "ActsPasteBoardETSApiTest"
+}
+
+ohos_js_assets("pasteBoard_ets_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
+ohos_js_assets("pasteBoard_ets_test_assets") {
+  source_dir = "./entry/src/main/ets/TestAbility"
 }
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
+ohos_resources("pasteBoard_ets_resources") {
+  sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

distributeddatamgr/Pasteboardjsapitest/Test.json

 {
     "description": "Configuration for PasteBoard js api Tests",
     "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "1800000",
-        "package": "com.open.harmony.pasteboard",
-        "shell-timeout": "1800000"
+        "type": "OHJSUnitTest",
+        "test-timeout": "600000",
+        "bundle-name": "com.acts.distributeddatamgr.pasteboardtest",
+        "package-name": "com.acts.distributeddatamgr.pasteboardtest",
+        "shell-timeout": "60000"
     },
     "kits": [
         {
-            "test-file-name": [
-                "ActsPasteBoardJSApiTest.hap"
-            ],
+            "test-file-name": ["ActsPasteBoardETSApiTest.hap"],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },
+        {
+            "type": "ShellKit",
+            "cleanup-apps": true
         }
     ]
-}
+}
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/entry/src/main/config.json

 {
   "app": {
-    "bundleName": "com.open.harmony.pasteboard",
-    "vendor": "open",
+    "bundleName": "com.acts.distributeddatamgr.pasteboardtest",
+    "vendor": "example",
     "version": {
-      "code": 1000000,
+      "code": 1,
       "name": "1.0.0"
     },
     "apiVersion": {
-      "compatible": 4,
-      "releaseType": "Beta1",
-      "target": 5
+      "compatible": 7,
+      "target": 9,
+      "releaseType": "Release"
     }
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.open.harmony.pasteboard",
+    "package": "com.acts.distributeddatamgr.pasteboardtest",
     "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
+    "mainAbility": "com.acts.distributeddatamgr.pasteboardtest.MainAbility",
+    "deviceType": ["phone"],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry"
+      "moduleType": "entry",
+      "installationFree": true
     },
     "abilities": [
       {
@@ -36,21 +36,56 @@
             ]
           }
         ],
-        "name": "com.open.harmony.pasteboard.MainAbility",
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      },
+      {
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "TestAbility",
+        "name": ".TestAbility",
+        "srcLanguage": "ets",
         "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
+        "description": "$string:TestAbility_desc",
+        "formsEnabled": false,
+        "label": "$string:TestAbility_label",
         "type": "page",
-        "launchType": "standard",
-        "visible": true
+        "launchType": "standard"
       }
     ],
     "js": [
       {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      },
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
         "pages": [
-          "pages/index/index"
+          "pages/index"
         ],
-        "name": "default",
+        "name": ".TestAbility",
         "window": {
           "designWidth": 720,
           "autoDesignWidth": false
@@ -58,4 +93,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file

theme/screenlock_js/src/main/js/default/pages/index/index.js → distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/MainAbility/app.ets

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+// @ts-nocheck
+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,22 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import app from '@system.app'
-import file from '@system.file'
-import {Core} from 'deccjsunit/index'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from 'hypium/index'
+import testsuite from '../test/List.test'
 
 export default {
-    data: {title: ""},
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow finish')
-        const core = Core.getInstance()
-        core.init()
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-        require('../../../test/List.test')
-        core.execute()
-    }
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
 }
\ No newline at end of file

theme/screenlock_js/src/main/js/default/app.js → distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/MainAbility/pages/index.ets

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+// @ts-nocheck
+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,11 +13,25 @@
  * 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');
+
+@Entry
+@Component
+struct MyComponent {
+  aboutToAppear() {
+  }
+
+  build() {
+    Flex({
+      direction: FlexDirection.Column,
+      alignItems: ItemAlign.Center,
+      justifyContent: FlexAlign.Center
+    }) {
+      Text('PASTEBOARD ETS TEST')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
     }
-};
+    .width('100%')
+    .height('100%')
+  }
+}
+

distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/TestAbility/app.ets

+// @ts-nocheck
+/**
+ * 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 'hypium/index'
+import testsuite from '../test/List.test'
+
+export default {
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.js → distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/TestAbility/pages/index.ets

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+// @ts-nocheck
+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,34 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Core, ExpectExtend} from 'deccjsunit'
+import router from '@system.router';
 
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
 
-export default {
-    data: {
-        title: ''
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow finish')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-
-        require('../../test/List.test')
-        core.execute()
-    },
-    onReady() {
-    },
-    onBackPress(){
-    }
-}
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+// @ts-nocheck
+/**
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+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'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log('onAbilityCreateCallback');
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info('addAbilityMonitorCallback : ' + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    }
+
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun call abilityDelegator.getAppContext')
+        var context = abilityDelegator.getAppContext()
+        console.info('getAppContext : ' + JSON.stringify(context))
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/test/List.test.js → distributeddatamgr/Pasteboardjsapitest/entry/src/main/ets/test/List.test.ets

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,5 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-require('./PasteBoardJsunit.test.js')
+
+import pasteBoardJEtsunitTest from './PasteBoardEtsunitTest';
\ No newline at end of file
+
+export default function testsuite() {
+  pasteBoardJEtsunitTest()
+}
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/en-US.json

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

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/i18n/zh-CN.json

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

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.css

-/*
-* Copyright (c) 2022 Huawei Device Co., Ltd.
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-.container {
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.title {
-    font-size: 100px;
-}

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/default/pages/index/index.hml

-<!--
-  Copyright (c) 2022 Huawei Device Co., Ltd.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<div class="container">
-    <text class="title">
-        {{ title }}
-    </text>
-</div>

distributeddatamgr/Pasteboardjsapitest/entry/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "PasteBoardTest_js"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file

request/RequestTest_js/entry/src/main/resources/base/element/string.json → distributeddatamgr/Pasteboardjsapitest/entry/src/main/resources/base/element/string.json

@@ -5,8 +5,16 @@
       "value": "entry_MainAbility"
     },
     {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
+      "name": "description_mainability",
+      "value": "ETS_Empty Ability"
+    },
+    {
+      "name": "TestAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "TestAbility_label",
+      "value": "label"
     }
   ]
 }
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/local.properties

-# This file is automatically generated by DevEco Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# For customization when using a Version Control System, please read the header note.
-sdk.dir=C:/Users/lwx1095534/AppData/Local/OpenHarmony/Sdk
-nodejs.dir=D:/DevEco Studio/tools/nodejs
-npm.dir=D:/DevEco Studio/tools/nodejs
\ No newline at end of file

distributeddatamgr/Pasteboardjsapitest/package-lock.json

-{
-  "lockfileVersion": 1
-}

inputmethod/InputMethodTest_ets/.idea/.deveco/project.cache.json

-{
-	"BuildOptions":{},
-	"CommonInfo":{
-		"project.ide.version":"3.0.0.900"
-	}
-}
\ No newline at end of file

inputmethod/InputMethodTest_ets/.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml

inputmethod/InputMethodTest_ets/.idea/InputMethodTest_ets.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="EMPTY_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

inputmethod/InputMethodTest_ets/.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/InputMethodTest_ets.iml" filepath="$PROJECT_DIR$/.idea/InputMethodTest_ets.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

inputmethod/InputMethodTest_ets/.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

inputmethod/InputMethodTest_ets/BUILD.gn

-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -9,7 +9,7 @@
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsInputMethodEtsTest") {
     ":inputMethod_ets_test_assets",
   ]
   ets2abc = true
+  subsystem_name = "inputmethod"
+  part_name = "imf"
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsInputMethodEtsTest"
 }

inputmethod/InputMethodTest_ets/Test.json

@@ -3,8 +3,8 @@
     "driver": {
         "type": "OHJSUnitTest",
         "test-timeout": "600000",
-        "bundle-name": "com.open.harmony.inputMethodtest",
-        "package-name": "com.open.harmony.inputMethodtest",
+        "bundle-name": "com.acts.inputmethodtest",
+        "package-name": "com.acts.inputmethodtest",
         "shell-timeout": "600000"
     },
     "kits": [

inputmethod/InputMethodTest_ets/entry/src/main/config.json

 {
   "app": {
-    "bundleName": "com.open.harmony.inputMethodtest",
+    "bundleName": "com.acts.inputmethodtest",
     "vendor": "open",
     "version": {
       "code": 1000000,
@@ -9,14 +9,14 @@
     "apiVersion": {
       "compatible": 7,
       "releaseType": "Release",
-      "target": 7
+      "target": 9
     }
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.open.harmony.inputMethodtest",
+    "package": "com.acts.inputmethodtest",
     "name": ".MyApplication",
-    "mainAbility": "com.open.harmony.inputMethodtest.MainAbility",
+    "mainAbility": "com.acts.inputmethodtest.MainAbility",
     "deviceType": [
       "phone"
     ],

inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/app.ets

 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/index.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/MainAbility/pages/input.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputRequestJsunit.test.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethodEngineJsunit.test.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/InputmethohJsunit.test.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -96,28 +96,6 @@ export default function settingUiJsunit() {
       done();
     });
 
-    /*
-     * @tc.number  inputmethod_test_switchInputMethod_001
-     * @tc.name    Test Indicates the input method which will replace the current one.
-     * @tc.desc    Function test
-     * @tc.level   2
-     */
-    it('inputmethod_test_switchInputMethod_001', 0, async function (done) {
-      console.info("************* inputmethod_test_switchInputMethod_001 Test start*************");
-      let inputMethodProperty = {
-        packageName:"com.example.kikakeyboard",
-        methodId:"ServiceExtAbility"
-      }
-      inputMethod.switchInputMethod(inputMethodProperty).then((data) => {
-        console.info("inputmethod_test_switchInputMethod_001 data:" + data)
-        expect(data).assertEqual(true);
-      }).catch((err) => {
-        console.error('inputmethod_test_switchInputMethod_001 failed because ' + JSON.stringify(err));
-      });
-      console.info("************* inputmethod_test_switchInputMethod_001 Test end*************");
-      done();
-    });
-
     /*
      * @tc.number  inputmethod_test_switchInputMethod_002
      * @tc.name    Test Indicates the input method which will replace the current one.

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/List.test.ets

 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestDownloadTaskJsunit.test.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/RequestJsunit.test.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/entry/src/main/ets/test/Utils.ets

 // @ts-nocheck
 /**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

inputmethod/InputMethodTest_ets/local.properties

-# This file is automatically generated by DevEco Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# For customization when using a Version Control System, please read the header note.
-sdk.dir=C:/Users/lwx1095534/AppData/Local/OpenHarmony/Sdk
-nodejs.dir=D:/DevEco Studio/tools/nodejs
-npm.dir=D:/DevEco Studio/tools/nodejs
\ No newline at end of file

inputmethod/InputMethodTest_ets/package-lock.json

-{
-  "lockfileVersion": 1
-}

request/BUILD.gn

@@ -14,5 +14,5 @@
 import("//build/ohos_var.gni")
 group("request") {
   testonly = true
-  deps = [ "RequestTest_js:ActsMiscservicesRequestJSApiTest" ]
+  deps = [ "RequestTest_ets:ActsRequestETSApiTest" ]
 }

request/RequestTest_js/BUILD.gn → request/RequestTest_ets/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,21 +10,30 @@
 # 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("ActsMiscservicesRequestJSApiTest") {
+import("//build/ohos.gni")
+import("//test/xts/tools/build/suite.gni")
+ohos_js_hap_suite("ActsRequestETSApiTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":request_js_assets",
-    ":request_js_resources",
+    ":request_ets_assets",
+    ":request_ets_resources",
+    ":request_ets_test_assets",
   ]
+  ets2abc = true
+  subsystem_name = "request"
+  part_name = "request"
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsMiscservicesRequestJSApiTest"
+  hap_name = "ActsRequestETSApiTest"
+}
+
+ohos_js_assets("request_ets_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_js_assets("request_js_assets") {
-  source_dir = "./entry/src/main/js/default"
+ohos_js_assets("request_ets_test_assets") {
+  source_dir = "./entry/src/main/ets/TestAbility"
 }
-ohos_resources("request_js_resources") {
+ohos_resources("request_ets_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

request/RequestTest_ets/Test.json

+{
+    "description": "Configuration for MiscservicesRequestJSApiTest js api Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "600000",
+        "bundle-name": "com.acts.requesttest",
+        "package-name": "com.acts.requesttest",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": ["ActsRequestETSApiTest.hap"],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "mkdir -p /data/app/el2/100/base/com.acts.requesttest/haps/entry/cache",
+                "echo \"123456\" > /data/app/el2/100/base/com.acts.requesttest/haps/entry/cache/test.txt"
+            ]
+        }
+    ]
+}
\ No newline at end of file

request/RequestTest_ets/entry/src/main/config.json

+{
+  "app": {
+    "bundleName": "com.acts.requesttest",
+    "vendor": "example",
+    "version": {
+      "code": 1,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 7,
+      "target": 9,
+      "releaseType": "Release"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.acts.requesttest",
+    "name": ".MyApplication",
+    "mainAbility": "com.acts.requesttest.MainAbility",
+    "deviceType": ["phone"],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": true
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      },
+      {
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "TestAbility",
+        "name": ".TestAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:TestAbility_desc",
+        "formsEnabled": false,
+        "label": "$string:TestAbility_label",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      },
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}

request/RequestTest_ets/entry/src/main/ets/MainAbility/app.ets

+// @ts-nocheck
+/**
+ * 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 'hypium/index'
+import testsuite from '../test/List.test'
+
+export default {
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

theme/wallpaper_js/src/main/js/default/app.js → request/RequestTest_ets/entry/src/main/ets/MainAbility/pages/index.ets

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+// @ts-nocheck
+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,11 +13,25 @@
  * 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');
+
+@Entry
+@Component
+struct MyComponent {
+  aboutToAppear() {
+  }
+
+  build() {
+    Flex({
+      direction: FlexDirection.Column,
+      alignItems: ItemAlign.Center,
+      justifyContent: FlexAlign.Center
+    }) {
+      Text('REQUEST ETS TEST')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
     }
-};
+    .width('100%')
+    .height('100%')
+  }
+}
+

request/RequestTest_ets/entry/src/main/ets/TestAbility/app.ets

+// @ts-nocheck
+/**
+ * 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 'hypium/index'
+import testsuite from '../test/List.test'
+
+export default {
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

theme/wallpaper_js/src/main/js/default/pages/index/index.js → request/RequestTest_ets/entry/src/main/ets/TestAbility/pages/index.ets

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+// @ts-nocheck
+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,31 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Core, ExpectExtend} from 'deccjsunit/index'
+import router from '@system.router';
 
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow finish')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-        console.log("test start")
-        require('../../../Test/List.test.js')
-        core.execute()
-        this.title = this.$t('strings.start');
-        console.log("test end")
-    },
-    onReady() {
-    }
-}
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

request/RequestTest_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+// @ts-nocheck
+/**
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+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'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log('onAbilityCreateCallback');
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info('addAbilityMonitorCallback : ' + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    }
+
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun call abilityDelegator.getAppContext')
+        var context = abilityDelegator.getAppContext()
+        console.info('getAppContext : ' + JSON.stringify(context))
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

request/RequestTest_js/entry/src/main/js/Test/List.test.js → request/RequestTest_ets/entry/src/main/ets/test/List.test.ets

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,4 +13,8 @@
  * limitations under the License.
  */
 
-require('./UploadCallbackXTSJsunit.test.js')
+import uploadRequestJsunitTest from './uploadCallbackXTSJsunitTest';
+
+export default function testsuite() {
+  uploadRequestJsunitTest()
+}
\ No newline at end of file

theme/wallpaper_js/src/main/resources/base/element/string.json → request/RequestTest_ets/entry/src/main/resources/base/element/string.json

@@ -5,8 +5,16 @@
       "value": "entry_MainAbility"
     },
     {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
+      "name": "description_mainability",
+      "value": "ETS_Empty Ability"
+    },
+    {
+      "name": "TestAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "TestAbility_label",
+      "value": "label"
     }
   ]
 }
\ No newline at end of file

request/RequestTest_js/Test.json

-{
-	"description": "Configuration for MiscservicesRequestJSApiTest js api Tests",
-	"driver": {
-		"type": "JSUnitTest",
-		"test-timeout": "4200000",
-		"package": "com.example.myapplication.hmservice",
-		"shell-timeout": "60000"
-	},
-	"kits": [
-		{
-			"test-file-name": ["ActsMiscservicesRequestJSApiTest.hap"],
-			"type": "AppInstallKit",
-			"cleanup-apps": true
-		},
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "mkdir -p /data/app/el2/100/base/com.example.myapplication.hmservice/haps/entry/cache",
-                "echo \"123456\" > /data/app/el2/100/base/com.example.myapplication.hmservice/haps/entry/cache/test.txt"
-            ]
-        }
-	]
-}