From 280d52ae30d5fdff3b09003c290a2f345d048ef8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 Jul 2022 14:20:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0.=20Signed-off-by:=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Your Name --- .../extend/systemplugin/napi/ohos_uitest.js | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index c0be4ccd..550bd76e 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -165,7 +165,7 @@ const UiDriverClass = class UiDriverMock { this.screenCap = function(...args) { console.warn('uitest.UiDriver.screenCap' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.assertComponentExist = function(...args) { @@ -260,49 +260,49 @@ const UiComponentClass = class UiComponentMock { this.isEnabled = function(...args) { console.warn('uitest.UiComponent.isEnabled' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isFocused = function(...args) { console.warn('uitest.UiComponent.isFocused' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isSelected = function(...args) { console.warn('uitest.UiComponent.isSelected' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isClickable = function(...args) { console.warn('uitest.UiComponent.isClickable' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isLongClickable = function(...args) { console.warn('uitest.UiComponent.isLongClickable' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isScrollable = function(...args) { console.warn('uitest.UiComponent.isScrollable' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isCheckable = function(...args) { console.warn('uitest.UiComponent.isCheckable' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isChecked = function(...args) { console.warn('uitest.UiComponent.isChecked' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.getBounds = function(...args) { @@ -416,61 +416,61 @@ const UiWindowClass = class UiWindowMock { this.isFocused = function(...args) { console.warn('uitest.UiWindow.isFocused' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.isActived = function(...args) { console.warn('uitest.UiWindow.isActived' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.focus = function(...args) { console.warn('uitest.UiWindow.focus' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.moveTo = function(...args) { console.warn('uitest.UiWindow.moveTo' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.resize = function(...args) { console.warn('uitest.UiWindow.resize' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.split = function(...args) { console.warn('uitest.UiWindow.split' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.maximize = function(...args) { console.warn('uitest.UiWindow.maximize' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.resume = function(...args) { console.warn('uitest.UiWindow.resume' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.minimize = function(...args) { console.warn('uitest.UiWindow.minimize' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; this.close = function(...args) { console.warn('uitest.UiWindow.close' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBoolMock) + resolve(paramMock.paramBooleanMock) }); }; }; -- Gitee From 138e703f942ce3637891685a7249544fc9d16f80 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 25 Jul 2022 09:37:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9.=20Signed-off-by:=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Your Name --- runtime/main/extend/systemplugin/napi/ohos_uitest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 550bd76e..b7f72f9b 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -473,7 +473,7 @@ const UiWindowClass = class UiWindowMock { resolve(paramMock.paramBooleanMock) }); }; - }; + } } export function mockUiTest() { -- Gitee From a84770b70cf73efd8a4f070a97c91a6181fe003c Mon Sep 17 00:00:00 2001 From: Flowers Dance Date: Sat, 13 Aug 2022 11:03:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0.=20Signed-off-by:=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flowers Dance --- .../extend/systemplugin/napi/ohos_uitest.js | 92 ++++++++++++++++++- 1 file changed, 87 insertions(+), 5 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index b7f72f9b..ab7d65b0 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -44,6 +44,13 @@ export const WindowMode = { FLOATING: 3 } +export const DisplayRotation = { + ROTATION_0: 0, + ROTATION_90: 90, + ROTATION_180: 180, + ROTATION_270: 270 +} + export const Point = { X: '[PC Preview] unknown X', Y: '[PC Preview] unknown Y' @@ -98,10 +105,6 @@ const ByClass = class ByMock { console.warn('uitest.By.clickable' + warnMessage) return new ByClass() }; - this.enabled = function(...args) { - console.warn('uitest.By.enabled' + warnMessage) - return new ByClass() - }; this.longClickable = function(...args) { console.warn('uitest.By.longClickable' + warnMessage) return new ByClass() @@ -222,6 +225,66 @@ const UiDriverClass = class UiDriverMock { resolve() }); }; + this.setDisplayRotation = function(...args) { + console.warn('uitest.UiDriver.setDisplayRotation' + warnMessage) + return new Promise((resolve) => { + resolve() + }); + }; + this.getDisplayRotation = function(...args) { + console.warn('uitest.UiDriver.getDisplayRotation' + warnMessage) + return new Promise((resolve) => { + resolve(paramMock.paramNumberMock) + }); + }; + this.setDisplayRotationEnabled = function(...args) { + console.warn('uitest.UiDriver.setDisplayRotationEnabled' + warnMessage) + return new Promise((resolve) => { + resolve(paramMock.paramBooleanMock) + }); + }; + this.getDisplaySize = function(...args) { + console.warn('uitest.UiDriver.getDisplaySize' + warnMessage) + return new Promise((resolve) => { + resolve(Point) + }); + }; + this.getDisplayDensity = function(...args) { + console.warn('uitest.UiDriver.getDisplayDensity' + warnMessage) + return new Promise((resolve) => { + resolve(Point) + }); + }; + this.wakeUpDisplay = function(...args) { + console.warn('uitest.UiDriver.wakeUpDisplay' + warnMessage) + return new Promise((resolve) => { + resolve() + }); + }; + this.pressHome = function(...args) { + console.warn('uitest.UiDriver.pressHome' + warnMessage) + return new Promise((resolve) => { + resolve() + }); + }; + this.waitForIdle = function(...args) { + console.warn('uitest.UiDriver.waitForIdle' + warnMessage) + return new Promise((resolve) => { + resolve(paramMock.paramBooleanMock) + }); + }; + this.fling = function(...args) { + console.warn('uitest.UiDriver.fling' + warnMessage) + return new Promise((resolve) => { + resolve() + }); + }; + this.injectMultiPointerAction = function(...args) { + console.warn('uitest.UiDriver.injectMultiPointerAction' + warnMessage) + return new Promise((resolve) => { + resolve(paramMock.paramBooleanMock) + }); + }; } } @@ -476,18 +539,37 @@ const UiWindowClass = class UiWindowMock { } } +const PointerMatrixClass = class PointerMatrixMock { + constructor() { + console.warn('uitest.PointerMatrix.constructor' + warnMessage); + this.setPoint = function(...args) { + console.warn('uitest.PointerMatrix.setPoint' + warnMessage) + return new Promise((resolve) => { + resolve() + }); + }; + } +} + +PointerMatrixClass.create = function () { + console.warn('uitest.PointerMatrix.create' + warnMessage) + return new PointerMatrixClass() +} + export function mockUiTest() { const module = { ResizeDirection: ResizeDirection, MatchPattern: MatchPattern, WindowMode: WindowMode, + DisplayRotation: DisplayRotation, Point: Point, Rect: Rect, WindowFilter: WindowFilter, BY: new ByClass(), UiDriver: UiDriverClass, UiComponent: UiComponentClass, - UiWindow: UiWindowClass + UiWindow: UiWindowClass, + PointerMatrix: PointerMatrixClass }; return module } \ No newline at end of file -- Gitee From d0c33b0d56f9e7e4128a9935553364e6f2a38b88 Mon Sep 17 00:00:00 2001 From: Flowers Dance Date: Sat, 13 Aug 2022 20:30:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0.=20Signed-off-by:=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flowers Dance --- runtime/main/extend/systemplugin/napi/ohos_uitest.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index ab7d65b0..545ad292 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -234,13 +234,13 @@ const UiDriverClass = class UiDriverMock { this.getDisplayRotation = function(...args) { console.warn('uitest.UiDriver.getDisplayRotation' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramNumberMock) + resolve(DisplayRotation) }); }; this.setDisplayRotationEnabled = function(...args) { console.warn('uitest.UiDriver.setDisplayRotationEnabled' + warnMessage) return new Promise((resolve) => { - resolve(paramMock.paramBooleanMock) + resolve() }); }; this.getDisplaySize = function(...args) { @@ -539,7 +539,7 @@ const UiWindowClass = class UiWindowMock { } } -const PointerMatrixClass = class PointerMatrixMock { +const PointerMatrixClass = class PointerMatrix { constructor() { console.warn('uitest.PointerMatrix.constructor' + warnMessage); this.setPoint = function(...args) { -- Gitee