diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/ButtonJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/ButtonJsunit.test.ets index 54e44d5c5c137687897698585568b07a31ce282d..e2eb114af78dbfde7c358ca82b6e2db1447f1bd1 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/ButtonJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/ButtonJsunit.test.ets @@ -17,6 +17,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from " import router from '@system.router'; import events_emitter from '@ohos.events.emitter' import Utils from './Utils'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; export default function buttonJsunit() { describe('buttonTest', function () { @@ -299,6 +300,9 @@ export default function buttonJsunit() { }); it('testButton12', 0, async function (done) { + let driver = Driver.create(); + let density = await driver.getDisplayDensity(); + console.info("[testButton12] getDisplayDensity is: " + JSON.stringify(density)); await Utils.sleep(1000); var callback = (eventData) => { console.info("[testButton12] get event state result is: " + JSON.stringify(eventData)); @@ -307,10 +311,17 @@ export default function buttonJsunit() { console.info("[testButton12] get event state result is: " + Math.trunc(event.screenY)); console.info("[testButton12] get event state result is: " + Math.trunc(event.screenX)); try { - expect(event.screenX).assertEqual(185) - expect(event.screenY).assertEqual(533) - expect(event.x).assertEqual(100) - expect(event.y).assertEqual(50) + if(density.x == 1080){ + expect(Math.trunc(event.screenX)).assertEqual(185) + expect(Math.trunc(event.screenY)).assertEqual(533) + expect(Math.trunc(event.x)).assertEqual(100) + expect(Math.trunc(event.y)).assertEqual(50) + }else{ + expect(Math.trunc(event.screenX)).assertEqual(185) + expect(Math.trunc(event.screenY)).assertEqual(523) + expect(Math.trunc(event.x)).assertEqual(100) + expect(Math.trunc(event.y)).assertEqual(50) + } } catch (err) { console.info("[testButton12_] expection err : " + JSON.stringify(err)); expect().assertFail(); diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/GridJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/GridJsunit.test.ets index 6eca7be81b1a734d9900117c69d522d94de230f2..546e5e13f3b8c1eb43ee0a9c4462a27243496bf9 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/GridJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/GridJsunit.test.ets @@ -166,7 +166,7 @@ export default function GridJsunit() { let strJson = getInspectorByKey('button'); let obj = JSON.parse(strJson); console.info('[GridJsunit_0400] component obj is: ' + obj.$attrs.content); - expect(obj.$attrs.content).assertEqual('clicked'); + expect(obj.$attrs.label).assertEqual('clicked'); console.info('[GridJsunit_0400] END'); done(); }); @@ -239,10 +239,10 @@ export default function GridJsunit() { await CommonFunc.sleep(1000); let driver = await UiDriver.create() let gridItem1 = CommonFunc.getComponentRect('0'); - let top1 = gridItem1.top - let gridItem2 = CommonFunc.getComponentRect('4'); - let top2 = gridItem2.top - expect(top1).assertEqual(parseInt(top2)); + let left1 = gridItem1.left + let gridItem2 = CommonFunc.getComponentRect('1'); + let left2 = gridItem2.left + expect(parseInt(left1)).assertEqual(parseInt(left2)); console.info('[GridJsunit_0800] END'); done(); });