!6602 【Distributeddatamgr】【monthly_20221018】utc导致的用例失败问题解决

Merge pull request !6602 from 梁梁/monthly_20221018

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

@@ -2023,17 +2023,17 @@ describe('SingleKvStorePromiseTest', function () {
      * @tc.type: FUNC
      * @tc.name Test Js Api SingleKvStoreCommit testcase 001
      */
-    it('SUB_DDM_DKV_SINGLEKVSTORE_STARTTRANSACTION_PROMISE_0100', 0, async function (done) {
-        console.info('SUB_DDM_DKV_SINGLEKVSTORE_STARTTRANSACTION_PROMISE_0100');
+    it('SUB_DDM_DKV_SINGLEKVSTORE_COMMIT_PROMISE_0100', 0, async function (done) {
+        console.info('SUB_DDM_DKV_SINGLEKVSTORE_COMMIT_PROMISE_0100');
         try {
             await kvStore.commit(1).then(async (err) => {
-                console.info('SUB_DDM_DKV_SINGLEKVSTORE_STARTTRANSACTION_PROMISE_0100 commit success');
+                console.info('SUB_DDM_DKV_SINGLEKVSTORE_COMMIT_PROMISE_0100 commit success');
                 expect(null).assertFail();
             }).catch((err) => {
-                console.error('SUB_DDM_DKV_SINGLEKVSTORE_STARTTRANSACTION_PROMISE_0100 commit fail ' + `, error code is ${err.code}, message is ${err.message}`);
+                console.error('SUB_DDM_DKV_SINGLEKVSTORE_COMMIT_PROMISE_0100 commit fail ' + `, error code is ${err.code}, message is ${err.message}`);
             });
         }catch(e) {
-            console.error('SUB_DDM_DKV_SINGLEKVSTORE_STARTTRANSACTION_PROMISE_0100 e ' + `, error code is ${e.code}, message is ${e.message}`);
+            console.error('SUB_DDM_DKV_SINGLEKVSTORE_COMMIT_PROMISE_0100 e ' + `, error code is ${e.code}, message is ${e.message}`);
         }
         done();
     })

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

@@ -410,15 +410,38 @@ describe('preferencesV9CallbackTest', async function () {
         try {
             var observer = function (key) {
                 console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 key' + key);
-                expect(false).assertTrue()
             };
             mPreference.on('change', observer);
-            mPreference.off('change', observer);
+            mPreference.off('sschange', observer);
+            expect(false).assertTrue()
             await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
             await mPreference.flush();
         } catch (err) {
             console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
+            mPreference.off('change', observer);
+        }
+        done();
+    })
+
+    /**
+     * @tc.name  mPreference.off()
+     * @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1700
+     * @tc.desc  mPreference.off()
+     */
+     it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1700', 0, async function (done) {
+        console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1700 begin.")
+        try {
+            var observer = function (key) {
+                console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1700 key' + key);
+            };
+            mPreference.on('change', observer);
+            mPreference.off('change', "observer");
             expect(false).assertTrue()
+            await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
+            await mPreference.flush();
+        } catch (err) {
+            console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
+            mPreference.off('change', observer);
         }
         done();
     })

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

@@ -410,15 +410,38 @@ describe('preferencesV9PromiseTest', async function () {
         try {
             var observer = function (key) {
                 console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1600 key' + key);
-                expect(false).assertTrue()
             };
             mPreference.on('change', observer);
-            mPreference.off('change', observer);
+            mPreference.off('sschange', observer);
+            expect(false).assertTrue()
             await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
             await mPreference.flush();
         } catch (err) {
             console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
+            mPreference.off('change', observer);
+        }
+        done();
+    })
+
+    /**
+     * @tc.name  mPreference.off()
+     * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1700
+     * @tc.desc  mPreference.off()
+     */
+     it('SUB_DDM_JSPREFERENCEV9_PROMISE_1700', 0, async function (done) {
+        console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1700 begin.")
+        try {
+            var observer = function (key) {
+                console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1700 key' + key);
+            };
+            mPreference.on('change', observer);
+            mPreference.off('change', "observer");
             expect(false).assertTrue()
+            await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
+            await mPreference.flush();
+        } catch (err) {
+            console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
+            mPreference.off('change', observer);
         }
         done();
     })

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

@@ -68,8 +68,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () {
         console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0001 start *************");
 
         let predicates = await new dataRdb.RdbPredicates("test")
-        predicates.groupBy(["DATE(test.adddate,'utc')"]).orderByAsc("COUNT(*)")
-        let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS 'num Count'", "DATE(test.adddate,'utc') as birthday"])
+        predicates.groupBy(["DATE(test.adddate)"]).orderByAsc("COUNT(*)")
+        let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS 'num Count'", "DATE(test.adddate) as birthday"])
         expect(true).assertEqual(resultSet.goToFirstRow())
         let count = await resultSet.getLong(resultSet.getColumnIndex("num Count"))
         let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday"))
@@ -94,8 +94,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () {
         console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0002 start *************");
 
         let predicates = await new dataRdb.RdbPredicates("test")
-        predicates.groupBy(["DATE(test.adddate,'utc')"]).orderByDesc("COUNT(*)")
-        let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS numCount", "DATE(test.adddate,'utc') as birthday"])
+        predicates.groupBy(["DATE(test.adddate)"]).orderByDesc("COUNT(*)")
+        let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS numCount", "DATE(test.adddate) as birthday"])
         expect(true).assertEqual(resultSet.goToFirstRow())
         let count = await resultSet.getLong(resultSet.getColumnIndex("numCount"))
         let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday"))