提交 0a25843a 编写于 作者: L liangzhenyu123

用例优化,解决时区问题

Signed-off-by: Nliangzhenyu123 <liangzhenyu6@huawei.com>
上级 30ddf9d9
...@@ -328,13 +328,13 @@ describe('preferencesV9CallbackTest', async function () { ...@@ -328,13 +328,13 @@ describe('preferencesV9CallbackTest', async function () {
expect(false).assertTrue() expect(false).assertTrue()
} }
}) })
/** /**
* @tc.name mPreference.clear() * @tc.name mPreference.on()
* @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1300 * @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1300
* @tc.desc mPreference.clear() * @tc.desc mPreference.on()
*/ */
it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1300', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1300', 0, async function () {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1300 begin.") console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1300 begin.")
try { try {
mPreference.clear(); mPreference.clear();
...@@ -347,78 +347,79 @@ describe('preferencesV9CallbackTest', async function () { ...@@ -347,78 +347,79 @@ describe('preferencesV9CallbackTest', async function () {
}; };
await mPreference.on('change', observer); await mPreference.on('change', observer);
await mPreference.put(KEY_TEST_STRING_ELEMENT, "abcd"); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abcd");
mPreference.off('change', observer);
} catch (error) { } catch (error) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
expect(false).assertTrue() expect(false).assertTrue()
} }
}) })
/** /**
* @tc.name mPreference.clear() * @tc.name mPreference.on()
* @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1400 * @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1400
* @tc.desc mPreference.clear() * @tc.desc mPreference.on()
*/ */
it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1400', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1400', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1400 begin.") console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1400 begin.")
await mPreference.clear();
try { try {
var observer = function (key) { var observer = function (key) {
if (key) { console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1400 key' + key);
console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1400 key' + key); done();
expect(false).assertTrue() expect(KEY_TEST_STRING_ELEMENT).assertEqual(key);
}
expect("abcd").assertEqual(key);
}; };
mPreference.clear(); mPreference.on('change', observer);
await mPreference.on('sschange', observer); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abc");
await mPreference.put(KEY_TEST_STRING_ELEMENT, "abcd"); await mPreference.flush();
} catch (error) { } catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
done()
expect(false).assertTrue() expect(false).assertTrue()
} finally {
mPreference.off('change', observer);
} }
}) })
/** /**
* @tc.name mPreference.on() * @tc.name mPreference.off()
* @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1500 * @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1500
* @tc.desc mPreference.on() * @tc.desc mPreference.off()
*/ */
it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1500', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1500', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1500 begin.")
await mPreference.clear();
try { try {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1500 begin.")
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1500 key' + key); console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1500 key' + key);
expect('').assertEqual(key); expect(KEY_TEST_STRING_ELEMENT).assertEqual(key);
}; };
await mPreference.on('change', observer); mPreference.on('sschange', observer);
await mPreference.off('change', observer);
await mPreference.put(KEY_TEST_STRING_ELEMENT, "abc");
} catch (error) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
expect(false).assertTrue() expect(false).assertTrue()
} catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
done();
} }
}) })
/** /**
* @tc.name mPreference.off() * @tc.name mPreference.off()
* @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 * @tc.number SUB_DDM_JSPREFERENCEV9_CALLBACK_1600
* @tc.desc mPreference.off() * @tc.desc mPreference.off()
*/ */
it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1600', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_CALLBACK_1600', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 begin.")
try { try {
console.log("SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 begin.")
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 key' + key); console.info('SUB_DDM_JSPREFERENCEV9_CALLBACK_1600 key' + key);
expect('').assertEqual(key);
}; };
await mPreference.on('change', observer); mPreference.on('change', observer);
await mPreference.off('123change', observer); mPreference.off('change', observer);
await mPreference.put(KEY_TEST_STRING_ELEMENT, "abc"); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
} catch (error) { await mPreference.flush();
} catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
done()
expect(false).assertTrue() expect(false).assertTrue()
} }
done();
}) })
}) })
} }
\ No newline at end of file
...@@ -34,6 +34,12 @@ describe('preferencesV9PromiseTest', async function () { ...@@ -34,6 +34,12 @@ describe('preferencesV9PromiseTest', async function () {
await data_preferences.deletePreferences(context, NAME) await data_preferences.deletePreferences(context, NAME)
}) })
beforeEach(async function () {
console.info('beforeEach')
await mPreference.clear();
await mPreference.flush();
})
/** /**
* @tc.name has、delete、get、flush String callback interface test * @tc.name has、delete、get、flush String callback interface test
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_0100 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_0100
...@@ -113,12 +119,13 @@ describe('preferencesV9PromiseTest', async function () { ...@@ -113,12 +119,13 @@ describe('preferencesV9PromiseTest', async function () {
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_0300 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_0300
* @tc.desc mPreference.get() * @tc.desc mPreference.get()
*/ */
it('SUB_DDM_JSPREFERENCEV9_PROMISE_0300', 0, function (done) { it('SUB_DDM_JSPREFERENCEV9_PROMISE_0300', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_0300 begin.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_0300 begin.")
try{ try{
mPreference.get(KEY_TEST_STRING_ELEMENT, KEY_TEST_INT_ELEMENT).then((ret)=>{ await mPreference.put(KEY_TEST_STRING_ELEMENT, '123');
expect('123').assertEqual(ret) mPreference.get(KEY_TEST_STRING_ELEMENT, KEY_TEST_INT_ELEMENT).then((ret) => {
done() done()
expect('123').assertEqual(ret)
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_0300 end.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_0300 end.")
}).catch((err) => { }).catch((err) => {
console.log("get err =" + err + ", code =" + err.code +", message =" + err.message) console.log("get err =" + err + ", code =" + err.code +", message =" + err.message)
...@@ -327,17 +334,21 @@ describe('preferencesV9PromiseTest', async function () { ...@@ -327,17 +334,21 @@ describe('preferencesV9PromiseTest', async function () {
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1300 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1300
* @tc.desc mPreference.on() * @tc.desc mPreference.on()
*/ */
it('SUB_DDM_JSPREFERENCEV9_PROMISE_1300', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_PROMISE_1300', 0, async function () {
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1300 begin.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1300 begin.")
await mPreference.clear();
try { try {
mPreference.clear();
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1300 key' + key); if (key) {
expect('abc').assertEqual(key); console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1300 key' + key);
expect(false).assertTrue()
}
expect("abcd").assertEqual(key);
}; };
mPreference.on('change', observer); await mPreference.on('change', observer);
mPreference.put(KEY_TEST_STRING_ELEMENT, "abc"); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abcd");
} catch (err) { mPreference.off('change', observer);
} catch (error) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
expect(false).assertTrue() expect(false).assertTrue()
} }
...@@ -348,20 +359,23 @@ describe('preferencesV9PromiseTest', async function () { ...@@ -348,20 +359,23 @@ describe('preferencesV9PromiseTest', async function () {
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1400 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1400
* @tc.desc mPreference.on() * @tc.desc mPreference.on()
*/ */
it('SUB_DDM_JSPREFERENCEV9_PROMISE_1400', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_PROMISE_1400', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1400 begin.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1400 begin.")
await mPreference.clear(); await mPreference.clear();
try { try {
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1400 key' + key); console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1400 key' + key);
expect('abc').assertEqual(key); done();
expect(KEY_TEST_STRING_ELEMENT).assertEqual(key);
}; };
mPreference.on('sschange', observer); mPreference.on('change', observer);
mPreference.put(KEY_TEST_STRING_ELEMENT, "abc"); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abc");
await mPreference.flush();
} catch (err) { } catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
done()
expect(false).assertTrue() expect(false).assertTrue()
} finally {
mPreference.off('change', observer);
} }
}) })
...@@ -370,41 +384,42 @@ describe('preferencesV9PromiseTest', async function () { ...@@ -370,41 +384,42 @@ describe('preferencesV9PromiseTest', async function () {
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1500 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1500
* @tc.desc mPreference.off() * @tc.desc mPreference.off()
*/ */
it('SUB_DDM_JSPREFERENCEV9_PROMISE_1500', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_PROMISE_1500', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1500 begin.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1500 begin.")
await mPreference.clear();
try { try {
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1500 key' + key); console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1500 key' + key);
expect('').assertEqual(key); expect(KEY_TEST_STRING_ELEMENT).assertEqual(key);
}; };
mPreference.on('change', observer); mPreference.on('sschange', observer);
mPreference.off('change', observer); expect(false).assertTrue()
mPreference.put(KEY_TEST_STRING_ELEMENT, "abc");
} catch (err) { } catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
expect(false).assertTrue() done();
} }
}) })
/** /**
* @tc.name mPreference.off() * @tc.name mPreference.off()
* @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1600 * @tc.number SUB_DDM_JSPREFERENCEV9_PROMISE_1600
* @tc.desc mPreference.off() * @tc.desc mPreference.off()
*/ */
it('SUB_DDM_JSPREFERENCEV9_PROMISE_1600', 0, async function () { it('SUB_DDM_JSPREFERENCEV9_PROMISE_1600', 0, async function (done) {
console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1600 begin.") console.log("SUB_DDM_JSPREFERENCEV9_PROMISE_1600 begin.")
try { try {
var observer = function (key) { var observer = function (key) {
console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1600 key' + key); console.info('SUB_DDM_JSPREFERENCEV9_PROMISE_1600 key' + key);
expect('').assertEqual(key);
}; };
mPreference.on('change', observer); mPreference.on('change', observer);
mPreference.off('sschange', observer); mPreference.off('change', observer);
mPreference.put(KEY_TEST_STRING_ELEMENT, "abc"); await mPreference.put(KEY_TEST_STRING_ELEMENT, "abb");
await mPreference.flush();
} catch (err) { } catch (err) {
console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message) console.log("trycatch err =" + err + ", code =" + err.code + ", message =" + err.message)
done()
expect(false).assertTrue() expect(false).assertTrue()
} }
done();
}) })
}) })
} }
\ No newline at end of file
...@@ -68,8 +68,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () { ...@@ -68,8 +68,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () {
console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0001 start *************"); console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0001 start *************");
let predicates = await new dataRdb.RdbPredicates("test") let predicates = await new dataRdb.RdbPredicates("test")
predicates.groupBy(["DATE(test.adddate,'utc')"]).orderByAsc("COUNT(*)") predicates.groupBy(["DATE(test.adddate)"]).orderByAsc("COUNT(*)")
let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS 'num Count'", "DATE(test.adddate,'utc') as birthday"]) let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS 'num Count'", "DATE(test.adddate) as birthday"])
expect(true).assertEqual(resultSet.goToFirstRow()) expect(true).assertEqual(resultSet.goToFirstRow())
let count = await resultSet.getLong(resultSet.getColumnIndex("num Count")) let count = await resultSet.getLong(resultSet.getColumnIndex("num Count"))
let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday"))
...@@ -94,8 +94,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () { ...@@ -94,8 +94,8 @@ describe('rdbStorePredicatesComplexFiledTest', function () {
console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0002 start *************"); console.log(TAG + "************* SUB_DDM_AppDataFWK_JSRDB_Predicates_ComplexFiled_0002 start *************");
let predicates = await new dataRdb.RdbPredicates("test") let predicates = await new dataRdb.RdbPredicates("test")
predicates.groupBy(["DATE(test.adddate,'utc')"]).orderByDesc("COUNT(*)") predicates.groupBy(["DATE(test.adddate)"]).orderByDesc("COUNT(*)")
let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS numCount", "DATE(test.adddate,'utc') as birthday"]) let resultSet = await rdbStore.query(predicates, ["COUNT(*) AS numCount", "DATE(test.adddate) as birthday"])
expect(true).assertEqual(resultSet.goToFirstRow()) expect(true).assertEqual(resultSet.goToFirstRow())
let count = await resultSet.getLong(resultSet.getColumnIndex("numCount")) let count = await resultSet.getLong(resultSet.getColumnIndex("numCount"))
let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday"))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册