From c1d57c6b10c571e5829307fe0ff242f0fdf1cfe4 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 8 Sep 2021 21:47:52 +1200 Subject: [PATCH] Refactor tidy tests --- .../ebean}/config/TestTableName.java | 2 +- .../ebean/util}/TestEncodeB64.java | 2 +- .../server/type}/TestSimpleEncryptor.java | 2 +- .../org/tests/unitinternal/TestBasics.java | 24 ----------- .../unitinternal/TestEqualsOnEnhanced.java | 40 +++++++------------ .../unitinternal/TestNullCollectionSet.java | 5 +-- .../tests/unitinternal/TestOrderByParse.java | 26 ++++++------ .../TestVanillaCollectionSet.java | 5 +-- 8 files changed, 34 insertions(+), 72 deletions(-) rename ebean-core/src/test/java/{org/tests => io/ebean}/config/TestTableName.java (98%) rename ebean-core/src/test/java/{org/tests/unitinternal => io/ebean/util}/TestEncodeB64.java (95%) rename ebean-core/src/test/java/{org/tests/unitinternal => io/ebeaninternal/server/type}/TestSimpleEncryptor.java (96%) delete mode 100644 ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java diff --git a/ebean-core/src/test/java/org/tests/config/TestTableName.java b/ebean-core/src/test/java/io/ebean/config/TestTableName.java similarity index 98% rename from ebean-core/src/test/java/org/tests/config/TestTableName.java rename to ebean-core/src/test/java/io/ebean/config/TestTableName.java index be7f699aa..eaf4632a9 100644 --- a/ebean-core/src/test/java/org/tests/config/TestTableName.java +++ b/ebean-core/src/test/java/io/ebean/config/TestTableName.java @@ -1,4 +1,4 @@ -package org.tests.config; +package io.ebean.config; import io.ebean.BaseTestCase; import io.ebean.config.TableName; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 95% rename from ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java rename to ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java index a9a5af80e..54f024308 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java +++ b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java @@ -1,4 +1,4 @@ -package org.tests.unitinternal; +package io.ebean.util; import org.junit.jupiter.api.Test; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java similarity index 96% rename from ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 1bf1f45e2..47c9acb50 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -1,4 +1,4 @@ -package org.tests.unitinternal; +package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java deleted file mode 100644 index b1a281eaf..000000000 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.tests.unitinternal; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class TestBasics { - - private String parentPath(String path) { - int pos = path.lastIndexOf('.'); - if (pos == -1) { - return null; - } else { - return path.substring(0, pos); - } - } - - @Test - public void testParentPath() { - assertTrue((parentPath("banana") == null)); - assertTrue((parentPath("banana.apple").equals("banana"))); - assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); - } -} diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index b85d21421..ac21a2642 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -6,40 +6,30 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestEqualsOnEnhanced extends BaseTestCase { @Test public void test() { Customer c = new Customer(); - if (c instanceof EntityBean) { - Order o = new Order(); - if (o instanceof EntityBean) { + Order o = new Order(); - c.setId(1); + c.setId(1); + o.setId(1); + assertNotEquals(c, o); + assertNotEquals(null, c); + assertEquals(c, c); - o.setId(1); + Customer c2 = new Customer(); + c2.setId(1); + assertEquals(c, c2); - assertFalse(c.equals(o)); - assertFalse(c.equals(null)); - assertTrue(c.equals(c)); - - Customer c2 = new Customer(); - c2.setId(1); - assertTrue(c.equals(c2)); - - Customer c3 = new Customer(); - // c2.setId(1); - assertFalse(c.equals(c3)); - - Customer c4 = new Customer(); - c4.setId(2); - assertFalse(c.equals(c4)); - - } - } + Customer c3 = new Customer(); + assertNotEquals(c, c3); + Customer c4 = new Customer(); + c4.setId(2); + assertNotEquals(c, c4); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 1e3f1601a..ccce09fd8 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -9,8 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestNullCollectionSet extends BaseTestCase { @@ -30,7 +29,7 @@ public class TestNullCollectionSet extends BaseTestCase { assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - assertTrue(!bc.isPopulated()); + assertFalse(bc.isPopulated()); assertNotNull(bc.getOwnerBean()); assertNotNull(bc.getPropertyName()); } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java index d1e338894..6f3f084ff 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -46,7 +46,7 @@ public class TestOrderByParse extends BaseTestCase { o1 = new OrderBy<>("id desc"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc", o1.toStringFormat()); o1 = new OrderBy<>(" id asc "); @@ -65,7 +65,7 @@ public class TestOrderByParse extends BaseTestCase { OrderBy o1 = new OrderBy<>("id desc nulls high"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high", o1.toStringFormat()); assertFalse(o1.supportsSelect()); } @@ -77,7 +77,7 @@ public class TestOrderByParse extends BaseTestCase { o1.add("id desc nulls high"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high", o1.toStringFormat()); } @@ -87,7 +87,7 @@ public class TestOrderByParse extends BaseTestCase { OrderBy o1 = new OrderBy<>("id desc nulls high, name"); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high, name", o1.toStringFormat()); assertEquals("name", o1.getProperties().get(1).getProperty()); assertTrue(o1.getProperties().get(1).isAscending()); @@ -116,9 +116,9 @@ public class TestOrderByParse extends BaseTestCase { o1 = new OrderBy<>(" id desc , name desc "); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(1).isAscending()); + assertFalse(o1.getProperties().get(1).isAscending()); assertEquals("id desc, name desc", o1.toStringFormat()); o1 = new OrderBy<>(" id ascending, name asc"); @@ -149,9 +149,9 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("name"); assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(1).isAscending()); + assertFalse(o1.getProperties().get(1).isAscending()); assertEquals("id desc, name desc", o1.toStringFormat()); o1.reverse(); @@ -188,7 +188,7 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("id", "latin_1"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id collate latin_1 desc", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -198,7 +198,7 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); assertEquals("date", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, date", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -209,7 +209,7 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(2, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); assertEquals("name", o1.getProperties().get(1).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat()); assertTrue(o1.supportsSelect()); @@ -219,7 +219,7 @@ public class TestOrderByParse extends BaseTestCase { o1.desc("id", "COLLATION_KEY(${}, 'latin_1')"); assertEquals(1, o1.getProperties().size()); assertEquals("id", o1.getProperties().get(0).getProperty()); - assertTrue(!o1.getProperties().get(0).isAscending()); + assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat()); assertTrue(o1.supportsSelect()); } @@ -235,7 +235,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals(o1, o2); assertEquals(o1, o3); - OrderBy o4 = new OrderBy<>("id desc"); OrderBy o5 = new OrderBy<>("oid desc nulls high"); OrderBy o6 = new OrderBy<>("id desc nulls low"); @@ -247,7 +246,6 @@ public class TestOrderByParse extends BaseTestCase { @Test public void equals_with_collation() { - OrderBy o1 = new OrderBy<>(); o1.asc("name", "latin_1"); diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 10a3b8ed3..9f7a56f32 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -9,8 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestVanillaCollectionSet extends BaseTestCase { @@ -31,7 +30,7 @@ public class TestVanillaCollectionSet extends BaseTestCase { assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - assertTrue(!bc.isPopulated()); + assertFalse(bc.isPopulated()); assertNotNull(bc.getOwnerBean()); assertNotNull(bc.getPropertyName()); }