github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor tidy tests

Browse Source
This commit is contained in:
rbygrave
2021-09-08 21:47:52 +12:00
parent 1049435f86
commit c1d57c6b10
8 changed files with 34 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/org/tests/config/TestTableName.java → ebean-core/src/test/java/io/ebean/config/TestTableName.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.tests.config;
package io.ebean.config;
import io.ebean.BaseTestCase;
import io.ebean.config.TableName;
ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java → ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.tests.unitinternal;
package io.ebean.util;
import org.junit.jupiter.api.Test;
ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java → ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.tests.unitinternal;
package io.ebeaninternal.server.type;
import io.ebean.BaseTestCase;
import io.ebean.config.EncryptKey;
ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java
-24
View File
@@ -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")));
}
}
ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java
+15 -25
View File
@@ -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);
}
}
ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java
+2 -3
View File
@@ -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());
}
ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java
+12 -14
View File
@@ -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<Object> 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<Object> 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<Object> o4 = new OrderBy<>("id desc");
OrderBy<Object> o5 = new OrderBy<>("oid desc nulls high");
OrderBy<Object> o6 = new OrderBy<>("id desc nulls low");
@@ -247,7 +246,6 @@ public class TestOrderByParse extends BaseTestCase {
@Test
public void equals_with_collation() {
OrderBy<Object> o1 = new OrderBy<>();
o1.asc("name", "latin_1");
ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java
+2 -3
View File
@@ -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());
}