From c365151e3b4294f22d3e2adbeb0a34ae8bd35e34 Mon Sep 17 00:00:00 2001 From: zwx1016320 Date: Wed, 16 Nov 2022 09:56:59 +0000 Subject: [PATCH] fixed 0e0aac7 from https://gitee.com/yu-shuai-zhang/xts_acts/pulls/6524 optimization input API 1 Signed-off-by: zwx1016320 --- .../src/main/ets/test/imeAbilityTest.test.ets | 42 +-- .../main/ets/test/inputMethodStageJSUnit.ets | 277 ++++++++++-------- .../src/main/ets/test/inputMethodJSUnit.ets | 180 +++++++----- .../src/main/ets/test/systemTimer.test.ets | 18 +- 4 files changed, 281 insertions(+), 236 deletions(-) diff --git a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/imeAbilityTest.test.ets b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/imeAbilityTest.test.ets index e3ed8ac0d..cabe2ddf1 100644 --- a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/imeAbilityTest.test.ets +++ b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/imeAbilityTest.test.ets @@ -17,6 +17,13 @@ import inputMethod from '@ohos.inputmethod' export default function imeAbilityTest(abilityContext) { describe('imeAbilityTest', function () { + var prop = { + packageName: '', + methodId: '', + name:'', + id:'', + extra:{} + } /** * sleep function. */ @@ -28,28 +35,26 @@ export default function imeAbilityTest(abilityContext) { /** * beforeEach: Prerequisites at the test case level, which are executed before each test case is executed. */ - beforeEach(function () { - console.info('====>beforeEach: switchInputMethod to kikakeyboard.'); - let serviceAbilityProperty = { - packageName: "com.example.kikakeyboard", - methodId: "ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", - extra:{} - } - - inputMethod.switchInputMethod(serviceAbilityProperty).then((data)=>{ - console.info('====>SUB_InputMethod_IMEAbility_0001 switchInputMethod to Kika :' + data); - expect(data == true).assertTrue(); - }) - + beforeAll(function () { + let inputM = inputMethod.getCurrentInputMethod() + console.info("====>beforeAll: switchInputMethod to: " + JSON.stringify(inputM)); + prop.packageName = inputM.packageName; + prop.methodId = inputM.methodId; + prop.name = inputM.packageName; + prop.id = inputM.methodId; }); /** * afterEach: Test case-level clearance conditions, which are executed after each test case is executed. */ - afterEach(function () { - console.info('====>afterEach: Test case-level clearance conditions is executed.'); + afterAll(async function () { + console.info('====>afterAll: switchInputMethod to origionInput.' + JSON.stringify(prop)); + await inputMethod.switchInputMethod(prop).then((data)=>{ + console.info('====>afterAll switchInputMethod to origionInput :' + data); + expect(data == true).assertTrue(); + }).catch(err =>{ + console.info('====>afterAll switchInputMethod to origionInput error: ' + err); + }) }); /** @@ -75,7 +80,6 @@ export default function imeAbilityTest(abilityContext) { }); sleep(Date.now(), 3000); console.info('====>----------SUB_InputMethod_IMEAbility_0001 end-------------'); - done(); }) @@ -98,7 +102,7 @@ export default function imeAbilityTest(abilityContext) { } inputMethod.switchInputMethod(imExtAbilityProperty).then((data)=>{ - console.info('====>SUB_InputMethod_IMEAbility_0004 switchInputMethod to IME :' + data); + console.info('====>SUB_InputMethod_IMEAbility_0002 switchInputMethod to IME :' + data); expect(data == true).assertTrue(); }); sleep(Date.now(), 2500); diff --git a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/inputMethodStageJSUnit.ets b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/inputMethodStageJSUnit.ets index d0f5a7b96..0829a0ac5 100644 --- a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/inputMethodStageJSUnit.ets +++ b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/test/inputMethodStageJSUnit.ets @@ -54,21 +54,23 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_listInputMethodSubtype_001', 0, async function (done) { console.info("====>-----------------inputMethod_test_listInputMethodSubtype_001 start---------------------"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_listInputMethodSubtype_001 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName:"com.example.kikakeyboard", - methodId:"ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, label: "", icon: "", iconId: 124, extra:{} } - try{ - let inputMethodSetting = inputMethod.getSetting(); - console.info("====>inputMethod_test_listInputMethodSubtype_001 getSetting result:" + inputMethodSetting); - inputMethodSetting.listInputMethodSubtype(inputMethodProperty, (err, data) => { + let inputMethodSetting = inputMethod.getSetting(); + console.info("====>inputMethod_test_listInputMethodSubtype_001 getSetting result:" + inputMethodSetting); + inputMethodSetting.listInputMethodSubtype(inputMethodProperty, (err, data) => { + try { if(err){ console.info("====>inputMethod_test_listInputMethodSubtype_001 failed" + JSON.stringify(err)); expect().assertFail(); @@ -77,12 +79,11 @@ export default function inputMethodStageJSUnit() { console.info("====>inputMethod_test_listInputMethodSubtype_001 listInputMethodSubtype: " + JSON.stringify(data)); expect(true).assertTrue(); done(); - }); - }catch(error){ - console.info("====>inputMethod_test_listInputMethodSubtype_001 listInputMethodSubtype catch error" + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + } catch (error) { + console.info("====>inputMethod_test_listInputMethodSubtype_001 listInputMethodSubtype catch error" + JSON.stringify(error)); + done(); + } + }); console.info("====>-----------------inputMethod_test_listInputMethodSubtype_001 end---------------------"); }); @@ -94,21 +95,23 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_listInputMethodSubtype_002', 0, async function (done) { console.info("====>-----------------inputMethod_test_listInputMethodSubtype_002 start---------------------"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_listInputMethodSubtype_002 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName:"com.example.kikakeyboard", - methodId:"ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, label: "", icon: "", iconId: 124, extra:{} - }; + } - try{ - let inputMethodSetting = inputMethod.getSetting(); - console.info("====>inputMethod_test_listInputMethodSubtype_002 getSetting result:" + inputMethodSetting); - inputMethodSetting.listInputMethodSubtype(inputMethodProperty, (err, data) => { + let inputMethodSetting = inputMethod.getSetting(); + console.info("====>inputMethod_test_listInputMethodSubtype_002 getSetting result:" + inputMethodSetting); + inputMethodSetting.listInputMethodSubtype(inputMethodProperty, (err, data) => { + try { if(err){ console.info("====>inputMethod_test_listInputMethodSubtype_002 failed" + JSON.stringify(err)); expect().assertFail(); @@ -126,12 +129,11 @@ export default function inputMethodStageJSUnit() { expect().assertFail(); done(); }; - }); - }catch(error){ - console.info("====>inputMethod_test_listInputMethodSubtype_002 listInputMethodSubtype catch error" + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + } catch (error) { + console.info("====>inputMethod_test_listInputMethodSubtype_002 listInputMethodSubtype catch error" + JSON.stringify(error)); + done(); + } + }); console.info("====>-----------------inputMethod_test_listInputMethodSubtype_002 end---------------------"); }); @@ -144,11 +146,13 @@ export default function inputMethodStageJSUnit() { it('inputMethod_test_listInputMethodSubtype_003', 0, async function (done) { console.info("====>-----------------inputMethod_test_listInputMethodSubtype_003 start---------------------"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_listInputMethodSubtype_003 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName:"com.example.kikakeyboard", - methodId:"ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, label: "", icon: "", iconId: 124, @@ -183,43 +187,45 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_listInputMethodSubtype_004', 0, async function (done) { console.info("====>-----------------inputMethod_test_listInputMethodSubtype_004 start---------------------"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_listInputMethodSubtype_004 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName:"com.example.kikakeyboard", - methodId:"ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, label: "", icon: "", iconId: 124, extra:{} - }; + } - try{ - let inputMethodSetting = inputMethod.getSetting(); - console.info("====>inputMethod_test_listInputMethodSubtype_004 getSetting result:" + inputMethodSetting); - inputMethodSetting.listInputMethodSubtype(inputMethodProperty).then((data) => { - 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(err => { - console.info("====>inputMethod_test_listInputMethodSubtype_004 failed" + JSON.stringify(err)); + 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(err => { + console.info("====>inputMethod_test_listInputMethodSubtype_004 failed" + JSON.stringify(err)); + expect().assertFail(); + done(); + }); console.info("====>-----------------inputMethod_test_listInputMethodSubtype_004 end---------------------"); }); @@ -231,10 +237,10 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_listCurrentInputMethodSubtype_001', 0, async function (done) { console.info("====>-----------------inputMethod_test_listCurrentInputMethodSubtype_001 start---------------------"); - try{ - let inputMethodSetting = inputMethod.getSetting(); - console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 getSetting result:" + inputMethodSetting); - inputMethodSetting.listCurrentInputMethodSubtype((err, data) => { + let inputMethodSetting = inputMethod.getSetting(); + console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 getSetting result:" + inputMethodSetting); + inputMethodSetting.listCurrentInputMethodSubtype((err, data) => { + try { if(err){ console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 failed" + JSON.stringify(err)); expect().assertFail(); @@ -243,12 +249,11 @@ export default function inputMethodStageJSUnit() { console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 listCurrentInputMethodSubtype: " + JSON.stringify(data)); expect(true).assertTrue(); done(); - }); - }catch(error){ - console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 listCurrentInputMethodSubtype catch error" + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + } catch (error) { + console.info("====>inputMethod_test_listCurrentInputMethodSubtype_001 listCurrentInputMethodSubtype catch error" + JSON.stringify(error)); + done(); + } + }); console.info("====>-----------------inputMethod_test_listCurrentInputMethodSubtype_001 end---------------------"); }); @@ -314,26 +319,34 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_switchCurrentInputMethodAndSubtype_001', 0, async function (done) { console.info("====>************* inputMethod_test_switchCurrentInputMethodAndSubtype_001 Test start*************"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_001 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName: "com.example.kikakeyboard", - methodId: "ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, + label: "", + icon: "", + iconId: 124, extra:{} - }; + } + let inputMS = inputMethod.getCurrentInputMethodSubtype() + console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_001 getCurrentInputMethodSubtype: " + JSON.stringify(inputMS)); let inputMethodSubProperty : subtype = { - id: "com.example.kikakeyboard", - label: "ServiceExtAbility", + id: inputMS.id, + label: inputMS.label, name: "", - mode: "upper", + mode: "lower", locale: "", language: "", icon: "", iconId: 0, extra: {} }; - try { - inputMethod.switchCurrentInputMethodAndSubtype(inputMethodProperty, inputMethodSubProperty, (err,data) => { + + inputMethod.switchCurrentInputMethodAndSubtype(inputMethodProperty, inputMethodSubProperty, (err,data) => { + try { if (err) { console.error('inputMethod_test_switchCurrentInputMethodAndSubtype_001 err: ' + JSON.stringify(err)); expect( err.code == 12800008 ).assertTrue(); @@ -342,12 +355,11 @@ export default function inputMethodStageJSUnit() { console.info("====>inputMethod_test_switchCurrentInputMethodAndSubtype_001 data: " + JSON.stringify(data)); expect(data != null).assertTrue(); done(); - }); - } catch (error) { - console.error('inputMethod_test_switchCurrentInputMethodAndSubtype_001 catch error: ' + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + } catch (error) { + console.error('inputMethod_test_switchCurrentInputMethodAndSubtype_001 catch error: ' + JSON.stringify(error)); + done(); + } + }); console.info("====>************* inputMethod_test_switchCurrentInputMethodAndSubtype_001 Test end*************"); }); @@ -359,16 +371,23 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_switchCurrentInputMethodAndSubtype_002', 0, async function (done) { console.info("====>************* inputMethod_test_switchCurrentInputMethodAndSubtype_002 Test start*************"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_002 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName: "com.example.kikakeyboard", - methodId: "ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", + packageName:inputM.packageName, + methodId:inputM.methodId, + name:inputM.packageName, + id:inputM.methodId, + label: "", + icon: "", + iconId: 124, extra:{} - }; + } + let inputMS = inputMethod.getCurrentInputMethodSubtype() + console.info("inputMethod_test_switchCurrentInputMethodAndSubtype_002 getCurrentInputMethodSubtype: " + JSON.stringify(inputMS)); let inputMethodSubProperty : subtype = { - id: "com.example.kikakeyboard", - label: "ServiceExtAbility", + id: inputMS.id, + label: inputMS.label, name: "", mode: "lower", locale: "", @@ -377,6 +396,7 @@ export default function inputMethodStageJSUnit() { iconId: 0, extra: {} }; + try { inputMethod.switchCurrentInputMethodAndSubtype(inputMethodProperty, inputMethodSubProperty).then((data) => { console.info("====>inputMethod_test_switchCurrentInputMethodAndSubtype_002 data: " + JSON.stringify(data)); @@ -403,19 +423,22 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_switchCurrentInputMethodSubtype_001', 0, async function (done) { console.info("====>************* inputMethod_test_switchCurrentInputMethodSubtype_001 Test start*************"); + let inputMS = inputMethod.getCurrentInputMethodSubtype() + console.info("inputMethod_test_switchCurrentInputMethodSubtype_001 getCurrentInputMethodSubtype: " + JSON.stringify(inputMS)); let inputMethodSubProperty : subtype = { - id: "com.example.kikakeyboard", - label: "ServiceExtAbility", + id: inputMS.id, + label: inputMS.label, name: "", - mode: "upper", + mode: "lower", locale: "", language: "", icon: "", iconId: 0, extra: {} }; - try { - inputMethod.switchCurrentInputMethodSubtype(inputMethodSubProperty, (err,data) => { + + inputMethod.switchCurrentInputMethodSubtype(inputMethodSubProperty, (err,data) => { + try { if (err) { console.error('inputMethod_test_switchCurrentInputMethodSubtype_001 err: ' + JSON.stringify(err)); expect().assertFail(); @@ -424,12 +447,11 @@ export default function inputMethodStageJSUnit() { console.info("====>inputMethod_test_switchCurrentInputMethodSubtype_001 data: " + JSON.stringify(data)); expect(data != null).assertTrue(); done(); - }); - } catch (error) { - console.error('inputMethod_test_switchCurrentInputMethodSubtype_001 catch error: ' + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + } catch (error) { + console.error('inputMethod_test_switchCurrentInputMethodSubtype_001 catch error: ' + JSON.stringify(error)); + done(); + } + }); console.info("====>************* inputMethod_test_switchCurrentInputMethodSubtype_001 Test end*************"); }); @@ -441,9 +463,11 @@ export default function inputMethodStageJSUnit() { */ it('inputMethod_test_switchCurrentInputMethodSubtype_002', 0, async function (done) { console.info("====>************* inputMethod_test_switchCurrentInputMethodSubtype_002 Test start*************"); + let inputMS = inputMethod.getCurrentInputMethodSubtype() + console.info("inputMethod_test_switchCurrentInputMethodSubtype_002 getCurrentInputMethodSubtype: " + JSON.stringify(inputMS)); let inputMethodSubProperty : subtype = { - id: "com.example.kikakeyboard", - label: "ServiceExtAbility", + id: inputMS.id, + label: inputMS.label, name: "", mode: "lower", locale: "", @@ -452,6 +476,7 @@ export default function inputMethodStageJSUnit() { iconId: 0, extra: {} }; + try { inputMethod.switchCurrentInputMethodSubtype(inputMethodSubProperty).then((data) => { console.info("====>inputMethod_test_switchCurrentInputMethodSubtype_002 data: " + JSON.stringify(data)); @@ -480,9 +505,9 @@ export default function inputMethodStageJSUnit() { it('inputMethod_test_showOptionalInputMethods_001', 0, async function (done) { console.info("====>-----------------inputMethod_test_showOptionalInputMethods_001 start---------------------"); let inputMethodSetting = inputMethod.getSetting(); - try{ - console.info("====>inputMethod_test_showOptionalInputMethods_001 result:" + inputMethodSetting); - inputMethodSetting.showOptionalInputMethods((err, data) => { + console.info("====>inputMethod_test_showOptionalInputMethods_001 result:" + inputMethodSetting); + inputMethodSetting.showOptionalInputMethods((err, data) => { + try { if(err){ console.info("====>inputMethod_test_showOptionalInputMethods_001 showOptionalInputMethods faild: " + JSON.stringify(err)); expect().assertFail(); @@ -492,13 +517,12 @@ export default function inputMethodStageJSUnit() { expect(true).assertTrue(); setTimeout(() => { done(); - }, 1000); - }); - }catch(error){ - console.info("====>inputMethod_test_showOptionalInputMethods_001 showOptionalInputMethods catch error: " + JSON.stringify(error)); - expect().assertFail(); - done(); - }; + }, 1500); + } catch (error) { + console.info("====>inputMethod_test_showOptionalInputMethods_001 showOptionalInputMethods catch error: " + JSON.stringify(error)); + done(); + } + }); console.info("====>-----------------inputMethod_test_showOptionalInputMethods_001 end---------------------"); }); @@ -567,21 +591,20 @@ export default function inputMethodStageJSUnit() { console.info("====>-----------------inputMethod_test_stopInputSession_001 start---------------------"); let inputMethodCtrl = inputMethod.getController(); console.debug("inputMethod_test_stopInputSession_001 result: " + typeof inputMethodCtrl); - try{ - inputMethodCtrl.stopInputSession((err)=>{ - if(err){ - console.info("====>inputMethod_test_stopInputSession_001 faild: " + JSON.stringify(err)); - expect(err.code).assertEqual('12800003'); - done(); - }else{ - expect().assertFail(); - done(); - } - }) - }catch(err){ - expect().assertFail(); + inputMethodCtrl.stopInputSession((err)=>{ + try { + if(err){ + console.info("====>inputMethod_test_stopInputSession_001 faild: " + JSON.stringify(err)); + expect(err.code).assertEqual('12800003'); + done(); + }else{ + expect().assertFail(); + done(); + } + } catch (err) { done(); - } + } + }) }); /* diff --git a/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/inputMethodJSUnit.ets b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/inputMethodJSUnit.ets index 2c2c3d815..38c0d9233 100644 --- a/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/inputMethodJSUnit.ets +++ b/inputmethod/InputMethodTest_ets/entry/src/main/ets/test/inputMethodJSUnit.ets @@ -12,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 '@ohos/hypium'; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import inputMethod from '@ohos.inputmethod'; export default function inputMethodJSUnit() { @@ -23,7 +23,7 @@ export default function inputMethodJSUnit() { console.info("====>inputmethoh_test_001 result:" + JSON.stringify(inputMethodSetting)); inputMethodSetting.listInputMethod((arr) => { console.info("====>appInfoTest_input_2 listInputMethod result---" + JSON.stringify(arr)); - expect(1==1).assertTrue(); + expect(1 == 1).assertTrue(); done(); }); }); @@ -32,18 +32,18 @@ export default function inputMethodJSUnit() { let inputMethodSetting = inputMethod.getInputMethodSetting(); console.info("====>inputmethoh_test_002 result:" + JSON.stringify(inputMethodSetting)); inputMethodSetting.listInputMethod().then(inputMethodProperty => { - if (inputMethodProperty.length > 0){ + if (inputMethodProperty.length > 0) { let obj = inputMethodProperty[0] console.info("====>inputmethoh_test_002 listInputMethod obj---" + JSON.stringify(obj)); expect(obj.packageName != null).assertTrue(); expect(obj.methodId != null).assertTrue(); - }else{ + } else { console.info("====>inputmethoh_test_002 listInputMethod is null"); expect().assertFail() } done(); }).catch(err => { - console.info("====>inputmethoh_test_002 listInputMethod is err: " + JSON.stringify(err)); + console.info("====>inputmethoh_test_002 listInputMethod is err: " + JSON.stringify(err)); done(); }); }); @@ -51,10 +51,10 @@ export default function inputMethodJSUnit() { it('inputmethoh_test_003', 0, async function (done) { let inputMethodSetting = inputMethod.getInputMethodSetting(); console.info("====>inputmethoh_test_003 result:" + JSON.stringify(inputMethodSetting)); - setTimeout(()=>{ - try{ - inputMethodSetting.displayOptionalInputMethod((err) => { - if(err){ + setTimeout(() => { + inputMethodSetting.displayOptionalInputMethod((err) => { + try { + if (err) { console.info("====>inputmethoh_test_003 displayOptionalInputMethod err:" + JSON.stringify(err)); expect().assertFail(); done(); @@ -62,19 +62,18 @@ export default function inputMethodJSUnit() { expect(true).assertTrue(); console.info("====>inputmethoh_test_003 displayOptionalInputMethod---"); done(); - }); - }catch(err){ - console.info("====>inputmethoh_test_004 displayOptionalInputMethod throw_err: " + JSON.stringify(err)); - expect().assertFail() - done(); - } - },100) + } catch (err) { + console.info("====>inputmethoh_test_004 displayOptionalInputMethod throw_err: " + JSON.stringify(err)); + done(); + } + }); + }, 500) }); it('inputmethoh_test_004', 0, async function (done) { let inputMethodSetting = inputMethod.getInputMethodSetting(); console.info("====>inputmethoh_test_004 result:" + JSON.stringify(inputMethodSetting)); - setTimeout(()=>{ + setTimeout(() => { inputMethodSetting.displayOptionalInputMethod().then(() => { console.info("====>inputmethoh_test_004 displayOptionalInputMethod is called"); expect(true).assertTrue() @@ -84,7 +83,7 @@ export default function inputMethodJSUnit() { expect().assertFail() done(); }); - },100) + }, 500) }); it('inputmethoh_test_005', 0, async function (done) { @@ -131,24 +130,25 @@ export default function inputMethodJSUnit() { */ it('inputmethod_test_switchInputMethod_001', 0, async function (done) { console.info("====>************* inputmethod_test_switchInputMethod_001 Test start*************"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputmethod_test_switchInputMethod_001 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName: "com.example.kikakeyboard", - methodId: "ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", - extra:{} + packageName: inputM.packageName, + methodId: inputM.methodId, + name: inputM.packageName, + id: inputM.methodId, + extra: {} } inputMethod.switchInputMethod(inputMethodProperty).then(data => { console.info("====>inputmethod_test_switchInputMethod_001 data:" + data) expect(data == true).assertTrue(); - console.info("====>************* inputmethod_test_switchInputMethod_001 Test end*************"); + console.info("====>************* inputmethod_test_switchInputMethod_001 Test end*************"); done(); - }).catch( err=> { + }).catch(err => { console.info("====>inputmethod_test_switchInputMethod_001 err:" + err) expect().assertFail(); done(); - }) - + }); }); /* @@ -159,25 +159,31 @@ export default function inputMethodJSUnit() { */ it('inputmethod_test_switchInputMethod_002', 0, async function (done) { console.info("====>************* inputmethod_test_switchInputMethod_002 Test start*************"); + let inputM = inputMethod.getCurrentInputMethod() + console.info("inputmethod_test_switchInputMethod_002 getCurrentInputMethod: " + JSON.stringify(inputM)); let inputMethodProperty = { - packageName: "com.example.kikakeyboard", - methodId: "ServiceExtAbility", - name:"com.example.kikakeyboard", - id:"ServiceExtAbility", - extra:{} + packageName: inputM.packageName, + methodId: inputM.methodId, + name: inputM.packageName, + id: inputM.methodId, + extra: {} } - inputMethod.switchInputMethod(inputMethodProperty, (err, data)=>{ - if(err){ - console.info("====>inputmethod_test_switchInputMethod_002 error:" + err); - expect().assertFail(); - done(); + inputMethod.switchInputMethod(inputMethodProperty, (err, data) => { + try { + if (err) { + console.info("====>inputmethod_test_switchInputMethod_002 error:" + err); + expect().assertFail(); + done(); + } + console.info("====>inputmethod_test_switchInputMethod_002 data:" + data) + console.info("====>************* inputmethod_test_switchInputMethod_002 Test end*************"); + expect(data == true).assertTrue(); + done(); + } catch (err) { + console.info("====>inputmethod_test_switchInputMethod_002 catch error:" + err); + done(); } - console.info("====>inputmethod_test_switchInputMethod_002 data:" + data) - console.info("====>************* inputmethod_test_switchInputMethod_002 Test end*************"); - expect(data == true).assertTrue(); - done(); }); - }); /* @@ -188,27 +194,27 @@ export default function inputMethodJSUnit() { */ it('inputmethod_test_showSoftKeyboard_001', 0, async function (done) { let inputMethodCtrl = inputMethod.getInputMethodController() - try{ - inputMethodCtrl.showSoftKeyboard((err)=>{ + inputMethodCtrl.showSoftKeyboard((err) => { + try { expect(err.code).assertEqual('12800003') console.info("====>************* inputmethod_test_showSoftKeyboard_001 Test end*************"); done(); - }); - }catch(err){ - expect().assertFail() - done(); - } + } catch (err) { + expect().assertFail() + done(); + } + }); }); /* - * @tc.number inputmethod_test_showSoftKeyboard_001 + * @tc.number inputmethod_test_showSoftKeyboard_002 * @tc.name Test Indicates the input method which will show softboard with Promise. * @tc.desc Function test * @tc.level 2 */ it('inputmethod_test_showSoftKeyboard_002', 0, async function (done) { let inputMethodCtrl = inputMethod.getInputMethodController() - inputMethodCtrl.showSoftKeyboard().then(() =>{ + inputMethodCtrl.showSoftKeyboard().then(() => { expect().assertFail() done(); }).catch((err) => { @@ -220,35 +226,35 @@ export default function inputMethodJSUnit() { }); /* - * @tc.number inputmethod_test_showSoftKeyboard_001 + * @tc.number inputmethod_test_hideSoftKeyboard_001 * @tc.name Test Indicates the input method which will hide softboard with calback. * @tc.desc Function test * @tc.level 2 */ it('inputmethod_test_hideSoftKeyboard_001', 0, async function (done) { let inputMethodCtrl = inputMethod.getInputMethodController() - try{ - inputMethodCtrl.hideSoftKeyboard((err)=>{ - console.info('====>hideSoftKeyboard callbacek failed : ' + JSON.stringify(err)) - expect(err.code).assertEqual('12800003') - console.info("====>************* inputmethod_test_hideSoftKeyboard_001 Test end*************"); - done(); + inputMethodCtrl.hideSoftKeyboard((err) => { + try { + console.info('====>hideSoftKeyboard callbacek failed : ' + JSON.stringify(err)) + expect(err.code).assertEqual('12800003') + console.info("====>************* inputmethod_test_hideSoftKeyboard_001 Test end*************"); + done(); + } catch (err) { + expect().assertFail(); + done(); + } }) - }catch(err){ - expect().assertFail(); - done(); - } }); /* - * @tc.number inputmethod_test_showSoftKeyboard_001 + * @tc.number inputmethod_test_hideSoftKeyboard_002 * @tc.name Test Indicates the input method which will hide softboard with Promise. * @tc.desc Function test * @tc.level 2 */ it('inputmethod_test_hideSoftKeyboard_002', 0, async function (done) { let inputMethodCtrl = inputMethod.getInputMethodController() - inputMethodCtrl.hideSoftKeyboard().then(() =>{ + inputMethodCtrl.hideSoftKeyboard().then(() => { expect().assertFail(); done(); }).catch((err) => { @@ -266,7 +272,7 @@ export default function inputMethodJSUnit() { * @tc.level 2 */ it('inputmethod_test_getCurrentInputMethod_001', 0, async function (done) { - let currentIme = inputMethod.getCurrentInputMethod(); + let currentIme = inputMethod.getCurrentInputMethod(); console.info("====>inputmethod_test_getCurrentInputMethod_001 currentIme---" + JSON.stringify(currentIme)); console.info(currentIme.packageName); console.info(currentIme.methodId); @@ -287,15 +293,21 @@ export default function inputMethodJSUnit() { let inputMethodSetting = inputMethod.getInputMethodSetting(); console.info("====>inputmethod_test_getInputMethods_001 result:" + JSON.stringify(inputMethodSetting)); inputMethodSetting.getInputMethods(true, (err, arr) => { - if (err) { - console.error("inputmethod_test_getInputMethods_001 failed because: " + JSON.stringify(err)); - expect().assertFail(); - done(); - }; - console.info("====>inputmethod_test_getInputMethods_001 listInputMethod result---" + JSON.stringify(arr)); - expect(arr != null).assertTrue(); - console.info("====>************* inputmethod_test_getInputMethods_001 Test end*************"); - done(); + try { + if (err) { + console.error("inputmethod_test_getInputMethods_001 failed because: " + JSON.stringify(err)); + expect().assertFail(); + done(); + } + ; + console.info("====>inputmethod_test_getInputMethods_001 listInputMethod result---" + JSON.stringify(arr)); + expect(arr != null).assertTrue(); + console.info("====>************* inputmethod_test_getInputMethods_001 Test end*************"); + done(); + } catch (err) { + console.error("inputmethod_test_getInputMethods_001 catch error: " + err); + done(); + } }); }); @@ -310,13 +322,19 @@ export default function inputMethodJSUnit() { let inputMethodSetting = inputMethod.getInputMethodSetting(); console.info("====>inputmethod_test_getInputMethods_002 result:" + JSON.stringify(inputMethodSetting)); inputMethodSetting.getInputMethods(false, (err, arr) => { - if (err) { - console.error("inputmethod_test_getInputMethods_002 failed because: " + JSON.stringify(err)); - expect().assertFail(); - }; - console.info("====>inputmethod_test_getInputMethods_002 listInputMethod result---" + JSON.stringify(arr)); - expect(arr != null).assertTrue(); - done(); + try { + if (err) { + console.error("inputmethod_test_getInputMethods_002 failed because: " + JSON.stringify(err)); + expect().assertFail(); + } + ; + console.info("====>inputmethod_test_getInputMethods_002 listInputMethod result---" + JSON.stringify(arr)); + expect(arr != null).assertTrue(); + done(); + } catch (err) { + console.error("inputmethod_test_getInputMethods_002 catch error: " + err); + done(); + } }); }); }); diff --git a/time/timeTest/entry/src/main/ets/test/systemTimer.test.ets b/time/timeTest/entry/src/main/ets/test/systemTimer.test.ets index 6a55866ce..cdd265ac2 100644 --- a/time/timeTest/entry/src/main/ets/test/systemTimer.test.ets +++ b/time/timeTest/entry/src/main/ets/test/systemTimer.test.ets @@ -208,7 +208,7 @@ export default function systemTimerTest() { done(); }); } catch (e) { - console.info('====>SUB_time_systemTimer_createTimer_0002 arv wrong since ' + e); + console.info('====>SUB_time_systemTimer_createTimer_0003 arv wrong since ' + e); expect().assertTrue(); done(); }; @@ -502,35 +502,35 @@ export default function systemTimerTest() { }); /** - * @tc.number SUB_time_systemTimer_createTimer_0002 - * @tc.name SUB_time_systemTimer_createTimer_0002 + * @tc.number SUB_time_systemTimer_createTimerPromise_0001 + * @tc.name SUB_time_systemTimer_createTimerPromise_0001 * @tc.desc Test createTimer() interfaces, type = TIMER_TYPE_REALTIME, repeat = false (Promise) * @tc.size MEDIUM * @tc.type Function * @tc.level Level 0 */ - it('SUB_time_systemTimer_createTimer_0002', 0, async function (done) { - console.info('====>SUB_time_systemTimer_createTimer_0002 start.'); + it('SUB_time_systemTimer_createTimerPromise_0001', 0, async function (done) { + console.info('====>SUB_time_systemTimer_createTimerPromise_0001 start.'); let options = { type: systemTimer.TIMER_TYPE_REALTIME, repeat: false }; try { - console.info('====>SUB_time_systemTimer_createTimer_0002 create timer.'); + console.info('====>SUB_time_systemTimer_createTimerPromise_0001 create timer.'); systemTimer.createTimer(options).then((timerID)=>{ - console.info('====>SUB_time_systemTimer_createTimer_0002 timerID:' + timerID); + console.info('====>SUB_time_systemTimer_createTimerPromise_0001 timerID:' + timerID); expect(Number.isInteger(timerID)).assertTrue(); globalTimerID = timerID; done(); }).catch( error => { // 捕获业务逻辑错误 - console.info('====>SUB_time_systemTimer_createTimer_0002 failed to create timer.'); + console.info('====>SUB_time_systemTimer_createTimerPromise_0001 failed to create timer.'); expect().assertTrue(); done(); }); } catch (err) { // 捕获参数错误 - console.info('====>SUB_time_systemTimer_createTimer_0002 has failed for ' + err); + console.info('====>SUB_time_systemTimer_createTimerPromise_0001 has failed for ' + err); expect().assertTrue(); done(); }; -- GitLab