From 6dc255a835dee52c66178ab46f8c9ed5850797d3 Mon Sep 17 00:00:00 2001 From: shi_jie Date: Tue, 28 May 2024 16:50:19 +0800 Subject: [PATCH] =?UTF-8?q?dataORM=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shi_jie --- entry/src/ohosTest/ets/test/Ability.test.ets | 18 +++++++++++++++++- entry/src/ohosTest/ets/test/Note.test.ets | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/entry/src/ohosTest/ets/test/Ability.test.ets b/entry/src/ohosTest/ets/test/Ability.test.ets index 8e91610..ad12f21 100644 --- a/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/entry/src/ohosTest/ets/test/Ability.test.ets @@ -81,6 +81,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db: Database = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); await noteDao.deleteAllAsync(); @@ -135,7 +136,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); - + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); // 清除上方测试用例已添加数据 @@ -169,6 +170,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); @@ -223,6 +225,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); // 清除上方测试用例已添加数据 await daoSession.deleteAllAsync(new Note()); @@ -257,6 +260,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); rdb = await relationalStore.getRdbStore(ctt, { @@ -304,6 +308,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); let entityClass = GlobalContext.getContext().getValue(GlobalContext.KEY_CLS) as Record; @@ -354,6 +359,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); @@ -402,6 +408,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb() + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); await noteDao.deleteAllAsync(); @@ -454,6 +461,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb() + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); await noteDao.deleteAllAsync(); @@ -495,6 +503,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb() + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); GlobalContext.getContext().setValue("daoSession", daoSession); noteDao = daoSession.getBaseDao(Note); @@ -524,6 +533,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); let entity = GlobalContext.getContext().getValue(GlobalContext.KEY_CLS) as Record; @@ -583,6 +593,7 @@ export default function abilityTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); @@ -639,6 +650,7 @@ export default function abilityTest() { await helper.setVersion(newVersion) helper.setEntities(ConvertInfo); let db = await helper.getWritableDb(); + db.name = "notes_1.db"; daoSession = new DaoMaster(db).newSession(); let covertDao: BaseDao = daoSession.getBaseDao(ConvertInfo); @@ -672,6 +684,7 @@ export default function abilityTest() { await helper.setVersion(newVersion) helper.setEntities(User); let db = await helper.getWritableDb(); + db.name = "notes_2.db"; daoSession = new DaoMaster(db).newSession(); let userDao: BaseDao = daoSession.getBaseDao(User); @@ -716,6 +729,7 @@ export default function abilityTest() { await helper.setVersion(newVersion) helper.setEntities(JoinPropertyUser, Customer); let db = await helper.getWritableDb(); + db.name = "notes_3.db"; daoSession = new DaoMaster(db).newSession(); let joinPropertyUserDao: BaseDao = daoSession.getBaseDao(JoinPropertyUser); @@ -761,6 +775,8 @@ export default function abilityTest() { let db1 = await helper1.getWritableDb(); let db2 = await helper2.getWritableDb(); + db1.name = "notes_4.db"; + db2.name = "notes_5.db"; let daoSession1 = new DaoMaster(db1).newSession(); let daoSession2 = new DaoMaster(db2).newSession(); diff --git a/entry/src/ohosTest/ets/test/Note.test.ets b/entry/src/ohosTest/ets/test/Note.test.ets index d447cf9..8f74104 100644 --- a/entry/src/ohosTest/ets/test/Note.test.ets +++ b/entry/src/ohosTest/ets/test/Note.test.ets @@ -45,6 +45,7 @@ export default function notePageTest() { let migration: Migration = new Migration("notes.db", "NOTE", newVersion).addColumn("MONEYS", ColumnType.realValue); helper.setMigration(migration); let db: Database = await helper.getWritableDb(); + db.name = "notes.db"; daoSession = new DaoMaster(db).newSession(); noteDao = daoSession.getBaseDao(Note); await noteDao.deleteAllAsync(); -- Gitee