From eaca382d197e898625bdf421432cef8e77e6cff6 Mon Sep 17 00:00:00 2001
From: yanglifeng1217 <yanglifeng5@huawei.com>
Date: Thu, 13 Oct 2022 12:03:34 +0800
Subject: [PATCH] <modified>

Signed-off-by: yanglifeng1217 <yanglifeng5@huawei.com>
---
 .../main/js/test/RdbstoreInsertJsunit.test.js |  7 +------
 .../main/js/test/RdbstoreUpdateJsunit.test.js | 20 +++++++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreInsertJsunit.test.js b/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreInsertJsunit.test.js
index ca5a8dc2d..6af12519e 100644
--- a/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreInsertJsunit.test.js
+++ b/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreInsertJsunit.test.js
@@ -665,7 +665,7 @@ describe('rdbstoreInsertTest', function () {
         const valueBuckets = [valueBucket1, valueBucket2, valueBucket3]
         await rdbStore.executeSql(CREATE_TABLE_NAME + "callback1" + CREATE_TABLE).then(() => {
             console.info(TAG + "Batch insert data start")
-            rdbStore.batchInsert("testcallback1", valueBuckets, async (err, data) => {
+            await rdbStore.batchInsert("testcallback1", valueBuckets, async (err, data) => {
                 if(err != null){
                     expect(false).assertTrue();
                 }else{
@@ -1068,7 +1068,6 @@ describe('rdbstoreInsertTest', function () {
      */
      it('testRdbStorebatchInsertCallback0007', 0, async function (done) {
         console.info(TAG + "************* testRdbStorebatchInsertCallback0007 start *************");
-        try{
             await rdbStore.executeSql(CREATE_TABLE_NAME + "Callback7" + CREATE_TABLE).then(async () => {
                 await rdbStore.batchInsert("testCallback7", (err,data) => {
                     console.info(TAG + "Affect row is " + data)
@@ -1084,10 +1083,6 @@ describe('rdbstoreInsertTest', function () {
             }).catch((err) => {
                 expect(null).assertFail();
             })
-        }catch(err){
-            console.info(TAG + "Batch insert data error:  " + err)
-            expect(null).assertFail();
-        }
         done()
         console.info(TAG + "************* testRdbStorebatchInsertCallback0007 end *************");
     })
diff --git a/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreUpdateJsunit.test.js b/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreUpdateJsunit.test.js
index 633d856a2..039db4739 100644
--- a/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreUpdateJsunit.test.js
+++ b/distributeddatamgr/relationalStorejstest/hap/src/main/js/test/RdbstoreUpdateJsunit.test.js
@@ -80,9 +80,9 @@ describe('rdbStoreUpdateTest', function () {
                 "blobType": u8,
             }
             let predicates = await new dataRdb.RdbPredicates("test")
-            await predicates.equalTo("id", "1")
+            predicates.equalTo("id", "1")
             let updatePromise = rdbStore.update(valueBucket, predicates)
-            updatePromise.then(async (ret) => {
+            await updatePromise.then(async (ret) => {
                 await expect(1).assertEqual(ret);
                 await console.info(TAG + "update done: " + ret);
                 let resultSet = await rdbStore.query(predicates)
@@ -94,15 +94,15 @@ describe('rdbStoreUpdateTest', function () {
                 const salary = await resultSet.getDouble(resultSet.getColumnIndex("salary"))
                 const blobType = await resultSet.getBlob(resultSet.getColumnIndex("blobType"))
 
-                await expect(1).assertEqual(id);
-                await expect("lisi").assertEqual(name);
-                await expect(20).assertEqual(age);
-                await expect(200.5).assertEqual(salary);
-                await expect(4).assertEqual(blobType[0]);
-                await expect(5).assertEqual(blobType[1]);
-                await expect(6).assertEqual(blobType[2]);
+                expect(1).assertEqual(id);
+                expect("lisi").assertEqual(name);
+                expect(20).assertEqual(age);
+                expect(200.5).assertEqual(salary);
+                expect(4).assertEqual(blobType[0]);
+                expect(5).assertEqual(blobType[1]);
+                expect(6).assertEqual(blobType[2]);
                 console.info(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType);
-                await expect(false).assertEqual(resultSet.goToNextRow())
+                expect(false).assertEqual(resultSet.goToNextRow())
                 resultSet = null
             }).catch((err) => {
                 console.info(TAG + "update error");
-- 
GitLab