From 4fba819d0a734ad2248acdadc2e18f4125c89482 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 16 Jul 2022 12:40:42 +0800 Subject: [PATCH 01/10] =?UTF-8?q?uitest=20MockAPI=E5=A2=9E=E5=8A=A0.=20Sig?= =?UTF-8?q?ned-off-by:=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Your Name --- .../main/extend/systemplugin/napi/index.js | 3 + .../extend/systemplugin/napi/ohos_uitest.js | 350 ++++++++++++++++++ 2 files changed, 353 insertions(+) create mode 100644 runtime/main/extend/systemplugin/napi/ohos_uitest.js diff --git a/runtime/main/extend/systemplugin/napi/index.js b/runtime/main/extend/systemplugin/napi/index.js index 5d7c060e..0d1a921b 100644 --- a/runtime/main/extend/systemplugin/napi/index.js +++ b/runtime/main/extend/systemplugin/napi/index.js @@ -172,6 +172,7 @@ import { mockMouseEvent } from './ohos_multimodalInput_mouseEvent' import { mockTouchEvent } from './ohos_multimodalInput_touchEvent' import { mockUiAppearance } from './ohos_uiAppearance' import { mockContinationManager } from './ohos_continuation_continuationManager' +import { mockUiTest } from './ohos_uitest' export function mockRequireNapiFun() { global.requireNapi = function (...args) { switch (args[0]) { @@ -493,6 +494,8 @@ export function mockRequireNapiFun() { return mockTouchEvent(); case "continuation.continuationManager": return mockContinationManager(); + case "uitest": + return mockUiTest(); default: return global.requireNapiPreview(...args); } diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js new file mode 100644 index 00000000..16000859 --- /dev/null +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -0,0 +1,350 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {paramMock} from '../utils' + +const warnMessage = + ' interface mocked in the Previewer. How this interface works on the' + + ' Previewer may be different from that on a real device.' + +const MatchPatternMock = { + EQUALS: 0, + CONTAINS: 1, + STARTS_WITH: 2, + ENDS_WITH: 3 +} + +const ByMockClass = class ByMock { + constructor() { + console.warn('uitest.By.constructor' + warnMessage); + this.id = function(...args) { + console.warn('uitest.By.id' + warnMessage) + return paramMock.paramObjectMock + }; + this.text = function(...args) { + console.warn('uitest.By.text' + warnMessage) + return paramMock.paramObjectMock + }; + this.key = function(...args) { + console.warn('uitest.By.key' + warnMessage) + return paramMock.paramObjectMock + }; + this.type = function(...args) { + console.warn('uitest.By.type' + warnMessage) + return paramMock.paramObjectMock + }; + this.enabled = function(...args) { + console.warn('uitest.By.enabled' + warnMessage) + return paramMock.paramObjectMock + }; + this.focused = function(...args) { + console.warn('uitest.By.focused' + warnMessage) + return paramMock.paramObjectMock + }; + this.selected = function(...args) { + console.warn('uitest.By.selected' + warnMessage) + return paramMock.paramObjectMock + }; + this.clickable = function(...args) { + console.warn('uitest.By.clickable' + warnMessage) + return paramMock.paramObjectMock + }; + this.enabled = function(...args) { + console.warn('uitest.By.enabled' + warnMessage) + return paramMock.paramObjectMock + }; + this.longClickable = function(...args) { + console.warn('uitest.By.longClickable' + warnMessage) + return paramMock.paramObjectMock + }; + this.scrollable = function(...args) { + console.warn('uitest.By.scrollable' + warnMessage) + return paramMock.paramObjectMock + }; + this.checkable = function(...args) { + console.warn('uitest.By.checkable' + warnMessage) + return paramMock.paramObjectMock + }; + this.checked = function(...args) { + console.warn('uitest.By.checked' + warnMessage) + return paramMock.paramObjectMock + }; + this.isBefore = function(...args) { + console.warn('uitest.By.isBefore' + warnMessage) + return paramMock.paramObjectMock + }; + this.isAfter = function(...args) { + console.warn('uitest.By.isAfter' + warnMessage) + return paramMock.paramObjectMock + }; + } +} + +const BYMock = new ByMockClass() + +const UiDriverMockClass = class UiDriverMock { + constructor() { + console.warn('uitest.UiDriver.constructor' + warnMessage); + this.create = function(...args) { + console.warn('uitest.UiDriver.create' + warnMessage) + return paramMock.paramObjectMock + }; + this.delayMs = function(...args) { + console.warn('uitest.UiDriver.delayMs' + warnMessage) + return paramMock.paramObjectMock + }; + this.findComponent = function(...args) { + console.warn('uitest.UiDriver.findComponent' + warnMessage) + return paramMock.paramObjectMock + }; + this.findWindow = function(...args) { + console.warn('uitest.UiDriver.findWindow' + warnMessage) + return paramMock.paramObjectMock + }; + this.findComponents = function(...args) { + console.warn('uitest.UiDriver.findComponents' + warnMessage) + return paramMock.paramObjectMock + }; + this.waitForComponent = function(...args) { + console.warn('uitest.UiDriver.waitForComponent' + warnMessage) + return paramMock.paramObjectMock + }; + this.screenCap = function(...args) { + console.warn('uitest.UiDriver.screenCap' + warnMessage) + return paramMock.paramObjectMock + }; + this.assertComponentExist = function(...args) { + console.warn('uitest.UiDriver.assertComponentExist' + warnMessage) + return paramMock.paramObjectMock + }; + this.pressBack = function(...args) { + console.warn('uitest.UiDriver.pressBack' + warnMessage) + return paramMock.paramObjectMock + }; + this.triggerKey = function(...args) { + console.warn('uitest.UiDriver.triggerKey' + warnMessage) + return paramMock.paramObjectMock + }; + this.triggerCombineKeys = function(...args) { + console.warn('uitest.UiDriver.triggerCombineKeys' + warnMessage) + return paramMock.paramObjectMock + }; + this.click = function(...args) { + console.warn('uitest.UiDriver.click' + warnMessage) + return paramMock.paramObjectMock + }; + this.longClick = function(...args) { + console.warn('uitest.UiDriver.longClick' + warnMessage) + return paramMock.paramObjectMock + }; + this.doubleClick = function(...args) { + console.warn('uitest.UiDriver.doubleClick' + warnMessage) + return paramMock.paramObjectMock + }; + this.swipe = function(...args) { + console.warn('uitest.UiDriver.swipe' + warnMessage) + return paramMock.paramObjectMock + }; + this.drag = function(...args) { + console.warn('uitest.UiDriver.drag' + warnMessage) + return paramMock.paramObjectMock + }; + } +} + +const UIDriverMock = new UiDriverMockClass() + +const UiComponentMockClass = class UiComponentMock { + constructor() { + console.warn('uitest.UiComponent.constructor' + warnMessage); + this.getId = function(...args) { + console.warn('uitest.UiComponent.getId.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getText = function(...args) { + console.warn('uitest.UiComponent.getText.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getKey = function(...args) { + console.warn('uitest.UiComponent.getKey.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getType = function(...args) { + console.warn('uitest.UiComponent.getType.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isEnabled = function(...args) { + console.warn('uitest.UiComponent.isEnabled.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isFocused = function(...args) { + console.warn('uitest.UiComponent.isFocused.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isSelected = function(...args) { + console.warn('uitest.UiComponent.isSelected.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isClickable = function(...args) { + console.warn('uitest.UiComponent.isClickable.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isLongClickable = function(...args) { + console.warn('uitest.UiComponent.isLongClickable.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isScrollable = function(...args) { + console.warn('uitest.UiComponent.isScrollable.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isCheckable = function(...args) { + console.warn('uitest.UiComponent.isCheckable.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isChecked = function(...args) { + console.warn('uitest.UiComponent.isChecked.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getBounds = function(...args) { + console.warn('uitest.UiComponent.getBounds.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getBoundsCenter = function(...args) { + console.warn('uitest.UiComponent.getBoundsCenter.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.click = function(...args) { + console.warn('uitest.UiComponent.click.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.longClick = function(...args) { + console.warn('uitest.UiComponent.longClick.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.doubleClick = function(...args) { + console.warn('uitest.UiComponent.doubleClick.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.scrollToTop = function(...args) { + console.warn('uitest.UiComponent.scrollToTop.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.scrollToBottom = function(...args) { + console.warn('uitest.UiComponent.scrollToBottom.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.inputText = function(...args) { + console.warn('uitest.UiComponent.inputText.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.clearText = function(...args) { + console.warn('uitest.UiComponent.clearText.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.scrollSearch = function(...args) { + console.warn('uitest.UiComponent.scrollSearch.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.dragTo = function(...args) { + console.warn('uitest.UiComponent.dragTo.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.pinchOut = function(...args) { + console.warn('uitest.UiComponent.pinchOut.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.pinchIn = function(...args) { + console.warn('uitest.UiComponent.pinchIn.warn' + warnMessage) + return paramMock.paramObjectMock + }; + } +} + +const UIComponentMock = new UiComponentMockClass() + +const UiWindowMockClass = class UiWindowMock { + constructor() { + console.warn('uitest.UiWindowMock.constructor' + warnMessage); + this.getBundleName = function(...args) { + console.warn('uitest.UiWindowMock.getBundleName.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getBounds = function(...args) { + console.warn('uitest.UiWindowMock.getBounds.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getTitle = function(...args) { + console.warn('uitest.UiWindowMock.getTitle.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.getWindowMode = function(...args) { + console.warn('uitest.UiWindowMock.getWindowMode.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isFocused = function(...args) { + console.warn('uitest.UiWindowMock.isFocused.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.isActived = function(...args) { + console.warn('uitest.UiWindowMock.isActived.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.focuse = function(...args) { + console.warn('uitest.UiWindowMock.focuse.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.moveTo = function(...args) { + console.warn('uitest.UiWindowMock.moveTo.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.resize = function(...args) { + console.warn('uitest.UiWindowMock.resize.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.split = function(...args) { + console.warn('uitest.UiWindowMock.split.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.maximize = function(...args) { + console.warn('uitest.UiWindowMock.maximize.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.resume = function(...args) { + console.warn('uitest.UiWindowMock.resume.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.minimize = function(...args) { + console.warn('uitest.UiWindowMock.minimize.warn' + warnMessage) + return paramMock.paramObjectMock + }; + this.close = function(...args) { + console.warn('uitest.UiWindowMock.close.warn' + warnMessage) + return paramMock.paramObjectMock + }; + }; +} + +const UIWindowMock = new UiWindowMockClass() + +export function mockUiTest() { + const module = { + MatchPattern: MatchPatternMock, + BY: BYMock, + UiDriver: UIDriverMock, + UiComponent: UIComponentMock, + UiWindow: UIWindowMock + }; + return module +} \ No newline at end of file From 8f6e17018dfb8d93ef95053b5549cffe03e523c8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 16 Jul 2022 18:24:12 +0800 Subject: [PATCH 02/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 327 +++++++++++++----- 1 file changed, 239 insertions(+), 88 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 16000859..736530f7 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -19,332 +19,483 @@ const warnMessage = ' interface mocked in the Previewer. How this interface works on the' + ' Previewer may be different from that on a real device.' -const MatchPatternMock = { +export const ResizeDirectionMock = { + LEFT: 0, + RIGHT: 1, + UP: 2, + DOWN: 3, + LEFT_UP: 4, + LEFT_DOWN: 5, + RIGHT_UP: 6, + RIGHT_DOWN: 7 +} + +export const MatchPatternMock = { EQUALS: 0, CONTAINS: 1, STARTS_WITH: 2, ENDS_WITH: 3 } +export const WindowModeMock = { + FULLSCREEN: 0, + PRIMARY: 1, + SECONDARY: 2, + FLOATING: 3 +} + +const PointMockClass = class PointMock { + constructor() { + X: '[PC Preview] unknown X'; + Y: '[PC Preview] unknown Y'; + } +} + +const RectMockClass = class RectMock { + constructor() { + leftX: '[PC Preview] unknown leftX'; + topY: '[PC Preview] unknown topY'; + rightX: '[PC Preview] unknown rightX'; + bottomY: '[PC Preview] unknown bottomY'; + } +} + +const WindowFilterMockClass = class WindowFilterMock { + constructor() { + bundleName: '[PC Preview] unknown bundleName'; + title: '[PC Preview] unknown title'; + focused: '[PC Preview] unknown focused'; + actived: '[PC Preview] unknown actived'; + } +} + const ByMockClass = class ByMock { constructor() { console.warn('uitest.By.constructor' + warnMessage); this.id = function(...args) { console.warn('uitest.By.id' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.text = function(...args) { console.warn('uitest.By.text' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.key = function(...args) { console.warn('uitest.By.key' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.type = function(...args) { console.warn('uitest.By.type' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.focused = function(...args) { console.warn('uitest.By.focused' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.selected = function(...args) { console.warn('uitest.By.selected' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.clickable = function(...args) { console.warn('uitest.By.clickable' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.longClickable = function(...args) { console.warn('uitest.By.longClickable' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.scrollable = function(...args) { console.warn('uitest.By.scrollable' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.checkable = function(...args) { console.warn('uitest.By.checkable' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.checked = function(...args) { console.warn('uitest.By.checked' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.isBefore = function(...args) { console.warn('uitest.By.isBefore' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; this.isAfter = function(...args) { console.warn('uitest.By.isAfter' + warnMessage) - return paramMock.paramObjectMock + return new BYMock() }; } } -const BYMock = new ByMockClass() - -const UiDriverMockClass = class UiDriverMock { +const UiDriverClass = class UiDriverMock { constructor() { console.warn('uitest.UiDriver.constructor' + warnMessage); - this.create = function(...args) { - console.warn('uitest.UiDriver.create' + warnMessage) - return paramMock.paramObjectMock - }; this.delayMs = function(...args) { console.warn('uitest.UiDriver.delayMs' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.findComponent = function(...args) { console.warn('uitest.UiDriver.findComponent' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(new UiComponentMock()) + }); }; this.findWindow = function(...args) { console.warn('uitest.UiDriver.findWindow' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(new UiWindowMock()) + }); }; this.findComponents = function(...args) { console.warn('uitest.UiDriver.findComponents' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(new UiComponentMock()) + }); }; this.waitForComponent = function(...args) { console.warn('uitest.UiDriver.waitForComponent' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(new UiComponentMock()) + }); }; this.screenCap = function(...args) { console.warn('uitest.UiDriver.screenCap' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.assertComponentExist = function(...args) { console.warn('uitest.UiDriver.assertComponentExist' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.pressBack = function(...args) { console.warn('uitest.UiDriver.pressBack' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.triggerKey = function(...args) { console.warn('uitest.UiDriver.triggerKey' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.triggerCombineKeys = function(...args) { console.warn('uitest.UiDriver.triggerCombineKeys' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.click = function(...args) { console.warn('uitest.UiDriver.click' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.longClick = function(...args) { console.warn('uitest.UiDriver.longClick' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.doubleClick = function(...args) { console.warn('uitest.UiDriver.doubleClick' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.swipe = function(...args) { console.warn('uitest.UiDriver.swipe' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.drag = function(...args) { console.warn('uitest.UiDriver.drag' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; } } -const UIDriverMock = new UiDriverMockClass() +UiDriverClass.create = function () { + this.create = function(...args) { + console.warn('uitest.UiDriver.create' + warnMessage) + return new UiDriverMock() + } +} -const UiComponentMockClass = class UiComponentMock { +const UiComponentClass = class UiComponentMock { constructor() { console.warn('uitest.UiComponent.constructor' + warnMessage); this.getId = function(...args) { console.warn('uitest.UiComponent.getId.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramNumberMock) + }); }; this.getText = function(...args) { console.warn('uitest.UiComponent.getText.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramStringMock) + }); }; this.getKey = function(...args) { console.warn('uitest.UiComponent.getKey.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramStringMock) + }); }; this.getType = function(...args) { console.warn('uitest.UiComponent.getType.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramStringMock) + }); }; this.isEnabled = function(...args) { console.warn('uitest.UiComponent.isEnabled.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isFocused = function(...args) { console.warn('uitest.UiComponent.isFocused.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isSelected = function(...args) { console.warn('uitest.UiComponent.isSelected.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isClickable = function(...args) { console.warn('uitest.UiComponent.isClickable.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isLongClickable = function(...args) { console.warn('uitest.UiComponent.isLongClickable.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isScrollable = function(...args) { console.warn('uitest.UiComponent.isScrollable.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isCheckable = function(...args) { console.warn('uitest.UiComponent.isCheckable.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isChecked = function(...args) { console.warn('uitest.UiComponent.isChecked.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.getBounds = function(...args) { console.warn('uitest.UiComponent.getBounds.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(RectMock) + }); }; this.getBoundsCenter = function(...args) { console.warn('uitest.UiComponent.getBoundsCenter.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(PointMock) + }); }; this.click = function(...args) { console.warn('uitest.UiComponent.click.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.longClick = function(...args) { console.warn('uitest.UiComponent.longClick.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.doubleClick = function(...args) { console.warn('uitest.UiComponent.doubleClick.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.scrollToTop = function(...args) { console.warn('uitest.UiComponent.scrollToTop.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.scrollToBottom = function(...args) { console.warn('uitest.UiComponent.scrollToBottom.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.inputText = function(...args) { console.warn('uitest.UiComponent.inputText.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.clearText = function(...args) { console.warn('uitest.UiComponent.clearText.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.scrollSearch = function(...args) { console.warn('uitest.UiComponent.scrollSearch.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(new UiComponentMock()) + }); }; this.dragTo = function(...args) { console.warn('uitest.UiComponent.dragTo.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.pinchOut = function(...args) { console.warn('uitest.UiComponent.pinchOut.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; this.pinchIn = function(...args) { console.warn('uitest.UiComponent.pinchIn.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve() + }); }; } } -const UIComponentMock = new UiComponentMockClass() - -const UiWindowMockClass = class UiWindowMock { +const UiWindowClass = class UiWindowMock { constructor() { console.warn('uitest.UiWindowMock.constructor' + warnMessage); this.getBundleName = function(...args) { console.warn('uitest.UiWindowMock.getBundleName.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramStringMock) + }); }; this.getBounds = function(...args) { console.warn('uitest.UiWindowMock.getBounds.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(RectMock) + }); }; this.getTitle = function(...args) { console.warn('uitest.UiWindowMock.getTitle.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramStringMock) + }); }; this.getWindowMode = function(...args) { console.warn('uitest.UiWindowMock.getWindowMode.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(WindowModeMock) + }); }; this.isFocused = function(...args) { console.warn('uitest.UiWindowMock.isFocused.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.isActived = function(...args) { console.warn('uitest.UiWindowMock.isActived.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.focuse = function(...args) { console.warn('uitest.UiWindowMock.focuse.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.moveTo = function(...args) { console.warn('uitest.UiWindowMock.moveTo.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.resize = function(...args) { console.warn('uitest.UiWindowMock.resize.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.split = function(...args) { console.warn('uitest.UiWindowMock.split.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.maximize = function(...args) { console.warn('uitest.UiWindowMock.maximize.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.resume = function(...args) { console.warn('uitest.UiWindowMock.resume.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.minimize = function(...args) { console.warn('uitest.UiWindowMock.minimize.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; this.close = function(...args) { console.warn('uitest.UiWindowMock.close.warn' + warnMessage) - return paramMock.paramObjectMock + return new Promise((resolve) => { + resolve(paramMock.paramBoolMock) + }); }; }; } -const UIWindowMock = new UiWindowMockClass() - export function mockUiTest() { const module = { + ResizeDirection: ResizeDirectionMock, MatchPattern: MatchPatternMock, - BY: BYMock, - UiDriver: UIDriverMock, - UiComponent: UIComponentMock, - UiWindow: UIWindowMock + WindowMode: WindowModeMock, + Point: PointMockClass, + Rect: RectMockClass, + WindowFilter: WindowFilterMockClass, + BY: ByMockClass, + UiDriver: UiDriverClass, + UiComponent: UiComponentClass, + UiWindow: UiWindowClass }; return module } \ No newline at end of file From 2acb01f913899b0babc9127533b4d8044c769dab Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 16 Jul 2022 19:40:34 +0800 Subject: [PATCH 03/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 736530f7..f5fb094c 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -74,63 +74,63 @@ const ByMockClass = class ByMock { console.warn('uitest.By.constructor' + warnMessage); this.id = function(...args) { console.warn('uitest.By.id' + warnMessage) - return new BYMock() + return new ByMock() }; this.text = function(...args) { console.warn('uitest.By.text' + warnMessage) - return new BYMock() + return new ByMock() }; this.key = function(...args) { console.warn('uitest.By.key' + warnMessage) - return new BYMock() + return new ByMock() }; this.type = function(...args) { console.warn('uitest.By.type' + warnMessage) - return new BYMock() + return new ByMock() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return new BYMock() + return new ByMock() }; this.focused = function(...args) { console.warn('uitest.By.focused' + warnMessage) - return new BYMock() + return new ByMock() }; this.selected = function(...args) { console.warn('uitest.By.selected' + warnMessage) - return new BYMock() + return new ByMock() }; this.clickable = function(...args) { console.warn('uitest.By.clickable' + warnMessage) - return new BYMock() + return new ByMock() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return new BYMock() + return new ByMock() }; this.longClickable = function(...args) { console.warn('uitest.By.longClickable' + warnMessage) - return new BYMock() + return new ByMock() }; this.scrollable = function(...args) { console.warn('uitest.By.scrollable' + warnMessage) - return new BYMock() + return new ByMock() }; this.checkable = function(...args) { console.warn('uitest.By.checkable' + warnMessage) - return new BYMock() + return new ByMock() }; this.checked = function(...args) { console.warn('uitest.By.checked' + warnMessage) - return new BYMock() + return new ByMock() }; this.isBefore = function(...args) { console.warn('uitest.By.isBefore' + warnMessage) - return new BYMock() + return new ByMock() }; this.isAfter = function(...args) { console.warn('uitest.By.isAfter' + warnMessage) - return new BYMock() + return new ByMock() }; } } @@ -492,7 +492,7 @@ export function mockUiTest() { Point: PointMockClass, Rect: RectMockClass, WindowFilter: WindowFilterMockClass, - BY: ByMockClass, + BY: new ByMockClass(), UiDriver: UiDriverClass, UiComponent: UiComponentClass, UiWindow: UiWindowClass From 1770385fc2f004a83f11f60676c66175ddc1e0ca Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 18 Jul 2022 09:36:12 +0800 Subject: [PATCH 04/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 --- runtime/main/extend/systemplugin/napi/ohos_uitest.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index f5fb094c..961ce571 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -69,7 +69,7 @@ const WindowFilterMockClass = class WindowFilterMock { } } -const ByMockClass = class ByMock { +const ByClass = class ByMock { constructor() { console.warn('uitest.By.constructor' + warnMessage); this.id = function(...args) { @@ -159,7 +159,7 @@ const UiDriverClass = class UiDriverMock { this.findComponents = function(...args) { console.warn('uitest.UiDriver.findComponents' + warnMessage) return new Promise((resolve) => { - resolve(new UiComponentMock()) + resolve(new Array(new UiComponentMock())) }); }; this.waitForComponent = function(...args) { @@ -232,10 +232,8 @@ const UiDriverClass = class UiDriverMock { } UiDriverClass.create = function () { - this.create = function(...args) { console.warn('uitest.UiDriver.create' + warnMessage) - return new UiDriverMock() - } + return new UiDriverClass() } const UiComponentClass = class UiComponentMock { @@ -492,7 +490,7 @@ export function mockUiTest() { Point: PointMockClass, Rect: RectMockClass, WindowFilter: WindowFilterMockClass, - BY: new ByMockClass(), + BY: new ByClass(), UiDriver: UiDriverClass, UiComponent: UiComponentClass, UiWindow: UiWindowClass From e0244cd308ba8a603e8bac963ee610b838f3a0e3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 18 Jul 2022 10:48:36 +0800 Subject: [PATCH 05/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 961ce571..780032c0 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -19,7 +19,7 @@ const warnMessage = ' interface mocked in the Previewer. How this interface works on the' + ' Previewer may be different from that on a real device.' -export const ResizeDirectionMock = { +export const ResizeDirection = { LEFT: 0, RIGHT: 1, UP: 2, @@ -30,28 +30,28 @@ export const ResizeDirectionMock = { RIGHT_DOWN: 7 } -export const MatchPatternMock = { +export const MatchPattern = { EQUALS: 0, CONTAINS: 1, STARTS_WITH: 2, ENDS_WITH: 3 } -export const WindowModeMock = { +export const WindowMode = { FULLSCREEN: 0, PRIMARY: 1, SECONDARY: 2, FLOATING: 3 } -const PointMockClass = class PointMock { +export const Point = { constructor() { X: '[PC Preview] unknown X'; Y: '[PC Preview] unknown Y'; } } -const RectMockClass = class RectMock { +export const Rect = { constructor() { leftX: '[PC Preview] unknown leftX'; topY: '[PC Preview] unknown topY'; @@ -60,7 +60,7 @@ const RectMockClass = class RectMock { } } -const WindowFilterMockClass = class WindowFilterMock { +export const WindowFilter = { constructor() { bundleName: '[PC Preview] unknown bundleName'; title: '[PC Preview] unknown title'; @@ -74,63 +74,63 @@ const ByClass = class ByMock { console.warn('uitest.By.constructor' + warnMessage); this.id = function(...args) { console.warn('uitest.By.id' + warnMessage) - return new ByMock() + return new ByClass() }; this.text = function(...args) { console.warn('uitest.By.text' + warnMessage) - return new ByMock() + return new ByClass() }; this.key = function(...args) { console.warn('uitest.By.key' + warnMessage) - return new ByMock() + return new ByClass() }; this.type = function(...args) { console.warn('uitest.By.type' + warnMessage) - return new ByMock() + return new ByClass() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return new ByMock() + return new ByClass() }; this.focused = function(...args) { console.warn('uitest.By.focused' + warnMessage) - return new ByMock() + return new ByClass() }; this.selected = function(...args) { console.warn('uitest.By.selected' + warnMessage) - return new ByMock() + return new ByClass() }; this.clickable = function(...args) { console.warn('uitest.By.clickable' + warnMessage) - return new ByMock() + return new ByClass() }; this.enabled = function(...args) { console.warn('uitest.By.enabled' + warnMessage) - return new ByMock() + return new ByClass() }; this.longClickable = function(...args) { console.warn('uitest.By.longClickable' + warnMessage) - return new ByMock() + return new ByClass() }; this.scrollable = function(...args) { console.warn('uitest.By.scrollable' + warnMessage) - return new ByMock() + return new ByClass() }; this.checkable = function(...args) { console.warn('uitest.By.checkable' + warnMessage) - return new ByMock() + return new ByClass() }; this.checked = function(...args) { console.warn('uitest.By.checked' + warnMessage) - return new ByMock() + return new ByClass() }; this.isBefore = function(...args) { console.warn('uitest.By.isBefore' + warnMessage) - return new ByMock() + return new ByClass() }; this.isAfter = function(...args) { console.warn('uitest.By.isAfter' + warnMessage) - return new ByMock() + return new ByClass() }; } } @@ -147,25 +147,25 @@ const UiDriverClass = class UiDriverMock { this.findComponent = function(...args) { console.warn('uitest.UiDriver.findComponent' + warnMessage) return new Promise((resolve) => { - resolve(new UiComponentMock()) + resolve(new UiComponentClass()) }); }; this.findWindow = function(...args) { console.warn('uitest.UiDriver.findWindow' + warnMessage) return new Promise((resolve) => { - resolve(new UiWindowMock()) + resolve(new UiWindowClass()) }); }; this.findComponents = function(...args) { console.warn('uitest.UiDriver.findComponents' + warnMessage) return new Promise((resolve) => { - resolve(new Array(new UiComponentMock())) + resolve(new Array(new UiComponentClass())) }); }; this.waitForComponent = function(...args) { console.warn('uitest.UiDriver.waitForComponent' + warnMessage) return new Promise((resolve) => { - resolve(new UiComponentMock()) + resolve(new UiComponentClass()) }); }; this.screenCap = function(...args) { @@ -314,13 +314,13 @@ const UiComponentClass = class UiComponentMock { this.getBounds = function(...args) { console.warn('uitest.UiComponent.getBounds.warn' + warnMessage) return new Promise((resolve) => { - resolve(RectMock) + resolve(Rect) }); }; this.getBoundsCenter = function(...args) { console.warn('uitest.UiComponent.getBoundsCenter.warn' + warnMessage) return new Promise((resolve) => { - resolve(PointMock) + resolve(Point) }); }; this.click = function(...args) { @@ -368,7 +368,7 @@ const UiComponentClass = class UiComponentMock { this.scrollSearch = function(...args) { console.warn('uitest.UiComponent.scrollSearch.warn' + warnMessage) return new Promise((resolve) => { - resolve(new UiComponentMock()) + resolve(new UiComponentClass()) }); }; this.dragTo = function(...args) { @@ -404,7 +404,7 @@ const UiWindowClass = class UiWindowMock { this.getBounds = function(...args) { console.warn('uitest.UiWindowMock.getBounds.warn' + warnMessage) return new Promise((resolve) => { - resolve(RectMock) + resolve(Rect) }); }; this.getTitle = function(...args) { @@ -416,7 +416,7 @@ const UiWindowClass = class UiWindowMock { this.getWindowMode = function(...args) { console.warn('uitest.UiWindowMock.getWindowMode.warn' + warnMessage) return new Promise((resolve) => { - resolve(WindowModeMock) + resolve(WindowMode) }); }; this.isFocused = function(...args) { @@ -484,12 +484,12 @@ const UiWindowClass = class UiWindowMock { export function mockUiTest() { const module = { - ResizeDirection: ResizeDirectionMock, - MatchPattern: MatchPatternMock, - WindowMode: WindowModeMock, - Point: PointMockClass, - Rect: RectMockClass, - WindowFilter: WindowFilterMockClass, + ResizeDirection: ResizeDirection, + MatchPattern: MatchPattern, + WindowMode: WindowMode, + Point: Point, + Rect: Rect, + WindowFilter: WindowFilter, BY: new ByClass(), UiDriver: UiDriverClass, UiComponent: UiComponentClass, From 528a60ff6c6cfab67ac28f4f9be8c05d6c3cb4db Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 18 Jul 2022 14:23:07 +0800 Subject: [PATCH 06/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 780032c0..a7e236f8 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -240,151 +240,151 @@ const UiComponentClass = class UiComponentMock { constructor() { console.warn('uitest.UiComponent.constructor' + warnMessage); this.getId = function(...args) { - console.warn('uitest.UiComponent.getId.warn' + warnMessage) + console.warn('uitest.UiComponent.getId' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramNumberMock) }); }; this.getText = function(...args) { - console.warn('uitest.UiComponent.getText.warn' + warnMessage) + console.warn('uitest.UiComponent.getText' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getKey = function(...args) { - console.warn('uitest.UiComponent.getKey.warn' + warnMessage) + console.warn('uitest.UiComponent.getKey' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getType = function(...args) { - console.warn('uitest.UiComponent.getType.warn' + warnMessage) + console.warn('uitest.UiComponent.getType' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.isEnabled = function(...args) { - console.warn('uitest.UiComponent.isEnabled.warn' + warnMessage) + console.warn('uitest.UiComponent.isEnabled' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isFocused = function(...args) { - console.warn('uitest.UiComponent.isFocused.warn' + warnMessage) + console.warn('uitest.UiComponent.isFocused' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isSelected = function(...args) { - console.warn('uitest.UiComponent.isSelected.warn' + warnMessage) + console.warn('uitest.UiComponent.isSelected' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isClickable = function(...args) { - console.warn('uitest.UiComponent.isClickable.warn' + warnMessage) + console.warn('uitest.UiComponent.isClickable' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isLongClickable = function(...args) { - console.warn('uitest.UiComponent.isLongClickable.warn' + warnMessage) + console.warn('uitest.UiComponent.isLongClickable' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isScrollable = function(...args) { - console.warn('uitest.UiComponent.isScrollable.warn' + warnMessage) + console.warn('uitest.UiComponent.isScrollable' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isCheckable = function(...args) { - console.warn('uitest.UiComponent.isCheckable.warn' + warnMessage) + console.warn('uitest.UiComponent.isCheckable' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isChecked = function(...args) { - console.warn('uitest.UiComponent.isChecked.warn' + warnMessage) + console.warn('uitest.UiComponent.isChecked' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.getBounds = function(...args) { - console.warn('uitest.UiComponent.getBounds.warn' + warnMessage) + console.warn('uitest.UiComponent.getBounds' + warnMessage) return new Promise((resolve) => { resolve(Rect) }); }; this.getBoundsCenter = function(...args) { - console.warn('uitest.UiComponent.getBoundsCenter.warn' + warnMessage) + console.warn('uitest.UiComponent.getBoundsCenter' + warnMessage) return new Promise((resolve) => { resolve(Point) }); }; this.click = function(...args) { - console.warn('uitest.UiComponent.click.warn' + warnMessage) + console.warn('uitest.UiComponent.click' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.longClick = function(...args) { - console.warn('uitest.UiComponent.longClick.warn' + warnMessage) + console.warn('uitest.UiComponent.longClick' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.doubleClick = function(...args) { - console.warn('uitest.UiComponent.doubleClick.warn' + warnMessage) + console.warn('uitest.UiComponent.doubleClick' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.scrollToTop = function(...args) { - console.warn('uitest.UiComponent.scrollToTop.warn' + warnMessage) + console.warn('uitest.UiComponent.scrollToTop' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.scrollToBottom = function(...args) { - console.warn('uitest.UiComponent.scrollToBottom.warn' + warnMessage) + console.warn('uitest.UiComponent.scrollToBottom' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.inputText = function(...args) { - console.warn('uitest.UiComponent.inputText.warn' + warnMessage) + console.warn('uitest.UiComponent.inputText' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.clearText = function(...args) { - console.warn('uitest.UiComponent.clearText.warn' + warnMessage) + console.warn('uitest.UiComponent.clearText' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.scrollSearch = function(...args) { - console.warn('uitest.UiComponent.scrollSearch.warn' + warnMessage) + console.warn('uitest.UiComponent.scrollSearch' + warnMessage) return new Promise((resolve) => { resolve(new UiComponentClass()) }); }; this.dragTo = function(...args) { - console.warn('uitest.UiComponent.dragTo.warn' + warnMessage) + console.warn('uitest.UiComponent.dragTo' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.pinchOut = function(...args) { - console.warn('uitest.UiComponent.pinchOut.warn' + warnMessage) + console.warn('uitest.UiComponent.pinchOut' + warnMessage) return new Promise((resolve) => { resolve() }); }; this.pinchIn = function(...args) { - console.warn('uitest.UiComponent.pinchIn.warn' + warnMessage) + console.warn('uitest.UiComponent.pinchIn' + warnMessage) return new Promise((resolve) => { resolve() }); @@ -396,85 +396,85 @@ const UiWindowClass = class UiWindowMock { constructor() { console.warn('uitest.UiWindowMock.constructor' + warnMessage); this.getBundleName = function(...args) { - console.warn('uitest.UiWindowMock.getBundleName.warn' + warnMessage) + console.warn('uitest.UiWindowMock.getBundleName' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getBounds = function(...args) { - console.warn('uitest.UiWindowMock.getBounds.warn' + warnMessage) + console.warn('uitest.UiWindowMock.getBounds' + warnMessage) return new Promise((resolve) => { resolve(Rect) }); }; this.getTitle = function(...args) { - console.warn('uitest.UiWindowMock.getTitle.warn' + warnMessage) + console.warn('uitest.UiWindowMock.getTitle' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getWindowMode = function(...args) { - console.warn('uitest.UiWindowMock.getWindowMode.warn' + warnMessage) + console.warn('uitest.UiWindowMock.getWindowMode' + warnMessage) return new Promise((resolve) => { resolve(WindowMode) }); }; this.isFocused = function(...args) { - console.warn('uitest.UiWindowMock.isFocused.warn' + warnMessage) + console.warn('uitest.UiWindowMock.isFocused' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isActived = function(...args) { - console.warn('uitest.UiWindowMock.isActived.warn' + warnMessage) + console.warn('uitest.UiWindowMock.isActived' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.focuse = function(...args) { - console.warn('uitest.UiWindowMock.focuse.warn' + warnMessage) + console.warn('uitest.UiWindowMock.focuse' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.moveTo = function(...args) { - console.warn('uitest.UiWindowMock.moveTo.warn' + warnMessage) + console.warn('uitest.UiWindowMock.moveTo' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.resize = function(...args) { - console.warn('uitest.UiWindowMock.resize.warn' + warnMessage) + console.warn('uitest.UiWindowMock.resize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.split = function(...args) { - console.warn('uitest.UiWindowMock.split.warn' + warnMessage) + console.warn('uitest.UiWindowMock.split' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.maximize = function(...args) { - console.warn('uitest.UiWindowMock.maximize.warn' + warnMessage) + console.warn('uitest.UiWindowMock.maximize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.resume = function(...args) { - console.warn('uitest.UiWindowMock.resume.warn' + warnMessage) + console.warn('uitest.UiWindowMock.resume' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.minimize = function(...args) { - console.warn('uitest.UiWindowMock.minimize.warn' + warnMessage) + console.warn('uitest.UiWindowMock.minimize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.close = function(...args) { - console.warn('uitest.UiWindowMock.close.warn' + warnMessage) + console.warn('uitest.UiWindowMock.close' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); From fe66bf7d0bc3d9f1e808f6cbafd14df22b19cad1 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 18 Jul 2022 15:59:30 +0800 Subject: [PATCH 07/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 --- runtime/main/extend/systemplugin/napi/ohos_uitest.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index a7e236f8..738af166 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -45,28 +45,22 @@ export const WindowMode = { } export const Point = { - constructor() { X: '[PC Preview] unknown X'; Y: '[PC Preview] unknown Y'; - } } export const Rect = { - constructor() { leftX: '[PC Preview] unknown leftX'; topY: '[PC Preview] unknown topY'; rightX: '[PC Preview] unknown rightX'; bottomY: '[PC Preview] unknown bottomY'; - } } export const WindowFilter = { - constructor() { bundleName: '[PC Preview] unknown bundleName'; title: '[PC Preview] unknown title'; focused: '[PC Preview] unknown focused'; actived: '[PC Preview] unknown actived'; - } } const ByClass = class ByMock { From e06e2cf3927aeeeb63d1b4e3d20ac2b8b28eea86 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 18 Jul 2022 18:09:56 +0800 Subject: [PATCH 08/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 738af166..20eb6313 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -45,22 +45,22 @@ export const WindowMode = { } export const Point = { - X: '[PC Preview] unknown X'; - Y: '[PC Preview] unknown Y'; + X: '[PC Preview] unknown X', + Y: '[PC Preview] unknown Y' } export const Rect = { - leftX: '[PC Preview] unknown leftX'; - topY: '[PC Preview] unknown topY'; - rightX: '[PC Preview] unknown rightX'; - bottomY: '[PC Preview] unknown bottomY'; + leftX: '[PC Preview] unknown leftX', + topY: '[PC Preview] unknown topY', + rightX: '[PC Preview] unknown rightX', + bottomY: '[PC Preview] unknown bottomY' } export const WindowFilter = { - bundleName: '[PC Preview] unknown bundleName'; - title: '[PC Preview] unknown title'; - focused: '[PC Preview] unknown focused'; - actived: '[PC Preview] unknown actived'; + bundleName: '[PC Preview] unknown bundleName', + title: '[PC Preview] unknown title', + focused: '[PC Preview] unknown focused', + actived: '[PC Preview] unknown actived' } const ByClass = class ByMock { @@ -425,8 +425,8 @@ const UiWindowClass = class UiWindowMock { resolve(paramMock.paramBoolMock) }); }; - this.focuse = function(...args) { - console.warn('uitest.UiWindowMock.focuse' + warnMessage) + this.focus = function(...args) { + console.warn('uitest.UiWindowMock.focus' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); From e289be0665a3e330ee571c30d9ffbff3e21c5936 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 Jul 2022 09:54:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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 | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_uitest.js b/runtime/main/extend/systemplugin/napi/ohos_uitest.js index 20eb6313..c0be4ccd 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_uitest.js +++ b/runtime/main/extend/systemplugin/napi/ohos_uitest.js @@ -388,87 +388,87 @@ const UiComponentClass = class UiComponentMock { const UiWindowClass = class UiWindowMock { constructor() { - console.warn('uitest.UiWindowMock.constructor' + warnMessage); + console.warn('uitest.UiWindow.constructor' + warnMessage); this.getBundleName = function(...args) { - console.warn('uitest.UiWindowMock.getBundleName' + warnMessage) + console.warn('uitest.UiWindow.getBundleName' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getBounds = function(...args) { - console.warn('uitest.UiWindowMock.getBounds' + warnMessage) + console.warn('uitest.UiWindow.getBounds' + warnMessage) return new Promise((resolve) => { resolve(Rect) }); }; this.getTitle = function(...args) { - console.warn('uitest.UiWindowMock.getTitle' + warnMessage) + console.warn('uitest.UiWindow.getTitle' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramStringMock) }); }; this.getWindowMode = function(...args) { - console.warn('uitest.UiWindowMock.getWindowMode' + warnMessage) + console.warn('uitest.UiWindow.getWindowMode' + warnMessage) return new Promise((resolve) => { resolve(WindowMode) }); }; this.isFocused = function(...args) { - console.warn('uitest.UiWindowMock.isFocused' + warnMessage) + console.warn('uitest.UiWindow.isFocused' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.isActived = function(...args) { - console.warn('uitest.UiWindowMock.isActived' + warnMessage) + console.warn('uitest.UiWindow.isActived' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.focus = function(...args) { - console.warn('uitest.UiWindowMock.focus' + warnMessage) + console.warn('uitest.UiWindow.focus' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.moveTo = function(...args) { - console.warn('uitest.UiWindowMock.moveTo' + warnMessage) + console.warn('uitest.UiWindow.moveTo' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.resize = function(...args) { - console.warn('uitest.UiWindowMock.resize' + warnMessage) + console.warn('uitest.UiWindow.resize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.split = function(...args) { - console.warn('uitest.UiWindowMock.split' + warnMessage) + console.warn('uitest.UiWindow.split' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.maximize = function(...args) { - console.warn('uitest.UiWindowMock.maximize' + warnMessage) + console.warn('uitest.UiWindow.maximize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.resume = function(...args) { - console.warn('uitest.UiWindowMock.resume' + warnMessage) + console.warn('uitest.UiWindow.resume' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.minimize = function(...args) { - console.warn('uitest.UiWindowMock.minimize' + warnMessage) + console.warn('uitest.UiWindow.minimize' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); }; this.close = function(...args) { - console.warn('uitest.UiWindowMock.close' + warnMessage) + console.warn('uitest.UiWindow.close' + warnMessage) return new Promise((resolve) => { resolve(paramMock.paramBoolMock) }); From 5204d3e4a5a337793b711ca74894c9dfffb0ad2f Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 Jul 2022 14:20:49 +0800 Subject: [PATCH 10/10] =?UTF-8?q?uitest=20MockAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=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) }); }; };