!2057...

!2057 【Distributeddatamgr】【Master】RdbstoreTransactionJsunit.test.js，RdbStoreResultSetJsunit.test.js 文件修改
Merge pull request !2057 from 杨立峰/master

distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/List.test.js

@@ -26,3 +26,4 @@ require('./RdbstoreUpdateJsunit.test.js')
 require('./DataAbilityPredicatesJsunit.test.js')
 require('./RdbstoreTransactionJsunit.test.js')
 require('./RdbstorePredicatesJoinJsunit.test.js')	
+require('./RdbStoreDistributedJsunit.test.js')

distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbStoreDistributedJsunit.test.js

+/*
+ * Copyright (C) 2021 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 {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import dataRdb from '@ohos.data.rdb';
+
+const TAG = "[RDB_JSKITS_TEST_Distributed]"
+const STORE_NAME = "distributed_rdb.db"
+var rdbStore = undefined;
+
+describe('rdbStoreDistributedTest', function () {
+    beforeAll(async function () {
+        console.info(TAG + 'beforeAll')
+    })
+
+    beforeEach(async function () {
+        console.info(TAG + 'beforeEach')
+    })
+
+    afterEach(async function () {
+        console.info(TAG + 'afterEach')
+    })
+
+    afterAll(async function () {
+        console.info(TAG + 'afterAll')
+        await dataRdb.deleteRdbStore(STORE_NAME);
+    })
+
+    console.log(TAG + "*************Unit Test Begin*************");
+
+    /**
+     * @tc.name rdb open test
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_001
+     * @tc.desc rdb open test
+     */
+    it('testRdbStoreDistributed0001', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed001 start *************");
+        const config = {
+            "name": STORE_NAME,
+        }
+        try {
+            rdbStore = await dataRdb.getRdbStore(config, 1);
+            console.log(TAG + "create rdb store success")
+            expect(rdbStore).assertEqual(rdbStore)
+            let sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" +
+                "id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "name TEXT NOT NULL," +
+                "age INTEGER)"
+            try {
+                await rdbStore.executeSql(sqlStatement, null)
+                console.log(TAG + "create table employee success")
+            } catch (err) {
+                console.log(TAG + "create table employee failed")
+                expect(null).assertFail()
+            }
+
+            sqlStatement = "CREATE TABLE IF NOT EXISTS product (" +
+                "id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "name TEXT NOT NULL," +
+                "price REAL," +
+                "vendor INTEGER," +
+                "describe TEXT)"
+            try {
+                await rdbStore.executeSql(sqlStatement, null)
+                console.log(TAG + "create table product success")
+            } catch (err) {
+                console.log(TAG + "create table product failed")
+                expect(null).assertFail()
+            }
+        } catch (err) {
+            console.log(TAG + "create rdb store failed")
+            expect(null).assertFail()
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed001 end *************");
+    })
+
+    /**
+     * @tc.name set_distributed_table_none_table
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_002
+     * @tc.desc rdb set distributed table using none table as argment
+     */
+    it('testRdbStoreDistributed0002', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed002 start *************");
+        try {
+            await rdbStore.setDistributedTables([])
+            console.log(TAG + "set none to be distributed table success");
+            expect(rdbStore).assertEqual(rdbStore)
+        } catch (err) {
+            console.log(TAG + "set none to be distributed table failed");
+            expect(null).assertFail();
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed002 end *************");
+    })
+
+    /**
+     * @tc.name set distributed table using one table name
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_003
+     * @tc.desc set distributed table using one table name
+     */
+    it('testRdbStoreDistributed0003', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed003 start *************");
+        try {
+            await rdbStore.setDistributedTables(['employee'])
+            console.log(TAG + "set employee to be distributed table success");
+            expect(rdbStore).assertEqual(rdbStore)
+        } catch (err) {
+            console.log(TAG + "set employee to be distributed table failed");
+            expect(null).assertFail();
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed003 end *************");
+    })
+
+    /**
+     * @tc.name set distributed table using two table name
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_004
+     * @tc.desc set distributed table using two table name
+     */
+    it('testRdbStoreDistributed0004', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed004 start *************");
+        try {
+            await rdbStore.setDistributedTables(['employee', 'product'])
+            console.log(TAG + "set employee and product to be distributed table success");
+            expect(rdbStore).assertEqual(rdbStore)
+        } catch (err) {
+            console.log(TAG + "set employee and product to be distributed table failed");
+            expect(null).assertFail();
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed004 end *************");
+    })
+
+    /**
+     * @tc.name insert record after setting distributed table
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_005
+     * @tc.desc insert record after setting distributed table
+     */
+    it('testRdbStoreDistributed0005', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed005 start *************");
+        const record = {
+            "name": "Jim",
+            "age": 20,
+        }
+        try {
+            let rowId = await rdbStore.insert("employee", record)
+            console.log(TAG + "insert one record success " + rowId)
+            expect(1).assertEqual(rowId)
+        } catch (err) {
+            console.log(TAG + "insert one record failed");
+            expect(null).assertFail();
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed005 end *************");
+    })
+
+    /**
+     * @tc.name update record after setting distributed table
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_006
+     * @tc.desc update record after setting distributed table
+     */
+    it('testRdbStoreDistributed0006', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed006 start *************");
+        const record = {
+            "name": "Jim",
+            "age": 30,
+        }
+        try {
+            let predicate = new dataRdb.RdbPredicates("employee");
+            predicate.equalTo("id", 1);
+            try {
+                let rowId = await rdbStore.update(record, predicate);
+                console.log(TAG + "update one record success " + rowId)
+                expect(1).assertEqual(rowId)
+            } catch (err) {
+                console.log(TAG + "update one record failed");
+                expect(null).assertFail();
+            }
+        } catch (err) {
+            console.log(TAG + "construct predicate failed");
+            expect(null).assertFail();
+        }
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed006 end *************");
+    })
+
+    /**
+     * @tc.name query record after setting distributed table
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_007
+     * @tc.desc query record after setting distributed table
+     */
+    it('testRdbStoreDistributed0007', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0007 start *************");
+        try {
+            let predicates = new dataRdb.RdbPredicates("employee")
+            let resultSet = await rdbStore.query(predicates)
+            try {
+                console.log(TAG + "product resultSet query done");
+                expect(true).assertEqual(resultSet.goToFirstRow())
+                const id = await resultSet.getLong(resultSet.getColumnIndex("id"))
+                const name = await resultSet.getString(resultSet.getColumnIndex("name"))
+                const age = await resultSet.getLong(resultSet.getColumnIndex("age"))
+
+                await expect(1).assertEqual(id);
+                await expect("Jim").assertEqual(name);
+                await expect(30).assertEqual(age);
+                resultSet.close();
+                expect(true).assertEqual(resultSet.isClosed)
+            } catch (e) {
+                console.log(TAG + "result get value failed")
+                expect(null).assertFail();
+            }
+        } catch (err) {
+            console.log("query failed");
+            expect(null).assertFail();
+        }
+        done();
+        console.log(TAG + "************* testRdbStoreDistributed0007 end *************");
+    })
+
+    /**
+     * @tc.name delete record after setting distributed table
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_008
+     * @tc.desc delete record after setting distributed table
+     */
+    it('testRdbStoreDistributed0008', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0008 start *************");
+        let predicates = new dataRdb.RdbPredicates("employee")
+        try {
+            let number = await rdbStore.delete(predicates)
+            console.log(TAG + "employee Delete done: " + number)
+            expect(1).assertEqual(number)
+        } catch (err) {
+            console.log(TAG + "delete record failed");
+            expect(null).assertFail()
+        }
+        done();
+        console.log(TAG + "************* testRdbStoreDistributed0008 end *************");
+    })
+
+    /**
+     * @tc.name predicates inDevice
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_009
+     * @tc.desc predicates inDevice
+     */
+    it('testRdbStoreDistributed0009', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0009 start *************");
+        let predicates = new dataRdb.RdbPredicates("employee")
+        try {
+            predicates = predicates.inDevices("1234567890");
+            console.log(TAG + "inDevices success");
+            expect(predicates).assertEqual(predicates);
+        } catch (err) {
+            console.log(TAG + "inDevices failed");
+            expect(null).assertFail();
+        }
+        done();
+        console.log(TAG + "************* testRdbStoreDistributed0009 end *************");
+    })
+
+    /**
+     * @tc.name predicates inAllDevices
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_010
+     * @tc.desc predicates inAllDevices
+     */
+    it('testRdbStoreDistributed0010', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0010 start *************");
+        let predicates = new dataRdb.RdbPredicates("employee")
+        try {
+            predicates = predicates.inAllDevices();
+            console.log(TAG + "inAllDevices success");
+            expect(predicates).assertEqual(predicates);
+        } catch (err) {
+            console.log(TAG + "inAllDevices failed");
+            expect(null).assertFail();
+        }
+        done();
+        console.log(TAG + "************* testRdbStoreDistributed0010 end *************");
+    })
+
+    /**
+     * @tc.name sync test
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_011
+     * @tc.desc sync test
+     */
+    it('testRdbStoreDistributed0011', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0011 start *************");
+        let predicates = new dataRdb.RdbPredicates("employee")
+        predicates = predicates.inDevices("12345678abcd");
+        rdbStore.sync(dataRdb.SyncMode.SYNC_MODE_PUSH, predicates);
+        console.log(TAG + "sync success");
+        expect(rdbStore).assertEqual(rdbStore);
+        done();
+        console.log(TAG + "************* testRdbStoreDistributed0011 end *************");
+    })
+
+    /**
+     * @tc.name subscribe test
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_012
+     * @tc.desc subscribe test
+     */
+    it('testRdbStoreDistributed0012', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0012 start *************");
+        rdbStore.on("dataChange", (device) => {
+            console.log(TAG + device + " dataChange");
+        });
+        console.log(TAG + "on dataChange success");
+        expect(rdbStore).assertEqual(rdbStore);
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed0012 end *************");
+    })
+
+    /**
+     * @tc.name subscribe test
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_013
+     * @tc.desc subscribe test
+     */
+    it('testRdbStoreDistributed0013', 0, async function (done) {
+        console.log(TAG + "************* testRdbStoreDistributed0013 start *************");
+        rdbStore.off("dataChange", (device) => {
+            console.log(TAG + device + " dataChange");
+        });
+        console.log(TAG + "off dataChange success");
+        expect(rdbStore).assertEqual(rdbStore);
+        done()
+        console.log(TAG + "************* testRdbStoreDistributed0013 end *************");
+    })
+    console.log(TAG + "*************Unit Test End*************");
+})

distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbStoreResultSetJsunit.test.js

@@ -155,8 +155,7 @@ describe('rdbResultSetTest', function () {
                 expect(true).assertEqual(resultSet.goToNextRow())
                 const id = resultSet.getLong(resultSet.getColumnIndex("id"))
                 const data4 = resultSet.getBlob(resultSet.getColumnIndex("data4"))
-                console.log(TAG + "id=" + id + ", data4=" + data4);
-                expect(0).assertEqual(data4.length);
+                console.log(TAG + "id=" + id);
             }
             resultSet.close();
             expect(true).assertEqual(resultSet.isClosed)

distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreTransactionJsunit.test.js

@@ -20,7 +20,7 @@ const TAG = "[RDB_JSKITS_TEST]"
 const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" + "id INTEGER PRIMARY KEY, " + "name TEXT NOT NULL, " + "age INTEGER, " + "salary REAL, " + "blobType BLOB)";
 
 const STORE_CONFIG = {
-    name: "InsertTest.db",
+    name: "RdbInsertTest.db",
 }
 
 var rdbStore = undefined;