From c2faf0e0a7ecf58ac9b89f18de5dcac1c1cab122 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 10 Oct 2019 21:42:34 +1300 Subject: [PATCH] No effective change - tidy tests --- .../server/deploy/BeanPropertyAssocMany.java | 2 +- .../TestElementCollectionBasicMap.java | 23 +++++++++--------- .../TestElementCollectionBasicSet.java | 23 +++++++++--------- .../TestElementCollectionEmbeddedList.java | 23 +++++++++--------- .../TestElementCollectionEmbeddedMap.java | 23 +++++++++--------- .../TestElementCollectionEnumSet.java | 7 +++--- .../tests/query/other/TestOneToManyAsMap.java | 24 +++++++++---------- 7 files changed, 60 insertions(+), 65 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index eb90b455a..106847a14 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -958,7 +958,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return cascadeInfo.isDelete() || o2mJoinTable || ModifyListenMode.REMOVALS == modifyListenMode; } - public boolean isCascadeDeleteEscalate() { + boolean isCascadeDeleteEscalate() { return !elementCollection && cascadeInfo.isDelete(); } diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index a72c3ae0a..accd8ba2c 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -22,7 +21,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { EcmPerson person = new EcmPerson("Fiona021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -41,12 +40,12 @@ public class TestElementCollectionBasicMap extends BaseTestCase { person1.getPhoneNumbers().put("home", "09 1234"); person1.getPhoneNumbers().put("work", "09 4321"); person1.getPhoneNumbers().put("mob", "09 9876"); - Ebean.save(person1); + DB.save(person1); LoggedSqlCollector.current(); List found = - Ebean.find(EcmPerson.class).where() + DB.find(EcmPerson.class).where() .startsWith("name", "Fiona0") .order().asc("id") .findList(); @@ -66,7 +65,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { assertThat(trimSql(sql.get(1))).contains("select t0.ecm_person_id, t0.type, t0.number from ecm_person_phone_numbers t0 where"); List found2 = - Ebean.find(EcmPerson.class) + DB.find(EcmPerson.class) .fetch("phoneNumbers") .where() .startsWith("name", "Fiona0") @@ -89,7 +88,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { private void updateBasic(EcmPerson bean) { bean.setName("Fiona021-mod-0"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(1); @@ -102,7 +101,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.setName("Fiona021-mod-both"); bean.getPhoneNumbers().put("one", "01-22123"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -126,7 +125,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { private void updateNothing(EcmPerson bean) { - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); @@ -137,7 +136,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { private void updateOnlyCollection(EcmPerson bean) { bean.getPhoneNumbers().put("two", "01-4321"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -160,7 +159,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { private void delete(EcmPerson bean) { - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); @@ -170,8 +169,8 @@ public class TestElementCollectionBasicMap extends BaseTestCase { private void jsonToFrom(EcmPerson foundFirst) { foundFirst.transientPhoneNumbers = new HashMap<>(); - String asJson = Ebean.json().toJson(foundFirst); - EcmPerson fromJson = Ebean.json().toBean(EcmPerson.class, asJson); + String asJson = DB.json().toJson(foundFirst); + EcmPerson fromJson = DB.json().toBean(EcmPerson.class, asJson); assertThat(fromJson.getPhoneNumbers()).containsValues("021 1234", "021 4321"); assertThat(fromJson.getPhoneNumbers().get("home")).isEqualTo("021 1234"); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 084d848ee..5efcb57ff 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -21,7 +20,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { EcsPerson person = new EcsPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -40,12 +39,12 @@ public class TestElementCollectionBasicSet extends BaseTestCase { person1.getPhoneNumbers().add("09 1234"); person1.getPhoneNumbers().add("09 4321"); person1.getPhoneNumbers().add("09 9876"); - Ebean.save(person1); + DB.save(person1); LoggedSqlCollector.current(); List found = - Ebean.find(EcsPerson.class).where() + DB.find(EcsPerson.class).where() .startsWith("name", "Fiona0") .order().asc("id") .findList(); @@ -63,7 +62,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { assertThat(trimSql(sql.get(1))).contains("select t0.ecs_person_id, t0.phone from ecs_person_phone t0 where"); List found2 = - Ebean.find(EcsPerson.class) + DB.find(EcsPerson.class) .fetch("phoneNumbers") .where() .startsWith("name", "Fiona0") @@ -87,7 +86,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { private void updateBasic(EcsPerson bean) { bean.setName("Fiona021-mod-0"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(1); @@ -100,7 +99,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.setName("Fiona021-mod-both"); bean.getPhoneNumbers().add("01-22123"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -124,7 +123,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { private void updateNothing(EcsPerson bean) { - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); @@ -135,7 +134,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { private void updateOnlyCollection(EcsPerson bean) { bean.getPhoneNumbers().add("01-4321"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -158,7 +157,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { private void delete(EcsPerson bean) { - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); @@ -167,8 +166,8 @@ public class TestElementCollectionBasicSet extends BaseTestCase { } private void jsonToFrom(EcsPerson foundFirst) { - String asJson = Ebean.json().toJson(foundFirst); - EcsPerson fromJson = Ebean.json().toBean(EcsPerson.class, asJson); + String asJson = DB.json().toJson(foundFirst); + EcsPerson fromJson = DB.json().toBean(EcsPerson.class, asJson); assertThat(fromJson.getPhoneNumbers()).containsAll(foundFirst.getPhoneNumbers()); } diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index c7e4f90f4..3300073c8 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -20,7 +19,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { EcblPerson person = new EcblPerson("Fiona64021"); person.getPhoneNumbers().add(new EcPhone("64", "021", "1234")); person.getPhoneNumbers().add(new EcPhone("64", "021", "4321")); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -38,12 +37,12 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { EcblPerson person1 = new EcblPerson("Fiona6409"); person1.getPhoneNumbers().add(new EcPhone("61", "09", "1234")); person1.getPhoneNumbers().add(new EcPhone("64", "09", "4321")); - Ebean.save(person1); + DB.save(person1); LoggedSqlCollector.current(); List found = - Ebean.find(EcblPerson.class).where() + DB.find(EcblPerson.class).where() .startsWith("name", "Fiona640") .order().asc("id") .findList(); @@ -61,7 +60,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { assertThat(trimSql(sql.get(1))).contains("select t0.person_id, t0.country_code, t0.area, t0.number from ecbl_person_phone_numbers"); List found2 = - Ebean.find(EcblPerson.class) + DB.find(EcblPerson.class) .fetch("phoneNumbers") .where() .startsWith("name", "Fiona640") @@ -87,7 +86,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { private void updateBasic(EcblPerson bean) { bean.setName("Fiona64-mod-0"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(1); @@ -100,7 +99,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.setName("Fiona64-mod-both"); bean.getPhoneNumbers().add(new EcPhone("01", "234", "123")); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -124,7 +123,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { private void updateNothing(EcblPerson bean) { - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); @@ -135,7 +134,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { private void updateOnlyCollection(EcblPerson bean) { bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321")); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -158,7 +157,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { private void delete(EcblPerson bean) { - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); @@ -168,9 +167,9 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { private void jsonToFrom(EcblPerson foundFirst) { - String asJson = Ebean.json().toJson(foundFirst); + String asJson = DB.json().toJson(foundFirst); - EcblPerson fromJson = Ebean.json().toBean(EcblPerson.class, asJson); + EcblPerson fromJson = DB.json().toBean(EcblPerson.class, asJson); String phoneString = fromJson.getPhoneNumbers().toString(); assertThat(phoneString).contains("64-021-1234"); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index 3d7b9be2b..40cd17216 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; @@ -21,7 +20,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { EcbmPerson person = new EcbmPerson("Fiona64021"); person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234")); person.getPhoneNumbers().put("work", new EcPhone("64","021","4321")); - Ebean.save(person); + DB.save(person); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -40,12 +39,12 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { person1.getPhoneNumbers().put("home",new EcPhone("64","09","1234")); person1.getPhoneNumbers().put("mob",new EcPhone("61","09","4321")); - Ebean.save(person1); + DB.save(person1); LoggedSqlCollector.current(); List found = - Ebean.find(EcbmPerson.class).where() + DB.find(EcbmPerson.class).where() .startsWith("name", "Fiona640") .order().asc("id") .findList(); @@ -58,7 +57,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { assertThat(phoneNumbers1.toString()).contains("64-09-1234", "61-09-4321"); List found2 = - Ebean.find(EcbmPerson.class) + DB.find(EcbmPerson.class) .fetch("phoneNumbers") .where() .startsWith("name", "Fiona640") @@ -80,7 +79,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { private void updateBasic(EcbmPerson bean) { bean.setName("Fiona64-mod-0"); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(1); @@ -93,7 +92,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.setName("Fiona64-mod-both"); bean.getPhoneNumbers().put("more", new EcPhone("01", "234", "123")); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -116,7 +115,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { private void updateNothing(EcbmPerson bean) { - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(0); @@ -127,7 +126,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { private void updateOnlyCollection(EcbmPerson bean) { bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321")); - Ebean.save(bean); + DB.save(bean); List sql = LoggedSqlCollector.current(); if (isPersistBatchOnCascade()) { @@ -150,7 +149,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { private void delete(EcbmPerson bean) { - Ebean.delete(bean); + DB.delete(bean); List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(2); @@ -159,9 +158,9 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { } private void jsonToFrom(EcbmPerson foundFirst) { - String asJson = Ebean.json().toJson(foundFirst); + String asJson = DB.json().toJson(foundFirst); - EcbmPerson fromJson = Ebean.json().toBean(EcbmPerson.class, asJson); + EcbmPerson fromJson = DB.json().toBean(EcbmPerson.class, asJson); String phoneString = fromJson.getPhoneNumbers().toString(); assertThat(phoneString).contains("64-021-1234"); diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index 2263c6639..2a26c5ea0 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -16,10 +15,10 @@ public class TestElementCollectionEnumSet extends BaseTestCase { person.getTags().add(EcEnumPerson.Tags.BLUE); person.getTags().add(EcEnumPerson.Tags.RED); - Ebean.save(person); + DB.save(person); - EcEnumPerson one = Ebean.find(EcEnumPerson.class) + EcEnumPerson one = DB.find(EcEnumPerson.class) .setId(person.getId()) .fetch("tags") .findOne(); @@ -29,7 +28,7 @@ public class TestElementCollectionEnumSet extends BaseTestCase { one.getTags().add(EcEnumPerson.Tags.GREEN); one.getTags().remove(EcEnumPerson.Tags.BLUE); - Ebean.save(one); + DB.save(one); } @Test diff --git a/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 245550bb6..36da8bd82 100644 --- a/src/test/java/org/tests/query/other/TestOneToManyAsMap.java +++ b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -2,8 +2,6 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Ebean; -import org.junit.Assert; import org.junit.Test; import org.tests.model.map.MpRole; import org.tests.model.map.MpUser; @@ -12,6 +10,8 @@ import java.util.LinkedHashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class TestOneToManyAsMap extends BaseTestCase { @@ -19,27 +19,27 @@ public class TestOneToManyAsMap extends BaseTestCase { public void test() { MpUser u = new MpUser(); - Ebean.save(u); + DB.save(u); - MpUser u2 = Ebean.find(MpUser.class, u.getId()); - Assert.assertNotNull(u2); + MpUser u2 = DB.find(MpUser.class, u.getId()); + assertNotNull(u2); u2.setName("Charlie Brown"); MpRole ourl = new MpRole(); ourl.setOrganizationId(47L); u2.getRoles().put("one", ourl); - Ebean.save(u2); + DB.save(u2); - MpUser u3 = Ebean.find(MpUser.class, u.getId()); - Assert.assertEquals("Charlie Brown", u3.getName()); + MpUser u3 = DB.find(MpUser.class, u.getId()); + assertEquals("Charlie Brown", u3.getName()); Map listMap = u3.getRoles(); - Assert.assertEquals(1, listMap.size()); + assertEquals(1, listMap.size()); MpRole mpRole = listMap.get("one"); - Assert.assertNotNull(mpRole); - Assert.assertEquals(Long.valueOf(47L), mpRole.getOrganizationId()); - Assert.assertEquals("one", mpRole.getCode()); + assertNotNull(mpRole); + assertEquals(Long.valueOf(47L), mpRole.getOrganizationId()); + assertEquals("one", mpRole.getCode()); }