You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/02 08:22:13 UTC
[2/5] Apply JUnit4 instead of JUnit3 in cayenne-server
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
index 687db53..a64b830 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
@@ -19,6 +19,14 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.query.AbstractQuery;
+import org.apache.cayenne.query.MockAbstractQuery;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
+import org.xml.sax.InputSource;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -28,20 +36,20 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.MockAbstractQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.util.Util;
-import org.apache.cayenne.util.XMLEncoder;
-import org.xml.sax.InputSource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* DataMap unit tests.
*/
-public class DataMapTest extends TestCase {
+public class DataMapTest {
+ @Test
public void testSerializability() throws Exception {
DataMap m1 = new DataMap("abc");
DataMap d1 = (DataMap) Util.cloneViaSerialization(m1);
@@ -54,6 +62,7 @@ public class DataMapTest extends TestCase {
assertNotNull(d2.getObjEntity(oe1.getName()));
}
+ @Test
public void testInitWithProperties() {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(DataMap.CLIENT_SUPPORTED_PROPERTY, "true");
@@ -68,6 +77,7 @@ public class DataMapTest extends TestCase {
// TODO: test other defaults
}
+ @Test
public void testDefaultSchema() {
DataMap map = new DataMap();
String tstSchema = "tst_schema";
@@ -79,6 +89,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultSchema());
}
+ @Test
public void testDefaultClientPackage() {
DataMap map = new DataMap();
String tstPackage = "tst.pkg";
@@ -90,6 +101,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultClientPackage());
}
+ @Test
public void testDefaultClientSuperclass() {
DataMap map = new DataMap();
String tstSuperclass = "tst_superclass";
@@ -101,6 +113,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultClientSuperclass());
}
+ @Test
public void testDefaultPackage() {
DataMap map = new DataMap();
String tstPackage = "tst.pkg";
@@ -112,6 +125,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultPackage());
}
+ @Test
public void testDefaultSuperclass() {
DataMap map = new DataMap();
String tstSuperclass = "tst_superclass";
@@ -123,6 +137,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultSuperclass());
}
+ @Test
public void testDefaultLockType() {
DataMap map = new DataMap();
assertEquals(ObjEntity.LOCK_TYPE_NONE, map.getDefaultLockType());
@@ -133,6 +148,7 @@ public class DataMapTest extends TestCase {
assertEquals(ObjEntity.LOCK_TYPE_NONE, map.getDefaultLockType());
}
+ @Test
public void testName() {
DataMap map = new DataMap();
String tstName = "tst_name";
@@ -140,6 +156,7 @@ public class DataMapTest extends TestCase {
assertEquals(tstName, map.getName());
}
+ @Test
public void testLocation() {
DataMap map = new DataMap();
String tstName = "tst_name";
@@ -148,6 +165,7 @@ public class DataMapTest extends TestCase {
assertEquals(tstName, map.getLocation());
}
+ @Test
public void testAddObjEntity() {
DataMap map = new DataMap();
ObjEntity e = new ObjEntity("b");
@@ -157,6 +175,7 @@ public class DataMapTest extends TestCase {
assertSame(map, e.getDataMap());
}
+ @Test
public void testAddEntityWithSameName() {
DataMap map = new DataMap();
@@ -175,6 +194,7 @@ public class DataMapTest extends TestCase {
}
}
+ @Test
public void testRemoveThenAddNullClassName() {
DataMap map = new DataMap();
// It should be possible to cleanly remove and then add the same entity
@@ -188,6 +208,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e);
}
+ @Test
public void testRemoveObjEntity() {
// make sure deleting an ObjEntity & other entity's relationships to it
// works & does not cause a ConcurrentModificationException
@@ -224,6 +245,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getObjEntity("2"));
}
+ @Test
public void testMultipleNullClassNames() {
// Now possible to have more than one objEntity with a null class name.
// This test proves it
@@ -236,6 +258,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e2);
}
+ @Test
public void testRemoveThenAddRealClassName() {
ObjEntity e = new ObjEntity("f");
e.setClassName("f");
@@ -247,6 +270,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e);
}
+ @Test
public void testAddEmbeddable() {
Embeddable e = new Embeddable("XYZ");
@@ -257,6 +281,7 @@ public class DataMapTest extends TestCase {
assertTrue(map.getEmbeddables().contains(e));
}
+ @Test
public void testRemoveEmbeddable() {
Embeddable e = new Embeddable("XYZ");
@@ -270,6 +295,7 @@ public class DataMapTest extends TestCase {
assertFalse(map.getEmbeddables().contains(e));
}
+ @Test
public void testAddDbEntity() {
DbEntity e = new DbEntity("b");
@@ -279,6 +305,7 @@ public class DataMapTest extends TestCase {
assertSame(map, e.getDataMap());
}
+ @Test
public void testAddQuery() {
AbstractQuery q = new MockAbstractQuery("a");
DataMap map = new DataMap();
@@ -286,6 +313,7 @@ public class DataMapTest extends TestCase {
assertSame(q, map.getQuery("a"));
}
+ @Test
public void testRemoveQuery() {
AbstractQuery q = new MockAbstractQuery("a");
@@ -296,6 +324,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getQuery("a"));
}
+ @Test
public void testGetQueryMap() {
AbstractQuery q = new MockAbstractQuery("a");
DataMap map = new DataMap();
@@ -307,6 +336,7 @@ public class DataMapTest extends TestCase {
// make sure deleting a DbEntity & other entity's relationships to it
// works & does not cause a ConcurrentModificationException
+ @Test
public void testRemoveDbEntity() {
DataMap map = new DataMap();
@@ -348,6 +378,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDbEntity(e2.getName()));
}
+ @Test
public void testChildProcedures() throws Exception {
DataMap map = new DataMap();
checkProcedures(map, new String[0]);
@@ -379,6 +410,7 @@ public class DataMapTest extends TestCase {
}
}
+ @Test
public void testQuoteSqlIdentifiersEncodeAsXML() {
DataMap map = new DataMap("aaa");
map.setQuotingSQLIdentifiers(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
index b5c0c5b..ac3f2c9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
@@ -19,17 +19,24 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.dba.TypesMapping;
+import org.junit.Test;
+
import java.sql.Types;
import java.util.Collection;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.dba.TypesMapping;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class DbAttributeTest extends TestCase {
+public class DbAttributeTest {
+ @Test
public void testConstructor1() throws Exception {
DbAttribute a = new DbAttribute("abc");
assertEquals("abc", a.getName());
@@ -37,6 +44,7 @@ public class DbAttributeTest extends TestCase {
assertNull(a.getEntity());
}
+ @Test
public void testConstructor2() throws Exception {
int type = Types.INTEGER;
DbEntity dbe = new DbEntity("e");
@@ -46,6 +54,7 @@ public class DbAttributeTest extends TestCase {
assertSame(dbe, a.getEntity());
}
+ @Test
public void testPrimaryKeyEmpty() {
DbEntity dbe = new DbEntity("e");
assertNotNull(dbe.getPrimaryKeys());
@@ -56,6 +65,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(0, dbe.getPrimaryKeys().size());
}
+ @Test
public void testPrimaryKeyAdded() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -66,6 +76,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(1, pk.size());
}
+ @Test
public void testPrimaryKeyAttributeChanged() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -80,6 +91,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(1, pk.size());
}
+ @Test
public void testPrimaryKeyRemoved() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -94,6 +106,7 @@ public class DbAttributeTest extends TestCase {
assertNotNull(pk);
assertEquals(0, pk.size()); }
+ @Test
public void testAttributesCleared() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -109,6 +122,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(0, pk.size());
}
+ @Test
public void testAutoIncrement() throws Exception {
DbAttribute attribute = new DbAttribute();
assertFalse(attribute.isGenerated());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
index 912f66d..7802646 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
@@ -19,12 +19,17 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class DbJoinTest extends TestCase {
+public class DbJoinTest {
+ @Test
public void testRelationship() throws Exception {
DbJoin join = new DbJoin(null);
assertNull(join.getRelationship());
@@ -34,6 +39,7 @@ public class DbJoinTest extends TestCase {
assertSame(relationship, join.getRelationship());
}
+ @Test
public void testToString() {
DbJoin join = new DbJoin();
join.setSourceName("X");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
index f2e451f..e92ac61 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
@@ -20,17 +20,23 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
/**
*/
-public class DbKeyGeneratorTest extends TestCase {
+public class DbKeyGeneratorTest {
+
+ @Test
public void testName() throws Exception {
DbKeyGenerator generator = new DbKeyGenerator();
generator.setGeneratorName("abc");
assertEquals("abc", generator.getGeneratorName());
}
+ @Test
public void testSize() throws Exception {
DbKeyGenerator generator = new DbKeyGenerator();
generator.setKeyCacheSize(new Integer(3));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
index fdb29b9..0512c0f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
@@ -18,10 +18,14 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EmbeddableAttributeTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+public class EmbeddableAttributeTest {
+
+ @Test
public void testName() {
EmbeddableAttribute a1 = new EmbeddableAttribute();
assertNull(a1.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
index 66ac58d..8a6a41c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
@@ -18,10 +18,17 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EmbeddableTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+public class EmbeddableTest {
+
+ @Test
public void testClassName() {
Embeddable e1 = new Embeddable();
assertNull(e1.getClassName());
@@ -33,6 +40,7 @@ public class EmbeddableTest extends TestCase {
assertEquals("ABC", e2.getClassName());
}
+ @Test
public void testAddAttribute() {
Embeddable e1 = new Embeddable();
@@ -51,6 +59,7 @@ public class EmbeddableTest extends TestCase {
assertTrue(e1.getAttributes().contains(a2));
}
+ @Test
public void testRemoveAttribute() {
Embeddable e1 = new Embeddable();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
index f75ff47..4d6ab03 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
@@ -18,15 +18,19 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.util.Collections;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.exp.ExpressionFactory;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
-import junit.framework.TestCase;
-public class EntityInheritanceTreeTest extends TestCase {
+public class EntityInheritanceTreeTest {
+ @Test
public void testEntityMatchingRow_NoInheritance() {
DataMap dataMap = new DataMap("map");
@@ -54,6 +58,7 @@ public class EntityInheritanceTreeTest extends TestCase {
}
+ @Test
public void testEntityMatchingRow_SingleTableInheritance() {
DataMap dataMap = new DataMap("map");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
index 2bab75e..205f569 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
@@ -19,14 +19,6 @@
package org.apache.cayenne.map;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Ordering;
@@ -37,14 +29,27 @@ import org.apache.cayenne.testdo.embeddable.Embeddable1;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
import org.xml.sax.InputSource;
-public class MapLoaderLoadTest extends TestCase {
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class MapLoaderLoadTest {
private InputSource getMapXml(String mapName) {
return new InputSource(getClass().getClassLoader().getResourceAsStream(mapName));
}
+ @Test
public void testLoadEmbeddableMap() throws Exception {
MapLoader mapLoader = new MapLoader();
DataMap map = mapLoader.loadDataMap(getMapXml("embeddable.map.xml"));
@@ -83,6 +88,7 @@ public class MapLoaderLoadTest extends TestCase {
assertEquals(2, oea2.getAttributeOverrides().size());
}
+ @Test
public void testLoadTestMap() throws Exception {
MapLoader mapLoader = new MapLoader();
DataMap map = mapLoader.loadDataMap(getMapXml("tstmap.map.xml"));
@@ -114,6 +120,7 @@ public class MapLoaderLoadTest extends TestCase {
checkLoadedQueries(map);
}
+ @Test
public void testEncodeAsXML() throws FileNotFoundException {
// load map
MapLoader mapLoader = new MapLoader();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
index ad2d303..f6595c9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
@@ -19,14 +19,17 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
import java.sql.Types;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-import org.apache.cayenne.util.Util;
-
-public class ObjAttributeTest extends TestCase {
+public class ObjAttributeTest {
+ @Test
public void testDbAttribute() {
ObjAttribute attribute = new ObjAttribute("a1");
@@ -34,7 +37,8 @@ public class ObjAttributeTest extends TestCase {
attribute.setDbAttributePath(dbAttr.getName());
assertEquals(dbAttr.getName(), attribute.getDbAttributeName());
}
-
+
+ @Test
public void testDbAttributePath() {
ObjAttribute attribute = new ObjAttribute("a1");
attribute.setDbAttributePath("a");
@@ -46,6 +50,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals("b", attribute.getDbAttributeName());
}
+ @Test
public void testType() {
ObjAttribute attribute = new ObjAttribute("a1");
@@ -54,6 +59,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(type, attribute.getType());
}
+ @Test
public void testSerializability() throws Exception {
ObjAttribute a1 = new ObjAttribute("a1");
@@ -61,6 +67,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(a1.getName(), a2.getName());
}
+ @Test
public void testGetClientAttribute() {
ObjAttribute a1 = new ObjAttribute("a1");
a1.setType("x.y.z");
@@ -71,6 +78,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(a1.getType(), a2.getType());
}
+ @Test
public void testGetJavaClass() throws Exception {
ObjAttribute a1 = new ObjAttribute("test");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
index 28e9e54..bf8a6e8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
@@ -19,13 +19,19 @@
package org.apache.cayenne.map;
+import org.junit.Before;
+import org.junit.Test;
+
import java.sql.Types;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
/**
*/
-public class ObjEntitySingleTableInheritanceTest extends TestCase {
+public class ObjEntitySingleTableInheritanceTest {
protected DataMap map;
@@ -51,7 +57,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
protected ObjRelationship relationship2;
protected ObjRelationship relationship3;
- @Override
+ @Before
public void setUp() throws Exception {
map = new DataMap();
@@ -100,6 +106,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
map.addObjEntity(entity3);
}
+ @Test
public void testInheritedAttributes() throws Exception {
assertSame(attribute1, entity1.getAttribute("a1"));
assertNull(entity1.getAttribute("a2"));
@@ -114,6 +121,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertNotNull(entity1.getAttribute("a3"));
}
+ @Test
public void testInheritedRelationships() throws Exception {
assertSame(relationship1, entity1.getRelationship("r1"));
assertNull(entity1.getRelationship("r2"));
@@ -126,6 +134,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertSame(relationship3, entity1.getRelationship("r3"));
}
+ @Test
public void testAttributeForDbAttribute() throws Exception {
entity1.setSuperEntityName("e2");
entity2.setDbEntityName(dbEntity.getName());
@@ -140,6 +149,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertNotNull(entity1.getAttributeForDbAttribute(dbAttribute2));
}
+ @Test
public void testRelationshipForDbRelationship() throws Exception {
entity1.setSuperEntityName("e2");
entity2.setDbEntityName(dbEntity.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
index 7fbd492..ae0de5a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
@@ -19,18 +19,22 @@ package org.apache.cayenne.map;
* under the License.
****************************************************************/
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
/**
*/
-public class ProcedureTest extends TestCase {
+public class ProcedureTest {
protected Procedure procedure;
- @Override
+ @Before
public void setUp() throws Exception {
procedure = new Procedure();
}
+ @Test
public void testFullyQualifiedName() throws Exception {
String tstName = "tst_name";
String schemaName = "tst_schema_name";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
index 484c62a..829025d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
@@ -19,18 +19,20 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.Query;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
/**
*/
-public class QueryLoaderTest extends TestCase {
+public class QueryLoaderTest {
protected QueryLoader builder;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
builder = new QueryLoader() {
@Override
@@ -40,11 +42,13 @@ public class QueryLoaderTest extends TestCase {
};
}
+ @Test
public void testSetName() throws Exception {
builder.setName("aaa");
assertEquals("aaa", builder.name);
}
+ @Test
public void testSetRootInfoDbEntity() throws Exception {
DataMap map = new DataMap("map");
DbEntity entity = new DbEntity("DB1");
@@ -54,6 +58,7 @@ public class QueryLoaderTest extends TestCase {
assertSame(entity, builder.getRoot());
}
+ @Test
public void testSetRootObjEntity() throws Exception {
DataMap map = new DataMap("map");
ObjEntity entity = new ObjEntity("OBJ1");
@@ -63,6 +68,7 @@ public class QueryLoaderTest extends TestCase {
assertSame(entity, builder.getRoot());
}
+ @Test
public void testSetRootDataMap() throws Exception {
DataMap map = new DataMap("map");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
index 5f2a924..e6c75ba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
@@ -19,10 +19,14 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class RelationshipTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+public class RelationshipTest {
+
+ @Test
public void testName() throws Exception {
Relationship rel = new MockRelationship();
@@ -31,6 +35,7 @@ public class RelationshipTest extends TestCase {
assertEquals(tstName, rel.getName());
}
+ @Test
public void testSourceEntity() {
Relationship rel = new MockRelationship();
Entity tstEntity = new MockEntity();
@@ -38,6 +43,7 @@ public class RelationshipTest extends TestCase {
assertSame(tstEntity, rel.getSourceEntity());
}
+ @Test
public void testTargetEntity() {
Relationship rel = new MockRelationship();
Entity tstEntity = new MockEntity();
@@ -46,6 +52,7 @@ public class RelationshipTest extends TestCase {
assertSame("abc", rel.getTargetEntityName());
}
+ @Test
public void testTargetEntityName() {
Relationship rel = new MockRelationship();
rel.setTargetEntityName("abc");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
index 57e8111..b05ab21 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
@@ -19,21 +19,27 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SQLTemplate;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class SQLTemplateBuilderTest extends TestCase {
+public class SQLTemplateBuilderTest {
+ @Test
public void testGetQueryType() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
assertTrue(builder.getQuery() instanceof SQLTemplate);
}
+ @Test
public void testGetQueryName() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.setName("xyz");
@@ -41,6 +47,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertEquals("xyz", builder.getQuery().getName());
}
+ @Test
public void testGetQueryRoot() throws Exception {
DataMap map = new DataMap();
ObjEntity entity = new ObjEntity("A");
@@ -54,6 +61,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertSame(entity, ((SQLTemplate) query).getRoot());
}
+ @Test
public void testGetQueryProperties() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
@@ -68,6 +76,7 @@ public class SQLTemplateBuilderTest extends TestCase {
// TODO: test other properties...
}
+ @Test
public void testGetQuerySql() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addSql("abc", null);
@@ -76,6 +85,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertEquals("abc", query.getDefaultTemplate());
}
+ @Test
public void testGetQueryAdapterSql() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addSql("abc", "adapter");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
index d1d48f6..fac8027 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
@@ -19,22 +19,27 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SelectQuery;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class SelectQueryBuilderTest extends TestCase {
+public class SelectQueryBuilderTest {
+ @Test
public void testGetQueryType() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
assertTrue(builder.getQuery() instanceof SelectQuery);
}
+ @Test
public void testGetQueryName() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.setName("xyz");
@@ -42,6 +47,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertEquals("xyz", builder.getQuery().getName());
}
+ @Test
public void testGetQueryRoot() throws Exception {
DataMap map = new DataMap();
ObjEntity entity = new ObjEntity("A");
@@ -54,6 +60,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertSame(entity, ((SelectQuery) builder.getQuery()).getRoot());
}
+ @Test
public void testGetQueryQualifier() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.setQualifier("abc = 5");
@@ -63,6 +70,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertEquals(Expression.fromString("abc = 5"), query.getQualifier());
}
+ @Test
public void testGetQueryProperties() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
index 846333b..e881090 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
@@ -19,24 +19,32 @@
package org.apache.cayenne.map.event;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class MapEventTest extends TestCase {
+public class MapEventTest {
+ @Test
public void testNoNameChange() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName");
assertEquals("someName", event.getNewName());
assertFalse(event.isNameChange());
}
+ @Test
public void testNameChange() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName", "someOldName");
assertEquals("someName", event.getNewName());
assertTrue(event.isNameChange());
}
+ @Test
public void testOldName() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName");
assertNull(event.getOldName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
index 423989c..133c176 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
@@ -18,13 +18,16 @@
****************************************************************/
package org.apache.cayenne.map.naming;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LegacyNameGeneratorTest {
-public class LegacyNameGeneratorTest extends TestCase {
+ @Test
public void testStrategy() throws Exception {
LegacyNameGenerator strategy = new LegacyNameGenerator();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
index 6053676..f804e5e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
@@ -20,13 +20,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.testdo.testmap.Artist;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
-public class AbstractQueryTest extends TestCase {
+public class AbstractQueryTest {
+ @Test
public void testSetRootEntityName() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
@@ -34,6 +38,7 @@ public class AbstractQueryTest extends TestCase {
assertSame("SomeEntity", query.getRoot());
}
+ @Test
public void testSetRootObjEntity() {
AbstractQuery query = new MockAbstractQuery();
@@ -43,6 +48,7 @@ public class AbstractQueryTest extends TestCase {
assertSame(e, query.getRoot());
}
+ @Test
public void testSetRootClass() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
@@ -50,6 +56,7 @@ public class AbstractQueryTest extends TestCase {
assertSame(Artist.class, query.getRoot());
}
+ @Test
public void testSetInvalidRoot() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
index 47b67c6..0a2c295 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
@@ -19,12 +19,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
-public class NamedQueryTest extends TestCase {
+public class NamedQueryTest {
+ @Test
public void testName() {
NamedQuery query = new NamedQuery("abc");
@@ -33,11 +38,13 @@ public class NamedQueryTest extends TestCase {
assertEquals("123", query.getName());
}
+ @Test
public void testQueryName() {
NamedQuery query = new NamedQuery("abc");
assertEquals("abc", query.getName());
}
+ @Test
public void testSerializability() throws Exception {
NamedQuery o = new NamedQuery("abc");
Object clone = Util.cloneViaSerialization(o);
@@ -53,6 +60,7 @@ public class NamedQueryTest extends TestCase {
* Proper 'equals' and 'hashCode' implementations are important when mapping
* results obtained in a QueryChain back to the query.
*/
+ @Test
public void testEquals() throws Exception {
NamedQuery q1 = new NamedQuery("abc", new String[] { "a", "b" }, new Object[] { "1", "2" });
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
index 9a5a2e5..072dd26 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
@@ -19,13 +19,19 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class ObjectIdQueryTest extends TestCase {
+public class ObjectIdQueryTest {
+ @Test
public void testConstructorObjectId() {
ObjectId oid = new ObjectId("MockDataObject", "a", "b");
@@ -34,6 +40,7 @@ public class ObjectIdQueryTest extends TestCase {
assertSame(oid, query.getObjectId());
}
+ @Test
public void testSerializability() throws Exception {
ObjectId oid = new ObjectId("test", "a", "b");
ObjectIdQuery query = new ObjectIdQuery(oid);
@@ -48,6 +55,7 @@ public class ObjectIdQueryTest extends TestCase {
* Proper 'equals' and 'hashCode' implementations are important when mapping
* results obtained in a QueryChain back to the query.
*/
+ @Test
public void testEquals() throws Exception {
ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1));
ObjectIdQuery q2 = new ObjectIdQuery(new ObjectId("abc", "a", 1));
@@ -64,6 +72,7 @@ public class ObjectIdQueryTest extends TestCase {
assertFalse(q1.hashCode() == q4.hashCode());
}
+ @Test
public void testMetadata() {
ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1), true, ObjectIdQuery.CACHE_REFRESH);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
index 6d4de03..cd2279c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
@@ -19,17 +19,22 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.testdo.testmap.Painting;
+import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.util.TstBean;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class OrderingTest extends TestCase {
+public class OrderingTest {
+ @Test
public void testPathSpec1() throws Exception {
String pathSpec = "a.b.c";
Ordering ord = new Ordering();
@@ -39,12 +44,14 @@ public class OrderingTest extends TestCase {
assertEquals(pathSpec, ord.getSortSpec().getOperand(0));
}
+ @Test
public void testPathSpec3() throws Exception {
String pathSpec = "a.b.c";
Ordering ord = new Ordering(pathSpec, SortOrder.DESCENDING);
assertEquals(pathSpec, ord.getSortSpec().getOperand(0));
}
+ @Test
public void testAscending1() throws Exception {
Ordering ord = new Ordering();
ord.setAscending();
@@ -52,6 +59,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testAscending2() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.ASCENDING);
@@ -59,6 +67,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testAscending3() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.ASCENDING_INSENSITIVE);
@@ -66,6 +75,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testDescending1() throws Exception {
Ordering ord = new Ordering();
ord.setDescending();
@@ -73,6 +83,7 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testDescending2() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.DESCENDING);
@@ -80,6 +91,7 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testDescending3() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.DESCENDING_INSENSITIVE);
@@ -87,26 +99,31 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testCaseInsensitive3() throws Exception {
Ordering ord = new Ordering("M", SortOrder.ASCENDING_INSENSITIVE);
assertTrue(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive4() throws Exception {
Ordering ord = new Ordering("N", SortOrder.ASCENDING);
assertFalse(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive5() throws Exception {
Ordering ord = new Ordering("M", SortOrder.DESCENDING_INSENSITIVE);
assertTrue(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive6() throws Exception {
Ordering ord = new Ordering("N", SortOrder.DESCENDING);
assertFalse(ord.isCaseInsensitive());
}
+ @Test
public void testCompare3() throws Exception {
Painting p1 = new Painting();
p1.setEstimatedPrice(new BigDecimal(1000.00));
@@ -123,6 +140,7 @@ public class OrderingTest extends TestCase {
assertTrue(ordering.compare(p2, p3) == 0);
}
+ @Test
public void testCompare4() throws Exception {
// compare on non-persistent property
TstBean t1 = new TstBean(1000);
@@ -135,6 +153,7 @@ public class OrderingTest extends TestCase {
assertTrue(ordering.compare(t2, t3) == 0);
}
+ @Test
public void testOrderList2() throws Exception {
// compare on non-persistent property
List<TstBean> list = new ArrayList<TstBean>(3);
@@ -149,6 +168,7 @@ public class OrderingTest extends TestCase {
assertEquals(5, ((TstBean) list.get(2)).getInteger().intValue());
}
+ @Test
public void testOrderListWithMultipleOrderings2() throws Exception {
// compare on non-persistent property
List<TstBean> list = new ArrayList<TstBean>(6);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
index 014a7fb..76846c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
@@ -19,12 +19,19 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class PrefetchTreeNodeTest extends TestCase {
+public class PrefetchTreeNodeTest {
+ @Test
public void testAddPath() {
PrefetchTreeNode tree = new PrefetchTreeNode();
tree.addPath("abc");
@@ -54,6 +61,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", n4.getName());
}
+ @Test
public void testGetPath() {
PrefetchTreeNode tree = new PrefetchTreeNode();
tree.addPath("abc");
@@ -75,8 +83,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", n4.getPath());
}
-
-
+ @Test
public void testTreeSerialization() throws Exception {
PrefetchTreeNode n1 = new PrefetchTreeNode();
PrefetchTreeNode n2 = n1.addPath("abc");
@@ -91,6 +98,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("abc", nc2.getName());
}
+ @Test
public void testSubtreeSerialization() throws Exception {
PrefetchTreeNode n1 = new PrefetchTreeNode();
PrefetchTreeNode n2 = n1.addPath("abc");
@@ -108,6 +116,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", nc3.getName());
}
+ @Test
public void testCloneJointSubtree() throws Exception {
PrefetchTreeNode root = new PrefetchTreeNode(null, "root");
root.setPhantom(false);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
index 5dbd6cd..a61e89c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
@@ -19,18 +19,25 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.junit.Test;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ProcedureQueryTest extends TestCase {
+public class ProcedureQueryTest {
+ @Test
public void testCreateQuery() {
ProcedureQuery template = new ProcedureQuery();
Query clone = template.createQuery(Collections.EMPTY_MAP);
@@ -38,6 +45,7 @@ public class ProcedureQueryTest extends TestCase {
assertNotSame(template, clone);
}
+ @Test
public void testColumnNameCapitalization() {
ProcedureQuery q1 = new ProcedureQuery();
assertSame(CapsStrategy.DEFAULT, q1.getColumnNamesCapitalization());
@@ -45,6 +53,7 @@ public class ProcedureQueryTest extends TestCase {
assertEquals(CapsStrategy.UPPER, q1.getColumnNamesCapitalization());
}
+ @Test
public void testCreateQueryWithParameters() {
Map params = new HashMap();
params.put("a", "1");
@@ -56,6 +65,7 @@ public class ProcedureQueryTest extends TestCase {
assertEquals(params, clone.getParameters());
}
+ @Test
public void testResultEntityName() {
ProcedureQuery query = new ProcedureQuery();
assertNull(query.getResultEntityName());
@@ -64,6 +74,7 @@ public class ProcedureQueryTest extends TestCase {
assertSame("abc.AAAA", query.getResultEntityName());
}
+ @Test
public void testResultDescriptors() {
ProcedureQuery query = new ProcedureQuery();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
index 506bbdb..93a4452 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
@@ -18,16 +18,24 @@
****************************************************************/
package org.apache.cayenne.query;
+import org.apache.cayenne.MockPersistentObject;
+import org.apache.cayenne.Persistent;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Collection;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.MockPersistentObject;
-import org.apache.cayenne.Persistent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class RefreshQueryTest extends TestCase {
+public class RefreshQueryTest {
+ @Test
public void testRefreshAllConstructor() {
RefreshQuery q = new RefreshQuery();
@@ -37,6 +45,7 @@ public class RefreshQueryTest extends TestCase {
assertTrue(q.isRefreshAll());
}
+ @Test
public void testCollectionConstructor() {
Collection c = new ArrayList();
c.add(new Object());
@@ -49,6 +58,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testObjectConstructor() {
Persistent p = new MockPersistentObject();
@@ -61,6 +71,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testQueryConstructor() {
Query query = new MockQuery();
@@ -72,6 +83,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testGroupKeysConstructor() {
String[] groupKeys = new String[] { "a", "b" };
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
index 9b26761..8171dc6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
@@ -19,13 +19,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
-public class RelationshipQueryTest extends TestCase {
+public class RelationshipQueryTest {
+ @Test
public void testConstructorObjectId() {
ObjectId oid = new ObjectId("MockDataObject", "a", "b");
@@ -34,6 +38,7 @@ public class RelationshipQueryTest extends TestCase {
assertSame("relX", query.getRelationshipName());
}
+ @Test
public void testSerializability() throws Exception {
ObjectId oid = new ObjectId("test", "a", "b");
RelationshipQuery query = new RelationshipQuery(oid, "relX");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
index 9b3185c..8bc4a17 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
@@ -19,21 +19,28 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.exp.ExpressionParameter;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
-import org.apache.cayenne.exp.ExpressionParameter;
-import org.apache.cayenne.testdo.testmap.Artist;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class SelectQueryBasicsTest extends TestCase {
+public class SelectQueryBasicsTest {
+ @Test
public void testAddPrefetch() {
SelectQuery q = new SelectQuery();
@@ -44,6 +51,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertNotNull(q.getPrefetchTree().getNode("a.b.c"));
}
+ @Test
public void testAddPrefetchDuplicates() {
SelectQuery q = new SelectQuery();
@@ -53,6 +61,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertEquals(1, q.getPrefetchTree().nonPhantomNodes().size());
}
+ @Test
public void testClearPrefetches() {
SelectQuery q = new SelectQuery();
@@ -64,12 +73,14 @@ public class SelectQueryBasicsTest extends TestCase {
assertNull(q.getPrefetchTree());
}
+ @Test
public void testPageSize() throws Exception {
SelectQuery q = new SelectQuery();
q.setPageSize(10);
assertEquals(10, q.getPageSize());
}
+ @Test
public void testAddOrdering1() throws Exception {
SelectQuery q = new SelectQuery();
@@ -79,6 +90,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertSame(ord, q.getOrderings().get(0));
}
+ @Test
public void testAddOrdering2() throws Exception {
SelectQuery<Object> q = new SelectQuery<Object>();
@@ -91,6 +103,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertEquals(false, ord.isAscending());
}
+ @Test
public void testDistinct() throws Exception {
SelectQuery q = new SelectQuery();
@@ -99,6 +112,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertTrue(q.isDistinct());
}
+ @Test
public void testQueryWithParams1() {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
@@ -110,6 +124,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertNull(q1.getQualifier());
}
+ @Test
public void testQueryWithParams2() throws Exception {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
@@ -130,6 +145,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertTrue(q1.getQualifier() != q.getQualifier());
}
+ @Test
public void testQueryWithParamsSkipName() {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
index fde0b02..9fadd70 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.reflect;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.cayenne.reflect.BaseProperty;
-
-import junit.framework.TestCase;
-
-public class BasePropertyTest extends TestCase {
+public class BasePropertyTest {
+ @Test
public void testGetName() {
ClassDescriptor owner = mock(ClassDescriptor.class);
Accessor accessor = mock(Accessor.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
index 1f23a67..9f62fb5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
@@ -19,12 +19,15 @@
package org.apache.cayenne.reflect;
-import org.apache.cayenne.reflect.BeanAccessor;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
-public class BeanAccessorTest extends TestCase {
+public class BeanAccessorTest {
+ @Test
public void testByteArrayProperty() {
BeanAccessor accessor = new BeanAccessor(
@@ -43,6 +46,7 @@ public class BeanAccessorTest extends TestCase {
assertSame(bytes, accessor.getValue(o1));
}
+ @Test
public void testStringProperty() {
BeanAccessor accessor = new BeanAccessor(
@@ -58,6 +62,7 @@ public class BeanAccessorTest extends TestCase {
assertSame("ABC", accessor.getValue(o1));
}
+ @Test
public void testIntProperty() {
BeanAccessor accessor = new BeanAccessor(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
index 3d2e09b..b267981 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
@@ -19,12 +19,15 @@
package org.apache.cayenne.reflect;
import org.apache.cayenne.map.MockCallingBackEntity;
-import org.apache.cayenne.reflect.CallbackOnEntity;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class CallbackOnEntityTest extends TestCase {
+public class CallbackOnEntityTest {
+ @Test
public void testPublicCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -38,6 +41,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testProtectedCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -51,6 +55,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testPrivateCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -64,6 +69,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testDefaultCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -77,6 +83,7 @@ public class CallbackOnEntityTest extends TestCase {
assertTrue(e.defaultCallbackInvoked);
}
+ @Test
public void testStaticCallbackMethod() {
try {
new CallbackOnEntity(MockCallingBackEntity.class, "staticCallback");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
index 66a8483..12a46c1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
@@ -20,12 +20,14 @@ package org.apache.cayenne.reflect;
import org.apache.cayenne.access.MockCallingBackListener;
import org.apache.cayenne.map.MockCallingBackEntity;
-import org.apache.cayenne.reflect.CallbackOnListener;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
-public class CallbackOnListenerTest extends TestCase {
+public class CallbackOnListenerTest {
+ @Test
public void testPublicCallbackMethod() {
MockCallingBackListener listener = new MockCallingBackListener();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
index a83e655..ae99531 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
@@ -18,14 +18,16 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.types.MockEnum2;
import org.apache.cayenne.access.types.MockEnum3;
import org.apache.cayenne.access.types.MockEnum4;
+import org.junit.Test;
+
+import static org.junit.Assert.assertSame;
-public class EnumConverterTest extends TestCase {
-
+public class EnumConverterTest {
+
+ @Test
public void testConvert() {
EnumConverter converter = new EnumConverter();
@@ -33,13 +35,15 @@ public class EnumConverterTest extends TestCase {
assertSame(MockEnum2.z, converter.convert("z", MockEnum2.class));
}
+ @Test
public void testConvertExtendedEnumeration() {
EnumConverter converter = new EnumConverter();
assertSame(MockEnum3.B, converter.convert(2, MockEnum3.class));
assertSame(MockEnum3.C, converter.convert(3, MockEnum3.class));
}
-
+
+ @Test
public void testConvertExtendedEnumerationWithNull() {
EnumConverter converter = new EnumConverter();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
index 9d276ba..eb6cb4a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
@@ -19,18 +19,21 @@
package org.apache.cayenne.reflect;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.reflect.FieldAccessor;
import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
-public class FieldAccessorTest extends TestCase {
+public class FieldAccessorTest {
+ @Test
public void testConstructor() {
FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
assertEquals("string", accessor.getName());
}
+ @Test
public void testGet() {
FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
@@ -39,6 +42,7 @@ public class FieldAccessorTest extends TestCase {
assertEquals("abc", accessor.getValue(object));
}
+ @Test
public void testSetValue() {
TstFields object = new TstFields();
@@ -67,6 +71,7 @@ public class FieldAccessorTest extends TestCase {
assertSame(strings, object.stringArrayField);
}
+ @Test
public void testSetValuePrimitive() {
TstFields object = new TstFields();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
index fc53cbc..9c1c1da 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
@@ -18,17 +18,20 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.map.EntityResolver;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class LifecycleCallbackEventHandlerTest extends TestCase {
+public class LifecycleCallbackEventHandlerTest {
+ @Test
public void testDefaultListeners() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -45,6 +48,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertTrue(l1.entities.contains(c1));
}
+ @Test
public void testDefaultListenersCallbackOrder() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -67,6 +71,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertTrue(t2.compareTo(t1) < 0);
}
+ @Test
public void testCallbackOnSuperclass() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -81,6 +86,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertEquals(1, subclass.callbacks.size());
}
+ @Test
public void testCallbackOnSuperclassWithSublcassOverrides() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -96,6 +102,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertEquals("c4Callback", subclass.callbacks.get(0));
}
+ @Test
public void testCallbackOrderInInheritanceHierarchy() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
index b60d0c3..5123f80 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
@@ -19,14 +19,18 @@
package org.apache.cayenne.reflect;
-import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
-public class PersistentDescriptorTest extends TestCase {
+public class PersistentDescriptorTest {
+ @Test
public void testConstructor() {
PersistentDescriptor d1 = new PersistentDescriptor();
assertNull(d1.getSuperclassDescriptor());
@@ -37,6 +41,7 @@ public class PersistentDescriptorTest extends TestCase {
assertSame(d1, d2.getSuperclassDescriptor());
}
+ @Test
public void testCopyObjectProperties() {
PersistentDescriptor d1 = new PersistentDescriptor();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
index 81c51a8..30761bb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
@@ -19,6 +19,11 @@
package org.apache.cayenne.reflect;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.types.MockEnum;
+import org.apache.cayenne.access.types.MockEnumHolder;
+import org.junit.Test;
+
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.ParseException;
@@ -29,14 +34,16 @@ import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.types.MockEnum;
-import org.apache.cayenne.access.types.MockEnumHolder;
-
-public class PropertyUtilsTest extends TestCase {
+public class PropertyUtilsTest {
+ @Test
public void testCreateAccessor() {
Accessor accessor = PropertyUtils.createAccessor(
@@ -54,6 +61,7 @@ public class PropertyUtilsTest extends TestCase {
assertSame(o1.getByteArrayField(), o2.getByteArrayField());
}
+ @Test
public void testCreateAccessorNested() {
Accessor accessor = PropertyUtils.createAccessor(
@@ -78,6 +86,7 @@ public class PropertyUtilsTest extends TestCase {
assertSame(b1, o2.getRelated().getByteArrayField());
}
+ @Test
public void testGetProperty() {
TstJavaBean o1 = createBean();
@@ -95,6 +104,7 @@ public class PropertyUtilsTest extends TestCase {
"booleanField"));
}
+ @Test
public void testSetProperty() {
TstJavaBean o1 = createBean();
TstJavaBean o2 = new TstJavaBean();
@@ -108,6 +118,7 @@ public class PropertyUtilsTest extends TestCase {
PropertyUtils.setProperty(o2, "booleanField", Boolean.valueOf(o1.isBooleanField()));
}
+ @Test
public void testGetPropertyMap() {
Map o1 = createMap();
@@ -123,6 +134,7 @@ public class PropertyUtilsTest extends TestCase {
.getProperty(o1, "booleanField"));
}
+ @Test
public void testSetPropertyMap() {
Map o1 = createMap();
Map o2 = new HashMap();
@@ -138,6 +150,7 @@ public class PropertyUtilsTest extends TestCase {
assertEquals(o1, o2);
}
+ @Test
public void testSetConverted() {
TstJavaBean o1 = new TstJavaBean();
@@ -168,11 +181,11 @@ public class PropertyUtilsTest extends TestCase {
// string to float primitive
PropertyUtils.setProperty(o1, "floatField", "4.5");
- assertEquals(4.5f, o1.getFloatField());
+ assertEquals(4.5f, o1.getFloatField(), 0);
// string to double primitive
PropertyUtils.setProperty(o1, "doubleField", "5.5");
- assertEquals(5.5, o1.getDoubleField());
+ assertEquals(5.5, o1.getDoubleField(), 0);
// string to boolean
PropertyUtils.setProperty(o1, "booleanField", "true");
@@ -205,6 +218,7 @@ public class PropertyUtilsTest extends TestCase {
assertEquals(new StringBuilder("abc").toString(), o1.getStringBuilderField().toString());
}
+ @Test
public void testSetConvertedWithCustomConverter() {
// save old converter for restore
Converter<Date> oldConverter = ConverterFactory.factory.getConverter(Date.class);
@@ -243,7 +257,8 @@ public class PropertyUtilsTest extends TestCase {
ConverterFactory.addConverter(Date.class, oldConverter);
}
}
-
+
+ @Test
public void testSetNull() {
TstJavaBean o1 = new TstJavaBean();
@@ -273,13 +288,14 @@ public class PropertyUtilsTest extends TestCase {
o1.setFloatField(4.5f);
PropertyUtils.setProperty(o1, "floatField", null);
- assertEquals(0.0f, o1.getFloatField());
+ assertEquals(0.0f, o1.getFloatField(), 0);
o1.setDoubleField(5.5f);
PropertyUtils.setProperty(o1, "doubleField", null);
- assertEquals(0.0, o1.getDoubleField());
+ assertEquals(0.0, o1.getDoubleField(), 0);
}
+ @Test
public void testSetConvertedEnum() {
MockEnumHolder o1 = new MockEnumHolder();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
index 783c96c..71aa2a8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
@@ -18,14 +18,17 @@
****************************************************************/
package org.apache.cayenne.reflect.generic;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class DataObjectAttributePropertyTest {
-public class DataObjectAttributePropertyTest extends TestCase {
-
+ @Test
public void testSerialization() throws Exception {
ObjEntity e1 = new ObjEntity("objEntityName");
ObjAttribute a1 = new ObjAttribute("aName", "aType", e1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
index 17d4337..869e110 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
@@ -19,24 +19,29 @@
package org.apache.cayenne.remote;
-import org.apache.cayenne.remote.RemoteSession;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class RemoteSessionTest extends TestCase {
+public class RemoteSessionTest {
+ @Test
public void testConstructor1() {
RemoteSession descriptor = new RemoteSession("abc");
assertEquals("abc", descriptor.getSessionId());
assertFalse(descriptor.isServerEventsEnabled());
}
+ @Test
public void testConstructor2() {
RemoteSession descriptor = new RemoteSession("abc", "factory", null);
assertEquals("abc", descriptor.getSessionId());
assertTrue(descriptor.isServerEventsEnabled());
}
+ @Test
public void testHashCode() {
RemoteSession d1 = new RemoteSession("1");
RemoteSession d2 = new RemoteSession("1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
index cc7d198..4cf0d0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
@@ -19,20 +19,25 @@
package org.apache.cayenne.remote.hessian;
-import org.apache.cayenne.map.EntityResolver;
-
-import junit.framework.TestCase;
-
import com.caucho.hessian.io.AbstractSerializerFactory;
import com.caucho.hessian.io.SerializerFactory;
+import org.apache.cayenne.map.EntityResolver;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class HessianConfigTest extends TestCase {
+public class HessianConfigTest {
+ @Test
public void testLoadFactoryNoExtensions() {
SerializerFactory factory = HessianConfig.createFactory(null, null);
assertNotNull(factory);
}
+ @Test
public void testLoadFactoryNoInjection() throws Exception {
AbstractSerializerFactory factory = HessianConfig.loadFactory(
MockAbstractSerializerFactory.class.getName(),
@@ -42,6 +47,7 @@ public class HessianConfigTest extends TestCase {
assertNull(((MockAbstractSerializerFactory) factory).getEntityResolver());
}
+ @Test
public void testLoadFactoryInjection() throws Exception {
EntityResolver resolver = new EntityResolver();
AbstractSerializerFactory factory = HessianConfig.loadFactory(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
index d85efb8..f5d5b32 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
@@ -19,25 +19,25 @@
package org.apache.cayenne.remote.hessian.service;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import junit.framework.TestCase;
-
+import com.caucho.services.server.ServiceContext;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpSession;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.event.MockEventBridgeFactory;
+import org.junit.Test;
-import com.caucho.services.server.ServiceContext;
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpSession;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertSame;
-public class HessianServiceTest extends TestCase {
+public class HessianServiceTest {
+ @Test
public void testGetSession() throws Exception {
Map<String, String> map = new HashMap<String, String>();