xts_acts_dstributeddatemgr1

Signed-off-by: Nlixinyi <lixinyi38@huawei.com>

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

@@ -118,6 +118,7 @@ function publicBackup(kvStore,file){
 
 function publicDeleteBackup(kvStore,files){
     console.log(`Test deleteBackup ${JSON.stringify(files)}`)
+    try{
         return new Promise(function(resolve, reject) {
             kvStore.deleteBackup(files, function(err, data){
                 console.log("Test deleteBackup BackUpInfo =" + data);
@@ -133,6 +134,9 @@ function publicDeleteBackup(kvStore,files){
                 }
             })
         })
+    } catch (e) {
+    console.log("111Test deleteBackup err information: " + e );
+    }
 }
 
 function publicRestoreSp(kvStore,file){
@@ -179,7 +183,7 @@ var file = '';
 
 var files =new Array();
 export default function kvStoreBackupCallbackJsunittest(){
-describe('kvStoreBackupCallbackJsunittest', function () {
+    describe('kvStoreBackupCallbackJsunittest', function () {
         beforeAll( async function () {
             console.info('Test beforeAll: Prerequisites at the test suite level, ' +
             'which are executed before t he test suite is executed.');
@@ -221,7 +225,7 @@ describe('kvStoreBackupCallbackJsunittest', function () {
                     done();
                 }).catch((err) => {
                     console.log("SUB_DDM_DKV_KVBACKUP_MANALRESTORE_CALLBACK_0100 Manualrestore fail 1" + err);
-                expect(err == "Error: Parameter error.The number of parameters is incorrect.").assertEqual(true);
+                    expect(err.code == 401 ).assertEqual(true);
                     done();
                 })
             } catch (e) {
@@ -837,5 +841,5 @@ describe('kvStoreBackupCallbackJsunittest', function () {
                 done();
             }
         })
-})
+    })
 }
\ No newline at end of file

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

@@ -111,21 +111,27 @@ function publicBackup(kvStore,file){
     })
 }
 
-function publicDeleteBackup(kvStore,files) {
+function publicDeleteBackup(kvStore,files){
     console.log(`Test deleteBackup ${JSON.stringify(files)}`)
-    return new Promise(function (resolve, reject) {
-        kvStore.deleteBackup(files).then((data) => {
+    try{
+        return new Promise(function(resolve, reject) {
+            kvStore.deleteBackup(files, function(err, data){
                 console.log("Test deleteBackup BackUpInfo =" + data);
-            var devices = new Array();
+                if (err != undefined) {
+                    console.log("Test deleteBackup err information: " + err );
+                    reject(err);
+                }else{
+                    var devices =new Array();
                     devices = data;
                     delresult = devices;
                     console.log("Test deleteBackup pass ");
                     resolve(data);
-        }).catch((err) => {
-            console.log("test deleteBackup err information: " + err);
-            reject(err);
+                }
             })
         })
+    } catch (e) {
+        console.log("111Test deleteBackup err information: " + e );
+    }
 }
 
 function publicRestoreSp(kvStore,file){
@@ -170,7 +176,7 @@ var file = '';
 
 var files =new Array();
 export default function kvStoreBackupPromiseJsunittest(){
-describe('kvStoreBackupPromiseJsunittest', function () {
+    describe('kvStoreBackupPromiseJsunittest', function () {
         beforeAll( async function () {
             console.info('Test beforeAll: Prerequisites at the test suite level, ' +
             'which are executed before the test suite is executed.');
@@ -814,5 +820,5 @@ describe('kvStoreBackupPromiseJsunittest', function () {
                 done();
             }
         })
-})
+    })
 }
\ No newline at end of file

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

@@ -26,8 +26,8 @@ const MAX_VALUE_LENGTH = 'y'.repeat(8192)
 var mPref;
 
 export default function storagePromiseTest() {
-describe('storagePromiseTest', function (done) {
-    beforeAll(async function () {
+describe('storagePromiseTest', function () {
+    beforeAll(async function (done) {
         console.info('beforeAll')
         const promise = storage.getStorage(PATH);
         promise.then((Storage)=>{

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

@@ -19,7 +19,7 @@ import ability_featureAbility from '@ohos.ability.featureAbility';
 
 const TAG = "[RelationalStore_JSKITS_TEST]"
 const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" + "id INTEGER PRIMARY KEY AUTOINCREMENT, "
-    + "name TEXT NOT NULL, " + "age INTEGER, " + "salary REAL, " + "blobType BLOB)"
++ "name TEXT NOT NULL, " + "age INTEGER, " + "salary REAL, " + "blobType BLOB)"
 const STORE_CONFIG = {
     name: "Query.db",
     securityLevel: data_Rdb.SecurityLevel.S1
@@ -64,7 +64,7 @@ async function CreatRdbStore(context, STORE_CONFIG) {
         }
         await RdbStore.insert("test", valueBucket)
     }
-    return RdbStore
+
 }
 
 async function getLocalDeviceId(){
@@ -154,21 +154,28 @@ export default function relationalStoreQueryTest(){
          * @tc.number SUB_DDM_RelationalStore_JS_RemoteQueryTest_Promise_0010
          * @tc.desc RelationalStore remotequery function test
          */
+        
         it('RdbRemoteQueryPromiseTest0010', 0, async function (done){
             console.info(TAG + "RdbRemoteQueryPromiseTest0010 start")
-            let errInfo = undefined
             let predicates = new data_Rdb.RdbPredicates("test");
             predicates.equalTo("name", "zhangsan")
             try{
-                rdbStore.remoteQuery(localDeviceId,"test",predicates,["name","age","salary"])
+                await rdbStore.remoteQuery(localDeviceId,"test",predicates,["name","age","salary"]).then((resultSet) => {
+                    console.info(TAG + "Remote query success")
+                    expect().assertFail();
+                }).catch((err) => {
+                    console.info(TAG + "Remote query error" + err)
+                    expect().assertFail();
+                })
             }catch(err){
-                errInfo = err
-            }
-            expect(errInfo.code).assertEqual("401")
+                console.info(TAG + "RdbRemoteQueryPromiseTest0010 error:" + err)
+                expect(err.message!==null).assertTrue();
                 done();
+            }
+
+
             console.info(TAG + "RdbRemoteQueryPromiseTest0010 end")
         })
-
         /**
          * @tc.name RelationalStore remotequery test
          * @tc.number SUB_DDM_RelationalStore_JS_RemoteQueryTest_Promise_0020