提交 bb3bea5e 编写于 作者: L liangzhenyu123

删除无效异常捕获

Signed-off-by: Nliangzhenyu123 <liangzhenyu6@huawei.com>
上级 574565e3
...@@ -94,7 +94,7 @@ describe('rdbEncryptTest', function () { ...@@ -94,7 +94,7 @@ describe('rdbEncryptTest', function () {
console.info(TAG + 'afterAll') console.info(TAG + 'afterAll')
}) })
console.log(TAG + "*************Unit Test Begin*************") console.info(TAG + "*************Unit Test Begin*************")
/** /**
* @tc.name RDB encrypted test * @tc.name RDB encrypted test
...@@ -102,22 +102,15 @@ describe('rdbEncryptTest', function () { ...@@ -102,22 +102,15 @@ describe('rdbEncryptTest', function () {
* @tc.desc RDB create encrypt db test * @tc.desc RDB create encrypt db test
*/ */
it('RdbEncryptTest_0010', 0, async function (done) { it('RdbEncryptTest_0010', 0, async function (done) {
console.log(TAG + "************* RdbEncryptTest_0010 start *************") console.info(TAG + "************* RdbEncryptTest_0010 start *************")
context = ability_featureAbility.getContext() context = ability_featureAbility.getContext()
let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1); data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1).then((store) => {
storePromise.then(async (store) => { done()
try { expect(store != null).assertTrue();
console.log(TAG + "getRdbStore done: " + store);
} catch (err) {
expect(null).assertFail();
}
}).catch((err) => { }).catch((err) => {
expect(null).assertFail(); expect(null).assertFail();
}) })
storePromise = null console.info(TAG + "************* RdbEncryptTest_0010 end *************")
done()
console.log(TAG + "************* RdbEncryptTest_0010 end *************")
}) })
/** /**
...@@ -126,22 +119,17 @@ describe('rdbEncryptTest', function () { ...@@ -126,22 +119,17 @@ describe('rdbEncryptTest', function () {
* @tc.desc RDB create unencrypted db test * @tc.desc RDB create unencrypted db test
*/ */
it('RdbEncryptTest_0020', 0, async function (done) { it('RdbEncryptTest_0020', 0, async function (done) {
console.log(TAG + "************* RdbEncryptTest_0020 start *************") console.info(TAG + "************* RdbEncryptTest_0020 start *************")
context = ability_featureAbility.getContext() context = ability_featureAbility.getContext()
let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT, 1); let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT, 1);
storePromise.then(async (store) => { storePromise.then((store) => {
try { expect(store != null).assertTrue();
console.log(TAG + "getRdbStore done: " + store); done()
} catch (err) {
expect(null).assertFail();
}
}).catch((err) => { }).catch((err) => {
expect(null).assertFail(); expect(null).assertFail();
}) })
storePromise = null
console.info(TAG + "************* RdbEncryptTest_0020 end *************")
done()
console.log(TAG + "************* RdbEncryptTest_0020 end *************")
}) })
...@@ -151,14 +139,14 @@ describe('rdbEncryptTest', function () { ...@@ -151,14 +139,14 @@ describe('rdbEncryptTest', function () {
* @tc.desc RDB Encrypt function test * @tc.desc RDB Encrypt function test
*/ */
it('RdbEncryptTest_0030', 0, async function (done) { it('RdbEncryptTest_0030', 0, async function (done) {
console.log(TAG + "************* RdbEncryptTest_0030 start *************") console.info(TAG + "************* RdbEncryptTest_0030 start *************")
context = ability_featureAbility.getContext() context = ability_featureAbility.getContext()
rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT) rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT)
let predicates = new data_rdb.RdbPredicates("test") let predicates = new data_rdb.RdbPredicates("test")
predicates.equalTo("name", "zhangsan") predicates.equalTo("name", "zhangsan")
let resultSet = await rdbStore.query(predicates) let resultSet = await rdbStore.query(predicates)
try { try {
console.log(TAG + "After restore resultSet query done") console.info(TAG + "After restore resultSet query done")
expect(true).assertEqual(resultSet.goToFirstRow()) expect(true).assertEqual(resultSet.goToFirstRow())
const id = resultSet.getLong(resultSet.getColumnIndex("id")) const id = resultSet.getLong(resultSet.getColumnIndex("id"))
const name = resultSet.getString(resultSet.getColumnIndex("name")) const name = resultSet.getString(resultSet.getColumnIndex("name"))
...@@ -172,7 +160,7 @@ describe('rdbEncryptTest', function () { ...@@ -172,7 +160,7 @@ describe('rdbEncryptTest', function () {
resultSet = null resultSet = null
rdbStore = null rdbStore = null
done() done()
console.log(TAG + "************* RdbEncryptTest_0030 end *************") console.info(TAG + "************* RdbEncryptTest_0030 end *************")
}) })
/** /**
...@@ -181,7 +169,7 @@ describe('rdbEncryptTest', function () { ...@@ -181,7 +169,7 @@ describe('rdbEncryptTest', function () {
* @tc.desc RDB Encrypt function test * @tc.desc RDB Encrypt function test
*/ */
it('RdbEncryptTest_0040', 0, async function (done) { it('RdbEncryptTest_0040', 0, async function (done) {
console.log(TAG + "************* RdbEncryptTest_0040 start *************") console.info(TAG + "************* RdbEncryptTest_0040 start *************")
context = ability_featureAbility.getContext() context = ability_featureAbility.getContext()
rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT) rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT)
rdbStore = null rdbStore = null
...@@ -189,9 +177,9 @@ describe('rdbEncryptTest', function () { ...@@ -189,9 +177,9 @@ describe('rdbEncryptTest', function () {
expect(rdbStore).assertNull expect(rdbStore).assertNull
done() done()
console.log(TAG + "************* RdbEncryptTest_0040 end *************") console.info(TAG + "************* RdbEncryptTest_0040 end *************")
}) })
console.log(TAG + "*************Unit Test End*************") console.info(TAG + "*************Unit Test End*************")
} }
) )
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册