add input API

Signed-off-by: Nzwx1016320 <zhangyushuai1@huawei-partners.com>

inputmethod/InputMethodTest_Stage/BUILD.gn

@@ -21,7 +21,7 @@ ohos_js_hap_suite("ActsImeAbilityTest") {
     ":IMExtAbility_resources",
   ]
   ets2abc = true
-  certificate_profile = "signature/openharmony_sx.p7b"
+  certificate_profile = "signature/ActInputMethodStageAPITest.p7b"
   hap_name = "ActsImeAbilityTest"
   subsystem_name = "inputmethod"
   part_name = "imf"

inputmethod/InputMethodTest_Stage/entry/src/main/ets/ImExtAbility/ImExtAbility.ets

@@ -71,7 +71,6 @@ export default class ImExtAbility extends inputMethodExtensionAbility {
     }).catch((err) => {
       console.info('startAbility004 terminateSelf fail: ' + JSON.stringify(err));
     })
-
   }
 
   onDestroy() {

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

@@ -13,7 +13,10 @@
  * limitations under the License.
  */
 import imeAbilityTest from './imeAbilityTest.test'
+import inputMethodStageJSUnit from './inputMethodStageJSUnit';
+
 
 export default function testsuite() {
-  imeAbilityTest(globalThis.abilityContext)
+  imeAbilityTest(globalThis.abilityContext);
+  inputMethodStageJSUnit();
 }
\ No newline at end of file

inputmethod/InputMethodTest_Stage/entry/src/main/module.json

@@ -48,6 +48,9 @@
             {
               "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
               "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+            },
+          {
+            "name": "ohos.permission.CONNECT_IME_ABILITY"
           }
         ]
     }

inputmethod/InputMethodTest_ets/BUILD.gn

@@ -23,7 +23,7 @@ ohos_js_hap_suite("ActsInputMethodEtsTest") {
   ets2abc = true
   subsystem_name = "inputmethod"
   part_name = "imf"
-  certificate_profile = "./signature/openharmony_sx.p7b"
+  certificate_profile = "./signature/ActInputMethodEtsAPITest.p7b"
   hap_name = "ActsInputMethodEtsTest"
 }
 ohos_js_assets("inputMethod_ets_assets") {

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

@@ -65,6 +65,11 @@
         "launchType": "standard"
       }
     ],
