From 94b4d6951a7dbee616ec7a8c1dd29b582275215b Mon Sep 17 00:00:00 2001 From: wuyongning Date: Wed, 13 Jul 2022 19:26:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B4=E6=94=B9rdb=20mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改检视意见 modify copyright Signed-off-by: wuyongning --- .../systemplugin/napi/data/rdb/resultSet.js | 97 +++++++++++++++++ .../extend/systemplugin/napi/ohos_data_rdb.js | 102 ++++-------------- 2 files changed, 115 insertions(+), 84 deletions(-) create mode 100644 runtime/main/extend/systemplugin/napi/data/rdb/resultSet.js diff --git a/runtime/main/extend/systemplugin/napi/data/rdb/resultSet.js b/runtime/main/extend/systemplugin/napi/data/rdb/resultSet.js new file mode 100644 index 00000000..25a16440 --- /dev/null +++ b/runtime/main/extend/systemplugin/napi/data/rdb/resultSet.js @@ -0,0 +1,97 @@ +/* + * 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" + +export const resultSet = { + columnNames: [paramMock.paramStringMock], + columnCount: "[PC Preview] unknow columnCount", + rowCount: "[PC Preview] unknow rowCount", + rowIndex: "[PC Preview] unknow rowIndex", + isAtFirstRow: "[PC Preview] unknow isAtFirstRow", + isAtLastRow: "[PC Preview] unknow isAtLastRow", + isEnded: "[PC Preview] unknow isEnded", + isStarted: "[PC Preview] unknow isStarted", + isClosed: "[PC Preview] unknow isClosed", + getColumnIndex: function (...args) { + console.warn("ResultSet.getColumnIndex interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramNumberMock; + }, + getColumnName: function (...args) { + console.warn("ResultSet.getColumnName interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramStringMock; + }, + goTo: function (...args) { + console.warn("ResultSet.goTo interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + goToRow: function (...args) { + console.warn("ResultSet.goToRow interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + goToFirstRow: function (...args) { + console.warn("ResultSet.goToFirstRow interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + goToLastRow: function (...args) { + console.warn("ResultSet.goToLastRow interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + goToNextRow: function (...args) { + console.warn("ResultSet.goToNextRow interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + goToPreviousRow: function (...args) { + console.warn("ResultSet.goToPreviousRow interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + getBlob: function (...args) { + console.warn("ResultSet.getBlob interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramObjectMock; + }, + getString: function (...args) { + console.warn("ResultSet.getString interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramStringMock; + }, + getLong: function (...args) { + console.warn("ResultSet.getLong interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramNumberMock; + }, + getDouble: function (...args) { + console.warn("ResultSet.getDouble interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramNumberMock; + }, + isColumnNull: function (...args) { + console.warn("ResultSet.isColumnNull interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + return paramMock.paramBooleanMock; + }, + close: function (...args) { + console.warn("ResultSet.close interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + }, +} diff --git a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js index 403eefdd..795a2642 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js +++ b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js @@ -14,6 +14,7 @@ */ import { paramMock } from "../utils" +import { resultSet } from "./data/rdb/resultSet" export const RdbPredicatesClass = class RdbPredicates { constructor(...args) { @@ -200,86 +201,7 @@ export function mockRdb() { }, RdbPredicates: RdbPredicatesClass }; - const resultSetMock = { - columnNames: "[[PC Preview] unknow columnNames]", - columnCount: "[PC Preview] unknow columnCount", - rowCount: "[PC Preview] unknow rowCount", - rowIndex: "[PC Preview] unknow rowIndex", - isAtFirstRow: "[PC Preview] unknow isAtFirstRow", - isAtLastRow: "[PC Preview] unknow isAtLastRow", - isEnded: "[PC Preview] unknow isEnded", - isStarted: "[PC Preview] unknow isStarted", - isClosed: "[PC Preview] unknow isClosed", - getColumnIndex: function (...args) { - console.warn("ResultSet.getColumnIndex interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramNumberMock; - }, - getColumnName: function (...args) { - console.warn("ResultSet.getColumnName interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramStringMock; - }, - goTo: function (...args) { - console.warn("ResultSet.goTo interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - goToRow: function (...args) { - console.warn("ResultSet.goToRow interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - goToFirstRow: function (...args) { - console.warn("ResultSet.goToFirstRow interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - goToLastRow: function (...args) { - console.warn("ResultSet.goToLastRow interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - goToNextRow: function (...args) { - console.warn("ResultSet.goToNextRow interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - goToPreviousRow: function (...args) { - console.warn("ResultSet.goToPreviousRow interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - getBlob: function (...args) { - console.warn("ResultSet.getBlob interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramObjectMock; - }, - getString: function (...args) { - console.warn("ResultSet.getString interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramStringMock; - }, - getLong: function (...args) { - console.warn("ResultSet.getLong interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramNumberMock; - }, - getDouble: function (...args) { - console.warn("ResultSet.getDouble interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramNumberMock; - }, - isColumnNull: function (...args) { - console.warn("ResultSet.isColumnNull interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - return paramMock.paramBooleanMock; - }, - close: function (...args) { - console.warn("ResultSet.close interface mocked in the Previewer. How this interface works on the" + - " Previewer may be different from that on a real device.") - } - } + const storeConfig = { name: "[PC Preview] unknown name" } @@ -325,10 +247,10 @@ export function mockRdb() { " Previewer may be different from that on a real device.") const len = args.length if (len > 0 && typeof args[len - 1] === 'function') { - args[len - 1].call(this, paramMock.businessErrorMock, resultSetMock); + args[len - 1].call(this, paramMock.businessErrorMock, resultSet); } else { return new Promise((resolve, reject) => { - resolve(resultSetMock); + resolve(resultSet); }) } }, @@ -337,10 +259,10 @@ export function mockRdb() { " Previewer may be different from that on a real device.") const len = args.length if (len > 0 && typeof args[len - 1] === 'function') { - args[len - 1].call(this, paramMock.businessErrorMock, resultSetMock); + args[len - 1].call(this, paramMock.businessErrorMock, resultSet); } else { return new Promise((resolve, reject) => { - resolve(resultSetMock); + resolve(resultSet); }) } }, @@ -356,6 +278,18 @@ export function mockRdb() { }) } }, + beginTransaction: function () { + console.warn("RdbStore.beginTransaction interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + }, + commit: function () { + console.warn("RdbStore.commit interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + }, + rollBack: function () { + console.warn("RdbStore.rollBack interface mocked in the Previewer. How this interface works on the" + + " Previewer may be different from that on a real device.") + }, backup: function (...args) { console.warn("RdbStore.backup interface mocked in the Previewer. How this interface works on the" + " Previewer may be different from that on a real device.") From 02d2642b6518e48473a5df1acd5739dfc66f5e1b Mon Sep 17 00:00:00 2001 From: wuyongning Date: Tue, 19 Jul 2022 11:02:15 +0800 Subject: [PATCH 2/3] add enum mock Signed-off-by: wuyongning --- runtime/main/extend/systemplugin/napi/ohos_data_rdb.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js index 795a2642..3a4f1208 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js +++ b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js @@ -205,6 +205,16 @@ export function mockRdb() { const storeConfig = { name: "[PC Preview] unknown name" } + + const SyncMode = { + SYNC_MODE_PUSH: "[PC Preview] unknown SYNC_MODE_PUSH", + SYNC_MODE_PULL: "[PC Preview] unknown SYNC_MODE_PULL" + } + + const SubscribeType = { + SUBSCRIBE_TYPE_REMOTE: "[PC Preview] unknown SUBSCRIBE_TYPE_REMOTE" + } + const rdbStore = { insert: function (...args) { console.warn("RdbStore.insert interface mocked in the Previewer. How this interface works on the" + From 83c4a195cf53fcf12f013fda0d6c50c511b17821 Mon Sep 17 00:00:00 2001 From: wuyongning Date: Tue, 19 Jul 2022 11:18:44 +0800 Subject: [PATCH 3/3] fix err Signed-off-by: wuyongning --- runtime/main/extend/systemplugin/napi/ohos_data_rdb.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js index 3a4f1208..e9ac4c8c 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js +++ b/runtime/main/extend/systemplugin/napi/ohos_data_rdb.js @@ -207,12 +207,12 @@ export function mockRdb() { } const SyncMode = { - SYNC_MODE_PUSH: "[PC Preview] unknown SYNC_MODE_PUSH", - SYNC_MODE_PULL: "[PC Preview] unknown SYNC_MODE_PULL" + SYNC_MODE_PUSH: 0, + SYNC_MODE_PULL: 1 } const SubscribeType = { - SUBSCRIBE_TYPE_REMOTE: "[PC Preview] unknown SUBSCRIBE_TYPE_REMOTE" + SUBSCRIBE_TYPE_REMOTE: 0 } const rdbStore = {