!8603 【ACE子系统】修改Three和UI测试套测试用例

Merge pull request !8603 from 王旭鹏/master

arkui/ace_ets_component_three/entry/src/main/ets/test/TabsJsunit.test.ets

@@ -300,6 +300,7 @@ export default function tabsJsunit() {
       console.info("testTabs_1400 click result is: " + JSON.stringify(sendEventByKey('tabContent1', 10, "")));
       await Utils.sleep(1000);
       console.info('testTabs_1400 END');
+      done();
     });
   })
 }
\ No newline at end of file

arkui/ace_ets_component_ui/entry/src/main/ets/test/BlankJsunit.test.ets

@@ -88,7 +88,7 @@ export default function blankJsunit() {
       let obj = JSON.parse(strJson);
       console.info("[blankJsunit_0300'] component obj is: " + obj.$attrs.min);
       // return not the default value to confirm ?
-      expect(obj.$attrs.min).assertEqual('0.00px');
+      expect(obj.$attrs.min).assertEqual('0.00vp');
       done();
     });
 
@@ -162,7 +162,7 @@ export default function blankJsunit() {
       let strJson2 = getInspectorByKey('bl2');
       let obj2 = JSON.parse(strJson2);
       console.info("[blankJsunit_0300'] component obj2 is: " + JSON.stringify(obj2));
-      expect(obj2.$attrs.min).assertEqual('0.00px');
+      expect(obj2.$attrs.min).assertEqual('0.00vp');
       done();
 
     });

arkui/ace_ets_component_ui/entry/src/main/ets/test/SearchJsunit.test.ets

