!7766 【xts_acts】【分布式数据管理】【master】解决xts用例问题

Merge pull request !7766 from 刘皓男/master

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/KvStoreBackupCallbackJsTest.js

@@ -784,14 +784,14 @@ describe('kvStoreBackupCallbackJsunittest', function () {
     it('SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200', 0, async function (done) {
         try {
             console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200 before putdata");
-            publicput(kvStore,"key","value") ;
+            await publicput(kvStore,"key","value") ;
             console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200 going putdata");
             await publicget(kvStore,"key").then((data) => {
                 console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200 going getdata" + JSON.stringify(data));
                 expect(true).assertEqual(data == "value");
                 done();
             }).catch((err) => {
-                console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200 Get fail 1 " + err);
+                console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0200 Get fail 1 " + JSON.stringify(err));
                 expect(err).assertFail();
                 done();
             })
@@ -811,14 +811,14 @@ describe('kvStoreBackupCallbackJsunittest', function () {
     it('SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300', 0, async function (done) {
         try {
             console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300 before putdata");
-            publicput(kvStore,"putcallback003","value1") ;
+            await publicput(kvStore,"putcallback003","value1") ;
             console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300 going putdata");
             await publicget(kvStore,"putcallback").then((data) => {
                 console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300 going getdata" + JSON.stringify(data));
                 expect(true).assertEqual(false);
                 done();
             }).catch((err) => {
-                console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300 Get fail 1 " + err);
+                console.log("SUB_DDM_DKV_KVBACKUP_PUT_CALLBACK_0300 Get fail 1 " + JSON.stringify(err));
                 expect(true).assertEqual(true);
                 done();
             })

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/KvStoreBackupPromiseJsTest.js

@@ -192,9 +192,6 @@ describe('kvStoreBackupPromiseJsunittest', function () {
         console.info('afterAll: Test suite-level cleanup condition, ' +
         'which is executed after the test suite is executed');
         publiccloseKvStore();
-        await kvManager.getAllKVStoreId(TEST_BUNDLE_NAME).then((data) => {
-            console.info(data.length);
-        })
         kvManager = null;
         console.info("Test kvstore = " + kvStore)
     })
@@ -779,7 +776,7 @@ describe('kvStoreBackupPromiseJsunittest', function () {
                 expect(true).assertEqual(data == "value");
                 done();
             }).catch((err) => {
-                console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0200 Get fail 1 " + err);
+                console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0200 Get fail 1 " + JSON.stringify(err));
                 expect(err).assertFail();
                 done();
             })
@@ -799,14 +796,14 @@ describe('kvStoreBackupPromiseJsunittest', function () {
     it('SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0300', 0, async function (done) {
         try {
             console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0300 before putdata");
-            publicput(kvStore,"PutPromise0004","value1") ;
+            await publicput(kvStore,"PutPromise0004","value1") ;
             console.log("KvStoreBackupestDbBuckupPutPromiseTest004t going putdata");
             await publicget(kvStore,"PutPromise").then((data) => {
                 console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0300 going getdata" + JSON.stringify(data));
                 expect(true).assertEqual(JSON.stringify(data) == '{}');
                 done();
             }).catch((err) => {
-                console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0300 Get fail 1 " + err);
+                console.log("SUB_DDM_DKV_KVBACKUP_PUT_PROMISE_0300 Get fail 1 " + JSON.stringify(err));
                 console.log(JSON.stringify(err));
                 expect(true).assertEqual(err.code == 15100004);
                 done();

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/js/test/List.test.js

@@ -35,8 +35,8 @@ export default function testsuite() {
     queryTest()
     SingleKvStoreCallbackTest()
     FieldNodeTest()
-    kvStoreBackupCallbackJsunittest()
-    kvStoreBackupPromiseJsunittest()
     schemaTest()
     singleKvStoreEnumTest()
+    kvStoreBackupPromiseJsunittest()
+    kvStoreBackupCallbackJsunittest()
 }

distributeddatamgr/preferencesjstest/hap/src/main/js/test/StoragePromiseJsunit.test.js

@@ -21,8 +21,8 @@ const KEY_TEST_LONG_ELEMENT = 'key_test_long';
 const KEY_TEST_FLOAT_ELEMENT = 'key_test_float';
 const KEY_TEST_BOOLEAN_ELEMENT = 'key_test_boolean';
 const KEY_TEST_STRING_ELEMENT = 'key_test_string';
-const MAX_KEY_LENGTH = 'X'.repeat(32)
-const MAX_VALUE_LENGTH = 'y'.repeat(8191)
+const MAX_KEY_LENGTH = 'X'.repeat(80)
+const MAX_VALUE_LENGTH = 'y'.repeat(8192)
 var mPref;
 
 export default function storagePromiseTest() {

distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstoreBackupRestoreCallbackJsunit.test.js

@@ -114,9 +114,13 @@ export default function rdbStoreBackupRestoreCallbackTest() {
     
         afterEach(async function () {
             console.info(TAG + 'afterEach')
+            try {
                 await dataRdb.deleteRdbStore(context, STORE_CONFIG.name)
                 await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME)
                 await dataRdb.deleteRdbStore(context, "BackupTest003.db")
+            } catch (err) {
+                console.info(TAG + "deleteRdbStore err" + JSON.stringify(err))
+            }
         })
     
         afterAll(async function () {

distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstoreBackupRestoreWithFAContextJsunit.test.js

@@ -112,9 +112,13 @@ export default function rdbStoreBackupRestorePromiseTest() {
 
         afterEach(async function () {
             console.info(TAG + 'afterEach')
+            try {
                 await dataRdb.deleteRdbStore(context, STORE_CONFIG.name)
                 await dataRdb.deleteRdbStore(context, DATABASE_BACKUP_NAME)
                 await dataRdb.deleteRdbStore(context, "BackupTest003.db")
+            } catch (err) {
+                console.info(TAG + "deleteRdbStore err" + JSON.stringify(err))
+            }
         })
 
         afterAll(async function () {

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js

@@ -114,9 +114,13 @@ export default function relationalStoreBackupRestoreCallbackTest() {
 
         afterEach(async function () {
             console.info(TAG + 'afterEach')
+            try {
                 await data_Rdb.deleteRdbStore(context, STORE_CONFIG.name)
                 await data_Rdb.deleteRdbStore(context, DATABASE_BACKUP_NAME)
                 await data_Rdb.deleteRdbStore(context, "BackupTest003.db")
+            } catch (err) {
+                console.info(TAG + "deleteRdbStore err" + JSON.stringify(err))
+            }
         })
 
         afterAll(async function () {

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js

@@ -112,9 +112,13 @@ describe('relationalStoreBackupRestorePromiseTest', function () {
 
     afterEach(async function () {
         console.info(TAG + 'afterEach')
+        try {
             await data_Rdb.deleteRdbStore(context, STORE_CONFIG.name)
             await data_Rdb.deleteRdbStore(context, DATABASE_BACKUP_NAME)
             await data_Rdb.deleteRdbStore(context, "BackupTest003.db")
+        } catch (err) {
+            console.info(TAG + "deleteRdbStore err" + JSON.stringify(err))
+        }
     })
 
         afterAll(async function () {