From 2c74ff57d88c04315331112984c7646d6fd3d532 Mon Sep 17 00:00:00 2001 From: lina123456 Date: Thu, 6 Jul 2023 19:56:11 +0800 Subject: [PATCH] Signed-off-by: lina123456 --- .../js/test/RdbstorePredicatesJsunit.test.js | 125 +++++++++++------ .../RelationalStorePredicatesJsunit.test.js | 129 ++++++++++++------ 2 files changed, 170 insertions(+), 84 deletions(-) diff --git a/distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstorePredicatesJsunit.test.js b/distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstorePredicatesJsunit.test.js index 040950657..671c1cb1e 100644 --- a/distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstorePredicatesJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/js/test/RdbstorePredicatesJsunit.test.js @@ -39,6 +39,7 @@ describe('rdbPredicatesTest', function () { await buildAllDataType1(); await buildAllDataType2(); await buildAllDataType3(); + await rdbStore.executeSql("CREATE INDEX index_name ON AllDataType (characterValue);", null); }) beforeEach(function () { @@ -2173,48 +2174,88 @@ describe('rdbPredicatesTest', function () { }) /** - * @tc.name predicates indexedBy test - * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0220 - * @tc.desc predicates indexedBy test - */ - it('testIndexedBy0001', 0, async function (done) { - console.info(TAG + "************* testIndexedBy0001 start *************"); - let errInfo = undefined - try{ - let predicates = await new dataRdb.RdbPredicates("AllDataType"); - predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValue"]); - let result = await rdbStore.query(predicates); - expect(3).assertEqual(result.rowCount); - } catch (err) { - expect(err != undefined).assertTrue(); - console.info(TAG + "testIndexedBy0001 err " + err); - errInfo = err; - } - done(); - console.info(TAG + "************* testIndexedBy0001 end *************"); - }) - - /** - * @tc.name predicates indexedBy test - * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0221 - * @tc.desc predicates indexedBy test - */ - it('testIndexedBy0002', 0, async function (done) { - console.info(TAG + "************* testIndexedBy0002 start *************"); - let errInfo = undefined - try{ - let predicates = await new dataRdb.RdbPredicates("AllDataType"); - predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValueX"]); - let result = await rdbStore.query(predicates); - expect(3).assertEqual(result.rowCount); - } catch (err) { - expect(err != undefined).assertTrue(); - console.info(TAG + "testIndexedBy0002 err " + err); - errInfo = err; - } - done(); - console.info(TAG + "************* testIndexedBy0002 end *************"); - }) + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0220 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0001', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0001 start *************"); + try{ + let predicates = await new dataRdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValue"]); + let result = await rdbStore.query(predicates); + expect(result.rowCount == -1).assertTrue(); + done(); + } catch (err) { + expect(err != undefined).assertTrue(); + console.info(TAG + "testIndexedBy0001 err " + err); + done(); + } + console.info(TAG + "************* testIndexedBy0001 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0221 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0002', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0002 start *************"); + try{ + let predicates = await new dataRdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy("characterValue"); + let result = await rdbStore.query(predicates); + expect(result.rowCount == -1).assertTrue(); + done(); + } catch (err) { + expect(err != undefined).assertTrue(); + console.info(TAG + "testIndexedBy0002 err " + err); + done(); + } + console.info(TAG + "************* testIndexedBy0002 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0222 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0003', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0003 start *************"); + try{ + let predicates = await new dataRdb.RdbPredicates("AllDataType"); + predicates.indexedBy("index_name"); + let result = await rdbStore.query(predicates); + expect(3).assertEqual(result.rowCount); + done(); + } catch (err) { + expect(err != undefined).assertFail(); + console.info(TAG + "testIndexedBy0003 err " + err); + done(); + } + console.info(TAG + "************* testIndexedBy0003 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRDB_Predicates_0223 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0004', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0004 start *************"); + try{ + let predicates = await new dataRdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy("index_name"); + let result = await rdbStore.query(predicates); + expect(3).assertEqual(result.rowCount); + done(); + } catch (err) { + expect(err != undefined).assertFail(); + console.info(TAG + "testIndexedBy0004 err " + err); + done(); + } + console.info(TAG + "************* testIndexedBy0004 end *************"); + }) console.info(TAG + "*************Unit Test End*************"); })} diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJsunit.test.js index 27eb9eaf8..2796b7db3 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJsunit.test.js @@ -42,6 +42,7 @@ describe('relationalStorePredicatesTest', function () { await buildAllDataType1(); await buildAllDataType2(); await buildAllDataType3(); + await rdbStore.executeSql("CREATE INDEX index_name ON AllDataType (characterValue);", null); }) beforeEach(function () { @@ -2174,48 +2175,92 @@ describe('relationalStorePredicatesTest', function () { }) /** - * @tc.name predicates indexedBy test - * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0220 - * @tc.desc predicates indexedBy test - */ - it('testIndexedBy0001', 0, async function (done) { - console.info(TAG + "************* testIndexedBy0001 start *************"); - let errInfo = undefined - try{ - let predicates = await new data_Rdb.RdbPredicates("AllDataType"); - predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValue"]); - let result = await rdbStore.query(predicates); - expect(3).assertEqual(result.rowCount); - result.close(); - }catch(err){ - errInfo = err - } - expect(errInfo.code).assertEqual("401") - done(); - console.info(TAG + "************* testIndexedBy0001 end *************"); - }) - - /** - * @tc.name predicates indexedBy test - * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0221 - * @tc.desc predicates indexedBy test - */ - it('testIndexedBy0002', 0, async function (done) { - console.info(TAG + "************* testIndexedBy0002 start *************"); - let errInfo = undefined - try{ - let predicates = await new data_Rdb.RdbPredicates("AllDataType"); - predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValueX"]); - let result = await rdbStore.query(predicates); - expect(3).assertEqual(result.rowCount); - result.close(); - }catch(err){ - errInfo = err - } - expect(errInfo.code).assertEqual("401") - done(); - console.info(TAG + "************* testIndexedBy0002 end *************"); - }) + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0220 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0001', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0001 start *************"); + try{ + let predicates = await new data_Rdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy(["characterValue"]); + let result = await rdbStore.query(predicates); + expect(result.rowCount == -1).assertTrue(); + result.close(); + done(); + }catch(err){ + expect(err.code).assertEqual("401"); + done(); + } + console.info(TAG + "************* testIndexedBy0001 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0221 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0002', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0002 start *************"); + try{ + let predicates = await new data_Rdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy("characterValue"); + let result = await rdbStore.query(predicates); + expect(result.rowCount == -1).assertTrue(); + result.close(); + done(); + }catch(err){ + expect(err != undefined ).assertFalse(); + done(); + } + console.info(TAG + "************* testIndexedBy0002 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0222 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0003', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0003 start *************"); + try{ + let predicates = await new data_Rdb.RdbPredicates("AllDataType"); + predicates.indexedBy("index_name"); + let result = await rdbStore.query(predicates); + console.info(TAG + "result.rowCount = " + result.rowCount); + expect(3).assertEqual(result.rowCount); + result.close(); + done(); + }catch(err){ + console.info(TAG + "err = " + err); + expect(err != undefined ).assertFalse(); + done(); + } + console.info(TAG + "************* testIndexedBy0003 end *************"); + }) + + /** + * @tc.name predicates indexedBy test + * @tc.number SUB_DDM_AppDataFWK_JSRelationalStore_Predicates_0223 + * @tc.desc predicates indexedBy test + */ + it('testIndexedBy0004', 0, async function (done) { + console.info(TAG + "************* testIndexedBy0004 start *************"); + try{ + let predicates = await new data_Rdb.RdbPredicates("AllDataType"); + predicates.like("stringValue", "ABCDEFGHIJKLMN").indexedBy("index_name"); + let result = await rdbStore.query(predicates); + console.info(TAG + "result.rowCount = " + result.rowCount); + expect(3).assertEqual(result.rowCount); + result.close(); + done(); + }catch(err){ + console.info(TAG + "err = " + err); + expect(err != undefined ).assertFalse(); + done(); + } + console.info(TAG + "************* testIndexedBy0004 end *************"); + }) console.info(TAG + "*************Unit Test End*************"); })} -- GitLab