diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js index 95e38a5cf7ff4e34ef9b40e21966834f92da10df..86afb34c03d4775bb4343725b3731a87c192ff8d 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreCallbackJsunit.test.js @@ -30,7 +30,7 @@ const STORE_CONFIG = { const DATABASE_BACKUP_NAME = "Backup.db" async function CreatRdbStore(context, STORE_CONFIG) { - let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1) + let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG) await RdbStore.executeSql(CREATE_TABLE_TEST, null) let u8 = new Uint8Array([1, 2, 3]) { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js index 59192d89fbbd4737fc51893bcabd9ad3065ed93c..9a6ff85dbbe4986b45a26bda8309826b02347ef1 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreBackupRestoreWithFAContextJsunit.test.js @@ -30,7 +30,7 @@ const STORE_CONFIG = { const DATABASE_BACKUP_NAME = "Backup.db" async function CreatRdbStore(context, STORE_CONFIG) { - let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1) + let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG) await RdbStore.executeSql(CREATE_TABLE_TEST, null) let u8 = new Uint8Array([1, 2, 3]) { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDeleteJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDeleteJsunit.test.js index 0369f604f5ee25176b14174c6345c1b19f24be9b..a07a4e51d9a2d8081d12599628e419211bcf585b 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDeleteJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDeleteJsunit.test.js @@ -34,7 +34,7 @@ describe('relationalStoreDeleteTest', function () { beforeEach(async function () { console.info(TAG + 'beforeEach') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDistributedJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDistributedJsunit.test.js index 004b59da89825592a94bafd3e789836cd1cec61f..e8dd3a7d33564f5868a746450fcbddd0eaeaf8c7 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDistributedJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreDistributedJsunit.test.js @@ -67,7 +67,7 @@ export default function relationalStoreDistributedTest() { describe('relationalStoreDistributedTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, config, 1); + rdbStore = await data_Rdb.getRdbStore(context, config); console.info(TAG + "create RelationalStore store success") await executeSql1() await executeSql2() @@ -399,7 +399,7 @@ describe('relationalStoreDistributedTest', function () { "name": STORE_NAME, securityLevel: data_Rdb.SecurityLevel.S1 } - rdbStore = await data_Rdb.getRdbStore(context, config, 1); + rdbStore = await data_Rdb.getRdbStore(context, config); let errInfo = undefined try{ rdbStore.obtainDistributedTableName(["deviceId"], "EMPLOYEE") diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreEncryptionJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreEncryptionJsunit.test.js index 8efbbfc91a146c8b09867445a3b54d9f683e8fe8..1777b0ad3fa7f99de4ef4a5368ae96c0b11b8281 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreEncryptionJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreEncryptionJsunit.test.js @@ -41,7 +41,7 @@ const STORE_CONFIG_WRONG = { export default function relationalStoreEncryptTest() { async function CreatRdbStore(context, STORE_CONFIG) { - let rdbStore = await data_rdb.getRdbStore(context, STORE_CONFIG, 1) + let rdbStore = await data_rdb.getRdbStore(context, STORE_CONFIG) await rdbStore.executeSql(CREATE_TABLE_TEST, null) let u8 = new Uint8Array([1, 2, 3]) { @@ -107,7 +107,7 @@ describe('relationalStoreEncryptTest', function () { it('RdbEncryptTest_0010', 0, async function (done) { console.info(TAG + "************* RdbEncryptTest_0010 start *************") context = ability_featureAbility.getContext() - data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1).then((store) => { + data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT).then((store) => { done() expect(store != null).assertTrue(); }).catch((err) => { @@ -124,7 +124,7 @@ describe('relationalStoreEncryptTest', function () { it('RdbEncryptTest_0020', 0, async function (done) { console.info(TAG + "************* RdbEncryptTest_0020 start *************") context = ability_featureAbility.getContext() - let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT, 1); + let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT); storePromise.then((store) => { expect(store != null).assertTrue(); done() diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreExcuteSqlJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreExcuteSqlJsunit.test.js index 6184532c30e9f6610704cd075a86b3eb7de19358..bde31f6589330df7be1055e42a712ee2f73c1ff5 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreExcuteSqlJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreExcuteSqlJsunit.test.js @@ -30,7 +30,7 @@ export default function relationalStoreExcuteSqlTest() { describe('relationalStoreExcuteSqlTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreInsertJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreInsertJsunit.test.js index 9d175a130aca48e927c9ef23203a159a725936b0..785015dd48bdfe80b16fdddb6cde42fb5167eb74 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreInsertJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreInsertJsunit.test.js @@ -37,7 +37,7 @@ export default function relationalStoreInsertTest() { describe('relationalStoreInsertTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null) await rdbStore.executeSql(CREATE_TABLE_BATCHINSERT_TEST, null); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreJsunit.test.js index 58fc5cde3baffa062c62ee4e7b5cba0839192235..0692ec0be52a0c2fe6a11bb3408f5293a6cb0f3e 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreJsunit.test.js @@ -57,7 +57,7 @@ describe('relationalStoreTest', function () { */ it('testRdbStore0001', 0, async function (done) { console.info(TAG + "************* testRdbStore0001 start *************"); - await data_Rdb.getRdbStore(context, STORE_CONFIG, 1).then(async (store) => { + await data_Rdb.getRdbStore(context, STORE_CONFIG).then(async (store) => { try { console.info(TAG + "getRdbStore done: " + store); } catch (e) { @@ -77,7 +77,7 @@ describe('relationalStoreTest', function () { */ it('testRdbStore0002', 0, async function (done) { console.info(TAG + "************* testRdbStore0002 start *************"); - let storePromise = data_Rdb.getRdbStore(context, STORE_CONFIG, 2); + let storePromise = data_Rdb.getRdbStore(context, STORE_CONFIG); storePromise.then(async (store) => { try { console.info(TAG + "getRdbStore done: " + store); @@ -107,7 +107,7 @@ describe('relationalStoreTest', function () { securityLevel: data_Rdb.SecurityLevel.S1 } try{ - data_Rdb.getRdbStore(context, storeConfig, 4).then(async (ret) => { + data_Rdb.getRdbStore(context, storeConfig).then(async (ret) => { console.info(TAG + "getRdbStore done" + ret); expect(null).assertFail(); }).catch((err) => { @@ -130,7 +130,7 @@ describe('relationalStoreTest', function () { it('testRdbStore0004', 0, async function (done) { console.info(TAG + "************* testRdbStore0004 start *************"); try{ - let store = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1) + let store = await data_Rdb.getRdbStore(context, STORE_CONFIG) await store.executeSql(CREATE_TABLE_TEST); await data_Rdb.deleteRdbStore(context, "rdbstore.db") }catch (e) { @@ -148,7 +148,7 @@ describe('relationalStoreTest', function () { it('testRdbStore0005', 0, async function (done) { console.info(TAG + "************* testRdbStore0005 start *************"); try { - let store = await data_Rdb.getRdbStore(context, STORE_CONFIG, 2); + let store = await data_Rdb.getRdbStore(context, STORE_CONFIG); console.info(TAG + "Get rdbstore success") await store.executeSql(CREATE_TABLE_TEST); await data_Rdb.deleteRdbStore(context, "rdbstore.db") @@ -172,7 +172,7 @@ describe('relationalStoreTest', function () { name: "rdbstorecontext.db", securityLevel: data_Rdb.SecurityLevel.S1 } - rdbstore = await data_Rdb.getRdbStore(context,STORE_CONFIG, 1) + rdbstore = await data_Rdb.getRdbStore(context,STORE_CONFIG) console.info(TAG + "Get rdbstore success") expect(rdbstore != null).assertTrue(); await data_Rdb.deleteRdbStore(context, STORE_CONFIG.name) @@ -198,7 +198,7 @@ describe('relationalStoreTest', function () { name: "rdbstorecontext.db", securityLevel: data_Rdb.SecurityLevel.S1 } - rdbstore = await data_Rdb.getRdbStore(contextApplication,STORE_CONFIG, 1) + rdbstore = await data_Rdb.getRdbStore(contextApplication,STORE_CONFIG) console.info(TAG + "Get rdbstore success") expect(rdbstore != null).assertTrue(); await data_Rdb.deleteRdbStore(context, STORE_CONFIG.name) @@ -218,7 +218,7 @@ describe('relationalStoreTest', function () { */ it('testRdbStore0008', 0, async function (done) { console.info(TAG + "************* testRdbStore0008 start *************"); - data_Rdb.getRdbStore(context, STORE_CONFIG, 1, async (err,data) => { + data_Rdb.getRdbStore(context, STORE_CONFIG, async (err,data) => { console.info(TAG + "getRdbStore finish") console.info(TAG + "getRdbStore success: " + data) expect(data != null).assertTrue(); @@ -236,7 +236,7 @@ describe('relationalStoreTest', function () { */ it('testRdbStore0009', 0, async function(done){ console.info(TAG + "************* testRdbStore0009 start *************"); - data_Rdb.getRdbStore(contextApplication, STORE_CONFIG, 1, async (err,data) => { + data_Rdb.getRdbStore(contextApplication, STORE_CONFIG, async (err,data) => { console.info(TAG + "getRdbStore finish") console.info(TAG + "getRdbStore success: " + data) expect(data != null).assertTrue(); diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesComplexFiledJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesComplexFiledJsunit.test.js index e30c7931d0821addb4f2c38096f24a84fdf24f94..793429ff721e24127b233a38f38220eaaf81eb85 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesComplexFiledJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesComplexFiledJsunit.test.js @@ -28,7 +28,7 @@ export default function relationalStorePredicatesComplexFiledTest(){ describe('relationalStorePredicatesComplexFiledTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await generateTable(); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJoinJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJoinJsunit.test.js index cc639ce1a020ffdfc9064b4544c7bfc8b4b07513..aae7cf5ada176742800e6ec23023a473e94fa46e 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJoinJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStorePredicatesJoinJsunit.test.js @@ -52,7 +52,7 @@ describe('relationalStorePredicatesJoinTest', function () { beforeEach(async function () { console.info(TAG + 'beforeEach') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, CURRENT_STORE_VERSION); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await generateUserTable(); await generateBookTable(); console.info(TAG + 'beforeEach 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 6456df3ddf66abc13a4f591a91500c4cd847c11e..915f76b35f71c8a882f7c26b109f6e3da5319b1b 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 @@ -37,7 +37,7 @@ export default function relationalStorePredicatesTest() { describe('relationalStorePredicatesTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_ALL_DATA_TYPE_SQL, null); await buildAllDataType1(); await buildAllDataType2(); diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreQuery.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreQuery.test.js index f558092ce627ae4961b4662339b194df23f30cde..d4e5cd50e012ba9220514f5f12703999c01c0019 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreQuery.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreQuery.test.js @@ -33,7 +33,7 @@ var rdbStore var context = ability_featureAbility.getContext() async function CreatRdbStore(context, STORE_CONFIG) { - let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1) + let RdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG) await RdbStore.executeSql(CREATE_TABLE_TEST, null) let u8 = new Uint8Array([1, 2, 3]) { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreResultSetJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreResultSetJsunit.test.js index 9cf8aaa1c861f8a6fa9714600a55583d34a36755..6a5069fe87f73f0f42583c93927379a78b314d01 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreResultSetJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreResultSetJsunit.test.js @@ -66,7 +66,7 @@ export default function relationalStoreResultSetTest() { describe('relationalStoreResultSetTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); await createTest(); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreTransactionJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreTransactionJsunit.test.js index dec5c727a63bd23acc17f987bde1b259f6ee18d9..fe98c636c4eef892975f4492431cb90ade072aad 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreTransactionJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreTransactionJsunit.test.js @@ -36,7 +36,7 @@ describe('relationalStoreTransactionTest', function () { beforeEach(async function () { console.info(TAG + 'beforeEach') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreUpdateJsunit.test.js b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreUpdateJsunit.test.js index 47935848cdc74648681ba9930f465c45f265ff83..de43eb656b3ffdb537e8ad23c176b1deb389888b 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreUpdateJsunit.test.js +++ b/distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RelationalStoreUpdateJsunit.test.js @@ -33,7 +33,7 @@ describe('relationalStoreUpdateTest', function () { beforeEach(async function () { console.info(TAG + 'beforeEach') - rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await data_Rdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreDistributedEtsunit.test.ets b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreDistributedEtsunit.test.ets index b490f8b60f665de99ebc6e5c408a77f7e4b8eddf..dfd925b59577aa147fab00dcc4d34b76acc297da 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreDistributedEtsunit.test.ets +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreDistributedEtsunit.test.ets @@ -34,7 +34,7 @@ describe('relationalStoreDistributedTest', function () { }) beforeEach(async function () { - rdbStore = await dataRdb.getRdbStore(context, config, 1); + rdbStore = await dataRdb.getRdbStore(context, config); await rdbStore.executeSql(CREATE_TABLE_TEST, null) console.info(TAG + 'beforeEach') }) diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreEtsunit.test.ets b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreEtsunit.test.ets index 9e77ee6a3f20d6500a22887e7943de2090d2f416..29f2fd8f3a354f8c1dd5bc70a0a869a53b369dc2 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreEtsunit.test.ets +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreEtsunit.test.ets @@ -55,7 +55,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S1 } - let storePromise = dataRdb.getRdbStore(context, config, 1); + let storePromise = dataRdb.getRdbStore(context, config); storePromise.then(async (store) => { try { await store.executeSql(CREATE_TABLE_TEST); @@ -84,7 +84,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S2 } - let storePromise = dataRdb.getRdbStore(context, config, 1); + let storePromise = dataRdb.getRdbStore(context, config); storePromise.then(async (store) => { try { await store.executeSql(CREATE_TABLE_TEST); @@ -113,7 +113,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S3 } - let storePromise = dataRdb.getRdbStore(context, config, 1); + let storePromise = dataRdb.getRdbStore(context, config); storePromise.then(async (store) => { try { await store.executeSql(CREATE_TABLE_TEST); @@ -142,7 +142,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S4 } - let storePromise = dataRdb.getRdbStore(context, config, 1); + let storePromise = dataRdb.getRdbStore(context, config); storePromise.then(async (store) => { try { await store.executeSql(CREATE_TABLE_TEST); @@ -171,7 +171,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S1 } - dataRdb.getRdbStore(context, config, 1, async (err,data) => { + dataRdb.getRdbStore(context, config, async (err,data) => { if(err != null){ console.info(TAG + "get rdb store error" + err.message) expect(null).assertFail(); @@ -198,7 +198,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S2 } - dataRdb.getRdbStore(context, config, 1,async (err,data) => { + dataRdb.getRdbStore(context, config,async (err,data) => { if(err != null){ console.info(TAG + "get rdb store error") expect(null).assertFail(); @@ -224,7 +224,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S3 } - dataRdb.getRdbStore(context, config, 1,async (err,data) => { + dataRdb.getRdbStore(context, config,async (err,data) => { if(err != null){ console.info(TAG + "get rdb store error") expect(null).assertFail(); @@ -250,7 +250,7 @@ describe('relationalStoreTest', function () { name: "secure.db", securityLevel: dataRdb.SecurityLevel.S4 } - dataRdb.getRdbStore(context, config, 1,async (err,data) => { + dataRdb.getRdbStore(context, config,async (err,data) => { if(err != null){ console.info(TAG + "get rdb store error") expect(null).assertFail(); @@ -277,7 +277,7 @@ describe('relationalStoreTest', function () { securityLevel: dataRdb.SecurityLevel.S4 } let deleteResult = false - await dataRdb.getRdbStore(context, config, 1).then(async (store) => { + await dataRdb.getRdbStore(context, config).then(async (store) => { console.info(TAG + "create table success") }) await dataRdb.deleteRdbStore(context,"secure.db").then(() => { @@ -302,7 +302,7 @@ describe('relationalStoreTest', function () { securityLevel: dataRdb.SecurityLevel.S1 } let deleteResult = false - await dataRdb.getRdbStore(context, config, 1).then(async (store) => { + await dataRdb.getRdbStore(context, config).then(async (store) => { console.info(TAG + "create rdb store success") }) dataRdb.deleteRdbStore(context,"secure.db", (err, data) => { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreTestResultsetEtsunit.test.ets b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreTestResultsetEtsunit.test.ets index d39ffd0b362db450f9fd125295da03b3df51db56..cbb20c72bb2f3aee74122d3280009e9403eda4e8 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreTestResultsetEtsunit.test.ets +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/test/relationalStoreTestResultsetEtsunit.test.ets @@ -29,7 +29,7 @@ export default function relationalStoreResultSetTest(context) { describe('relationalStoreResultSetTest', function () { beforeAll(async function () { console.info(TAG + 'beforeAll') - rdbStore = await dataRdb.getRdbStore(context, STORE_CONFIG, 1); + rdbStore = await dataRdb.getRdbStore(context, STORE_CONFIG); await rdbStore.executeSql(CREATE_TABLE_TEST, null); await createTest(); })