From 82b06b7c0301791319d10cd8bd65521e30b791b3 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 24 Jun 2024 10:37:14 +0800 Subject: [PATCH] test[orm]: list test --- .../java/com/zfoo/orm/accessor/MapTest.java | 3 +++ .../com/zfoo/orm/entity/bag/MapEntity.java | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java b/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java index 5d49b751..db32cac3 100644 --- a/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java +++ b/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; import java.util.HashMap; +import java.util.List; import java.util.Map; @Ignore @@ -51,6 +52,8 @@ public class MapTest { var entity = new MapEntity(); entity.setId(id); + entity.setList(List.of(1, 2, 3)); + var bagMap = new HashMap(); entity.setBagMap(bagMap); diff --git a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java index 009cb3ef..5175e7c7 100644 --- a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java +++ b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java @@ -18,15 +18,15 @@ import com.zfoo.orm.anno.Id; import com.zfoo.orm.anno.Persister; import com.zfoo.orm.model.IEntity; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; @EntityCache(persister = @Persister("time30s")) public class MapEntity implements IEntity { @Id private long id; + private List list = new CopyOnWriteArrayList<>(); private Map bagMap = new HashMap<>(); private Map> baseMap = new HashMap<>(); @@ -48,6 +48,14 @@ public class MapEntity implements IEntity { return id; } + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + public long getId() { return id; } @@ -165,11 +173,11 @@ public class MapEntity implements IEntity { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; MapEntity mapEntity = (MapEntity) o; - return id == mapEntity.id && Objects.equals(bagMap, mapEntity.bagMap) && Objects.equals(baseMap, mapEntity.baseMap) && Objects.equals(longStringMap, mapEntity.longStringMap) && Objects.equals(intStringMap, mapEntity.intStringMap) && Objects.equals(intBaseMap, mapEntity.intBaseMap) && Objects.equals(charBagMap, mapEntity.charBagMap) && Objects.equals(boolBagMap, mapEntity.boolBagMap) && Objects.equals(byteBagMap, mapEntity.byteBagMap) && Objects.equals(shortBagMap, mapEntity.shortBagMap) && Objects.equals(intBagMap, mapEntity.intBagMap) && Objects.equals(longBagMap, mapEntity.longBagMap) && Objects.equals(floatBagMap, mapEntity.floatBagMap) && Objects.equals(doubleBagMap, mapEntity.doubleBagMap); + return id == mapEntity.id && Objects.equals(list, mapEntity.list) && Objects.equals(bagMap, mapEntity.bagMap) && Objects.equals(baseMap, mapEntity.baseMap) && Objects.equals(longStringMap, mapEntity.longStringMap) && Objects.equals(intStringMap, mapEntity.intStringMap) && Objects.equals(intBaseMap, mapEntity.intBaseMap) && Objects.equals(charBagMap, mapEntity.charBagMap) && Objects.equals(boolBagMap, mapEntity.boolBagMap) && Objects.equals(byteBagMap, mapEntity.byteBagMap) && Objects.equals(shortBagMap, mapEntity.shortBagMap) && Objects.equals(intBagMap, mapEntity.intBagMap) && Objects.equals(longBagMap, mapEntity.longBagMap) && Objects.equals(floatBagMap, mapEntity.floatBagMap) && Objects.equals(doubleBagMap, mapEntity.doubleBagMap); } @Override public int hashCode() { - return Objects.hash(id, bagMap, baseMap, longStringMap, intStringMap, intBaseMap, charBagMap, boolBagMap, byteBagMap, shortBagMap, intBagMap, longBagMap, floatBagMap, doubleBagMap); + return Objects.hash(id, list, bagMap, baseMap, longStringMap, intStringMap, intBaseMap, charBagMap, boolBagMap, byteBagMap, shortBagMap, intBagMap, longBagMap, floatBagMap, doubleBagMap); } }