!6443 【Distributeddatamgr】【master】问题用例优化

Merge pull request !6443 from 梁梁/master

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

@@ -13,30 +13,30 @@
 * limitations under the License.
 */
 import SingleKvStorePromiseTest from './SingleKvStoreKVPromiseJsTest.js'
-// import deviceKvStoreCallbackTest from './DeviceKvStoreKVCallbackJsTest.js'
-// import deviceKvStorePromiseTest from './DeviceKvStoreKVPromiseJsTest.js'
-// import kvManagerCallbackTest from './KvManagerKVCallbackJsTest.js'
-// import KVManagerPromiseTest from './KvManagerKVPromiseJsTest.js'
-// import KvStoreResultSetTest from './KvStoreResultSetKVJsTest.js'
+import deviceKvStoreCallbackTest from './DeviceKvStoreKVCallbackJsTest.js'
+import deviceKvStorePromiseTest from './DeviceKvStoreKVPromiseJsTest.js'
+import kvManagerCallbackTest from './KvManagerKVCallbackJsTest.js'
+import KVManagerPromiseTest from './KvManagerKVPromiseJsTest.js'
+import KvStoreResultSetTest from './KvStoreResultSetKVJsTest.js'
 import queryTest from './QueryKVJsTest.js'
 import SingleKvStoreCallbackTest from './SingleKvStoreKVCallbackJsTest.js'
-// import FieldNodeTest from './FieldNodeJsTest.js'
-// import kvStoreBackupCallbackJsunittest from './KvStoreBackupCallbackJsTest.js'
-// import kvStoreBackupPromiseJsunittest from './KvStoreBackupPromiseJsTest.js'
-// import schemaTest from './SchemaJsTest.js'
-// import singleKvStoreEnumTest from './SingleKvStoreEnumJsTest.js'
+import FieldNodeTest from './FieldNodeJsTest.js'
+import kvStoreBackupCallbackJsunittest from './KvStoreBackupCallbackJsTest.js'
+import kvStoreBackupPromiseJsunittest from './KvStoreBackupPromiseJsTest.js'
+import schemaTest from './SchemaJsTest.js'
+import singleKvStoreEnumTest from './SingleKvStoreEnumJsTest.js'
 export default function testsuite() {
     SingleKvStorePromiseTest()
-    // deviceKvStoreCallbackTest()
-    // deviceKvStorePromiseTest()
-    // kvManagerCallbackTest()
-    // KVManagerPromiseTest()
-    // KvStoreResultSetTest()
+    deviceKvStoreCallbackTest()
+    deviceKvStorePromiseTest()
+    kvManagerCallbackTest()
+    KVManagerPromiseTest()
+    KvStoreResultSetTest()
     queryTest()
     SingleKvStoreCallbackTest()
-    // FieldNodeTest()
-    // kvStoreBackupCallbackJsunittest()
-    // kvStoreBackupPromiseJsunittest()
-    // schemaTest()
-    // singleKvStoreEnumTest()
+    FieldNodeTest()
+    kvStoreBackupCallbackJsunittest()
+    kvStoreBackupPromiseJsunittest()
+    schemaTest()
+    singleKvStoreEnumTest()
 }

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

@@ -2337,11 +2337,6 @@ describe('SingleKvStoreCallbackTest', function () {
      */
     it('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULT_CALLBACK_8200', 0, async function (done) {
         console.info('SingleKvStoreCloseResultSetCallbackTest004');
-        let resultSet = null;
-        await kvStore.getResultSet('batch_test_string_key').then((result) => {
-            console.info('SingleKvStoreCloseResultSetCallbackTest004 getResultSet success');
-            resultSet = result;
-        })
         try{
             kvStore.closeResultSet("",(err, data) => {
                 console.info('SingleKvStoreCloseResultSetCallbackTest004 close result finish')

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

@@ -2903,16 +2903,7 @@ describe('SingleKvStorePromiseTest', function () {
      * @tc.name Test Js Api SingleKvStoreCloseResultSet testcase 004
      */
     it('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULTSET_PROMISE_0400', 0, async function (done) {
-        let resultSet = undefined;
         let errorInfo = undefined;
-        await kvStore.getResultSet('batch_test_string_key').then((result) => {
-            console.info('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULTSET_PROMISE_0400 getResultSet success');
-            resultSet = result;
-        }).catch((err) => {
-            console.error('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULTSET_PROMISE_0400 getResultSet fail ' + `, error code is ${err.code}, message is ${err.message}`);
-            expect(null).assertFail();
-        });
-        
         try {
             kvStore.closeResultSet("")
             console.info('SUB_DDM_DKV_SINGLEKVSTORE_CLOSERESULTSET_PROMISE_0400 success');

distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStoreCallbackJsunit.test.js

@@ -2262,13 +2262,16 @@ describe('singleKvStoreCallbackTest', function () {
      * @tc.desc Test Js Api SingleKvStore.CloseResultSet() testcase 104
      */
     it('testSingleKvStoreCloseResultSet104', 0, async function (done) {
-        console.info('testSingleKvStoreCloseResultSet104');
-        try {
-            console.info('testSingleKvStoreCloseResultSet104 success');
-        }catch(e) {
-            console.info('testSingleKvStoreCloseResultSet104 e ' + e);
-            expect(null).assertFail();
-        }
+        console.info('SingleKvStoreCloseResultSetCallbackTest004');
+        kvStore.closeResultSet("",(err, data) => {
+            if(err != undefined){
+                console.info(`SingleKvStoreCloseResultSetCallbackTest004 close result error, error is ${err}`)
+            }else{
+                expect(null).assertFail();
+            }
+            done();
+        })
+        await sleep(1000)
         done();
     })
 

distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/SingleKvStorePromiseJsunit.test.js

@@ -2470,12 +2470,12 @@ describe('singleKvStorePromiseTest', function () {
      */
     it('testSingleKvStoreCloseResultSet004', 0, async function (done) {
         console.info('testSingleKvStoreCloseResultSet004');
-        try {
-            console.info('testSingleKvStoreCloseResultSet004 success');
-        }catch(e) {
-            console.info('testSingleKvStoreCloseResultSet004 e ' + e);
+        await kvStore.closeResultSet("").then((data) => {
+            console.info("testSingleKvStoreCloseResultSet004 close resultSet success")
             expect(null).assertFail();
-        }
+        }).catch((err) => {
+            console.info(`testSingleKvStoreCloseResultSet004 close resultSet error, error is ${err}`)
+        })
         done();
     })