!8239 【杂散】【输入法】修改inputmethod字段值，挑单到release3.2

Merge pull request !8239 from 张育帅/release

inputmethod/InputMethodEngine/entry/src/main/ets/pages/index/index.ets

@@ -21,8 +21,10 @@ import testsuite from '../../test/List.test'
 @Component
 struct Index {
   @State message: string = 'Hello World';
-  @State inputValue: string = 'inputMethodEngineinputMethodEngineinputMethodEngineinputMethodEngine' +
-  'inputMethodEngineinputMethodEngineinputMethodEngineinputMethodEngineinputMethodEngine';
+  @State inputValue: string = 'inputMethodEngine1inputMethodEngine2inputMethodEngine3inputMethodEngine' +
+  'inputMethodEngine4inputMethodEngine5inputMethodEngine6inputMethodEngine7inputMethodEngine8inputMethodEn' +
+  'gine9inputMethodEngine10inputMethodEngine11inputMethodEngine12inputMethodEngine13inputMethodEngine14inputMet' +
+  'hodEngine15inputMethodEngine16inputMethodEngine17inputMethodEngine18inputMethodEngine19inputMethodEngine20inputMethodEngine21';
 
   build() {
     Row() {
@@ -32,7 +34,6 @@ struct Index {
           .fontWeight(FontWeight.Bold)
           .defaultFocus(true)
         TextArea({ text: this.inputValue })
-          .height(50)
           .onChange((value: string) => {
             this.inputValue = value;
           })

inputmethod/InputMethodEngine/entry/src/main/ets/test/inputMethodAbility.test.ets

@@ -48,9 +48,9 @@ export default function inputMethodAbility() {
       inputServer.id = inputM.methodId;
       console.info("====>beforeAll inputMethodStageJSUnit start");
       let inputDemoService: subtype ={
-        id: 'com.acts.inputmethodengine.test',
-        label: 'inputStageService',
-        name: '',
+        id: 'inputStageService',
+        label: '',
+        name: 'com.acts.inputmethodengine.test',
         mode: 'lower',
         locale: '',
         language: '',

inputmethod/InputMethodEngine/entry/src/main/ets/test/inputMethodEngine.test.ets

@@ -42,9 +42,9 @@ export default function inputMethodEngineJSUnit() {
       inputSever.id = inputM.methodId;
 
       let inputDemoService: subtype = {
-        id: "com.acts.inputmethodengine.test",
-        label: "InputDemoService",
-        name: "",
+        id: "InputDemoService",
+        label: "",
+        name: "com.acts.inputmethodengine.test",
         mode: "lower",
         locale: "",
         language: "",

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

@@ -143,7 +143,7 @@ export default function inputMethodStageJSUnit() {
      * @tc.desc    Function test
      * @tc.level   2
      */
-     
+
     it('inputMethod_test_listInputMethodSubtype_003', 0, async function (done) {
       console.info("====>-----------------inputMethod_test_listInputMethodSubtype_003 start---------------------");
       let inputM = inputMethod.getCurrentInputMethod()
@@ -200,32 +200,32 @@ export default function inputMethodStageJSUnit() {
         extra:{}
       }
 
-    let inputMethodSetting = inputMethod.getSetting();
-    console.info("====>inputMethod_test_listInputMethodSubtype_004 getSetting result:" + inputMethodSetting);
-    inputMethodSetting.listInputMethodSubtype(inputMethodProperty).then((data) => {
-      try{
-        console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype:" + JSON.stringify(data));
-        if(data.length >= 1){
-          let inputMethodSubtype = data[0]
-          console.info("====>inputMethod_test_listInputMethodSubtype_004  inputMethodSubtype" + JSON.stringify(inputMethodSubtype));
-          expect(inputMethodSubtype.id != null).assertTrue();
-          expect(inputMethodSubtype.label != null).assertTrue();
-          done();
-        }else{
-          console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype length less 1");
+      let inputMethodSetting = inputMethod.getSetting();
+      console.info("====>inputMethod_test_listInputMethodSubtype_004 getSetting result:" + inputMethodSetting);
+      inputMethodSetting.listInputMethodSubtype(inputMethodProperty).then((data) => {
+        try{
+          console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype:" + JSON.stringify(data));
+          if(data.length >= 1){
+            let inputMethodSubtype = data[0]
+            console.info("====>inputMethod_test_listInputMethodSubtype_004  inputMethodSubtype" + JSON.stringify(inputMethodSubtype));
+            expect(inputMethodSubtype.id != null).assertTrue();
+            expect(inputMethodSubtype.label != null).assertTrue();
+            done();
+          }else{
+            console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype length less 1");
+            expect().assertFail();
+            done();
+          }
+        }catch(error){
+          console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype catch error" + JSON.stringify(error));
           expect().assertFail();
           done();
         }
-      }catch(error){
-        console.info("====>inputMethod_test_listInputMethodSubtype_004 listInputMethodSubtype catch error" + JSON.stringify(error));
+      }).catch(err => {
+        console.info("====>inputMethod_test_listInputMethodSubtype_004  failed" + JSON.stringify(err));
         expect().assertFail();
         done();
-      }
-    }).catch(err => {
-      console.info("====>inputMethod_test_listInputMethodSubtype_004  failed" + JSON.stringify(err));
-      expect().assertFail();
-      done();
-    });
+      });
       console.info("====>-----------------inputMethod_test_listInputMethodSubtype_004 end---------------------");
     });
 
@@ -335,8 +335,8 @@ export default function inputMethodStageJSUnit() {
       console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_001 getCurrentInputMethodSubtype: " +  JSON.stringify(inputMS));
       let inputMethodSubProperty : subtype = {
         id: inputMS.id,
-        label: inputMS.label,
-        name: "",
+        label: "",
+        name: inputMS.name,
         mode: "lower",
         locale: "",
         language: "",
@@ -387,8 +387,8 @@ export default function inputMethodStageJSUnit() {
       console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_002 getCurrentInputMethodSubtype: " +  JSON.stringify(inputMS));
       let inputMethodSubProperty : subtype = {
         id: inputMS.id,
-        label: inputMS.label,
-        name: "",
+        label: "",
+        name: inputMS.name,
         mode: "lower",
         locale: "",
         language: "",
@@ -427,8 +427,8 @@ export default function inputMethodStageJSUnit() {
       console.info("inputMethod_test_switchCurrentInputMethodSubtype_001 getCurrentInputMethodSubtype: " +  JSON.stringify(inputMS));
       let inputMethodSubProperty : subtype = {
         id: inputMS.id,
-        label: inputMS.label,
-        name: "",
+        label: "",
+        name: inputMS.name,
         mode: "lower",
         locale: "",
         language: "",
@@ -467,8 +467,8 @@ export default function inputMethodStageJSUnit() {
       console.info("inputMethod_test_switchCurrentInputMethodSubtype_002 getCurrentInputMethodSubtype: " +  JSON.stringify(inputMS));
       let inputMethodSubProperty : subtype = {
         id: inputMS.id,
-        label: inputMS.label,
-        name: "",
+        label: "",
+        name: inputMS.name,
         mode: "lower",
         locale: "",
         language: "",
@@ -493,7 +493,6 @@ export default function inputMethodStageJSUnit() {
         done();
       };
       console.info("====>************* inputMethod_test_switchCurrentInputMethodSubtype_002 Test end*************");
-      done();
     });
 
     /*
@@ -608,6 +607,6 @@ export default function inputMethodStageJSUnit() {
         }
       })
     });
-    
+
   });
 };