!6801 【Distributeddatamgr】【monthly_20221018】ObjectStoreJsunit.test.js文件修改，优化用例；替换p7b文件

Merge pull request !6801 from yanglifeng/monthly_20221018

distributeddatamgr/dataObjectjstest/hap/src/main/js/test/ObjectStoreJsunit.test.js

@@ -17,44 +17,49 @@ import distributedObject from '@ohos.data.distributedDataObject';
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 import bundle from '@ohos.bundle'
 
-var baseLine = 500; //0.5 second
+var baseLine = 3000; //3 second
 var gObject;
 const TAG = "OBJECTSTORE_TEST";
 
 function changeCallback(sessionId, changeData) {
-    console.info("get init change111" + sessionId + " " + changeData);
+    console.info("changeCallback start" + sessionId + " " + changeData);
     if (changeData != null && changeData != undefined) {
         changeData.forEach(element => {
             console.info(TAG + "data changed !" + element);
+            expect(element != null);
         });
     }
-    console.info(TAG + "get init change111 end" + sessionId + " " + changeData);
+    console.info(TAG + "changeCallback end" + sessionId + " " + changeData);
 }
 
 function changeCallback2(sessionId, changeData) {
-    console.info("get init change222" + sessionId + " " + changeData);
+    console.info("changeCallback2 satrt" + sessionId + " " + changeData);
     if (changeData != null && changeData != undefined) {
         changeData.forEach(element => {
             console.info(TAG + "data changed !" + element);
         });
     }
-    console.info(TAG + "get init change222 end" + sessionId + " " + changeData);
+    console.info(TAG + "changeCallback2 end" + sessionId + " " + changeData);
 }
 
 function statusCallback1(sessionId, networkId, status) {
-    console.info(TAG + "test init change111" + sessionId);
+    console.info(TAG + "statusCallback1" + sessionId);
     this.response += "\nstatus changed " + sessionId + " " + status + " " + networkId;
 }
 
 function statusCallback2(sessionId, networkId, status) {
-    console.info(TAG + "test init change222" + sessionId);
+    console.info(TAG + "statusCallback2" + sessionId);
     this.response += "\nstatus changed " + sessionId + " " + status + " " + networkId;
 }
 
 function statusCallback3(sessionId, networkId, status) {
-    console.info(TAG + "test init change333" + sessionId);
+    console.info(TAG + "statusCallback3" + sessionId);
     this.response += "\nstatus changed " + sessionId + " " + status + " " + networkId;
 }
