From c0331a720be6ddfeec5e25311b3d4d2a702c8d98 Mon Sep 17 00:00:00 2001
From: hexagon1337 <liuyaoming3@h-partners.com>
Date: Thu, 7 Dec 2023 11:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hexagon1337 <liuyaoming3@h-partners.com>
---
 entry/src/ohosTest/ets/test/Ability.test.ets | 33 ++++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/entry/src/ohosTest/ets/test/Ability.test.ets b/entry/src/ohosTest/ets/test/Ability.test.ets
index 64435e0..5af5c60 100644
--- a/entry/src/ohosTest/ets/test/Ability.test.ets
+++ b/entry/src/ohosTest/ets/test/Ability.test.ets
@@ -742,7 +742,7 @@ export default function abilityTest() {
       expect(data.length > 0).assertTrue();
     })
 
-    it('setVersionTwoDB', 0, async () => {
+    it('setDBVersionForTwoDB', 0, async () => {
       let newVersion = 1;
       let newVersion1 = 2;
       let newVersion2 = 3;
@@ -752,39 +752,38 @@ export default function abilityTest() {
       helper2.setEncrypt(false);
       await helper1.setVersion(newVersion)
       await helper2.setVersion(newVersion)
+
       helper1.setEntities(JoinPropertyUser, Customer);
       helper2.setEntities(JoinPropertyUser, Customer);
+
       await helper1.setVersion(newVersion2)
       await helper2.setVersion(newVersion1)
+
       let db1 = await helper1.getWritableDb();
       let db2 = await helper2.getWritableDb();
       let daoSession1 = new DaoMaster(db1).newSession();
       let daoSession2 = new DaoMaster(db2).newSession();
 
-      let joinPropertyUserDao: BaseDao<JoinPropertyUser, number> = daoSession.getBaseDao(JoinPropertyUser);
-      let customerDao: BaseDao<Customer, number> = daoSession.getBaseDao(Customer);
+      let joinPropertyUserDao1: BaseDao<JoinPropertyUser, number> = daoSession1.getBaseDao(JoinPropertyUser);
+      let joinPropertyUserDao2: BaseDao<JoinPropertyUser, number> = daoSession2.getBaseDao(JoinPropertyUser);
 
       await daoSession1.deleteAllAsync<JoinPropertyUser>(new JoinPropertyUser());
       await daoSession1.deleteAllAsync<Customer>(new Customer());
       await daoSession2.deleteAllAsync<JoinPropertyUser>(new JoinPropertyUser());
       await daoSession2.deleteAllAsync<Customer>(new Customer());
 
-      let joinProperty = new JoinPropertyUser(1, "lid", 1);
-      let rowId: number = -1;
-      if (joinPropertyUserDao) {
-        rowId = await joinPropertyUserDao.insert(joinProperty);
+      let joinProperty1 = new JoinPropertyUser(1, "lid", 1);
+      let joinProperty2 = new JoinPropertyUser(1, "lid", 1);
+      let rowId1: number = -1;
+      let rowId2: number = -1;
+      if (joinPropertyUserDao1) {
+        rowId1 = await joinPropertyUserDao1.insert(joinProperty1);
       }
-      expect(1).assertEqual(rowId);
-      let rowCustomerID: number = -1;
-      for (let index = 0; index < 5; index++) {
-        let customer = new Customer(index, "CustomerName_" + index, rowId);
-        if (customerDao) {
-          rowCustomerID = await customerDao.insert(customer);
-          expect(rowCustomerID >= 0).assertTrue();
-        }
+      if (joinPropertyUserDao2) {
+        rowId2 = await joinPropertyUserDao2.insert(joinProperty2);
       }
-      let data = await customerDao.queryToManyListByColumnName("customers", [joinProperty.flag + ""]);
-      expect(data.length > 0).assertTrue();
+      expect(1).assertEqual(rowId1);
+      expect(1).assertEqual(rowId2);
     })
   })
 }
-- 
Gitee