!1994...

!1994 【Distributeddatamgr】【Master】DataAbilityPredicatesJsunit.test.js，RdbstoreRdbstoreJsunit.test.js 文件修改
Merge pull request !1994 from Maowen/master

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) {

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   *************");
     })