diff --git a/arkXtest/uitest/src/main/ets/test/uitest.test.ets b/arkXtest/uitest/src/main/ets/test/uitest.test.ets index 998db8cbd1fe63bd4efb00ccec3dd9f5266b50ec..ca4daa284485672271e0aeb1488cb4e3ff2795b4 100644 --- a/arkXtest/uitest/src/main/ets/test/uitest.test.ets +++ b/arkXtest/uitest/src/main/ets/test/uitest.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import abilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; -import { UiComponent, UiDriver, BY, Component, Driver, UiWindow, ON, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix } from '@ohos.uitest' +import { UiComponent, UiDriver, BY, Component, Driver, UiWindow, ON, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix } from '@ohos.UiTest' import ability_featureAbility from '@ohos.ability.featureAbility'; const delegator = abilityDelegatorRegistry.getAbilityDelegator(); @@ -494,7 +494,7 @@ export default function UiTest() { await driver.delayMs(waitUiReadyMs) let Button = await driver.findComponent(ON.text('next page')) let center = await Button.getBoundsCenter() - await driver.click(center.X, center.Y) + await driver.click(center.x, center.y) await driver.delayMs(waitUiReadyMs) let newButton = await driver.findComponent(ON.text('back to index')) let text = await newButton.getText() @@ -514,7 +514,7 @@ export default function UiTest() { await driver.delayMs(waitUiReadyMs) let Button = await driver.findComponent(ON.text('Click twice')) let center = await Button.getBoundsCenter() - await driver.doubleClick(center.X, center.Y) + await driver.doubleClick(center.x, center.y) await driver.delayMs(waitUiReadyMs) let button = await driver.findComponent(ON.text('doubleClick')) let text = await button.getText() @@ -534,7 +534,7 @@ export default function UiTest() { await driver.delayMs(waitUiReadyMs) let Button = await driver.findComponent(ON.text('next page')) let center = await Button.getBoundsCenter() - await driver.longClick(center.X, center.Y) + await driver.longClick(center.x, center.y) await driver.delayMs(waitUiReadyMs) let newButton = await driver.findComponent(ON.text('longClick')) let text = await newButton.getText() @@ -784,7 +784,7 @@ export default function UiTest() { let text = await driver.findComponent(ON.type('TextInput')) let center = await text.getBoundsCenter() await text.inputText('123') - await driver.click(center.X, center.Y) + await driver.click(center.x, center.y) await driver.delayMs(waitUiReadyMs) await driver.triggerCombineKeys(2072, 2017) await driver.delayMs(waitUiReadyMs) @@ -924,7 +924,7 @@ export default function UiTest() { await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility') let driver = Driver.create() await driver.delayMs(waitUiReadyMs) - await driver.fling({X:300, Y:600},{X:300, Y:300}, 20, 600) + await driver.fling({x:300, y:600},{x:300, y:300}, 20, 600) let text = await driver.findComponent(ON.text('next page')) expect(text == null).assertTrue() let scrollBar = await driver.findComponent(ON.type('Scroll')) @@ -1026,28 +1026,28 @@ export default function UiTest() { let bounds1 = await image1.getBounds() let pointer = PointerMatrix.create(2,11) await driver.delayMs(300) - pointer.setPoint(0,0,{X:245,Y:480}) - pointer.setPoint(0,1,{X:250,Y:480}) - pointer.setPoint(0,2,{X:255,Y:480}) - pointer.setPoint(0,3,{X:260,Y:480}) - pointer.setPoint(0,4,{X:265,Y:480}) - pointer.setPoint(0,5,{X:270,Y:480}) - pointer.setPoint(0,6,{X:275,Y:480}) - pointer.setPoint(0,7,{X:280,Y:480}) - pointer.setPoint(0,8,{X:285,Y:480}) - pointer.setPoint(0,9,{X:290,Y:480}) - pointer.setPoint(0,10,{X:295,Y:480}) - pointer.setPoint(1,0,{X:505,Y:480}) - pointer.setPoint(1,1,{X:500,Y:480}) - pointer.setPoint(1,2,{X:495,Y:480}) - pointer.setPoint(1,3,{X:490,Y:480}) - pointer.setPoint(1,4,{X:485,Y:480}) - pointer.setPoint(1,5,{X:480,Y:480}) - pointer.setPoint(1,6,{X:475,Y:480}) - pointer.setPoint(1,7,{X:470,Y:480}) - pointer.setPoint(1,8,{X:465,Y:480}) - pointer.setPoint(1,9,{X:460,Y:480}) - pointer.setPoint(1,10,{X:455,Y:480}) + pointer.setPoint(0,0,{x:245,y:480}) + pointer.setPoint(0,1,{x:250,y:480}) + pointer.setPoint(0,2,{x:255,y:480}) + pointer.setPoint(0,3,{x:260,y:480}) + pointer.setPoint(0,4,{x:265,y:480}) + pointer.setPoint(0,5,{x:270,y:480}) + pointer.setPoint(0,6,{x:275,y:480}) + pointer.setPoint(0,7,{x:280,y:480}) + pointer.setPoint(0,8,{x:285,y:480}) + pointer.setPoint(0,9,{x:290,y:480}) + pointer.setPoint(0,10,{x:295,y:480}) + pointer.setPoint(1,0,{x:505,y:480}) + pointer.setPoint(1,1,{x:500,y:480}) + pointer.setPoint(1,2,{x:495,y:480}) + pointer.setPoint(1,3,{x:490,y:480}) + pointer.setPoint(1,4,{x:485,y:480}) + pointer.setPoint(1,5,{x:480,y:480}) + pointer.setPoint(1,6,{x:475,y:480}) + pointer.setPoint(1,7,{x:470,y:480}) + pointer.setPoint(1,8,{x:465,y:480}) + pointer.setPoint(1,9,{x:460,y:480}) + pointer.setPoint(1,10,{x:455,y:480}) await driver.injectMultiPointerAction(pointer, 600) let image2 = await driver.findComponent(ON.type('Image')) let bounds2= await image2.getBounds() @@ -1343,8 +1343,8 @@ export default function UiTest() { let driver = Driver.create() await driver.delayMs(waitUiReadyMs) let s = await driver.getDisplaySize() - expect(s.X != 0).assertTrue() - expect(s.Y != 0).assertTrue() + expect(s.x != 0).assertTrue() + expect(s.y != 0).assertTrue() await stopApplication('com.uitestScene.acts') }) @@ -1358,8 +1358,8 @@ export default function UiTest() { let driver = Driver.create() await driver.delayMs(waitUiReadyMs) let s = await driver.getDisplayDensity() - expect(s.X != 0).assertTrue() - expect(s.Y != 0).assertTrue() + expect(s.x != 0).assertTrue() + expect(s.y != 0).assertTrue() await stopApplication('com.uitestScene.acts') }) @@ -1501,7 +1501,7 @@ export default function UiTest() { let text2 = await driver.findComponent(ON.text('one')) let point1 = await text1.getBoundsCenter() let point2 = await text2.getBoundsCenter() - await driver.drag(point1.X, point1.Y, point2.X, point2.Y) + await driver.drag(point1.x, point1.y, point2.x, point2.y) await driver.delayMs(waitUiReadyMs) let text = await driver.findComponent(ON.text('four')) expect(text == null).assertTrue() diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/BlankJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/BlankJsunit.test.ets index de80f778d8e19e8fd6b52020d244ab9b5d85d0d1..cb0b63a764be01f3d7312249180f7e8e46ef3518 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/BlankJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/BlankJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/ButtonJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/ButtonJsunit.test.ets index 623f59cb4b9884a493ab97aea5d90d9982f9e2f4..d5b5cfb97f342b5321e0b3f218c1f15e970a05d5 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/ButtonJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/ButtonJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/CheckBoxJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/CheckBoxJsunit.test.ets index 550f2ed6bc77da2e75486a19b00861985ad5a919..6e9b50bd65d896b05c3e1120f18fd64e166b4033 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/CheckBoxJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/CheckBoxJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/checkBoxGroupUIJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/checkBoxGroupUIJsunit.test.ets index 822cb05336ec7031db15b91ae28ecac6643fdd63..7cc9919029c5faa273fbb396165bf56d14692e93 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/checkBoxGroupUIJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/checkBoxGroupUIJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/dataPickerJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/dataPickerJsunit.test.ets index 05b9f7d6a040947d37d58549d20f821731d14537..2e1b63ac34801147a9331c6d99de4434613c3ff9 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/dataPickerJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/dataPickerJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/datelPanelJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/datelPanelJsunit.test.ets index 5cb7b20d9a31e5e60e45c2e3a138e8ba665da42c..99a8bd8d15e137c085d97df818402dbcbaf1639b 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/datelPanelJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/datelPanelJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/dividerJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/dividerJsunit.test.ets index 887471d4da4ff85462b285c1fdf451c663fc29bc..7e1d0392b6b9cb5dedced649fcbcce826ed7317e 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/dividerJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/dividerJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/gaugeJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/gaugeJsunit.test.ets index bce248f5df61363047605d52634f677ef0c87376..b1ac91ae8dd6313901c7f41fcc721bf2189a591c 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/gaugeJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/gaugeJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/loadingProgressJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/loadingProgressJsunit.test.ets index 1cf9c897d6d2f7c967aa0655082cfc27697242bc..c9237a617502945c70b5cf823001be78ae6ff3a4 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/loadingProgressJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/loadingProgressJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000; diff --git a/arkui/ace_ets_component_ui/entry/src/main/ets/test/marqueeJsunit.test.ets b/arkui/ace_ets_component_ui/entry/src/main/ets/test/marqueeJsunit.test.ets index 67a5c08e9796a42139b33c2d2878b1712e79f30c..9074eaacccc580a92b6b93f0bc7ba661dfba88c6 100644 --- a/arkui/ace_ets_component_ui/entry/src/main/ets/test/marqueeJsunit.test.ets +++ b/arkui/ace_ets_component_ui/entry/src/main/ets/test/marqueeJsunit.test.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import router from '@system.router'; -import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.uitest'; +import {UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, WindowMode, PointerMatrix} from '@ohos.UiTest'; import CommonFunc from '../MainAbility/utils/Common'; import {MessageManager,Callback} from '../MainAbility/utils/MessageManager'; const waitUiReadyMs = 1000;