+    "reqPermissions": [
+      {
+        "name": "ohos.permission.CONNECT_IME_ABILITY"
+      }
+    ],
     "js": [
       {
         "mode": {

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default {

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default {

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

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 import inputMethodEngine from '@ohos.inputmethodengine';
 import Utils from './Utils';
 import router from '@system.router';
@@ -55,11 +54,11 @@ export default function inputMethodEngineJSUnit() {
         console.info("inputMethodEngine beforeEach inputStart:" + JSON.stringify(kbController));
         console.info("inputMethodEngine beforeEach inputStart:" + JSON.stringify(textInputClient));
       });
-      inputMethodEngineObject.off('keyboardShow', (err) => {
-        console.info("inputMethodEngine beforeEach keyboardShow:" + err);
+      inputMethodEngineObject.off('keyboardShow', () => {
+        console.info("inputMethodEngine beforeEach keyboardShow:");
       });
-      inputMethodEngineObject.off('keyboardHide', (err) => {
-        console.info("inputMethodEngine beforeEach keyboardHide:" + err);
+      inputMethodEngineObject.off('keyboardHide', () => {
+        console.info("inputMethodEngine beforeEach keyboardHide:");
       });
       KeyboardDelegate = inputMethodEngine.createKeyboardDelegate();
       KeyboardDelegate.off('keyDown', (keyEvent) => {
@@ -101,11 +100,11 @@ export default function inputMethodEngineJSUnit() {
         textInputClient = textInputClient;
         kbController = kbController;
       });
-      inputMethodEngineObject.on('keyboardShow', (err) => {
-        console.info("inputMethodEngine beforeEach keyboardShow:" + err);
+      inputMethodEngineObject.on('keyboardShow', () => {
+        console.info("inputMethodEngine beforeEach keyboardShow:");
       });
-      inputMethodEngineObject.on('keyboardHide', (err) => {
-        console.info("inputMethodEngine beforeEach keyboardHide:" + err);
+      inputMethodEngineObject.on('keyboardHide', () => {
+        console.info("inputMethodEngine beforeEach keyboardHide:");
       });
       mKeyboardDelegate = inputMethodEngine.createKeyboardDelegate();
       mKeyboardDelegate.on('keyDown', (keyEvent) => {
@@ -337,6 +336,8 @@ export default function inputMethodEngineJSUnit() {
         x: x_value,
         y: y_value,
         type: TouchType.Move,
+        screenX: rect.left + (rect.right - rect.left) / 10,
+        screenY: rect.left + (rect.right - rect.left) / 10,
       }
       console.info('[inputMethodEngine_test_027] testSendTouchEvent ' + sendTouchEvent(point));
       await Utils.sleep(1000)
@@ -489,7 +490,7 @@ export default function inputMethodEngineJSUnit() {
         expect(textInputClient == null).assertEqual(true);
       } else {
         textInputClient.getEditorAttribute(1, (editorAttribute) => {
-          console.info("inputMethodEngine_test_038 getEditorAttribute:" + value);
+          console.info("inputMethodEngine_test_038 getEditorAttribute:" + editorAttribute);
           expect(editorAttribute.inputPattern).assertEqual(1);
           expect(editorAttribute.enterKeyType).assertEqual(1);
         });
@@ -519,7 +520,7 @@ export default function inputMethodEngineJSUnit() {
         expect(kbController == null).assertEqual(true);
       } else {
         kbController.hideKeyboard(() => {
-          console.info("inputMethodEngine_test_040 hideKeyboard:" + value);
+          console.info("inputMethodEngine_test_040 hideKeyboard");
           expect(1 == 1).assertTrue();
         });
       }
@@ -631,5 +632,85 @@ export default function inputMethodEngineJSUnit() {
       done();
     })
 
+    it('inputMethodEngine_test_049', 0, async function (done) {
+      if (kbController == null) {
+        expect(kbController == null).assertEqual(true);
+      } else {
+        kbController.hide(() => {
+          console.info("inputMethodEngine_test_049 hideKeyboard:");
+          expect(1 == 1).assertTrue();
+        });
+      }
+      done();
+    });
+
+    it('inputMethodEngine_test_050', 0, async function (done) {
+      if (kbController == null) {
+        expect(kbController == null).assertEqual(true);
+      } else {
+        let promise = kbController.hide();
+        promise.then(res => {
+          console.info("inputMethodEngine_test_050 hideKeyboard promise result-----" + JSON.stringify(res));
+          expect(1 == 1).assertTrue();
+        }).catch(err => {
+          console.info("inputMethodEngine_test_050 hideKeyboard promise error----" + JSON.stringify(err));
+          expect().assertFail();
+        });
+      }
+      done();
+    });
+
+    /*
+     * @tc.number  inputMethodEngine_test_getInputMethodAbility_001
+     * @tc.name    InputMethodAbility object of the current input method.
+     * @tc.desc    Function test
+     * @tc.level   2
+     */
+    it('inputMethodEngine_test_getInputMethodAbility_001', 0, async function (done) {
+      console.info("-----------------inputMethodEngine_test_getInputMethodAbility_001 start---------------------");
+      try{
+        let inputMethodAbility = inputMethodEngine.getInputMethodAbility();
+        console.info("inputMethodEngine_test_getInputMethodAbility_001 result:" + typeof inputMethodAbility);
+        if(typeof inputMethodAbility == "object" ){
+          console.info("inputMethodEngine_test_getInputMethodAbility_001 getCurrentInputMethodSubtype success");
+          expect(true).assertTrue();
+        }else{
+          console.info("inputMethodEngine_test_getInputMethodAbility_001 getCurrentInputMethodSubtype failed");
+          expect().assertFail();
+        };
+      }catch(error){
+        console.info("inputMethodEngine_test_getInputMethodAbility_001 getCurrentInputMethodSubtype error" + JSON.stringify(error));
+        expect().assertFail();
+      }
+      console.info("-----------------inputMethodEngine_test_getInputMethodAbility_001 end---------------------");
+      done();
+    });
+
+    /*
+     * @tc.number  inputMethodEngine_test_getKeyboardDelegate_001
+     * @tc.name    KeyboardDelegate object of the current input method.
+     * @tc.desc    Function test
+     * @tc.level   2
+     */
+    it('inputMethodEngine_test_getKeyboardDelegate_001', 0, async function (done) {
+      console.info("-----------------inputMethodEngine_test_getKeyboardDelegate_001 start---------------------");
+      try{
+        let inputMethodAbility = inputMethodEngine.getKeyboardDelegate();
+        console.info("inputMethodEngine_test_getKeyboardDelegate_001 result:" + typeof inputMethodAbility);
+        if(typeof inputMethodAbility == "object" ){
+          console.info("inputMethodEngine_test_getKeyboardDelegate_001 getCurrentInputMethodSubtype success");
+          expect(true).assertTrue();
+        }else{
+          console.info("inputMethodEngine_test_getKeyboardDelegate_001 getCurrentInputMethodSubtype failed");
+          expect().assertFail();
+        };
+      }catch(error){
+        console.info("inputMethodEngine_test_getKeyboardDelegate_001 getCurrentInputMethodSubtype error" + JSON.stringify(error));
+        expect().assertFail();
+      }
+      console.info("-----------------inputMethodEngine_test_getKeyboardDelegate_001 end---------------------");
+      done();
+    });
+
   })
 }

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

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'hypium/index';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
 import inputMethod from '@ohos.inputmethod';
 
 export default function inputMethodJSUnit() {
@@ -161,7 +160,7 @@ export default function inputMethodJSUnit() {
      */
     it('inputmethod_test_showSoftKeyboard_001', 0, async function (done) {
       let inputMethodCtrl = inputMethod.getInputMethodController()
-      inputMethodCtrl.showSoftKeyboard((data)=>{
+      inputMethodCtrl.showSoftKeyboard((err, data)=>{
         if(data == undefined){
           console.info("showSoftKeyboard callbace success" );
           expect(true).assertTrue();
@@ -201,7 +200,7 @@ export default function inputMethodJSUnit() {
      */
     it('inputmethod_test_hideSoftKeyboard_001', 0, async function (done) {
       let inputMethodCtrl = inputMethod.getInputMethodController()
-      inputMethodCtrl.hideSoftKeyboard((data)=>{
+      inputMethodCtrl.hideSoftKeyboard((err, data)=>{
         if(data == undefined){
           console.info("hideSoftKeyboard callbace success" );
           expect(true).assertTrue();
@@ -251,45 +250,47 @@ export default function inputMethodJSUnit() {
     });
 
     /*
-     * @tc.number  inputmethod_test_listInputMethod_001
+     * @tc.number  inputmethod_test_getInputMethods_001
      * @tc.name    param enable :
      *             if true, collect enabled input methods.
      * @tc.desc    Function test
      * @tc.level   2
      */
-    it('inputmethod_test_listInputMethod_001', 0, async function (done) {
+    it('inputmethod_test_getInputMethods_001', 0, async function (done) {
       let inputMethodSetting = inputMethod.getInputMethodSetting();
-      console.info("inputmethod_test_listInputMethod_001 result:" + JSON.stringify(inputMethodSetting));
-      inputMethodSetting.listInputMethod(true, (err, arr) => {
+      console.info("inputmethod_test_getInputMethods_001 result:" + JSON.stringify(inputMethodSetting));
+      inputMethodSetting.getInputMethods(true, (err, arr) => {
         if (err) {
-          console.error("inputmethod_test_listInputMethod_001 failed because: " + JSON.stringify(err));
+          console.error("inputmethod_test_getInputMethods_001 failed because: " + JSON.stringify(err));
           expect().assertFail();
         };
-        console.info("inputmethod_test_listInputMethod_001 listInputMethod result---" + JSON.stringify(arr));
+        console.info("inputmethod_test_getInputMethods_001 listInputMethod result---" + JSON.stringify(arr));
         expect(arr != null).assertTrue();
       });
       done();
     });
 
     /*
-     * @tc.number  inputmethod_test_listInputMethod_002
+     * @tc.number  inputmethod_test_getInputMethods_002
      * @tc.name    param enable :
      *             if false, collect disabled input methods.
      * @tc.desc    Function test
      * @tc.level   2
      */
-    it('inputmethod_test_listInputMethod_002', 0, async function (done) {
+    it('inputmethod_test_getInputMethods_002', 0, async function (done) {
       let inputMethodSetting = inputMethod.getInputMethodSetting();
-      console.info("inputmethod_test_listInputMethod_002 result:" + JSON.stringify(inputMethodSetting));
-      inputMethodSetting.listInputMethod(false, (err, arr) => {
+      console.info("inputmethod_test_getInputMethods_002 result:" + JSON.stringify(inputMethodSetting));
+      inputMethodSetting.getInputMethods(false, (err, arr) => {
         if (err) {
-          console.error("inputmethod_test_listInputMethod_002 failed because: " + JSON.stringify(err));
+          console.error("inputmethod_test_getInputMethods_002 failed because: " + JSON.stringify(err));
           expect().assertFail();
         };
-        console.info("inputmethod_test_listInputMethod_002 listInputMethod result---" + JSON.stringify(arr));
+        console.info("inputmethod_test_getInputMethods_002 listInputMethod result---" + JSON.stringify(arr));
         expect(arr != null).assertTrue();
       });
       done();
     });
-  })
-}
+
+
+  });
+};

theme/wallpaper_ets/Test.json

@@ -18,10 +18,11 @@
         {
             "type": "PushKit",
             "pre-push": [
-                "mount -o rw,remount /"
+                "mount -o rw,remount /",
+                "mkdir -p /data/app/el2/100/base/com.acts.theme.wallpapertest/haps"
             ],
             "push": [
-                "wp.png ->/system/etc/wp.png"
+                "./resource./wallpaper/wp.png ->/data/app/el2/100/base/com.acts.theme.wallpapertest/haps/wp.png"
             ]
         }
     ]

theme/wallpaper_ets/entry/src/main/ets/test/wallpaperTest.ets

@@ -14,12 +14,12 @@
  */
 import wallpaper from '@ohos.wallpaper';
 import image from '@ohos.multimedia.image';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 const WALLPAPER_SYSTEM = 0;
 const WALLPAPER_LOCKSCREEN = 1;
-let imageSourceSystem = '/system/etc/wp.png';
-let imageSourceLockscreen = '/system/etc/wp.png';
+let imageSourceSystem = '/data/storage/el2/base/haps/wp.png';
+let imageSourceLockscreen = '/data/storage/el2/base/haps/wp.png';
 
 export default function wallpaperJSUnit() {
     describe('WallpaperJsunitTest', function () {
@@ -1050,7 +1050,7 @@ export default function wallpaperJSUnit() {
         */
         it('testSetImageCallBack101', 0, async function (done) {
             console.info('------------------testSetImageCallBack101 start----------------------');
-            let wallpaperPath = "/system/etc/wp.png";
+            let wallpaperPath = "/data/storage/el2/base/haps/wp.png";
             try{
                 wallpaper.setImage(wallpaperPath, wallpaper.WallpaperType.WALLPAPER_SYSTEM, (error, data) => {
                     if (error) {
@@ -1078,7 +1078,7 @@ export default function wallpaperJSUnit() {
         */
         it('testSetImageCallBack102', 0, async function (done) {
             console.info('------------------testSetImageCallBack102 start----------------------');
-            let wallpaperPath = "/system/etc/wp.png";
+            let wallpaperPath = "/data/storage/el2/base/haps/wp.png";
             try{
                 wallpaper.setImage(wallpaperPath, wallpaper.WallpaperType.WALLPAPER_LOCKSCREEN, (error, data) => {
                     if (error) {
@@ -1147,7 +1147,7 @@ export default function wallpaperJSUnit() {
         */
         it('testSetImagePromise101', 0, async function (done) {
             console.info('------------------testSetImagePromise101 start----------------------');
-            let wallpaperPath = "/system/etc/wp.png";
+            let wallpaperPath = "/data/storage/el2/base/haps/wp.png";
             try{
                 wallpaper.setImage(wallpaperPath, wallpaper.WallpaperType.WALLPAPER_SYSTEM).then((data) => {
                     console.log(`testSetImagePromise101 success to setImage.`);
@@ -1174,7 +1174,7 @@ export default function wallpaperJSUnit() {
         */
         it('testSetImagePromise102', 0, async function (done) {
             console.info('------------------testSetImagePromise102 start----------------------');
-            let wallpaperPath = "/system/etc/wp.png";
+            let wallpaperPath = "/data/storage/el2/base/haps/wp.png";
             try{
                 wallpaper.setImage(wallpaperPath, wallpaper.WallpaperType.WALLPAPER_LOCKSCREEN).then((data) => {
                     console.log(`testSetImagePromise102 success to setImage.`);