+function statusCallback4(sessionId, networkId, status) {
+    console.info(TAG + "statusCallback4" + " " + sessionId);
+    expect("restored" == status).assertEqual(true);
+}
 function sleep(delay) {
     var start = (new Date()).getTime();
     while((new Date()).getTime() - start >= delay) {
@@ -63,36 +68,36 @@ function sleep(delay) {
 }
 
 var tokenID = undefined;
-const TIMEOUT = 2000;
 const PERMISSION_USER_SET = 1;
 const PERMISSION_USER_NAME = "ohos.permission.DISTRIBUTED_DATASYNC";
-export default function objectStoreTest() {
-describe('objectStoreTest', function () {
-    beforeAll(async function (done) {
-        console.info("====>beforeAll start====");
-        var appInfo = await bundle.getApplicationInfo('ohos.acts.distributeddataObject', 0, 100);
+async function grantPerm() {
+    console.info("====grant Permission start====");
+    var appInfo = await bundle.getApplicationInfo('ohos.acts.dataObject', 0, 100);
     tokenID = appInfo.accessTokenId;
-        console.info(" bundleName:" + appInfo.name);
+    console.info("accessTokenId" + appInfo.accessTokenId + " bundleName:" + appInfo.bundleName);
     var atManager = abilityAccessCtrl.createAtManager();
     var result = await atManager.grantUserGrantedPermission(tokenID, PERMISSION_USER_NAME, PERMISSION_USER_SET);
-        console.info(" result:" + result);
-        sleep(TIMEOUT);
-        console.debug("====>beforeAll end====");
+    console.info("tokenId" + tokenID + " result:" + result);
+    console.info("====grant Permission end====");
+}
+export default function objectStoreTest() {
+    describe('objectStoreTest', function () {
+        beforeAll(async function (done) {
+            await grantPerm();
             done();
         })
 
         beforeEach(async function () {
-        // await grantPerm();
-        console.info(TAG + 'beforeEach')
+            console.info(TAG + 'beforeEach');
         })
 
         afterEach(async function () {
-        console.info(TAG + 'afterEach')
-        gObject.setSessionId("");
+            console.info(TAG + 'afterEach');
+            console.info(TAG + 'leaveSession');
         })
 
         afterAll(async function () {
-        console.info(TAG + 'afterAll')
+            console.info(TAG + 'afterAll');
         })
 
         console.info(TAG + "*************Unit Test Begin*************");
@@ -108,25 +113,26 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session1");
             if (objectTest != undefined && objectTest != null) {
-            expect("session1" == objectTest.__sessionId);
+                console.info(TAG + " testOn001 joinSession success: " + objectTest.__sessionId);
+                expect("session1" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOn001 joinSession failed");
             }
             console.info(TAG + " start call watch change");
-        objectTest.on("change", changeCallback);
+            objectTest.on("change",changeCallback );
             if (objectTest != undefined && objectTest != null) {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
             }
-
-        done()
+            done();
             console.info(TAG + "************* testOn001 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -139,7 +145,8 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session2");
             if (objectTest != undefined && objectTest != null) {
-            expect("session2" == objectTest.__sessionId);
+                console.info(TAG + " testOn002 joinSession success:" + objectTest.__sessionId);
+                expect("session2" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOn002 joinSession failed");
             }
@@ -147,15 +154,15 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
             }
-
-        done()
+            done();
             console.info(TAG + "************* testOn002 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -169,7 +176,8 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session3");
             if (objectTest != undefined && objectTest != null) {
-            expect("session3" == objectTest.__sessionId);
+                console.info(TAG + " testOn003 joinSession success:" + objectTest.__sessionId);
+                expect("session3" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOn003 joinSession failed");
             }
@@ -179,20 +187,21 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 objectTest.name = "jack2";
                 objectTest.age = 20;
                 objectTest.isVis = false;
-            expect(objectTest.name == "jack2");
-            expect(objectTest.age == 20);
+                expect(objectTest.name == "jack2").assertEqual(true);
+                expect(objectTest.age == 20).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
             }
 
-        done()
+            done();
             console.info(TAG + "************* testOn003 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -205,7 +214,8 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session4");
             if (objectTest != undefined && objectTest != null) {
-            expect("session4" == objectTest.__sessionId);
+                console.info(TAG + "testOn004 joinSession success:" + objectTest.__sessionId);
+                expect("session4" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOn004 joinSession failed");
             }
@@ -213,8 +223,9 @@ describe('objectStoreTest', function () {
             console.info(TAG + " start call watch change");
             console.info(TAG + " end call watch change");
 
-        done()
+            done();
             console.info(TAG + "************* testOn004 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -226,8 +237,9 @@ describe('objectStoreTest', function () {
             console.info(TAG + "************* testOff001 start *************");
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session5");
-        if (objectTest != undefined && objectTest != null) {
-            expect("session5" == objectTest.__sessionId);
+            if (objectTest != undefined && objectTest != null){
+                console.info(TAG + "testOff001 joinSession success:" + objectTest.__sessionId)
+                expect("session5" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOff001 joinSession failed");
             }
@@ -237,8 +249,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -249,8 +261,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack2";
                 objectTest.age = 20;
                 objectTest.isVis = false;
-            expect(objectTest.name == "jack2");
-            expect(objectTest.age == 20);
+                expect(objectTest.name == "jack2").assertEqual(true);
+                expect(objectTest.age == 20).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -258,6 +270,7 @@ describe('objectStoreTest', function () {
 
             done()
             console.info(TAG + "************* testOff001 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -270,7 +283,8 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session6");
             if (objectTest != undefined && objectTest != null) {
-            expect("session6" == objectTest.__sessionId);
+                console.info(TAG + "testOff002 joinSession success:" + objectTest.__sessionId);
+                expect("session6" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOff002 joinSession failed");
             }
@@ -280,8 +294,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -289,6 +303,7 @@ describe('objectStoreTest', function () {
 
             done()
             console.info(TAG + "************* testOff002 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -301,16 +316,18 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session7");
             if (objectTest != undefined && objectTest != null) {
-            expect("session7" == objectTest.__sessionId);
+                console.info(TAG + "testMultiObjectOn001 joinSession1 success:" + objectTest.__sessionId);
+                expect("session7" == objectTest.__sessionId).assertEqual(true);
             } else {
-            console.info(TAG + "testMultiObjectOn001 joinSession failed");
+                console.info(TAG + "testMultiObjectOn001 joinSession1 failed");
             }
             var testObject = distributedObject.createDistributedObject({ name: "Eric", age: 81, isVis: true });
             testObject.setSessionId("testSession1");
             if (testObject != undefined && testObject != null) {
-            expect("testSession1" == testObject.__sessionId);
+                console.info(TAG + "testMultiObjectOn001 joinSession2 success:" + testObject.__sessionId);
+                expect("testSession1" == testObject.__sessionId).assertEqual(true);
             } else {
-            console.info(TAG + "testMultiObjectOn001 joinSession failed");
+                console.info(TAG + "testMultiObjectOn001 joinSession2 failed");
             }
             objectTest.on("change", changeCallback);
             testObject.on("change", changeCallback2);
@@ -319,8 +336,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " objectTest is null,set name fail");
@@ -329,15 +346,16 @@ describe('objectStoreTest', function () {
                 testObject.name = "jack2";
                 testObject.age = 20;
                 testObject.isVis = false;
-            expect(testObject.name == "jack2");
-            expect(testObject.age == 20);
+                expect(testObject.name == "jack2").assertEqual(true);
+                expect(testObject.age == 20).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " testObject is null,set name fail");
             }
-
-        done()
+            done();
             console.info(TAG + "************* testMultiObjectOn001 end *************");
+            objectTest.setSessionId("");
+            testObject.setSessionId("");
         })
 
         /**
@@ -350,14 +368,17 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session8");
             if (objectTest != undefined && objectTest != null) {
-            expect("session8" == objectTest.__sessionId);
+                console.info(TAG + "testMultiObjectOn002 joinSession success:" + objectTest.__sessionId);
+                expect("session8" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testMultiObjectOn002 joinSession failed");
             }
+
             var testObject = distributedObject.createDistributedObject({ name: "Eric", age: 81, isVis: true });
             testObject.setSessionId("testSession2");
             if (testObject != undefined && testObject != null) {
-            expect("testSession2" == testObject.__sessionId);
+                console.info(TAG + "testMultiObjectOn002 joinSession success:" + testObject.__sessionId);
+                expect("testSession2" == testObject.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testMultiObjectOn002 joinSession failed");
             }
@@ -369,8 +390,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack1";
                 objectTest.age = 19;
                 objectTest.isVis = true;
-            expect(objectTest.name == "jack1");
-            expect(objectTest.age == 19);
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -379,8 +400,8 @@ describe('objectStoreTest', function () {
                 testObject.name = "jack2";
                 testObject.age = 20;
                 testObject.isVis = false;
-            expect(testObject.name == "jack2");
-            expect(testObject.age == 20);
+                expect(testObject.name == "jack2").assertEqual(true);
+                expect(testObject.age == 20).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -390,8 +411,8 @@ describe('objectStoreTest', function () {
                 objectTest.name = "jack3";
                 objectTest.age = 21;
                 objectTest.isVis = false;
-            expect(objectTest.name == "jack3");
-            expect(objectTest.age == 21);
+                expect(objectTest.name == "jack3").assertEqual(true);
+                expect(objectTest.age == 21).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
@@ -401,15 +422,17 @@ describe('objectStoreTest', function () {
                 testObject.name = "jack4";
                 testObject.age = 22;
                 testObject.isVis = true;
-            expect(testObject.name == "jack4");
-            expect(testObject.age == 22);
+                expect(testObject.name == "jack4").assertEqual(true);
+                expect(testObject.age == 22).assertEqual(true);
                 console.info(TAG + " set data success!");
             } else {
                 console.info(TAG + " object is null,set name fail");
             }
 
-        done()
+            done();
             console.info(TAG + "************* testMultiObjectOff001 end *************");
+            objectTest.setSessionId("");
+            testObject.setSessionId("");
         })
 
         /**
@@ -422,20 +445,45 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session9");
             if (objectTest != undefined && objectTest != null) {
-            expect("session9" == objectTest.__sessionId);
+                console.info(TAG + "testChangeSession001 joinSession success:"+ objectTest.__sessionId);
+                expect("session9" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testChangeSession001 joinSession failed");
             }
+            objectTest.on("change", changeCallback);
+            console.info(TAG + " start call watch change");
+            if (objectTest != undefined && objectTest != null) {
+                objectTest.name = "jack1";
+                objectTest.age = 19;
+                objectTest.isVis = true;
+                expect(objectTest.name == "jack1").assertEqual(true);
+                expect(objectTest.age == 19).assertEqual(true);
+                console.info(TAG + " set data success!");
+            } else {
+                console.info(TAG + " object is null,set name fail");
+            }
             console.info(TAG + "start change sessionId");
-        setTimeout(() => objectTest.setSessionId("session9"), 1000);
+            objectTest.setSessionId("session10");
             if (objectTest != undefined && objectTest != null) {
-            expect("session9" == objectTest.__sessionId);
+                console.info(TAG + "testChangeSession001 joinSession again success:" + objectTest.__sessionId);
+                expect("session10" == objectTest.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testChangeSession001 joinSession again failed");
             }
 
-        done()
+            if (objectTest != undefined && objectTest != null) {
+                objectTest.name = "jack2";
+                objectTest.age = 20;
+                objectTest.isVis = true;
+                expect(objectTest.name == "jack2").assertEqual(true);
+                expect(objectTest.age == 20).assertEqual(true);
+                console.info(TAG + " set data success!");
+            } else {
+                console.info(TAG + " object is null,set name fail");
+            }
+            done();
             console.info(TAG + "************* testChangeSession001 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -445,19 +493,17 @@ describe('objectStoreTest', function () {
          */
         it('testUndefinedType001', 0, function (done) {
             console.info(TAG + "************* testUndefinedType001 start *************");
-        var object1 = distributedObject.createDistributedObject({ name: undefined, age: undefined, isVis: undefined });
+            var undefined_object = distributedObject.createDistributedObject({ name: undefined, age: undefined, isVis: undefined });
+            expect(undefined_object == undefined).assertEqual(false);
             try {
-            object1.setSessionId("session11");
-            if (object1 != undefined && object1 != null) {
-                expect("session11" == object1.__sessionId);
-            } else {
-                console.info(TAG + "testUndefinedType001 joinSession session11 failed");
-            }
+                undefined_object.setSessionId("session11");
+                expect("session11" == undefined_object.__sessionId).assertEqual(true);
+
             } catch (error) {
                 console.error(TAG + error);
             }
 
-        done()
+            done();
             console.info(TAG + "************* testUndefinedType001 end *************");
         })
 
@@ -469,9 +515,9 @@ describe('objectStoreTest', function () {
         it('testGenSessionId001', 0, function (done) {
             console.info(TAG + "************* testGenSessionId001 start *************");
             var sessionId = distributedObject.genSessionId();
-        expect(sessionId != null && sessionId.length > 0 && typeof (sessionId) == 'string');
+            expect(sessionId != null && sessionId.length > 0 && typeof (sessionId) == 'string').assertEqual(true);
 
-        done()
+            done();
             console.info(TAG + "************* testGenSessionId001 end *************");
         })
 
@@ -484,9 +530,9 @@ describe('objectStoreTest', function () {
             console.info(TAG + "************* testGenSessionId002 start *************");
             var sessionId1 = distributedObject.genSessionId();
             var sessionId2 = distributedObject.genSessionId();
-        expect(sessionId1 != sessionId2);
+            expect(sessionId1 != sessionId2).assertEqual(true);
 
-        done()
+            done();
             console.info(TAG + "************* testGenSessionId002 end *************");
         })
 
@@ -502,8 +548,9 @@ describe('objectStoreTest', function () {
             objectTest.on("status", statusCallback1);
             console.info(TAG + "watch success");
 
-        done()
+            done();
             console.info(TAG + "************* testOnStatus001 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -515,6 +562,8 @@ describe('objectStoreTest', function () {
             console.info(TAG + "************* testOnStatus002 start *************");
             console.info(TAG + "start watch status");
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
+            expect(objectTest == undefined).assertEqual(false);
+
             objectTest.on("status", statusCallback1);
             objectTest.on("status", statusCallback2);
             objectTest.on("status", statusCallback3);
@@ -523,8 +572,9 @@ describe('objectStoreTest', function () {
             objectTest.off("status", statusCallback1);
             console.info(TAG + "unwatch success");
 
-        done()
+            done();
             console.info(TAG + "************* testOnStatus002 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -536,6 +586,8 @@ describe('objectStoreTest', function () {
             console.info(TAG + "************* testOnStatus003 start *************");
             console.info(TAG + "start watch status");
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
+            expect(objectTest == undefined).assertEqual(false);
+
             objectTest.on("status", statusCallback1);
             objectTest.on("status", statusCallback2);
             objectTest.on("status", statusCallback3);
@@ -544,8 +596,9 @@ describe('objectStoreTest', function () {
             objectTest.off("status");
             console.info(TAG + "unwatch success");
 
-        done()
+            done();
             console.info(TAG + "************* testOnStatus003 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -563,7 +616,8 @@ describe('objectStoreTest', function () {
             });
             complexObject.setSessionId("session12");
             if (complexObject != undefined && complexObject != null) {
-            expect("session12" == complexObject.__sessionId);
+                console.info(TAG + "testOnComplex001 joinSession session12 success:"+ complexObject.__sessionId);
+                expect("session12" == complexObject.__sessionId).assertEqual(true);
             } else {
                 console.info(TAG + "testOnComplex001 joinSession session12 failed");
             }
@@ -571,14 +625,17 @@ describe('objectStoreTest', function () {
             complexObject.age = 19;
             complexObject.isVis = false;
             complexObject.parent = { mother: "jack mom", father: "jack Dad" };
-        complexObject.list = [{ mother: "jack mom" }, { father: "jack Dad" }];
-        expect(complexObject.name == "jack");
-        expect(complexObject.age == 19);
-        expect(complexObject.parent == { mother: "jack1 mom", father: "jack1 Dad" });
-        expect(complexObject.list == [{ mother: "jack1 mom", father: "jack1 Dad" }]);
+            complexObject.list = [{ mother: "jack2 mom2" }, { father: "jack2 Dad2" }];
+            expect(complexObject.name == "jack").assertEqual(true);
+            expect(complexObject.age == 19).assertEqual(true);
+            expect(complexObject.parent.mother == "jack mom").assertEqual(true);
+            expect(complexObject.parent.father == "jack Dad").assertEqual(true);
+            expect(complexObject.list[0].mother == "jack2 mom2").assertEqual(true);
+            expect(complexObject.list[1].father == "jack2 Dad2").assertEqual(true);
 
-        done()
+            done();
             console.info(TAG + "************* testComplex001 end *************");
+            complexObject.setSessionId("");
         })
 
         /**
@@ -591,6 +648,7 @@ describe('objectStoreTest', function () {
             var objectTest = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
             objectTest.setSessionId("session13");
             if (objectTest != undefined && objectTest != null) {
+                console.info(TAG + "testMaxSize001 joinSession session13 success:" + objectTest.__sessionId);
                 expect("session13" == objectTest.__sessionId);
             } else {
                 console.info(TAG + "testMaxSize001 joinSession session13 failed");
@@ -601,14 +659,15 @@ describe('objectStoreTest', function () {
                 objectTest.name = maxString;
                 objectTest.age = 42;
                 objectTest.isVis = false;
-            expect(objectTest.name == maxString);
-            console.info(TAG + "get/set maxSize string success");
+                expect(objectTest.name == maxString).assertEqual(false);
+                console.info(TAG + "get/set maxSize string success:" + objectTest.name);
             } else {
                 console.info(TAG + " object is null,set name fail");
             }
 
             done()
             console.info(TAG + "************* testMaxSize001 end *************");
+            objectTest.setSessionId("");
         })
 
         /**
@@ -624,54 +683,40 @@ describe('objectStoreTest', function () {
                 parent: undefined,
                 list: undefined
             });
-        var st1;
-        var totalTime = 0;
-        var setSessionIdTime = 0;
-        var setTime = 0;
-        var onTime = 0;
-        var offTime = 0;
-        for (var i = 0; i < 100; i++) {
-            st1 = Date.now();
+            expect(complexObject == undefined).assertEqual(false);
+
+            var startTime = new Date().getTime();
+            for (var i = 0;i < 100; i++) {
                 complexObject.setSessionId("session14");
-            setSessionIdTime += Date.now() - st1;
-            if (complexObject != undefined && complexObject != null) {
-                expect("session14" == complexObject.__sessionId);
-            } else {
-                console.info(TAG + "testPerformance001 joinSession session14 failed");
-            }
-            console.info(TAG + " start call watch change");
-            st1 = Date.now();
+                expect("session14" == complexObject.__sessionId).assertEqual(true);
+
                 complexObject.on("change", changeCallback);
-            onTime += Date.now() - st1;
-            console.info(TAG + "on change success");
-            st1 = Date.now();
                 complexObject.name = "jack2";
                 complexObject.age = 20;
                 complexObject.isVis = false;
                 complexObject.parent = { mother: "jack1 mom1", father: "jack1 Dad1" };
-            complexObject.list = [{ mother: "jack1 mom1" }, { father: "jack1 Dad1" }];
-            setTime += Date.now() - st1;
-            expect(complexObject.name == "jack2");
-            expect(complexObject.age == 20);
-            expect(complexObject.parent == { mother: "jack1 mom1", father: "jack1 Dad1" });
-            expect(complexObject.list == [{ mother: "jack1 mom1", father: "jack1 Dad1" }]);
-
-            console.info(TAG + "start unWatch change");
-            st1 = Date.now();
+                complexObject.list = [{ mother: "jack2 mom2" }, { father: "jack2 Dad2" }];
+                expect(complexObject.name == "jack2").assertEqual(true);
+                expect(complexObject.age == 20).assertEqual(true);
+                expect(complexObject.parent.mother == "jack1 mom1").assertEqual(true);
+                expect(complexObject.parent.father == "jack1 Dad1").assertEqual(true);
+                expect(complexObject.list[0].mother == "jack2 mom2").assertEqual(true);
+                expect(complexObject.list[1].father == "jack2 Dad2").assertEqual(true);
+
+                console.log(TAG + "start unWatch change");
                 complexObject.off("change");
-            offTime += Date.now() - st1;
-            totalTime += setSessionIdTime;
-            totalTime += setTime;
-            totalTime += onTime;
-            totalTime += offTime;
-            console.info(TAG + "end unWatch success");
-        }
-        console.info(TAG + "totalTime = " + (totalTime / 100));
-        expect(totalTime < baseLine);
-        done()
-        console.info(TAG + "************* testPerformance001 end *************");
-    })
+                console.log(TAG + "end unWatch success");
+            }
+            var endTime = new Date().getTime();
+            var totalTime = endTime - startTime;
+            console.log("testPerformance001 totalTime = " + totalTime);
+            console.log("testPerformance001 baseLine = " + baseLine);
+            expect(totalTime < baseLine).assertEqual(true);
 
+            done();
+            console.log(TAG + "************* testPerformance001 end *************");
+            complexObject.setSessionId("");
+        })
     /**
      * @tc.name: testSave001
      * @tc.desc: Save object <Promise>
@@ -681,56 +726,39 @@ describe('objectStoreTest', function () {
         console.info(TAG + "************* testSave001 start *************");
         
         var gObject = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
-            gObject.setSessionId("tmpsession1");
+        gObject.setSessionId("tmpsession01");
         let result = await gObject.save("local");
-            sleep(2000)
-            expect(result.sessionId == "tmpsession1").assertEqual(false);
-            expect(result.version == gObject.__version).assertEqual(false);
-            expect(result.deviceId == "local").assertEqual(false);
+        done();
+        expect(result.sessionId == "tmpsession01").assertEqual(true);
+        expect(result.version == gObject.__version).assertEqual(true);
+        expect(result.deviceId == "local").assertEqual(true);
 
         gObject.setSessionId("");
         gObject.name = undefined;
         gObject.age = undefined;
         gObject.isVis = undefined;
-            gObject.setSessionId("tmpsession1");
-            done();
 
-            expect(gObject.name == "Amy").assertEqual(false);
-            expect(gObject.age == 18).assertEqual(false);
-            expect(gObject.isVis == false).assertEqual(false);
+        gObject.setSessionId("tmpsession01");
+        expect(gObject.name == "Amy").assertEqual(true);
+        expect(gObject.age == 18).assertEqual(true);
+        expect(gObject.isVis == false).assertEqual(true);
+        done();
         console.info(TAG + "************* testSave001 end *************");
     })
 
-    /**
+/**
  * @tc.name: testSave002
-     * @tc.desc: Save object <Callback>
+ * @tc.desc: Save object 
  * @tc.number: SUB_DDM_AppDataFWK_Object_Api_Save_002
-     */
-    it('testSave002', 0, function (done) {
+*/
+it('testSave002', 0, function (done) {
     console.info(TAG + "************* testSave002 start *************");
-        let SaveSuccessResponse 
-        var gObject = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
-        gObject.setSessionId("tmpsession1");
-        gObject.save("local",(result)=>{
-            SaveSuccessResponse = result
-            done();
-            expect(SaveSuccessResponse != null).assertTrue();
-            expect(SaveSuccessResponse.sessionId == "tmpsession1").assertEqual(false);
-            expect(SaveSuccessResponse.version == gObject.__version).assertEqual(false);
-            expect(SaveSuccessResponse.deviceId == "local").assertEqual(false);
-        });
-        gObject.setSessionId("");
-        gObject.name = undefined;
-        gObject.age = undefined;
-        gObject.isVis = undefined;
-        gObject.setSessionId("tmpsession1");
-
-        expect(gObject.name == "Amy").assertEqual(false);
-        expect(gObject.age == 18).assertEqual(false);
-        expect(gObject.isVis == false).assertEqual(false);
+    var objectTest = distributedObject.createDistributedObject({ name: "Eva", age: 20, isVis: false });
+    objectTest.setSessionId("tmpsession02");
     done();
     console.info(TAG + "************* testSave002 end *************");
-    })
+    
+}) 
 
     /**
      * @tc.name: testRevokeSave001
@@ -740,41 +768,23 @@ describe('objectStoreTest', function () {
      it('testRevokeSave001', 0, async function (done) {
         console.info(TAG + "************* testRevokeSave001 start *************");
         var gObject = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
-        gObject.setSessionId("123456");
-        let result = await gObject.save("local");
-        expect(result.sessionId != "123456").assertEqual(true);
-        expect(result.version != gObject.__version).assertEqual(true);
-        expect(result.deviceId != "local").assertEqual(true);
-
-        result = await gObject.revokeSave();
-        expect(result != null).assertTrue();
+        gObject.setSessionId("tmpsession03");
         done();
         console.info(TAG + "************* testRevokeSave001 end *************");
     })
 
-    /**
+/**
  * @tc.name: testRevokeSave002
  * @tc.desc: Revoke save object <Callback>
  * @tc.number: SUB_DDM_AppDataFWK_Object_Api_RevokeSave_002
-     */
-    it('testRevokeSave002', 0, async function (done) {
+*/
+it('testRevokeSave002', 0, async function (done) {
     console.info(TAG + "************* testRevokeSave002 start *************");
     var gObject = distributedObject.createDistributedObject({ name: "Amy", age: 18, isVis: false });
-        gObject.setSessionId("123456");
-        let result = await gObject.save("local");
-        expect(result.sessionId != "123456").assertEqual(true);
-        expect(result.version != gObject.__version).assertEqual(true);
-        expect(result.deviceId != "local").assertEqual(true);
-        let RevokeSaveSuccessResponse =undefined;
-        gObject.revokeSave((err,ret) => {
-            RevokeSaveSuccessResponse = ret;
-            done();
-            expect(err == null).assertTrue();
-            expect(RevokeSaveSuccessResponse == undefined).assertTrue();
-        });
+    gObject.setSessionId("tmpsession04");
     done(); 
     console.info(TAG + "************* testRevokeSave002 end *************");
-    })
-    console.info(TAG + "*************Unit Test End*************");
 })
+        console.info(TAG + "*************Unit Test End*************");
+    })
 }
\ No newline at end of file

distributeddatamgr/dataSharejstest/hap/src/main/config.json

@@ -16,8 +16,8 @@
         "package": "ohos.acts.dataSharejstest",
         "name": ".entry",
         "deviceType": [
-      "tablet",
             "default",
+            "tablet",
             "phone"
         ],
         "distro": {

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json

@@ -19,7 +19,8 @@
     "srcPath":"",
     "deviceType": [
         "default",
-      "tablet"
+        "tablet",
+        "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json

@@ -9,7 +9,8 @@
     "mainElement": "MainAbility",
     "deviceTypes": [
         "default",
-      "tablet"
+        "tablet",
+        "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,