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/04 18:25:38 UTC
[08/12] Apply JUnit4 instead of JUnit3 in IT
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
index 991072f..7347063 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
@@ -18,23 +18,45 @@
****************************************************************/
package org.apache.cayenne.remote;
-import java.util.List;
-
import org.apache.cayenne.BaseContext;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class NestedObjectContextLocalIT extends RemoteCayenneCase {
-
+
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public NestedObjectContextLocalIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Inject
private ClientRuntime runtime;
+ @Test
public void testLocalCacheStaysLocal() {
SelectQuery query = new SelectQuery(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
index ba4ad9a..d36f07f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
@@ -22,12 +22,21 @@ package org.apache.cayenne.remote;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class NestedObjectContextParentEventsIT extends RemoteCayenneCase {
@Inject
@@ -36,6 +45,19 @@ public class NestedObjectContextParentEventsIT extends RemoteCayenneCase {
@Inject
private ClientRuntime runtime;
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public NestedObjectContextParentEventsIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
super.setUpAfterInjection();
@@ -44,6 +66,7 @@ public class NestedObjectContextParentEventsIT extends RemoteCayenneCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testParentUpdatedId() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
index 5ad385a..e9139e6 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
@@ -23,13 +23,22 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable2;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
@Inject
@@ -38,6 +47,19 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
@Inject
private DBHelper dbHelper;
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public NestedObjectContextPeerEventsIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
super.setUpAfterInjection();
@@ -46,6 +68,7 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testPeerObjectUpdatedTempOID() throws Exception {
ObjectContext peer1 = runtime.newContext(clientContext);
ClientMtTable1 a1 = peer1.newObject(ClientMtTable1.class);
@@ -63,6 +86,7 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
assertEquals(a2.getObjectId(), a1.getObjectId());
}
+ @Test
public void testPeerObjectUpdatedSimpleProperty() throws Exception {
ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
a.setGlobalAttribute1("X");
@@ -84,6 +108,7 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
peer2.hasChanges());
}
+ @Test
public void testPeerObjectUpdatedToOneRelationship() throws Exception {
ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
ClientMtTable1 altA = clientContext.newObject(ClientMtTable1.class);
@@ -114,6 +139,7 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
peer2.hasChanges());
}
+ @Test
public void testPeerObjectUpdatedToManyRelationship() throws Exception {
ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
a.setGlobalAttribute1("X");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
index 3fef10c..931be97 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
@@ -21,16 +21,39 @@ package org.apache.cayenne.remote;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class NestedObjectContextRollbackIT extends RemoteCayenneCase {
@Inject
private ClientRuntime runtime;
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public NestedObjectContextRollbackIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Test
public void testRollbackChanges() {
ObjectContext child1 = runtime.newContext(clientContext);
@@ -49,7 +72,8 @@ public class NestedObjectContextRollbackIT extends RemoteCayenneCase {
clientContext.rollbackChanges();
}
-
+
+ @Test
public void testRollbackChangesLocally() {
ObjectContext child1 = runtime.newContext(clientContext);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
index b6b6875..299bb3d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
@@ -23,14 +23,23 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.RefreshQuery;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.mt.ClientMtMapToMany;
import org.apache.cayenne.testdo.mt.ClientMtMapToManyTarget;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime("cayenne-multi-tier.xml")
+@RunWith(value=Parameterized.class)
public class ROPPrefetchToManyMapIT extends RemoteCayenneCase {
@Inject
@@ -38,13 +47,27 @@ public class ROPPrefetchToManyMapIT extends RemoteCayenneCase {
@Inject
private DataChannelInterceptor queryInterceptor;
-
+
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public ROPPrefetchToManyMapIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("MT_MAP_TO_MANY_TARGET");
dbHelper.deleteAll("MT_MAP_TO_MANY");
}
-
+
+ @Test
public void test() throws Exception {
ObjectContext context = createROPContext();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
index b488d80..26877de 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
@@ -18,17 +18,40 @@
****************************************************************/
package org.apache.cayenne.remote;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable2;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
/**
* This is a test primarily for CAY-1118
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class RelationshipChangeIT extends RemoteCayenneCase {
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public RelationshipChangeIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Test
public void testNullify() {
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
ClientMtTable2 o2 = clientContext.newObject(ClientMtTable2.class);
@@ -41,7 +64,8 @@ public class RelationshipChangeIT extends RemoteCayenneCase {
o2.setTable1(null);
assertEquals(0, o1.getTable2Array().size());
}
-
+
+ @Test
public void testChange() {
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
ClientMtTable2 o2 = clientContext.newObject(ClientMtTable2.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
index 156b267..87d2be5 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
@@ -20,14 +20,36 @@ package org.apache.cayenne.remote;
import org.apache.cayenne.LifecycleListener;
import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtLifecycles;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class RemoteCallbacksIT extends RemoteCayenneCase implements LifecycleListener {
private int added, loaded, prePersisted, postPersisted, preRemoved, postRemoved, preUpdated, postUpdated;
-
+
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public RemoteCallbacksIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
super.setUpAfterInjection();
@@ -41,7 +63,8 @@ public class RemoteCallbacksIT extends RemoteCayenneCase implements LifecycleLis
preUpdated = 0;
postUpdated = 0;
}
-
+
+ @Test
public void testDefault() throws InterruptedException {
ObjectContext context = createROPContext();
context.getEntityResolver().getCallbackRegistry().addListener(ClientMtLifecycles.class, this);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
index 145c582..07cca01 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.cache.MapQueryCache;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.event.DefaultEventManager;
-import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.unit.UnitLocalConnection;
import org.apache.cayenne.unit.di.client.ClientCase;
@@ -38,21 +37,7 @@ public abstract class RemoteCayenneCase extends ClientCase {
/**
* Used serialization policy. Per CAY-979 we're testing on all policies
*/
- private int serializationPolicy;
-
- @Override
- public void runBare() throws Throwable {
- serializationPolicy = LocalConnection.HESSIAN_SERIALIZATION;
- runBareSimple();
- serializationPolicy = LocalConnection.JAVA_SERIALIZATION;
- runBareSimple();
- serializationPolicy = LocalConnection.NO_SERIALIZATION;
- runBareSimple();
- }
-
- protected void runBareSimple() throws Throwable {
- super.runBare();
- }
+ protected int serializationPolicy;
@Override
public void setUpAfterInjection() throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
index 82fe796..c0faac4 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
@@ -32,6 +32,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Iterator;
import java.util.List;
@@ -104,35 +105,42 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
list = new RemoteIncrementalFaultList(clientContext, query);
}
+ @Test
public void testSize() throws Exception {
prepareList(6);
assertEquals(COUNT, list.size());
}
+ @Test
public void testIteratorPageSize1() throws Exception {
doTestIterator(1);
}
+ @Test
public void testIteratorPageSize5() throws Exception {
// size divisiable by page size
doTestIterator(5);
}
+ @Test
public void testIteratorPageSize6() throws Exception {
// size not divisable by page size
doTestIterator(6);
}
+ @Test
public void testIteratorPageSize25() throws Exception {
// size equals to page size
doTestIterator(COUNT);
}
+ @Test
public void testIteratorPageSize26() throws Exception {
// size exceeding page size
doTestIterator(COUNT + 1);
}
+ @Test
public void testListIterator() throws Exception {
prepareList(6);
ListIterator<?> it = list.listIterator();
@@ -159,6 +167,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
}
}
+ @Test
public void testUnfetchedObjects() throws Exception {
prepareList(6);
assertEquals(COUNT - 6, list.getUnfetchedObjects());
@@ -168,6 +177,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
assertEquals(0, list.getUnfetchedObjects());
}
+ @Test
public void testPageIndex() throws Exception {
prepareList(6);
assertEquals(0, list.pageIndex(0));
@@ -183,6 +193,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
}
}
+ @Test
public void testPagesRead1() throws Exception {
prepareList(6);
assertTrue(list.elements.get(0) instanceof ClientMtTable1);
@@ -195,6 +206,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
assertTrue((list.elements.get(list.size() - 1)) instanceof ClientMtTable1);
}
+ @Test
public void testGet1() throws Exception {
prepareList(6);
assertTrue(list.elements.get(0) instanceof ClientMtTable1);
@@ -207,6 +219,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
assertTrue(list.elements.get(8) instanceof ClientMtTable1);
}
+ @Test
public void testIndexOf() throws Exception {
prepareList(6);
@@ -223,6 +236,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
assertEquals(-1, list.indexOf(list.context.newObject(ClientMtTable1.class)));
}
+ @Test
public void testLastIndexOf() throws Exception {
prepareList(6);
Expression qual = ExpressionFactory.matchExp(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
index ceeadcd..a200247 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
@@ -19,17 +19,40 @@
package org.apache.cayenne.remote;
import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable2;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
/**
* This is a test primarily for CAY-1103
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class RemoteRollbackIT extends RemoteCayenneCase {
-
+
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public RemoteRollbackIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Test
public void testRollbackNew() {
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
o1.setGlobalAttribute1("a");
@@ -60,6 +83,7 @@ public class RemoteRollbackIT extends RemoteCayenneCase {
// assertEquals(0, o1.getClientMtTable2Array().size());
}
+ @Test
public void testRollbackNewObject() {
String o1Name = "revertTestClientMtTable1";
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
@@ -74,6 +98,7 @@ public class RemoteRollbackIT extends RemoteCayenneCase {
// Catches a bug where new objects were unregistered within an object iterator, thus
// modifying the
// collection the iterator was iterating over (ConcurrentModificationException)
+ @Test
public void testRollbackWithMultipleNewObjects() {
String o1Name = "rollbackTestClientMtTable1";
String o2Title = "rollbackTestClientMtTable2";
@@ -95,6 +120,7 @@ public class RemoteRollbackIT extends RemoteCayenneCase {
assertEquals(PersistenceState.TRANSIENT, o1.getPersistenceState());
}
+ @Test
public void testRollbackRelationshipModification() {
String o1Name = "relationshipModClientMtTable1";
String o2Title = "relationshipTestClientMtTable2";
@@ -116,6 +142,7 @@ public class RemoteRollbackIT extends RemoteCayenneCase {
assertEquals(o1, o2.getTable1());
}
+ @Test
public void testRollbackDeletedObject() {
String o1Name = "deleteTestClientMtTable1";
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
@@ -130,6 +157,7 @@ public class RemoteRollbackIT extends RemoteCayenneCase {
assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
}
+ @Test
public void testRollbackModifiedObject() {
String o1Name = "initialTestClientMtTable1";
ClientMtTable1 o1 = clientContext.newObject(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
index de09b70..a289a42 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
@@ -23,17 +23,40 @@ import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1Subclass1;
import org.apache.cayenne.testdo.mt.MtTable1Subclass1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class ValueInjectorIT extends RemoteCayenneCase {
@Inject
protected DataContext serverContext;
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public ValueInjectorIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Test
public void testServer() {
ObjEntity entity = serverContext.getEntityResolver().getObjEntity(MtTable1Subclass1.class);
Expression qualifier = entity.getDeclaredQualifier();
@@ -52,6 +75,7 @@ public class ValueInjectorIT extends RemoteCayenneCase {
}
}
+ @Test
public void testClient() {
ObjectContext context = createROPContext();
ObjEntity entity = context.getEntityResolver().getObjEntity(ClientMtTable1Subclass1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseLifecycleManager.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseLifecycleManager.java b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseLifecycleManager.java
index bbd91cc..2dc73c3 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseLifecycleManager.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseLifecycleManager.java
@@ -18,16 +18,14 @@
****************************************************************/
package org.apache.cayenne.unit.di.client;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.di.spi.DefaultScope;
import org.apache.cayenne.unit.di.server.ServerCaseLifecycleManager;
+import java.util.HashMap;
+import java.util.Map;
+
public class ClientCaseLifecycleManager extends ServerCaseLifecycleManager {
@Inject
@@ -38,7 +36,7 @@ public class ClientCaseLifecycleManager extends ServerCaseLifecycleManager {
}
@Override
- public <T extends TestCase> void setUp(T testCase) {
+ public <T> void setUp(T testCase) {
Map<String, String> map = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
index 1db7f61..a0f77bc 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
@@ -22,6 +22,7 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientCaseSelfIT extends ClientCase {
@@ -32,6 +33,7 @@ public class ClientCaseSelfIT extends ClientCase {
@Inject
protected Provider<ServerRuntime> runtimeProvider;
+ @Test
public void testServerSetup_TearDown_Runtime() throws Exception {
ServerRuntime local = this.runtime;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
index 813e64b..4dc37ef 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
@@ -30,6 +30,9 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ObjectDetachOperationIT extends ClientCase {
@@ -51,6 +54,7 @@ public class ObjectDetachOperationIT extends ClientCase {
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
+ @Test
public void testDetachCommitted() {
EntityResolver serverResover = serverContext.getEntityResolver();
@@ -80,6 +84,7 @@ public class ObjectDetachOperationIT extends ClientCase {
assertNull(co.getObjectContext());
}
+ @Test
public void testDetachHollow() throws Exception {
tMtTable1.insert(4, "g1", "s1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
index ec8bbdb..bbb9f4b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
@@ -34,6 +34,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ShallowMergeOperation_ClientIT extends ClientCase {
@@ -71,6 +72,7 @@ public class ShallowMergeOperation_ClientIT extends ClientCase {
tMtTable1.insert(33004, "g4", "s4");
}
+ @Test
public void testMerge_Relationship() throws Exception {
ObjectContext childContext = runtime.newContext(context);
@@ -93,6 +95,7 @@ public class ShallowMergeOperation_ClientIT extends ClientCase {
});
}
+ @Test
public void testMerge_NoOverride() throws Exception {
ObjectContext childContext = runtime.newContext(context);
@@ -125,6 +128,7 @@ public class ShallowMergeOperation_ClientIT extends ClientCase {
});
}
+ @Test
public void testMerge_PersistenceStates() throws Exception {
createMtTable1DataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
index dc9c133..8e7ade5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.relationship.CollectionToMany;
import org.apache.cayenne.testdo.relationship.CollectionToManyTarget;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collection;
@@ -58,6 +59,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
tCollectionToManyTarget.insert(1, 1).insert(2, 1).insert(3, 1).insert(4, 2);
}
+ @Test
public void testReadToMany() throws Exception {
CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1);
@@ -83,6 +85,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
3)));
}
+ @Test
public void testReadToManyPrefetching() throws Exception {
SelectQuery query = new SelectQuery(CollectionToMany.class, ExpressionFactory
@@ -111,6 +114,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
3)));
}
+ @Test
public void testAddToMany() throws Exception {
CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1);
@@ -133,6 +137,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
assertEquals(4, o1.getTargets().size());
}
+ @Test
public void testRemoveToMany() throws Exception {
CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1);
@@ -157,6 +162,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
assertFalse(o1.getTargets().contains(target));
}
+ @Test
public void testAddToManyViaReverse() throws Exception {
CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
index 899ad6f..3af42e8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
@@ -34,6 +34,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.ROPainting;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
import java.util.List;
@@ -90,6 +91,7 @@ public class CDOMany2OneIT extends ServerCase {
}
+ @Test
public void testMultipleToOneDeletion() throws Exception {
// was a problem per CAY-901
@@ -122,6 +124,7 @@ public class CDOMany2OneIT extends ServerCase {
assertEquals(null, row.get("GALLERY_ID"));
}
+ @Test
public void testReadRO1() throws Exception {
createArtistWithPaintingDataSet();
@@ -138,6 +141,7 @@ public class CDOMany2OneIT extends ServerCase {
assertSame(a1, rop1.getToArtist());
}
+ @Test
public void testReadRO2() throws Exception {
createArtistWithPaintingDataSet();
@@ -158,6 +162,7 @@ public class CDOMany2OneIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, rop1.getToArtist().getPersistenceState());
}
+ @Test
public void testSelectViaRelationship() throws Exception {
createArtistWithPaintingDataSet();
@@ -172,6 +177,7 @@ public class CDOMany2OneIT extends ServerCase {
assertSame(p1, paints.get(0));
}
+ @Test
public void testSelectViaMultiRelationship() throws Exception {
createArtistWithPaintingsInGalleryDataSet();
@@ -187,6 +193,7 @@ public class CDOMany2OneIT extends ServerCase {
assertSame(a1, artists.get(0));
}
+ @Test
public void testNewAdd() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("bL");
@@ -206,6 +213,7 @@ public class CDOMany2OneIT extends ServerCase {
assertEquals(Cayenne.longPKForObject(a1), tPainting.getLong("ARTIST_ID"));
}
+ @Test
public void testRemove() throws Exception {
Painting p1 = context.newObject(Painting.class);
p1.setPaintingTitle("xa");
@@ -241,6 +249,7 @@ public class CDOMany2OneIT extends ServerCase {
assertNull(p3.getToGallery());
}
+ @Test
public void testReplace() throws Exception {
Painting p1 = context.newObject(Painting.class);
@@ -286,6 +295,7 @@ public class CDOMany2OneIT extends ServerCase {
assertSame(p3, g3.getPaintingArray().get(0));
}
+ @Test
public void testSavedAdd() throws Exception {
Painting p1 = context.newObject(Painting.class);
p1.setPaintingTitle("xa");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
index 27a2298..baa83aa 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class CDOMany2OneNoRevIT extends ServerCase {
@@ -31,6 +32,7 @@ public class CDOMany2OneNoRevIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testNewAdd() throws Exception {
Artist a1 = context.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
index 7323dd7..95b3985 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.relationship.MapToMany;
import org.apache.cayenne.testdo.relationship.MapToManyTarget;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Map;
@@ -85,6 +86,7 @@ public class CDOMapRelationshipIT extends ServerCase {
tIdMapToManyTarget.insert(4, 2);
}
+ @Test
public void testReadToMany() throws Exception {
createTestDataSet();
@@ -105,6 +107,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertEquals(3, Cayenne.intPKForObject((Persistent) targets.get("C")));
}
+ @Test
public void testReadToManyId() throws Exception {
createTestIdDataSet();
@@ -125,6 +128,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertEquals(3, Cayenne.intPKForObject((Persistent) targets.get(new Integer(3))));
}
+ @Test
public void testReadToManyPrefetching() throws Exception {
createTestDataSet();
@@ -144,6 +148,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertNotNull(targets.get("C"));
}
+ @Test
public void testAddToMany() throws Exception {
createTestDataSet();
@@ -169,6 +174,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertEquals(4, o1.getTargets().size());
}
+ @Test
public void testRemoveToMany() throws Exception {
createTestDataSet();
@@ -192,6 +198,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertNotNull(o1.getTargets().get("C"));
}
+ @Test
public void testAddToManyViaReverse() throws Exception {
createTestDataSet();
@@ -217,6 +224,7 @@ public class CDOMapRelationshipIT extends ServerCase {
assertEquals(4, o1.getTargets().size());
}
+ @Test
public void testModifyToManyKey() throws Exception {
createTestDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
index 6a219f7..1182010 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Date;
import java.util.List;
@@ -70,6 +71,7 @@ public class CDOOne2ManyIT extends ServerCase {
tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID");
}
+ @Test
public void testSelectWithToManyDBQualifier() throws Exception {
// intentionally add more than 1 painting to artist
@@ -103,6 +105,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertSame(a1, artists.get(0));
}
+ @Test
public void testSelectWithToManyQualifier() throws Exception {
// intentionally add more than 1 painting to artist
@@ -136,6 +139,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertSame(a1, artists.get(0));
}
+ @Test
public void testNewAdd() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("XyzQ");
@@ -165,6 +169,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertEquals(aRow[0], pRow[2]);
}
+ @Test
public void testNewAddMultiples() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("XyzV");
@@ -192,6 +197,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertEquals(2, a2.getPaintingArray().size());
}
+ @Test
public void testRemove1() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("XyzE");
@@ -230,6 +236,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertEquals(0, a3.getPaintingArray().size());
}
+ @Test
public void testRemove2() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("XyzQ");
@@ -269,6 +276,7 @@ public class CDOOne2ManyIT extends ServerCase {
assertEquals(1, a3.getPaintingArray().size());
}
+ @Test
public void testPropagatePK() throws Exception {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("XyBn");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
index 30a4ac4..96278e5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.PaintingInfo;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime("cayenne-small-testmap.xml")
public class CDOOne2OneDepIT extends CayenneDOTestBase {
@@ -32,6 +33,7 @@ public class CDOOne2OneDepIT extends CayenneDOTestBase {
@Inject
private ObjectContext context1;
+ @Test
public void testRollbackDependent() {
Artist a1 = newArtist();
Painting p1 = newPainting();
@@ -50,6 +52,7 @@ public class CDOOne2OneDepIT extends CayenneDOTestBase {
assertNull(p1.getToPaintingInfo());
}
+ @Test
public void test2Null() throws Exception {
Artist a1 = newArtist();
Painting p1 = newPainting();
@@ -66,6 +69,7 @@ public class CDOOne2OneDepIT extends CayenneDOTestBase {
assertNull(p2.getToPaintingInfo());
}
+ @Test
public void testReplaceNull() throws Exception {
Artist a1 = newArtist();
Painting p1 = newPainting();
@@ -84,6 +88,7 @@ public class CDOOne2OneDepIT extends CayenneDOTestBase {
assertNull(p2.getToPaintingInfo());
}
+ @Test
public void testNewAdd() throws Exception {
Artist a1 = newArtist();
PaintingInfo pi1 = newPaintingInfo();
@@ -110,6 +115,7 @@ public class CDOOne2OneDepIT extends CayenneDOTestBase {
assertEquals(textReview, pi2.getTextReview());
}
+ @Test
public void testTakeObjectSnapshotDependentFault() throws Exception {
// prepare data
Artist a1 = newArtist();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
index 695ffec..7056d6a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.PaintingInfo;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Timestamp;
@@ -37,6 +38,7 @@ public class CDOOneDep2OneIT extends CayenneDOTestBase {
@Inject
private ObjectContext context1;
+ @Test
public void testNewAdd1() throws Exception {
Artist a1 = newArtist();
PaintingInfo pi1 = newPaintingInfo();
@@ -64,6 +66,7 @@ public class CDOOneDep2OneIT extends CayenneDOTestBase {
}
/** Tests how primary key is propagated from one new object to another. */
+ @Test
public void testNewAdd2() throws Exception {
Artist a1 = this.newArtist();
Gallery g1 = context.newObject(Gallery.class);
@@ -82,6 +85,7 @@ public class CDOOneDep2OneIT extends CayenneDOTestBase {
context.commitChanges();
}
+ @Test
public void testReplace() throws Exception {
String altPaintingName = "alt painting";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
index 39dad81..8c21b8d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.ToManyFkRoot;
import org.apache.cayenne.testdo.relationship.ToManyRoot2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
// TODO: this mapping scenario is really unsupported ... this is just an attempt at
// partial solution
@@ -45,6 +46,7 @@ public class CDOOneToManyFKIT extends ServerCase {
dbHelper.deleteAll("TO_ONEFK1");
}
+ @Test
public void testReadRelationship() throws Exception {
ToManyRoot2 src2 = context.newObject(ToManyRoot2.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
index 5990596..e06eddf 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.ToOneFK1;
import org.apache.cayenne.testdo.relationship.ToOneFK2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
/**
* Tests the behavior of one-to-one relationship where to-one is pointing to an FK.
@@ -49,6 +50,7 @@ public class CDOOneToOneFKIT extends ServerCase {
dbHelper.deleteAll("TO_ONEFK2");
}
+ @Test
public void testReadRelationship() {
ToOneFK2 src = context.newObject(ToOneFK2.class);
ToOneFK1 target = context.newObject(ToOneFK1.class);
@@ -71,6 +73,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertSame(target2, target2.getToPK().getToOneToFK());
}
+ @Test
public void test2Null() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
context.commitChanges();
@@ -86,6 +89,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertNull(src2.getToOneToFK());
}
+ @Test
public void testReplaceNull1() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
context.commitChanges();
@@ -103,6 +107,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertNull(src2.getToOneToFK());
}
+ @Test
public void testReplaceNull2() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
context.commitChanges();
@@ -130,6 +135,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertEquals(target.getObjectId(), target2.getObjectId());
}
+ @Test
public void testNewAdd() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
ToOneFK1 target = context.newObject(ToOneFK1.class);
@@ -155,6 +161,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertEquals(target.getObjectId(), target2.getObjectId());
}
+ @Test
public void testTakeObjectSnapshotDependentFault() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
ToOneFK1 target = context.newObject(ToOneFK1.class);
@@ -174,6 +181,7 @@ public class CDOOneToOneFKIT extends ServerCase {
assertTrue(src2.readPropertyDirectly("toOneToFK") instanceof Fault);
}
+ @Test
public void testDelete() throws Exception {
ToOneFK2 src = context.newObject(ToOneFK2.class);
ToOneFK1 target = context.newObject(ToOneFK1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
index 2b40b30..f2c9531 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.qualified.Qualified2;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
import java.util.List;
@@ -85,6 +86,7 @@ public class CDOQualifiedEntitiesIT extends ServerCase {
tQualified2.insert(1, "OY1", null, 2);
}
+ @Test
public void testReadToMany() throws Exception {
if (accessStackAdapter.supportsNullBoolean()) {
@@ -107,6 +109,7 @@ public class CDOQualifiedEntitiesIT extends ServerCase {
}
}
+ @Test
public void testReadToOne() throws Exception {
if (accessStackAdapter.supportsNullBoolean()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
index 18c721e..b789135 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.testdo.testmap.ArtGroup;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime("cayenne-small-testmap.xml")
public class CDOReflexiveRelDeleteIT extends ServerCase {
@@ -61,6 +62,7 @@ public class CDOReflexiveRelDeleteIT extends ServerCase {
// ones below fairly well
// encompass the various orders that might be a problem. Add more if additional
// problems come to light
+ @Test
public void testReflexiveRelationshipDelete1() {
context.deleteObjects(parentGroup);
context.deleteObjects(childGroup1);
@@ -69,6 +71,7 @@ public class CDOReflexiveRelDeleteIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipDelete2() {
context.deleteObjects(childGroup1);
context.deleteObjects(parentGroup);
@@ -77,6 +80,7 @@ public class CDOReflexiveRelDeleteIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipDelete3() {
context.deleteObjects(childGroup1);
context.deleteObjects(childGroup3);
@@ -85,6 +89,7 @@ public class CDOReflexiveRelDeleteIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipDelete4() {
context.deleteObjects(childGroup3);
context.deleteObjects(parentGroup);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelIT.java
index fa94fe9..95ea822 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.testdo.testmap.ArtGroup;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
/**
* Some more tests regarding reflexive relationships, especially related to delete rules
@@ -34,6 +35,7 @@ public class CDOReflexiveRelIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testAddDeleteNoCommit() {
ArtGroup parentGroup = context.newObject(ArtGroup.class);
parentGroup.setName("parent");
@@ -45,6 +47,7 @@ public class CDOReflexiveRelIT extends ServerCase {
context.deleteObjects(parentGroup);
}
+ @Test
public void testAddDeleteWithCommit() {
ArtGroup parentGroup = context.newObject(ArtGroup.class);
parentGroup.setName("parent");
@@ -58,6 +61,7 @@ public class CDOReflexiveRelIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReplaceDeleteNoCommit() {
ArtGroup parentGroup1 = context.newObject(ArtGroup.class);
parentGroup1.setName("parent1");
@@ -74,6 +78,7 @@ public class CDOReflexiveRelIT extends ServerCase {
context.deleteObjects(parentGroup2);
}
+ @Test
public void testReplaceDeleteWithCommit() {
ArtGroup parentGroup1 = context.newObject(ArtGroup.class);
parentGroup1.setName("parent1");
@@ -91,6 +96,7 @@ public class CDOReflexiveRelIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCommitReplaceCommit() {
ArtGroup parentGroup1 = context.newObject(ArtGroup.class);
parentGroup1.setName("parent1");
@@ -105,6 +111,7 @@ public class CDOReflexiveRelIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testComplexInsertUpdateOrdering() {
ArtGroup parentGroup = context.newObject(ArtGroup.class);
parentGroup.setName("parent");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
index 213ec75..114a2a5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.relationship.SetToMany;
import org.apache.cayenne.testdo.relationship.SetToManyTarget;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Set;
@@ -64,6 +65,7 @@ public class CDOSetRelationshipIT extends ServerCase {
tSetToManyTarget.insert(4, 2);
}
+ @Test
public void testReadToMany() throws Exception {
createTestDataSet();
@@ -90,6 +92,7 @@ public class CDOSetRelationshipIT extends ServerCase {
3)));
}
+ @Test
public void testReadToManyPrefetching() throws Exception {
createTestDataSet();
@@ -119,6 +122,7 @@ public class CDOSetRelationshipIT extends ServerCase {
3)));
}
+ @Test
public void testAddToMany() throws Exception {
createTestDataSet();
@@ -143,6 +147,7 @@ public class CDOSetRelationshipIT extends ServerCase {
assertEquals(4, o1.getTargets().size());
}
+ @Test
public void testRemoveToMany() throws Exception {
createTestDataSet();
@@ -168,6 +173,7 @@ public class CDOSetRelationshipIT extends ServerCase {
assertFalse(o1.getTargets().contains(target));
}
+ @Test
public void testAddToManyViaReverse() throws Exception {
createTestDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
index e6a9730..bd4857c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
@@ -32,6 +32,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
import java.util.List;
@@ -92,6 +93,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
tArtistGroup.insert(33001, 1);
}
+ @Test
public void testReadFlattenedRelationship() throws Exception {
create1Artist1ArtGroupDataSet();
@@ -101,6 +103,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
assertEquals(0, groupList.size());
}
+ @Test
public void testReadFlattenedRelationship2() throws Exception {
create1Artist1ArtGroup1ArtistGroupDataSet();
@@ -113,6 +116,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
assertEquals("g1", groupList.get(0).getName());
}
+ @Test
public void testAddToFlattenedRelationship() throws Exception {
create1Artist1ArtGroupDataSet();
@@ -150,6 +154,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
}
// Test case to show up a bug in committing more than once
+ @Test
public void testDoubleCommitAddToFlattenedRelationship() throws Exception {
create1Artist1ArtGroupDataSet();
@@ -183,6 +188,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
}
+ @Test
public void testRemoveFromFlattenedRelationship() throws Exception {
create1Artist1ArtGroup1ArtistGroupDataSet();
@@ -205,6 +211,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
// Demonstrates a possible bug in ordering of deletes, when a flattened relationships
// link record is deleted at the same time (same transaction) as one of the record to
// which it links.
+ @Test
public void testRemoveFlattenedRelationshipAndRootRecord() throws Exception {
create1Artist1ArtGroup1ArtistGroupDataSet();
Artist a1 = Cayenne.objectForPK(context, Artist.class, 33001);
@@ -223,6 +230,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
}
}
+ @Test
public void testAddRemoveFlattenedRelationship1() throws Exception {
create1Artist1ArtGroupDataSet();
@@ -246,6 +254,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
});
}
+ @Test
public void testAddRemoveFlattenedRelationship2() throws Exception {
create1Artist2ArtGroupDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
index c0e90c9..37c4927 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
@@ -19,9 +19,6 @@
package org.apache.cayenne;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
@@ -31,6 +28,10 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class CayenneDataObjectIT extends ServerCase {
@@ -38,6 +39,7 @@ public class CayenneDataObjectIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testSetObjectId() throws Exception {
CayenneDataObject object = new CayenneDataObject();
ObjectId oid = new ObjectId("T");
@@ -48,6 +50,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertSame(oid, object.getObjectId());
}
+ @Test
public void testSetPersistenceState() throws Exception {
CayenneDataObject obj = new CayenneDataObject();
assertEquals(PersistenceState.TRANSIENT, obj.getPersistenceState());
@@ -56,6 +59,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, obj.getPersistenceState());
}
+ @Test
public void testReadNestedProperty1() throws Exception {
Artist a = new Artist();
assertNull(a.readNestedProperty("artistName"));
@@ -63,6 +67,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals("aaa", a.readNestedProperty("artistName"));
}
+ @Test
public void testReadNestedPropertyNotPersistentString() throws Exception {
Artist a = new Artist();
assertNull(a.readNestedProperty("someOtherProperty"));
@@ -70,6 +75,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals("aaa", a.readNestedProperty("someOtherProperty"));
}
+ @Test
public void testReadNestedPropertyNonPersistentNotString() throws Exception {
Artist a = new Artist();
Object object = new Object();
@@ -78,6 +84,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertSame(object, a.readNestedProperty("someOtherObjectProperty"));
}
+ @Test
public void testReadNestedPropertyNonDataObjectPath() {
CayenneDataObject o1 = new CayenneDataObject();
TstBean o2 = new TstBean();
@@ -90,6 +97,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals(TstBean.class.getName(), o1.readNestedProperty("o2.class.name"));
}
+ @Test
public void testReadNestedPropertyToManyInMiddle() throws Exception {
Artist a = context.newObject(Artist.class);
@@ -113,6 +121,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals(names, names2);
}
+ @Test
public void testReadNestedPropertyToManyInMiddle1() throws Exception {
Artist a = context.newObject(Artist.class);
@@ -136,6 +145,7 @@ public class CayenneDataObjectIT extends ServerCase {
assertEquals(names, names2);
}
+ @Test
public void testFilterObjects() {
List<Painting> paintingList = new ArrayList<Painting>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
index aaa7c70..df37ac2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -58,6 +59,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
+ @Test
public void testDoubleRegistration() {
DataObject object = new Artist();
@@ -85,6 +87,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
}
}
+ @Test
public void testCommitChangesInBatch() {
Artist a1 = context.newObject(Artist.class);
@@ -102,6 +105,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(3, artists.size());
}
+ @Test
public void testSetObjectId() {
Artist o1 = new Artist();
@@ -111,6 +115,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertNotNull(o1.getObjectId());
}
+ @Test
public void testStateTransToNew() {
Artist o1 = new Artist();
@@ -120,6 +125,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(PersistenceState.NEW, o1.getPersistenceState());
}
+ @Test
public void testStateNewToCommitted() {
Artist o1 = new Artist();
@@ -132,6 +138,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
}
+ @Test
public void testStateCommittedToModified() {
Artist o1 = new Artist();
@@ -144,6 +151,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(PersistenceState.MODIFIED, o1.getPersistenceState());
}
+ @Test
public void testStateModifiedToCommitted() {
Artist o1 = context.newObject(Artist.class);
@@ -157,6 +165,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
}
+ @Test
public void testStateCommittedToDeleted() {
Artist o1 = new Artist();
@@ -169,6 +178,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(PersistenceState.DELETED, o1.getPersistenceState());
}
+ @Test
public void testStateDeletedToTransient() {
Artist o1 = context.newObject(Artist.class);
@@ -184,6 +194,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertNull(o1.getObjectContext());
}
+ @Test
public void testSetContext() {
Artist o1 = new Artist();
@@ -193,6 +204,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertSame(context, o1.getObjectContext());
}
+ @Test
public void testFetchByAttribute() throws Exception {
tArtist.insert(7, "m6");
@@ -208,6 +220,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals("m6", o1.getArtistName());
}
+ @Test
public void testUniquing() throws Exception {
tArtist.insert(7, "m6");
@@ -225,6 +238,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertSame(a1, a2);
}
+ @Test
public void testSnapshotVersion1() {
Artist artist = context.newObject(Artist.class);
@@ -242,6 +256,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
assertEquals(cachedSnapshot.getVersion(), artist.getSnapshotVersion());
}
+ @Test
public void testSnapshotVersion2() throws Exception {
tArtist.insert(7, "m6");
@@ -258,6 +273,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
.getVersion(), artist.getSnapshotVersion());
}
+ @Test
public void testSnapshotVersion3() {
Artist artist = context.newObject(Artist.class);
@@ -282,6 +298,7 @@ public class CayenneDataObjectInContextIT extends ServerCase {
* setting replacement. This is demonstrated here -
* http://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0210.html
*/
+ @Test
public void testObjectsCommittedManualOID() {
Artist object = context.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
index cf66459..ff44ba7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.PaintingInfo;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -82,6 +83,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
tPaintingInfo.insert(6, "mE");
}
+ @Test
public void testReadNestedProperty1() throws Exception {
createArtistWithPaintingDataSet();
@@ -89,6 +91,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals("aX", p1.readNestedProperty("toArtist.artistName"));
}
+ @Test
public void testReadNestedProperty2() throws Exception {
createArtistWithPaintingDataSet();
@@ -96,6 +99,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertTrue(p1.getToArtist().readNestedProperty("paintingArray") instanceof List<?>);
}
+ @Test
public void testReciprocalRel1() throws Exception {
createArtistWithPaintingDataSet();
@@ -111,6 +115,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertSame(p1, p2);
}
+ @Test
public void testReadToOneRel1() throws Exception {
createArtistWithPaintingDataSet();
@@ -123,6 +128,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
}
+ @Test
public void testReadToOneRel2() throws Exception {
// test chained calls to read relationships
createArtistWithPaintingAndInfoDataSet();
@@ -139,6 +145,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
}
+ @Test
public void testReadToOneRel3() throws Exception {
createArtistWithPaintingDataSet();
@@ -147,6 +154,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertNull(g1);
}
+ @Test
public void testReadToManyRel1() throws Exception {
createArtistWithPaintingDataSet();
@@ -159,6 +167,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals("pW", plist.get(0).getPaintingTitle());
}
+ @Test
public void testReadToManyRel2() throws Exception {
// test empty relationship
tArtist.insert(11, "aX");
@@ -170,6 +179,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals(0, plist.size());
}
+ @Test
public void testReflexiveRelationshipInsertOrder1() {
ArtGroup parentGroup = context.newObject(ArtGroup.class);
@@ -181,6 +191,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipInsertOrder2() {
ArtGroup childGroup1 = context.newObject(ArtGroup.class);
@@ -194,6 +205,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipInsertOrder3() {
// multiple children, one created before parent, one after
@@ -212,6 +224,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testReflexiveRelationshipInsertOrder4() {
// multiple children, one created before parent, one after
@@ -230,6 +243,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCrossContextRelationshipException() {
// Create this object in one context...
@@ -261,6 +275,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
assertEquals(0, artist.getPaintingArray().size());
}
+ @Test
public void testComplexInsertUpdateOrdering() {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("a name");
@@ -278,6 +293,7 @@ public class CayenneDataObjectRelationshipsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testNewToMany() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("test");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
index 7e07e8e..fda101f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.validation.BeanValidationFailure;
import org.apache.cayenne.validation.ValidationFailure;
import org.apache.cayenne.validation.ValidationResult;
+import org.junit.Test;
import java.util.Date;
import java.util.List;
@@ -39,6 +40,7 @@ public class CayenneDataObjectValidationIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testValidateForSaveMandatoryToOneMissing() throws Exception {
Exhibit exhibit = context.newObject(Exhibit.class);
@@ -65,6 +67,7 @@ public class CayenneDataObjectValidationIT extends ServerCase {
assertFalse("No failures expected: " + result, result.hasFailures());
}
+ @Test
public void testValidateForSaveMandatoryAttributeMissing() throws Exception {
Artist artist = context.newObject(Artist.class);
@@ -88,6 +91,7 @@ public class CayenneDataObjectValidationIT extends ServerCase {
assertFalse(result.hasFailures());
}
+ @Test
public void testValidateForSaveAttributeTooLong() throws Exception {
Artist artist = context.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
index 7db6185..0ee8ac8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.testdo.testmap.CharPkTestEntity;
import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collection;
import java.util.Collections;
@@ -99,6 +100,7 @@ public class CayenneIT extends ServerCase {
tArtist.insert(33002, "artist2");
}
+ @Test
public void testReadNestedProperty_ToMany() throws Exception {
tArtist.insert(1, "a");
@@ -118,6 +120,7 @@ public class CayenneIT extends ServerCase {
assertEquals(2, size);
}
+ @Test
public void testScalarObjectForQuery() throws Exception {
createTwoArtists();
@@ -143,6 +146,7 @@ public class CayenneIT extends ServerCase {
assertEquals(2, ((Number) object).intValue());
}
+ @Test
public void testScalarObjectForQuery2() throws Exception {
createTwoArtists();
@@ -155,13 +159,15 @@ public class CayenneIT extends ServerCase {
object instanceof Number);
assertEquals(2, ((Number) object).intValue());
}
-
+
+ @Test
public void testMakePath() {
assertEquals("", Cayenne.makePath());
assertEquals("a", Cayenne.makePath("a"));
assertEquals("a.b", Cayenne.makePath("a", "b"));
}
+ @Test
public void testObjectForQuery() throws Exception {
createOneArtist();
@@ -177,6 +183,7 @@ public class CayenneIT extends ServerCase {
assertEquals("artist2", ((Artist) object).getArtistName());
}
+ @Test
public void testObjectForSelect() throws Exception {
createOneArtist();
@@ -188,7 +195,8 @@ public class CayenneIT extends ServerCase {
assertTrue(object instanceof Artist);
assertEquals("artist2", ((Artist) object).getArtistName());
}
-
+
+ @Test
public void testObjectForQueryNoObject() throws Exception {
ObjectId id = new ObjectId("Artist", Artist.ARTIST_ID_PK_COLUMN, new Integer(
@@ -198,6 +206,7 @@ public class CayenneIT extends ServerCase {
assertNull(object);
}
+ @Test
public void testNoObjectForPK() throws Exception {
createOneArtist();
@@ -206,6 +215,7 @@ public class CayenneIT extends ServerCase {
assertNull(object);
}
+ @Test
public void testObjectForPKTemporary() throws Exception {
Persistent o1 = context.newObject(Artist.class);
@@ -218,6 +228,7 @@ public class CayenneIT extends ServerCase {
})));
}
+ @Test
public void testObjectForPKObjectId() throws Exception {
createOneArtist();
@@ -231,6 +242,7 @@ public class CayenneIT extends ServerCase {
assertEquals("artist2", ((Artist) object).getArtistName());
}
+ @Test
public void testObjectForPKClassInt() throws Exception {
createOneArtist();
@@ -241,6 +253,7 @@ public class CayenneIT extends ServerCase {
assertEquals("artist2", ((Artist) object).getArtistName());
}
+ @Test
public void testObjectForPKEntityInt() throws Exception {
createOneArtist();
@@ -251,6 +264,7 @@ public class CayenneIT extends ServerCase {
assertEquals("artist2", ((Artist) object).getArtistName());
}
+ @Test
public void testObjectForPKClassMap() throws Exception {
createOneArtist();
@@ -264,6 +278,7 @@ public class CayenneIT extends ServerCase {
assertEquals("artist2", ((Artist) object).getArtistName());
}
+ @Test
public void testObjectForPKEntityMapCompound() throws Exception {
createOneCompoundPK();
@@ -277,6 +292,7 @@ public class CayenneIT extends ServerCase {
assertEquals("BBB", ((CompoundPkTestEntity) object).getName());
}
+ @Test
public void testCompoundPKForObject() throws Exception {
createOneCompoundPK();
@@ -292,6 +308,7 @@ public class CayenneIT extends ServerCase {
assertEquals("PK2", pk.get(CompoundPkTestEntity.KEY2_PK_COLUMN));
}
+ @Test
public void testIntPKForObjectFailureForCompound() throws Exception {
createOneCompoundPK();
@@ -309,6 +326,7 @@ public class CayenneIT extends ServerCase {
}
}
+ @Test
public void testIntPKForObjectFailureForNonNumeric() throws Exception {
createOneCharPK();
@@ -325,6 +343,7 @@ public class CayenneIT extends ServerCase {
}
}
+ @Test
public void testPKForObjectFailureForCompound() throws Exception {
createOneCompoundPK();
@@ -342,6 +361,7 @@ public class CayenneIT extends ServerCase {
}
}
+ @Test
public void testIntPKForObject() throws Exception {
createOneArtist();
@@ -352,6 +372,7 @@ public class CayenneIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject(object));
}
+ @Test
public void testPKForObject() throws Exception {
createOneArtist();
@@ -362,6 +383,7 @@ public class CayenneIT extends ServerCase {
assertEquals(new Long(33002), Cayenne.pkForObject(object));
}
+ @Test
public void testIntPKForObjectNonNumeric() throws Exception {
createOneCharPK();