From f12e9e92d8e48d1e98645dcaf2e56f8e56fa213d Mon Sep 17 00:00:00 2001
From: zhangmaowen <zhangmaowen@huawei.com>
Date: Sat, 19 Feb 2022 11:00:29 +0800
Subject: [PATCH] <zhangmaowen@huawei.com>

Signed-off-by: zhangmaowen <zhangmaowen@huawei.com>
---
 .../js/default/test/DataAbilityPredicatesJsunit.test.js  | 4 ++--
 .../main/js/default/test/RdbstoreRdbstoreJsunit.test.js  | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/DataAbilityPredicatesJsunit.test.js
 mode change 100644 => 100755 distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreRdbstoreJsunit.test.js

diff --git a/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/DataAbilityPredicatesJsunit.test.js b/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/DataAbilityPredicatesJsunit.test.js
old mode 100644
new mode 100755
index 2e407e5c7..971af1bf6
--- a/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/DataAbilityPredicatesJsunit.test.js
+++ b/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/DataAbilityPredicatesJsunit.test.js
@@ -27,7 +27,7 @@ const CREATE_TABLE_ALL_DATA_TYPE_SQL = "CREATE TABLE IF NOT EXISTS AllDataType "
 + "primBooleanValue INTEGER , primByteValue INTEGER , primCharValue TEXT, `order` INTEGER);";
 
 const STORE_CONFIG = {
-    name: "Predicates.db",
+    name: "DataAbilityPredicates.db",
 }
 var rdbStore = undefined;
 var DOUBLE_MAX = 9223372036854775807;
@@ -53,7 +53,7 @@ describe('dataAbilityPredicatesTest', function () {
     afterAll(async function () {
         console.info(TAG + 'afterAll')
         rdbStore = null
-        await dataRdb.deleteRdbStore("Predicates.db");
+        await dataRdb.deleteRdbStore("DataAbilityPredicates.db");
     })
 
     function resultSize(resultSet) {
diff --git a/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreRdbstoreJsunit.test.js b/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreRdbstoreJsunit.test.js
old mode 100644
new mode 100755
index 7528a5d80..f180a1b9d
--- a/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreRdbstoreJsunit.test.js
+++ b/distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/test/RdbstoreRdbstoreJsunit.test.js
@@ -31,8 +31,10 @@ describe('rdbStoreTest', function () {
         console.info(TAG + 'beforeEach')
     })
 
-    afterEach(function () {
-        console.info(TAG + 'afterEach')
+    afterEach(async function () {
+        console.info(TAG + 'afterAll')
+        rdbStore = null
+        await dataRdb.deleteRdbStore("rdbstore.db");
     })
 
     afterAll(async function () {
@@ -60,7 +62,6 @@ describe('rdbStoreTest', function () {
         })
         await storePromise
         storePromise = null
-        await dataRdb.deleteRdbStore("rdbstore.db");
         done();
         console.log(TAG + "************* testRdbStore0001 end   *************");
     })
@@ -85,7 +86,6 @@ describe('rdbStoreTest', function () {
         })
         await storePromise
         storePromise = null
-        await dataRdb.deleteRdbStore("rdbstore.db");
         done();
         console.log(TAG + "************* testRdbStore0002 end   *************");
     })
@@ -133,7 +133,6 @@ describe('rdbStoreTest', function () {
         })
         await storePromise
         storePromise = null
-        await dataRdb.deleteRdbStore("rdbstore.db");
         done();
         console.log(TAG + "************* testRdbStore0004 end   *************");
     })
-- 
GitLab