@@ -134,18 +134,20 @@ export default function SearchJsunit() {
       let textComponent1 = await driver.findComponent(BY.key('search'));
       await textComponent1.inputText("hello")
       await CommonFunc.sleep(1000);
-      let change = await driver.findComponent(BY.key('change'));
-      let text1 = await change.getText();
-      expect(text1).assertEqual('onChange:hello');
+      let strJson1 = getInspectorByKey('change');
+      let obj1 = JSON.parse(strJson1);
+      console.info("[SearchJsunit_0300] obj1: " + JSON.stringify(obj1));
+      expect(obj1.$attrs.content).assertEqual('onChange:hello');
       await CommonFunc.sleep(1000);
 
       // Verify the onSubmit function of the Search component
       let textComponent2 = await driver.findComponent(BY.text('CLICK_SEARCH'));
       await textComponent2.click()
       await CommonFunc.sleep(1000);
-      let submit = await driver.findComponent(BY.key('submit'));
-      let text2 = await submit.getText();
-      expect(text2).assertEqual('onSubmit:hello');
+      let strJson2 = getInspectorByKey('submit');
+      let obj2 = JSON.parse(strJson2);
+      console.info("[SearchJsunit_0300] obj2: " + JSON.stringify(obj2));
+      expect(obj2.$attrs.content).assertEqual('onSubmit:hello');
 
       // Verify the onCopy function of the Search component
       await textComponent1.longClick()
@@ -154,9 +156,11 @@ export default function SearchJsunit() {
       await textComponent3.click()
       let textComponent4 = await driver.findComponent(BY.text('复制'));
       await textComponent4.click()
-      let copy = await driver.findComponent(BY.key('copy'));
-      let text3 = await copy.getText();
-      expect(text3).assertEqual('onCopy:hello');
+      await CommonFunc.sleep(1000);
+      let strJson3 = getInspectorByKey('copy');
+      let obj3 = JSON.parse(strJson3);
+      console.info("[SearchJsunit_0300] obj3: " + JSON.stringify(obj3));
+      expect(obj3.$attrs.content).assertEqual('onCopy:hello');
 
       // Verify the onCut function of the Search component
       await textComponent1.longClick()
@@ -165,25 +169,29 @@ export default function SearchJsunit() {
       await textComponent5.click()
       let textComponent6 = await driver.findComponent(BY.text('剪切'));
       await textComponent6.click()
-      let cut = await driver.findComponent(BY.key('cut'));
-      let text4 = await cut.getText();
-      expect(text4).assertEqual('onCut:hello');
+      await CommonFunc.sleep(1000);
+      let strJson4 = getInspectorByKey('cut');
+      let obj4 = JSON.parse(strJson4);
+      console.info("[SearchJsunit_0300] obj4: " + JSON.stringify(obj4));
+      expect(obj4.$attrs.content).assertEqual('onCut:hello');
 
       // Verify the onPaste function of the Search component
       await textComponent1.longClick()
       await CommonFunc.sleep(1000);
       let textComponent8 = await driver.findComponent(BY.text('粘贴'));
       await textComponent8.click()
-      let paste = await driver.findComponent(BY.key('paste'));
-      let text5 = await paste.getText();
-      expect(text5).assertEqual('onPaste:hello');
+      await CommonFunc.sleep(1000);
+      let strJson5 = getInspectorByKey('paste');
+      let obj5 = JSON.parse(strJson5);
+      console.info("[SearchJsunit_0300] obj5: " + JSON.stringify(obj5));
+      expect(obj5.$attrs.content).assertEqual('onPaste:hello');
 
       // Verify the caretPosition function of the Search component
       let textComponent7 = await driver.findComponent(BY.key('button'));
       await textComponent7.click();
       await CommonFunc.sleep(1000);
-      let text6 = await textComponent7.getText();
-      expect(text6).assertEqual('Set caretPosition 2');
+      let text = await textComponent7.getText();
+      expect(text).assertEqual('Set caretPosition 2');
       console.info('[SearchJsunit_0300] END');
       done();
     });
@@ -227,7 +235,7 @@ export default function SearchJsunit() {
       expect(obj.$attrs.icon).assertEqual('resource:///ohos_search.svg');
       expect(obj.$attrs.searchButton).assertEqual('CLICK_SEARCH');
       expect(obj.$attrs.placeholderColor).assertEqual('#FF00000A');
-      expect(obj.$attrs.value).assertEqual('hello');
+      expect(obj.$attrs.value).assertEqual('');
       expect(obj.$attrs.placeholderFont).assertEqual('{"style":"FontStyle.Normal","size":"14.00fp","weight":"400","fontFamily":"sans-serif"}');
       expect(obj.$attrs.textFont).assertEqual('{"fontSize":"14.00fp","fontStyle":"FontStyle.Normal","fontWeight":"400","fontFamily":"HarmonyOS Sans"}');
       expect(obj.$attrs.textAlign).assertEqual('TextAlign.Start');

arkui/ace_ets_component_ui/entry/src/main/ets/test/SelectJsunit.test.ets

@@ -71,11 +71,10 @@ export default function SelectJsunit() {
       expect(obj.$attrs.optionFont).assertEqual('{"size":"16.00fp","weight":"400","family":"","style":"FontStyle.Normal"}');
       expect(obj.$attrs.optionFontColor).assertEqual('#FFFF0000');
       await CommonFunc.sleep(1000);
-      let driver = await UiDriver.create()
-      let textComponent = await driver.findComponent(BY.key('indexValue'));
-      let text = await textComponent.getText();
-      console.info("[SelectJsunit_0100] indexValue: " + JSON.stringify(text));
-      expect(text).assertEqual('indexValue:0');
+      let strJson1 = getInspectorByKey('indexValue');
+      let obj1 = JSON.parse(strJson1);
+      console.info("[SelectJsunit_0300] component obj1 is: " + JSON.stringify(obj1));
+      expect(obj1.$attrs.content).assertEqual('indexValue:0');
       console.info('[SelectJsunit_0100] END');
       done();
     });
@@ -132,16 +131,16 @@ export default function SelectJsunit() {
       let textComponent1 = await driver.findComponent(BY.key('select'));
       await textComponent1.click()
       await CommonFunc.sleep(1000);
-      let textMenuComponent = await driver.findComponent(BY.text('bbb'));
-      let textMenu = await textMenuComponent.getText();
-      expect(textMenu).assertEqual('bbb');
 
       // Verify the onSelect function of the select component
+      let textMenuComponent = await driver.findComponent(BY.text('bbb'));
       await textMenuComponent.click()
       await CommonFunc.sleep(1000);
-      let textComponent2 = await driver.findComponent(BY.key('indexValue'));
-      let text = await textComponent2.getText();
-      expect(text).assertEqual('indexValue:1');
+      let strJson1 = getInspectorByKey('indexValue');
+      let obj1 = JSON.parse(strJson1);
+      console.info("[SelectJsunit_0300] component obj1 is: " + JSON.stringify(obj1));
+      expect(obj1.$attrs.content).assertEqual('indexValue:1');
+
       let strJson = getInspectorByKey('select');
       let obj = JSON.parse(strJson);
       console.info("[SelectJsunit_0300] component obj is: " + JSON.stringify(obj));
@@ -196,10 +195,10 @@ export default function SelectJsunit() {
       expect(obj.$attrs.optionFont).assertEqual('{"size":"16.00fp","weight":"400","family":"","style":"FontStyle.Normal"}');
       expect(obj.$attrs.optionFontColor).assertEqual('#FFFFFF00');
       await CommonFunc.sleep(1000);
-      let driver = await UiDriver.create()
-      let textComponent = await driver.findComponent(BY.key('indexValue'));
-      let text = await textComponent.getText();
-      expect(text).assertEqual('indexValue:1');
+      let strJson1 = getInspectorByKey('indexValue');
+      let obj1 = JSON.parse(strJson1);
+      console.info("[SelectJsunit_0400] component obj1 is: " + JSON.stringify(obj1));
+      expect(obj1.$attrs.content).assertEqual('indexValue:1');
       console.info('[SelectJsunit_0400] END');
       done();
     });

arkui/ace_ets_component_ui/entry/src/main/ets/test/TextPickerJsunit.test.ets

@@ -101,15 +101,15 @@ export default function TextPickerJsunit() {
     it('TextPickerJsunit_0300', 0, async function (done) {
       // Verify the functions of TextPicker component
       console.info('[TextPickerJsunit_0300] START');
-      let bottomComponent = CommonFunc.getComponentRect('textPicker');
-      let bottom = bottomComponent.bottom
-      let rightComponent = CommonFunc.getComponentRect('textPicker');
-      let right = rightComponent.right
+      let component = CommonFunc.getComponentRect('textPicker');
+      let bottom = component.bottom
+      let right = component.right
       console.info("[TextPickerJsunit_0300] bottom: " + JSON.stringify(bottom));
       console.info("[TextPickerJsunit_0300] right: " + JSON.stringify(right));
       await CommonFunc.sleep(1000);
       let driver = await UiDriver.create()
       await driver.swipe(Math.round(right / 2), Math.round(bottom * 2 / 3), Math.round(right / 2), Math.round(bottom / 3));
+      await CommonFunc.sleep(1000);
       let strJson = getInspectorByKey('textContent1');
       let obj = JSON.parse(strJson);
       console.info("[TextPickerJsunit_0300] obj: " + JSON.stringify(obj));
@@ -141,7 +141,7 @@ export default function TextPickerJsunit() {
       expect(obj.$attrs.range).assertEqual('["icon:,text:banana1","icon:,text:orange2","icon:,text:peach3","icon:,text:grape4"]');
       expect(obj.$attrs.selected).assertEqual('1');
       //expect(obj.$attrs.value).assertEqual('');
-      expect(obj.$attrs.defaultPickerItemHeight).assertEqual('25.00fp');
+      expect(obj.$attrs.defaultPickerItemHeight).assertEqual('0.00fp');
       console.info('[TextPickerJsunit_0400] END');
       done();
     });

arkui/ace_ets_component_ui/entry/src/main/ets/test/ToggleJsunit.test.ets

@@ -190,7 +190,7 @@ export default function ToggleJsunit() {
       console.info("[ToggleJsunit_0600] isOn: " + JSON.stringify(obj.$attrs.isOn));
       console.info("[ToggleJsunit_0600] selectedColor: " + JSON.stringify(obj.$attrs.selectedColor));
       await CommonFunc.sleep(1000);
-      expect(obj.$attrs.type).assertEqual('ButtonType.Capsule');
+      expect(obj.$attrs.type).assertEqual('ToggleType.Switch');
       expect(obj.$attrs.isOn).assertEqual('false');
       expect(obj.$attrs.selectedColor).assertEqual('#FF00007B');
       let strJson1 = getInspectorByKey('toggleSwitch');

arkui/ace_ets_component_ui/entry/src/main/ets/test/marqueeJsunit.test.ets

@@ -52,7 +52,7 @@ export default function marqueeJsunit() {
        // to confirm allowScale
        console.info('marqueeJsunit_0100 component obj is: ' + obj.$attrs.allowScale);
        expect(obj.$attrs.start).assertEqual('false');
-       expect(obj.$attrs.step).assertEqual('50.000000');
+       expect(parseInt(obj.$attrs.step)).assertEqual(vp2px(50));
        expect(obj.$attrs.loop).assertEqual('2');
        expect(obj.$attrs.fromStart).assertEqual('true');
        expect(obj.$attrs.src).assertEqual('Running Marquee starts rolling');
@@ -107,7 +107,7 @@ export default function marqueeJsunit() {
       // check the value of changed attribute
       let strJson = getInspectorByKey('marquee');
       let obj = JSON.parse(strJson);
-      expect(obj.$attrs.loop).assertEqual('-30');
+      expect(obj.$attrs.loop).assertEqual('-1');
       done();
    });
    
@@ -119,7 +119,7 @@ export default function marqueeJsunit() {
       // check the value of changed parameter
       let strJson = getInspectorByKey('marquee');
       let obj = JSON.parse(strJson);
-      expect(obj.$attrs.step).assertEqual('50.000000');
+      expect(parseInt(obj.$attrs.step)).assertEqual(vp2px(50));
       done();   
     });    
     
@@ -131,7 +131,7 @@ export default function marqueeJsunit() {
       let strJson = getInspectorByKey('marquee');
       let obj = JSON.parse(strJson);
       // to confirm
-      expect(obj.$attrs.step).assertEqual('-30.000000');
+      expect(parseInt(obj.$attrs.step)).assertEqual(vp2px(6));
       done();
    });
   

arkui/ace_ets_component_ui/entry/src/main/ets/test/textAreaJsunit.test.ets

@@ -158,10 +158,11 @@ export default function textAreaJsunit() {
   
    it('textAreaJsunit_0800', 0, async function (done) {
       console.info('textAreaJsunit_0800 START');
-      globalThis.value.message.notify({name:'placeholder',value:''})
-      await CommonFunc.sleep(2000);
-      // test the change event
+      globalThis.value.message.notify({name:'text',value:''})
+      await CommonFunc.sleep(1000);
       let driver = UiDriver.create();
+      await CommonFunc.sleep(1000);
+      // test the change event
       let text = await driver.findComponent(BY.key('textArea'));
       await text.inputText('123');
       await CommonFunc.sleep(2000);
@@ -205,7 +206,7 @@ export default function textAreaJsunit() {
     });
 
     it('textAreaJsunit_1000', 0, async function (done) {
-      console.info('marqueeJsunit_0900 START');
+      console.info('textAreaJsunit_1000 START');
       await CommonFunc.sleep(1000);
       // test the cut event
       let driver = UiDriver.create();