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:31 UTC
[01/12] Apply JUnit4 instead of JUnit3 in IT
Repository: cayenne
Updated Branches:
refs/heads/master e1ad29f90 -> 8990e6554
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
index e81a513..efeaed1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import static java.util.Collections.singletonMap;
-import static org.junit.Assert.assertNotEquals;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
@@ -33,6 +30,9 @@ 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 static java.util.Collections.singletonMap;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SelectByIdIT extends ServerCase {
@@ -68,6 +68,7 @@ public class SelectByIdIT extends ServerCase {
tArtist.insert(3, "artist3");
}
+ @Test
public void testIntPk() throws Exception {
createTwoArtists();
@@ -80,6 +81,7 @@ public class SelectByIdIT extends ServerCase {
assertEquals("artist2", a2.getArtistName());
}
+ @Test
public void testMapPk() throws Exception {
createTwoArtists();
@@ -92,6 +94,7 @@ public class SelectByIdIT extends ServerCase {
assertEquals("artist2", a2.getArtistName());
}
+ @Test
public void testObjectIdPk() throws Exception {
createTwoArtists();
@@ -106,6 +109,7 @@ public class SelectByIdIT extends ServerCase {
assertEquals("artist2", a2.getArtistName());
}
+ @Test
public void testDataRowIntPk() throws Exception {
createTwoArtists();
@@ -118,6 +122,7 @@ public class SelectByIdIT extends ServerCase {
assertEquals("artist2", a2.get("ARTIST_NAME"));
}
+ @Test
public void testMetadataCacheKey() throws Exception {
SelectById<Painting> q1 = SelectById.query(Painting.class, 4);
QueryMetadata md1 = q1.getMetaData(context.getEntityResolver());
@@ -156,6 +161,7 @@ public class SelectByIdIT extends ServerCase {
assertEquals(md1.getCacheKey(), md5.getCacheKey());
}
+ @Test
public void testLocalCache() throws Exception {
createTwoArtists();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java
index 8cbf07b..664b67e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SelectQueryCacheKeyIT extends ServerCase {
@@ -32,6 +33,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testNoCache() {
SelectQuery query = new SelectQuery(Artist.class);
@@ -46,6 +48,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertNull(md2.getCacheKey());
}
+ @Test
public void testLocalCache() {
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -57,6 +60,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertNotNull(md1.getCacheKey());
}
+ @Test
public void testUseLocalCache() {
SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
@@ -76,6 +80,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertEquals(2, md2.getCacheGroups().length);
}
+ @Test
public void testSharedCache() {
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -86,7 +91,8 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertEquals(QueryCacheStrategy.SHARED_CACHE, md1.getCacheStrategy());
assertNotNull(md1.getCacheKey());
}
-
+
+ @Test
public void testUseSharedCache() {
SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
@@ -106,6 +112,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertEquals(2, md2.getCacheGroups().length);
}
+ @Test
public void testNamedQuery() {
SelectQuery query = new SelectQuery(Artist.class);
@@ -118,6 +125,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertFalse("XYZ".equals(md1.getCacheKey()));
}
+ @Test
public void testUniqueKeyEntity() {
SelectQuery q1 = new SelectQuery(Artist.class);
@@ -135,6 +143,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertFalse(q1.getMetaData(resolver).getCacheKey().equals(q3.getMetaData(resolver).getCacheKey()));
}
+ @Test
public void testUniqueKeyEntityQualifier() {
SelectQuery q1 = new SelectQuery(Artist.class);
@@ -155,6 +164,7 @@ public class SelectQueryCacheKeyIT extends ServerCase {
assertFalse(q1.getMetaData(resolver).getCacheKey().equals(q3.getMetaData(resolver).getCacheKey()));
}
+ @Test
public void testUniqueKeyEntityFetchLimit() {
SelectQuery q1 = new SelectQuery(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
index a251137..cb25202 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
@@ -26,6 +26,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;
@@ -61,6 +62,7 @@ public class SelectQueryFetchLimitOrderingIT extends ServerCase {
tArtist.insert(33006, "e");
}
+ @Test
public void testOrdering() throws Exception {
creatArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
index 6f5527f..c78f522 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
@@ -49,6 +49,7 @@ import org.apache.cayenne.testdo.testmap.ReturnTypesMap1;
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.util.Arrays;
import java.util.Collections;
@@ -120,7 +121,8 @@ public class SelectQueryIT extends ServerCase {
tNumerics.insert(4, 3);
tNumerics.insert(5, 4);
}
-
+
+ @Test
public void testSetQualifier() {
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
assertNull(query.getQualifier());
@@ -131,6 +133,7 @@ public class SelectQueryIT extends ServerCase {
assertSame(qual, query.getQualifier());
}
+ @Test
public void testAndQualifier() {
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
assertNull(query.getQualifier());
@@ -144,6 +147,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(Expression.AND, query.getQualifier().getType());
}
+ @Test
public void testOrQualifier() {
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
assertNull(query.getQualifier());
@@ -157,6 +161,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(Expression.OR, query.getQualifier().getType());
}
+ @Test
public void testFetchLimit() throws Exception {
createArtistsDataSet();
@@ -168,6 +173,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(7, objects.size());
}
+ @Test
public void testFetchOffset() throws Exception {
createArtistsDataSet();
@@ -183,6 +189,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals("artist6", results.get(0).getArtistName());
}
+ @Test
public void testDbEntityRoot() throws Exception {
createArtistsDataSet();
@@ -195,6 +202,7 @@ public class SelectQueryIT extends ServerCase {
assertTrue(results.get(0) instanceof DataRow);
}
+ @Test
public void testFetchLimitWithOffset() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -207,6 +215,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals("artist16", results.get(0).getArtistName());
}
+ @Test
public void testFetchOffsetWithQualifier() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -223,6 +232,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(size, sizeAll - 5);
}
+ @Test
public void testFetchLimitWithQualifier() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -232,6 +242,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(7, objects.size());
}
+ @Test
public void testSelectAllObjectsRootEntityName() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>("Artist");
@@ -239,6 +250,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(20, objects.size());
}
+ @Test
public void testSelectAllObjectsRootClass() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -246,6 +258,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(20, objects.size());
}
+ @Test
public void testSelectAllObjectsRootObjEntity() throws Exception {
createArtistsDataSet();
ObjEntity artistEntity = context.getEntityResolver().getObjEntity(Artist.class);
@@ -255,6 +268,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(20, objects.size());
}
+ @Test
public void testSelectLikeExactMatch() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -264,6 +278,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
+ @Test
public void testSelectNotLikeSingleWildcardMatch() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -273,6 +288,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(19, objects.size());
}
+ @Test
public void testSelectNotLikeIgnoreCaseSingleWildcardMatch() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -282,6 +298,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(19, objects.size());
}
+ @Test
public void testSelectLikeCaseSensitive() throws Exception {
if (!accessStackAdapter.supportsCaseSensitiveLike()) {
return;
@@ -295,6 +312,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(0, objects.size());
}
+ @Test
public void testSelectLikeSingleWildcardMatch() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -304,6 +322,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
+ @Test
public void testSelectLikeSingleWildcardMatchAndEscape() throws Exception {
createArtistsWildcardDataSet();
@@ -315,6 +334,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
+ @Test
public void testSelectLikeMultipleWildcardMatch() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -327,6 +347,7 @@ public class SelectQueryIT extends ServerCase {
/**
* Test how "like ignore case" works when using uppercase parameter.
*/
+ @Test
public void testSelectLikeIgnoreCaseObjects1() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -337,6 +358,7 @@ public class SelectQueryIT extends ServerCase {
}
/** Test how "like ignore case" works when using lowercase parameter. */
+ @Test
public void testSelectLikeIgnoreCaseObjects2() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
@@ -347,6 +369,7 @@ public class SelectQueryIT extends ServerCase {
}
/** Test how "like ignore case" works when using uppercase parameter. */
+ @Test
public void testSelectLikeIgnoreCaseClob() throws Exception {
if (accessStackAdapter.supportsLobs()) {
createClobDataSet();
@@ -358,6 +381,7 @@ public class SelectQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectFetchLimit_Offset_DistinctClob() throws Exception {
if (accessStackAdapter.supportsLobs()) {
createClobDataSet();
@@ -376,6 +400,7 @@ public class SelectQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectEqualsClob() throws Exception {
if (accessStackAdapter.supportsLobComparisons()) {
createClobDataSet();
@@ -387,6 +412,7 @@ public class SelectQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectNotEqualsClob() throws Exception {
if (accessStackAdapter.supportsLobComparisons()) {
createClobDataSet();
@@ -398,6 +424,7 @@ public class SelectQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -407,6 +434,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(2, objects.size());
}
+ @Test
public void testSelectParameterizedIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -417,6 +445,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(2, objects.size());
}
+ @Test
public void testSelectParameterizedEmptyIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -427,6 +456,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(0, objects.size());
}
+ @Test
public void testSelectParameterizedEmptyNotIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -437,6 +467,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(20, objects.size());
}
+ @Test
public void testSelectEmptyIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -446,6 +477,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(0, objects.size());
}
+ @Test
public void testSelectEmptyNotIn() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -455,6 +487,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(20, objects.size());
}
+ @Test
public void testSelectBooleanTrue() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -465,6 +498,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
+ @Test
public void testSelectBitwiseNot() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -487,6 +521,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(2, objects.size());
}
+ @Test
public void testSelectBitwiseOr() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -510,6 +545,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(2, objects.size());
}
+ @Test
public void testSelectBitwiseAnd() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -533,6 +569,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(3, objects.size());
}
+ @Test
public void testSelectBitwiseXor() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -557,6 +594,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(4, objects.get(0).getIntegerColumn().intValue());
}
+ @Test
public void testSelectBooleanNotTrueOr() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -568,6 +606,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
+ @Test
public void testSelectBooleanFalse() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -578,6 +617,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(0, objects.size());
}
+ @Test
public void testSelectBooleanFalseOr() throws Exception {
createArtistsDataSet();
SelectQuery query = new SelectQuery(Artist.class);
@@ -592,6 +632,7 @@ public class SelectQueryIT extends ServerCase {
* Tests that all queries specified in prefetch are executed in a more
* complex prefetch scenario.
*/
+ @Test
public void testRouteWithPrefetches() {
EntityResolver resolver = context.getEntityResolver();
MockQueryRouter router = new MockQueryRouter();
@@ -626,6 +667,7 @@ public class SelectQueryIT extends ServerCase {
* Tests that all queries specified in prefetch are executed in a more
* complex prefetch scenario with no reverse obj relationships.
*/
+ @Test
public void testRouteQueryWithPrefetchesNoReverse() {
EntityResolver resolver = context.getEntityResolver();
@@ -667,6 +709,7 @@ public class SelectQueryIT extends ServerCase {
* Test prefetching with qualifier on the root query being the path to the
* prefetch.
*/
+ @Test
public void testRouteQueryWithPrefetchesPrefetchExpressionPath() {
// find the painting not matching the artist (this is the case where
@@ -686,6 +729,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(2, router.getQueryCount());
}
+ @Test
public void testLeftJoinAndPrefetchToMany() throws Exception {
createArtistsDataSet();
SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class, ExpressionFactory.matchExp(
@@ -694,6 +738,7 @@ public class SelectQueryIT extends ServerCase {
context.performQuery(query);
}
+ @Test
public void testLeftJoinAndPrefetchToOne() throws Exception {
createArtistsDataSet();
SelectQuery<Painting> query = new SelectQuery<Painting>(Painting.class, ExpressionFactory.matchExp(
@@ -702,6 +747,7 @@ public class SelectQueryIT extends ServerCase {
context.select(query);
}
+ @Test
public void testSelect_MatchObject() {
Artist a1 = context.newObject(Artist.class);
@@ -732,6 +778,7 @@ public class SelectQueryIT extends ServerCase {
assertEquals(query.getQualifier(), ExpressionFactory.matchAnyExp(Arrays.asList(a1, a3)));
}
+ @Test
public void testSelect_WithOrdering() {
Artist a1 = context.newObject(Artist.class);
@@ -755,6 +802,7 @@ public class SelectQueryIT extends ServerCase {
/**
* Tests INs with more than 1000 elements
*/
+ @Test
public void testSelectLongIn() {
// not all adapters strip INs, so we just make sure query with such
// qualifier
@@ -769,6 +817,7 @@ public class SelectQueryIT extends ServerCase {
context.performQuery(query);
}
+ @Test
public void testCacheOffsetAndLimit() throws Exception {
createArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java
index df2b2f1..0189800 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java
@@ -29,6 +29,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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SelectQueryPrefetchRouterActionIT extends ServerCase {
@@ -36,6 +37,7 @@ public class SelectQueryPrefetchRouterActionIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testPaintings1() {
ObjEntity paintingEntity = resolver.getObjEntity(Painting.class);
SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", "abc"));
@@ -53,6 +55,7 @@ public class SelectQueryPrefetchRouterActionIT extends ServerCase {
assertEquals(Expression.fromString("db:toArtist.ARTIST_NAME = 'abc'"), prefetch.getQualifier());
}
+ @Test
public void testPrefetchPaintings2() {
ObjEntity paintingEntity = resolver.getObjEntity(Painting.class);
@@ -71,6 +74,7 @@ public class SelectQueryPrefetchRouterActionIT extends ServerCase {
prefetch.getQualifier());
}
+ @Test
public void testGalleries() {
ObjEntity galleryEntity = resolver.getObjEntity(Gallery.class);
SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", "abc"));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java
index 60361ca..ce42359 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.inherit.Employee;
import org.apache.cayenne.testdo.inherit.Manager;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.PEOPLE_PROJECT)
public class SelectQueryPrefetchRouterActionQualifiedEntityIT extends ServerCase {
@@ -36,6 +37,7 @@ public class SelectQueryPrefetchRouterActionQualifiedEntityIT extends ServerCase
@Inject
private EntityResolver resolver;
+ @Test
public void testPrefetchEmployee() throws Exception {
ObjEntity departmentEntity = resolver.getObjEntity(Department.class);
SelectQuery q = new SelectQuery(Employee.class, ExpressionFactory.matchExp("name", "abc"));
@@ -55,6 +57,7 @@ public class SelectQueryPrefetchRouterActionQualifiedEntityIT extends ServerCase
+ "or db:employees.PERSON_TYPE = 'EM')"), prefetch.getQualifier());
}
+ @Test
public void testPrefetchManager() throws Exception {
ObjEntity departmentEntity = resolver.getObjEntity(Department.class);
SelectQuery q = new SelectQuery(Manager.class, ExpressionFactory.matchExp("name", "abc"));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java
index 0a45df8..22bd81f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.di.Inject;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class StatementFetchSizeIT extends ServerCase {
@@ -31,6 +32,7 @@ public class StatementFetchSizeIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void test() {
SelectQuery query = new SelectQuery(Artist.class);
query.setStatementFetchSize(10);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java
index 0f61530..ffbe753 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.annotations.Tag1;
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 LifecycleCallbackRegistryIT extends ServerCase {
@@ -37,6 +38,7 @@ public class LifecycleCallbackRegistryIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testAddListener_PostAdd() {
LifecycleCallbackRegistry registry = new LifecycleCallbackRegistry(context
.getEntityResolver());
@@ -61,6 +63,7 @@ public class LifecycleCallbackRegistryIT extends ServerCase {
assertEquals("e:Painting;", listener.getAndReset());
}
+ @Test
public void testAddListener_PostAdd_InheritedListenerMethods() {
LifecycleCallbackRegistry registry = new LifecycleCallbackRegistry(context
.getEntityResolver());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java
index f246bcd..53531c4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.inheritance_flat.UserProperties;
import org.apache.cayenne.testdo.testmap.annotations.Tag2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT)
public class LifecycleCallbackRegistry_InheritanceIT extends ServerCase {
@@ -37,6 +38,7 @@ public class LifecycleCallbackRegistry_InheritanceIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testAddListener_PostAdd_EntityInheritance() {
LifecycleCallbackRegistry registry = new LifecycleCallbackRegistry(context
.getEntityResolver());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
index e9d8497..e320095 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy;
import org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
/**
* Tests conflicts between field and map-based persistence.
@@ -67,6 +68,7 @@ public class MixedPersistenceStrategyIT extends ServerCase {
tMixedPersistenceStrategy2.insert(2, 1, "dn2");
}
+ @Test
public void testConflictingField1() throws Exception {
createConflictingFieldDataSet();
@@ -83,6 +85,7 @@ public class MixedPersistenceStrategyIT extends ServerCase {
/**
* This test case reproduces CAY-582 bug.
*/
+ @Test
public void testConflictingField2() throws Exception {
createConflictingFieldDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
index d420ba5..a1cf9f2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.reflect.ToManyProperty;
import org.apache.cayenne.reflect.ToOneProperty;
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 DataObjectDescriptorFactoryIT extends ServerCase {
@@ -38,6 +39,7 @@ public class DataObjectDescriptorFactoryIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testVisitDeclaredProperties_IterationOrder() {
DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
@@ -74,6 +76,7 @@ public class DataObjectDescriptorFactoryIT extends ServerCase {
}
+ @Test
public void testVisitProperties_IterationOrder() {
DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
index aba4a61..22f2d06 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.reflect.ToManyProperty;
import org.apache.cayenne.reflect.ToOneProperty;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT)
public class DataObjectDescriptorFactory_InheritanceMapsIT extends ServerCase {
@@ -37,6 +38,7 @@ public class DataObjectDescriptorFactory_InheritanceMapsIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testVisitProperties_IterationOrder() {
DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java
index 126a498..57f0739 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.tx;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@ import static org.mockito.Mockito.when;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DefaultTransactionManagerIT extends ServerCase {
+ @Test
public void testPerformInTransaction_NoTx() {
final BaseTransaction tx = mock(BaseTransaction.class);
@@ -47,6 +49,7 @@ public class DefaultTransactionManagerIT extends ServerCase {
assertSame(expectedResult, result);
}
+ @Test
public void testPerformInTransaction_ExistingTx() {
final BaseTransaction tx1 = mock(BaseTransaction.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
index 0a472cb..f01f957 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
@@ -18,22 +18,22 @@
****************************************************************/
package org.apache.cayenne.unit.di;
-import junit.framework.TestCase;
-
import org.apache.cayenne.di.Injector;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
/**
* A unit test superclass that supports injection of members based on the standard unit
* test container.
*/
-public abstract class DICase extends TestCase {
+public abstract class DICase extends Assert {
protected abstract Injector getUnitTestInjector();
- @Override
- protected final void setUp() throws Exception {
+ @Before
+ public final void setUp() throws Exception {
getUnitTestInjector().getInstance(UnitTestLifecycleManager.class).setUp(this);
-
try {
setUpAfterInjection();
}
@@ -56,8 +56,8 @@ public abstract class DICase extends TestCase {
}
}
- @Override
- protected final void tearDown() throws Exception {
+ @After
+ public final void tearDown() throws Exception {
try {
tearDownBeforeInjection();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
index 605ba17..d6fe535 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.DefaultScope;
+import org.junit.Test;
public class DICaseSelfIT extends DICase {
@@ -62,6 +63,7 @@ public class DICaseSelfIT extends DICase {
return injector;
}
+ @Test
public void testInjection() throws Exception {
Object testScoped = this.testScoped;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DefaultUnitTestLifecycleManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DefaultUnitTestLifecycleManager.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DefaultUnitTestLifecycleManager.java
index 1c73a06..0cca948 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DefaultUnitTestLifecycleManager.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DefaultUnitTestLifecycleManager.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.unit.di;
-import junit.framework.TestCase;
-
import org.apache.cayenne.di.BeforeScopeEnd;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
@@ -36,12 +34,12 @@ public class DefaultUnitTestLifecycleManager implements UnitTestLifecycleManager
this.scope = scope;
}
- public <T extends TestCase> void setUp(T testCase) {
+ public <T> void setUp(T testCase) {
injector.injectMembers(testCase);
}
@BeforeScopeEnd
- public <T extends TestCase> void tearDown(T testCase) {
+ public <T> void tearDown(T testCase) {
scope.shutdown();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/UnitTestLifecycleManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/UnitTestLifecycleManager.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/UnitTestLifecycleManager.java
index a2f7434..eec5a5f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/UnitTestLifecycleManager.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/UnitTestLifecycleManager.java
@@ -18,11 +18,9 @@
****************************************************************/
package org.apache.cayenne.unit.di;
-import junit.framework.TestCase;
-
public interface UnitTestLifecycleManager {
- <T extends TestCase> void setUp(T testCase);
+ <T> void setUp(T testCase);
- <T extends TestCase> void tearDown(T testCase);
+ <T> void tearDown(T testCase);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseLifecycleManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseLifecycleManager.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseLifecycleManager.java
index 7677248..9a8764d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseLifecycleManager.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseLifecycleManager.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.unit.di.server;
-import junit.framework.TestCase;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.di.spi.DefaultScope;
@@ -35,7 +33,7 @@ public class ServerCaseLifecycleManager extends DefaultUnitTestLifecycleManager
}
@Override
- public <T extends TestCase> void setUp(T testCase) {
+ public <T> void setUp(T testCase) {
// init current runtime
UseServerRuntime runtimeName = testCase.getClass().getAnnotation(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
index bd72025..2c60da2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
+import org.junit.Test;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ServerCaseSelfIT extends ServerCase {
@@ -34,6 +35,7 @@ public class ServerCaseSelfIT extends ServerCase {
@Inject
protected ServerCaseProperties properties;
+ @Test
public void testSetup_TearDown_Runtime() throws Exception {
assertNotNull(properties);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
index 024f5e9..2e47ceb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.relationship.ClobMaster;
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.util.List;
@@ -78,6 +79,7 @@ public class CAY_115IT extends ServerCase {
tClobDetail.insert(4, 3, "cd31");
}
+ @Test
public void testDistinctClobFetch() throws Exception {
if (!accessStackAdapter.supportsLobInsertsAsStrings()) {
return;
@@ -99,6 +101,7 @@ public class CAY_115IT extends ServerCase {
assertEquals(noDistinctResult, distinctResult);
}
+ @Test
public void testDistinctClobFetchWithToManyJoin() throws Exception {
if (!accessStackAdapter.supportsLobInsertsAsStrings()) {
return;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
index eaf446e..bc5acbe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.unit.jira;
-import java.sql.Types;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
@@ -29,6 +27,9 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.FkOfDifferentType;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Types;
@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
public class CAY_191IT extends ServerCase {
@@ -61,6 +62,7 @@ public class CAY_191IT extends ServerCase {
tFkOfDifferentType.insert(1, 1);
}
+ @Test
public void testResolveToOneOverFKOfDifferentNumType() throws Exception {
// this is mostly for legacy schemas, as on many dbs you won;t be able to even
// create the FK constraint...
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
index 5ebfd81..51f1dd1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
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;
@@ -58,6 +59,7 @@ public class CAY_194IT extends ServerCase {
dbHelper.deleteAll("TO_ONEFK1");
}
+ @Test
public void testQualifyOnToMany() {
ReflexiveAndToOne ox = context.newObject(ReflexiveAndToOne.class);
@@ -84,6 +86,7 @@ public class CAY_194IT extends ServerCase {
assertEquals(0, parents.size());
}
+ @Test
public void testQualifyOnToOne() {
ReflexiveAndToOne ox = context.newObject(ReflexiveAndToOne.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
index f106204..c58ed54 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java
@@ -28,6 +28,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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DeepMergeOperationIT extends ServerCase {
@@ -41,6 +42,7 @@ public class DeepMergeOperationIT extends ServerCase {
@Inject
private DataContext context1;
+ @Test
public void testDeepMergeNonExistent() {
final Artist a = context.newObject(Artist.class);
@@ -60,6 +62,7 @@ public class DeepMergeOperationIT extends ServerCase {
});
}
+ @Test
public void testDeepMergeModified() {
final Artist a = context.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
index ba64dec..04813da 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
@@ -30,6 +30,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;
@UseServerRuntime(ServerCase.PEOPLE_PROJECT)
public class DeepMergeOperationInheritanceIT extends ServerCase {
@@ -43,6 +44,7 @@ public class DeepMergeOperationInheritanceIT extends ServerCase {
@Inject
protected DataChannelInterceptor queryInterceptor;
+ @Test
public void testDeepMergeExistingSubclass() {
final Department d1 = context.newObject(Department.class);
@@ -93,6 +95,7 @@ public class DeepMergeOperationInheritanceIT extends ServerCase {
}
+ @Test
public void testDeepMergeNonExistentSubclass() {
final Department d1 = context.newObject(Department.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java
index d5239fd..c5e59f9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.cayenne.util;
-import java.sql.Types;
-import java.util.Arrays;
-
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
@@ -30,10 +27,15 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.merge.MergeCase;
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.Arrays;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class EntityMergeSupportIT extends MergeCase {
+ @Test
public void testMerging() {
DbEntity dbEntity1 = new DbEntity("NEW_TABLE");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
index 6faa4a8..fe4623b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
@@ -35,6 +35,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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ShallowMergeOperationIT extends ServerCase {
@@ -73,6 +74,7 @@ public class ShallowMergeOperationIT extends ServerCase {
tArtist.insert(33004, "artist4");
}
+ @Test
public void testMerge_Relationship() throws Exception {
ObjectContext childContext = runtime.newContext(context);
@@ -96,6 +98,7 @@ public class ShallowMergeOperationIT extends ServerCase {
});
}
+ @Test
public void testMerge_NoOverride() throws Exception {
createArtistsDataSet();
@@ -136,6 +139,7 @@ public class ShallowMergeOperationIT extends ServerCase {
});
}
+ @Test
public void testMerge_PersistenceStates() throws Exception {
createArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java b/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java
index 60f23d6..d94fa17 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java
@@ -18,17 +18,6 @@
****************************************************************/
package org.apache.cayenne.velocity;
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.DataNode;
@@ -46,6 +35,18 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Tests BindDirective for passed null parameters and for not passed parameters
@@ -80,6 +81,7 @@ public class BindDirectiveIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testBindTimestamp() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Integer(1));
@@ -97,6 +99,7 @@ public class BindDirectiveIT extends ServerCase {
assertEquals(Date.class, row.get("DATE_OF_BIRTH").getClass());
}
+ @Test
public void testBindSQLDate() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Integer(1));
@@ -114,6 +117,7 @@ public class BindDirectiveIT extends ServerCase {
assertEquals(Date.class, row.get("DATE_OF_BIRTH").getClass());
}
+ @Test
public void testBindUtilDate() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Integer(1));
@@ -131,6 +135,7 @@ public class BindDirectiveIT extends ServerCase {
assertEquals(Date.class, row.get("DATE_OF_BIRTH").getClass());
}
+ @Test
public void testBindingForCollection() throws Exception {
// insert 3 artists
@@ -157,6 +162,7 @@ public class BindDirectiveIT extends ServerCase {
assertEquals(2, result.size());
}
+ @Test
public void testBindForPassedNullParam() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Long(1));
@@ -172,6 +178,7 @@ public class BindDirectiveIT extends ServerCase {
assertNull(row.get("DATE_OF_BIRTH"));
}
+ @Test
public void testBindWithJDBCForPassedNullParam() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Long(1));
@@ -187,6 +194,7 @@ public class BindDirectiveIT extends ServerCase {
assertNull(row.get("DATE_OF_BIRTH"));
}
+ @Test
public void testBindForNotPassedParam() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Long(1));
@@ -201,6 +209,7 @@ public class BindDirectiveIT extends ServerCase {
assertNull(row.get("DATE_OF_BIRTH"));
}
+ @Test
public void testBindWithJDBCForNotPassedParam() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("id", new Long(1));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java b/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java
index 2e7049b..5c40bc9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java
@@ -18,12 +18,6 @@
****************************************************************/
package org.apache.cayenne.velocity;
-import java.sql.Connection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.MockOperationObserver;
@@ -38,6 +32,13 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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.sql.Connection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Test for Result directive to check if we could use ResultDitrective
@@ -70,6 +71,7 @@ public class ResultDirectiveIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testWithoutResultDirective() throws Exception {
String sql = "SELECT ARTIST_ID, ARTIST_NAME FROM ARTIST";
Map<String, Object> artist = insertArtist();
@@ -79,6 +81,7 @@ public class ResultDirectiveIT extends ServerCase {
assertEquals(artist.get("ARTIST_NAME"), selectResult.get("ARTIST_NAME"));
}
+ @Test
public void testWithOnlyResultDirective() throws Exception {
String sql = "SELECT #result('ARTIST_ID' 'java.lang.Integer')," + " #result('ARTIST_NAME' 'java.lang.String')"
+ " FROM ARTIST";
@@ -89,6 +92,7 @@ public class ResultDirectiveIT extends ServerCase {
assertEquals(artist.get("ARTIST_NAME"), selectResult.get("ARTIST_NAME").toString().trim());
}
+ @Test
public void testWithMixedDirectiveUse1() throws Exception {
String sql = "SELECT ARTIST_ID," + " #result('ARTIST_NAME' 'java.lang.String')" + " FROM ARTIST";
Map<String, Object> artist = insertArtist();
@@ -98,6 +102,7 @@ public class ResultDirectiveIT extends ServerCase {
assertEquals(artist.get("ARTIST_NAME"), selectResult.get("ARTIST_NAME").toString().trim());
}
+ @Test
public void testWithMixedDirectiveUse2() throws Exception {
String sql = "SELECT #result('ARTIST_ID' 'java.lang.Integer')," + " ARTIST_NAME " + " FROM ARTIST";
Map<String, Object> artist = insertArtist();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/itests/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java b/itests/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
index 35ae3d8..c58d3d0 100644
--- a/itests/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
+++ b/itests/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
@@ -18,15 +18,19 @@
****************************************************************/
package org.apache.cayenne.tools;
+import org.junit.Test;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class CayenneGeneratorIntegrationTest extends TestCase {
+public class CayenneGeneratorIntegrationTest {
private File testDir;
@@ -38,6 +42,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
/**
* Test single classes with a non-standard template.
*/
+ @Test
public void testSingleClassesCustTemplate() throws Exception {
startTest("single-classes-cust-template");
@@ -47,6 +52,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
}
/** Test single classes generation including full package path. */
+ @Test
public void testSingleClasses1() throws Exception {
startTest("single-classes1");
@@ -56,6 +62,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
}
/** Test single classes generation ignoring package path. */
+ @Test
public void testSingleClasses2() throws Exception {
startTest("single-classes2");
@@ -65,6 +72,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
}
/** Test pairs generation including full package path. */
+ @Test
public void testPairs1() throws Exception {
startTest("pairs1");
@@ -75,6 +83,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
}
/** Test pairs generation in the same directory. */
+ @Test
public void testPairs2() throws Exception {
startTest("pairs2");
@@ -87,6 +96,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
* Test pairs generation including full package path with superclass and
* subclass in different packages.
*/
+ @Test
public void testPairs3() throws Exception {
startTest("pairs3");
@@ -95,7 +105,8 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
assertContents("org/apache/cayenne/testdo/testmap/superart/_Artist.java", "_Artist",
"org.apache.cayenne.testdo.testmap.superart", "CayenneDataObject");
}
-
+
+ @Test
public void testPairs1_client() throws Exception {
startTest("pairs1-client");
@@ -105,6 +116,7 @@ public class CayenneGeneratorIntegrationTest extends TestCase {
"org.apache.cayenne.testdo.testmap.client.superart", "PersistentObject");
}
+ @Test
public void testPairsEmbeddable3() throws Exception {
startTest("pairs-embeddables3");
[04/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
index 3e32532..73d564a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
@@ -19,11 +19,6 @@
package org.apache.cayenne.access;
-import java.sql.Types;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.DataObject;
@@ -44,6 +39,12 @@ 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.Date;
+import java.util.Iterator;
+import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContextReadIT extends ServerCase {
@@ -112,6 +113,7 @@ public class NestedDataContextReadIT extends ServerCase {
tPainting.insert(33006, "P_artist6", 33001, 3000);
}
+ @Test
public void testCreateChildDataContext() {
context.setValidatingObjectsOnCommit(true);
@@ -137,6 +139,7 @@ public class NestedDataContextReadIT extends ServerCase {
assertFalse(((DataContext) child2).isValidatingObjectsOnCommit());
}
+ @Test
public void testSelect() throws Exception {
createArtistsDataSet();
@@ -178,6 +181,7 @@ public class NestedDataContextReadIT extends ServerCase {
}
}
+ @Test
public void testReadToOneRelationship() throws Exception {
createRelationshipDataSet();
@@ -277,6 +281,7 @@ public class NestedDataContextReadIT extends ServerCase {
});
}
+ @Test
public void testPrefetchingToOne() throws Exception {
createPrefetchingDataSet();
@@ -315,6 +320,7 @@ public class NestedDataContextReadIT extends ServerCase {
});
}
+ @Test
public void testPrefetchingToMany() throws Exception {
createPrefetchingDataSet();
@@ -356,6 +362,7 @@ public class NestedDataContextReadIT extends ServerCase {
});
}
+ @Test
public void testObjectFromDataRow() throws Exception {
DataContext childContext = (DataContext) runtime.newContext(context);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java
index 86110c2..63b5ea0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.di.Inject;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContextRollbackIT extends ServerCase {
@@ -34,6 +35,7 @@ public class NestedDataContextRollbackIT extends ServerCase {
@Inject
private DataContext context;
+ @Test
public void testRollbackChanges() {
ObjectContext child1 = runtime.newContext(context);
@@ -51,6 +53,7 @@ public class NestedDataContextRollbackIT extends ServerCase {
assertFalse(child1.hasChanges());
}
+ @Test
public void testRollbackChangesLocally() {
ObjectContext child1 = runtime.newContext(context);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java
index fd18428..2ac6652 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java
@@ -27,6 +27,7 @@ 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.apache.cayenne.validation.ValidationException;
+import org.junit.Test;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContextValidationIT extends ServerCase {
@@ -49,6 +50,7 @@ public class NestedDataContextValidationIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testValidateOnCommitToParent() {
context.setValidatingObjectsOnCommit(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
index 569283c..ed319c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
@@ -39,6 +39,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.Collection;
@@ -129,6 +130,7 @@ public class NestedDataContextWriteIT extends ServerCase {
return context;
}
+ @Test
public void testDeleteNew() throws Exception {
createSingleArtistDataSet();
@@ -151,6 +153,7 @@ public class NestedDataContextWriteIT extends ServerCase {
/**
* A test case for CAY-698 bug.
*/
+ @Test
public void testNullifyToOne() throws Exception {
createNullifyToOneDataSet();
@@ -180,6 +183,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testCommitChangesToParent() throws Exception {
createArtistsDataSet();
@@ -254,6 +258,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testCommitChangesToParentDeleted() throws Exception {
createArtistsDataSet();
@@ -290,6 +295,7 @@ public class NestedDataContextWriteIT extends ServerCase {
assertEquals("DDD", parentDeleted.getArtistName());
}
+ @Test
public void testCommitChanges() throws Exception {
createArtistsDataSet();
@@ -356,6 +362,7 @@ public class NestedDataContextWriteIT extends ServerCase {
assertNotNull(parentHollow);
}
+ @Test
public void testCommitChangesToParent_MergeProperties() throws Exception {
createMixedDataSet();
@@ -436,6 +443,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testCommitChangesToParentPropagatedKey() throws Exception {
final DataContext context = createDataContext();
final ObjectContext childContext = runtime.newContext(context);
@@ -476,6 +484,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testCommitChangesToParentFlattened() throws Exception {
final DataContext context = createDataContext();
@@ -525,6 +534,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testCommitChangesToParentFlattenedMultipleFlush() throws Exception {
final DataContext context = createDataContext();
final ObjectContext childContext = runtime.newContext(context);
@@ -622,6 +632,7 @@ public class NestedDataContextWriteIT extends ServerCase {
});
}
+ @Test
public void testAddRemove() {
DataContext context = createDataContext();
@@ -648,6 +659,7 @@ public class NestedDataContextWriteIT extends ServerCase {
}
+ @Test
public void testCAY1194() throws Exception {
DataContext context = createDataContext();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
index a46c506..2d05ff3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.util.List;
-import java.util.Random;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
@@ -31,6 +28,10 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
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;
+import java.util.Random;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContext_DeadlockIT extends ServerCase {
@@ -64,6 +65,7 @@ public class NestedDataContext_DeadlockIT extends ServerCase {
}
}
+ @Test
public void testDeadlock() throws Exception {
createArtists();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
index 4581852..2ce5d42 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.access;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.List;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
@@ -42,6 +38,11 @@ import org.apache.cayenne.testdo.testmap.SmallintTestEntity;
import org.apache.cayenne.testdo.testmap.TinyintTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
/**
*/
@@ -87,6 +88,7 @@ public class NumericTypesIT extends ServerCase {
tTinyintTest.insert(2, 50);
}
+ @Test
public void testLong() throws Exception {
LongEntity test = context.newObject(LongEntity.class);
@@ -104,6 +106,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testBigInteger() throws Exception {
BigIntegerEntity test = context.newObject(BigIntegerEntity.class);
@@ -121,6 +124,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testBigDecimal() throws Exception {
BigDecimalEntity test = context.newObject(BigDecimalEntity.class);
@@ -138,6 +142,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testShortInQualifier() throws Exception {
createShortDataSet();
@@ -152,6 +157,7 @@ public class NumericTypesIT extends ServerCase {
assertEquals(new Short("9999"), object.getSmallintCol());
}
+ @Test
public void testShortInInsert() throws Exception {
SmallintTestEntity object = (SmallintTestEntity) (context)
.newObject("SmallintTestEntity");
@@ -159,6 +165,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testTinyintInQualifier() throws Exception {
createTinyintDataSet();
@@ -173,6 +180,7 @@ public class NumericTypesIT extends ServerCase {
assertEquals(new Byte((byte) 81), object.getTinyintCol());
}
+ @Test
public void testTinyintInInsert() throws Exception {
TinyintTestEntity object = (TinyintTestEntity) (context)
.newObject("TinyintTestEntity");
@@ -180,6 +188,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testBooleanBit() throws Exception {
BitTestEntity trueObject = (BitTestEntity) context.newObject("BitTestEntity");
@@ -218,6 +227,7 @@ public class NumericTypesIT extends ServerCase {
assertSame(Boolean.FALSE, falseRefetched.getBitColumn());
}
+ @Test
public void testBooleanBoolean() throws Exception {
// populate (testing insert as well)
@@ -260,6 +270,7 @@ public class NumericTypesIT extends ServerCase {
assertSame(Boolean.FALSE, falseRefetched.getBooleanColumn());
}
+ @Test
public void testDecimalPK() throws Exception {
// populate (testing insert as well)
@@ -279,6 +290,7 @@ public class NumericTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testDecimalPK1() throws Exception {
// populate (testing insert as well)
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
index f8b11d7..67eeb7a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.sql.Types;
@@ -73,6 +74,7 @@ public class ObjectStoreDiffRetainingIT extends ServerCase {
tPainting.insert(2000, null, null, 3000, "p1");
}
+ @Test
public void testSnapshotRetainedOnPropertyModification() throws Exception {
createMixedDataSet();
@@ -85,6 +87,7 @@ public class ObjectStoreDiffRetainingIT extends ServerCase {
assertNotNull(objectStore.getChangesByObjectId().get(a.getObjectId()));
}
+ @Test
public void testSnapshotRetainedOnRelAndPropertyModification() throws Exception {
createMixedDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java
index 86e8ede..81abf7f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ObjectStoreGCIT extends ServerCase {
@@ -46,6 +47,7 @@ public class ObjectStoreGCIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testReleaseUnreferenced() throws Exception {
context.performGenericQuery(new SQLTemplate(
Artist.class,
@@ -66,6 +68,7 @@ public class ObjectStoreGCIT extends ServerCase {
}.runTest(2000);
}
+ @Test
public void testRetainUnreferencedNew() throws Exception {
assertEquals(0, context.getObjectStore().registeredObjectsCount());
Artist a = context.newObject(Artist.class);
@@ -96,6 +99,7 @@ public class ObjectStoreGCIT extends ServerCase {
}
+ @Test
public void testRetainUnreferencedModified() throws Exception {
context.performGenericQuery(new SQLTemplate(
Artist.class,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java
index 8e24d38..4929c4f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java
@@ -30,6 +30,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.Collections;
import java.util.Date;
@@ -40,6 +41,7 @@ public class ObjectStoreIT extends ServerCase {
@Inject
private DataContext context;
+ @Test
public void testRegisteredObjectsCount() throws Exception {
assertEquals(0, context.getObjectStore().registeredObjectsCount());
@@ -62,6 +64,7 @@ public class ObjectStoreIT extends ServerCase {
assertEquals(2, context.getObjectStore().registeredObjectsCount());
}
+ @Test
public void testObjectsUnregistered() throws Exception {
DataRow row = new DataRow(10);
@@ -85,6 +88,7 @@ public class ObjectStoreIT extends ServerCase {
assertNull(context.getObjectStore().getCachedSnapshot(oid));
}
+ @Test
public void testUnregisterThenRegister() throws Exception {
// Create a gallery.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
index b345f2a..20e9f07 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.access;
-import java.sql.Types;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.Ordering;
import org.apache.cayenne.query.SelectQuery;
@@ -33,6 +29,11 @@ import org.apache.cayenne.testdo.locking.RelLockingTestEntity;
import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
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;
+import java.util.Map;
@UseServerRuntime(ServerCase.LOCKING_PROJECT)
public class OptimisticLockingIT extends ServerCase {
@@ -117,6 +118,7 @@ public class OptimisticLockingIT extends ServerCase {
tSimpleLockingTest.delete().execute();
}
+ @Test
public void testSuccessSimpleLockingOnDelete() throws Exception {
createSimpleLockingDataSet();
@@ -134,6 +136,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnDeleteFollowedByInvalidate() throws Exception {
createSimpleLockingDataSet();
@@ -152,6 +155,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnDeleteFollowedByForgetSnapshot()
throws Exception {
createSimpleLockingDataSet();
@@ -171,6 +175,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnDeletePrecededByInvalidate() throws Exception {
createSimpleLockingDataSet();
@@ -189,6 +194,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnDeletePrecededByForgetSnapshot()
throws Exception {
createSimpleLockingDataSet();
@@ -208,6 +214,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testFailSimpleLockingOnDelete() throws Exception {
createSimpleLockingDataSet();
@@ -235,6 +242,7 @@ public class OptimisticLockingIT extends ServerCase {
}
}
+ @Test
public void testSuccessSimpleLockingOnUpdate() throws Exception {
createSimpleLockingDataSet();
@@ -253,6 +261,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnUpdateFollowedByInvalidate() throws Exception {
createSimpleLockingDataSet();
@@ -272,6 +281,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnUpdatePrecededByInvalidate() throws Exception {
createSimpleLockingDataSet();
@@ -291,6 +301,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnUpdateFollowedByForgetSnapshot()
throws Exception {
createSimpleLockingDataSet();
@@ -311,6 +322,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSuccessSimpleLockingOnUpdatePrecededByForgetSnapshot()
throws Exception {
createSimpleLockingDataSet();
@@ -331,6 +343,7 @@ public class OptimisticLockingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testFailSimpleLocking() throws Exception {
createSimpleLockingDataSet();
@@ -359,6 +372,7 @@ public class OptimisticLockingIT extends ServerCase {
}
}
+ @Test
public void testFailLockingOnNull() throws Exception {
createLockingOnNullDataSet();
@@ -388,6 +402,7 @@ public class OptimisticLockingIT extends ServerCase {
}
}
+ @Test
public void testSuccessLockingOnMixed() throws Exception {
createLockingOnMixedDataSet();
@@ -412,6 +427,7 @@ public class OptimisticLockingIT extends ServerCase {
// this requires refactoring of ContextCommit.
}
+ @Test
public void testFailLockingOnToOne() throws Exception {
createLockingOnToOneDataSet();
@@ -446,6 +462,7 @@ public class OptimisticLockingIT extends ServerCase {
}
}
+ @Test
public void testFailRetrieveRow() throws Exception {
createSimpleLockingDataSet();
@@ -471,6 +488,7 @@ public class OptimisticLockingIT extends ServerCase {
}
}
+ @Test
public void testFailRetrieveDeletedRow() throws Exception {
createSimpleLockingDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java
index cdf65e3..6e9a6ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java
@@ -34,6 +34,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.ArrayList;
import java.util.HashMap;
@@ -49,6 +50,7 @@ public class PrefetchProcessorTreeBuilderIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testBuildTreeNoPrefetches() {
final ClassDescriptor descriptor = resolver.getClassDescriptor("Artist");
@@ -109,6 +111,7 @@ public class PrefetchProcessorTreeBuilderIT extends ServerCase {
assertNull(processingTree.getIncoming());
}
+ @Test
public void testBuildTreeWithPrefetches() {
final ClassDescriptor descriptor = resolver.getClassDescriptor("Artist");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java
index f16395d..206c90d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.PrimitivesTestEntity;
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 PrimitiveAttributesIT extends ServerCase {
@@ -38,6 +39,7 @@ public class PrimitiveAttributesIT extends ServerCase {
dbHelper.deleteAll("PRIMITIVES_TEST");
}
+ @Test
public void testCommit() {
PrimitivesTestEntity e = context.newObject(PrimitivesTestEntity.class);
e.setBooleanColumn(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
index de7f72a..2eac6d0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.di.Inject;
@@ -37,6 +33,11 @@ import org.apache.cayenne.testdo.quotemap.QuoteAdress;
import org.apache.cayenne.testdo.quotemap.Quote_Person;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
@UseServerRuntime(ServerCase.QUOTED_IDENTIFIERS_PROJECT)
public class QuotedIdentifiersIT extends ServerCase {
@@ -85,6 +86,7 @@ public class QuotedIdentifiersIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testPrefetchQuote() throws Exception {
DbEntity entity = context.getEntityResolver().getObjEntity(QuoteAdress.class).getDbEntity();
List idAttributes = Collections.singletonList(entity.getAttribute("City"));
@@ -129,6 +131,7 @@ public class QuotedIdentifiersIT extends ServerCase {
assertEquals(1, objects10.size());
}
+ @Test
public void testQuotedEJBQLQuery() throws Exception {
String ejbql = "select a from QuoteAdress a where a.group = '324'";
EJBQLQuery queryEJBQL = new EJBQLQuery(ejbql);
@@ -136,6 +139,7 @@ public class QuotedIdentifiersIT extends ServerCase {
assertEquals(1, objects11.size());
}
+ @Test
public void testQuotedEJBQLQueryWithJoin() throws Exception {
String ejbql = "select p from Quote_Person p join p.address_Rel a where p.name = 'Arcadi'";
EJBQLQuery queryEJBQL = new EJBQLQuery(ejbql);
@@ -143,6 +147,7 @@ public class QuotedIdentifiersIT extends ServerCase {
assertEquals(1, resultList.size());
}
+ @Test
public void testQuotedEJBQLQueryWithOrderBy() throws Exception {
EJBQLQuery query = new EJBQLQuery("select p from Quote_Person p order by p.name");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java
index 920096d..d84939c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.ReturnTypesMapLobs1;
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.math.BigDecimal;
import java.sql.Time;
@@ -65,7 +66,8 @@ public class ReturnTypesMappingIT extends ServerCase {
/*
* TODO: olga: We need divided TYPES_MAPPING_TES2 to 2 schemas with lobs columns and not lobs columns
*/
-
+
+ @Test
public void testBIGINT() throws Exception {
String columnName = "BIGINT_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -82,6 +84,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(bigintValue, columnValue);
}
+ @Test
public void testBIGINT2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -97,6 +100,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(bigintValue, columnValue);
}
+ @Test
public void testBINARY() throws Exception {
if (unitDbAdapter.supportsLobs()) {
String columnName = "BINARY_COLUMN";
@@ -117,6 +121,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testBINARY2() throws Exception {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class);
@@ -136,6 +141,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testBIT() throws Exception {
String columnName = "BIT_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -153,6 +159,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertTrue(bitValue.equals(columnValue) || ((Number) columnValue).intValue() == 1);
}
+ @Test
public void testBIT2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -168,6 +175,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(bitValue, columnValue);
}
+ @Test
public void testBLOB() throws Exception {
if (unitDbAdapter.supportsLobs()) {
String columnName = "BLOB_COLUMN";
@@ -188,6 +196,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testBLOB2() throws Exception {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class);
@@ -207,6 +216,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testBOOLEAN() throws Exception {
String columnName = "BOOLEAN_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -225,6 +235,7 @@ public class ReturnTypesMappingIT extends ServerCase {
|| ((Number) columnValue).intValue() == 1);
}
+ @Test
public void testBOOLEAN2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -240,6 +251,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(booleanValue, columnValue);
}
+ @Test
public void testCHAR() throws Exception {
String columnName = "CHAR_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -256,6 +268,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(charValue, columnValue);
}
+ @Test
public void testCHAR2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -271,6 +284,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(charValue, columnValue);
}
+ @Test
public void testCLOB() throws Exception {
if (unitDbAdapter.supportsLobs()) {
String columnName = "CLOB_COLUMN";
@@ -296,6 +310,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testCLOB2() throws Exception {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMapLobs1 test = context.newObject(ReturnTypesMapLobs1.class);
@@ -317,6 +332,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testDATE() throws Exception {
String columnName = "DATE_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -336,6 +352,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(dateValue.toString(), columnValue.toString());
}
+ @Test
public void testDATE2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -354,6 +371,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(dateValue.toString(), columnValue.toString());
}
+ @Test
public void testDECIMAL() throws Exception {
String columnName = "DECIMAL_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -370,6 +388,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(decimalValue, columnValue);
}
+ @Test
public void testDECIMAL2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -385,6 +404,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(decimalValue, columnValue);
}
+ @Test
public void testDOUBLE() throws Exception {
String columnName = "DOUBLE_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -401,6 +421,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(doubleValue, columnValue);
}
+ @Test
public void testDOUBLE2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -416,6 +437,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(doubleValue, columnValue);
}
+ @Test
public void testFLOAT() throws Exception {
String columnName = "FLOAT_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -430,9 +452,10 @@ public class ReturnTypesMappingIT extends ServerCase {
assertNotNull(columnValue);
assertTrue(Float.class.equals(columnValue.getClass())
|| Double.class.equals(columnValue.getClass()));
- assertEquals(floatValue.floatValue(), ((Number)columnValue).floatValue());
+ assertEquals(floatValue.floatValue(), ((Number)columnValue).floatValue(), 0);
}
+ @Test
public void testFLOAT2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -448,6 +471,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(floatValue, columnValue);
}
+ @Test
public void testINTEGER() throws Exception {
String columnName = "INTEGER_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -464,6 +488,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(integerValue, columnValue);
}
+ @Test
public void testINTEGER2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -479,6 +504,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(integerValue, columnValue);
}
+ @Test
public void testLONGVARBINARY() throws Exception {
if (unitDbAdapter.supportsLobs()) {
String columnName = "LONGVARBINARY_COLUMN";
@@ -499,6 +525,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testLONGVARBINARY2() throws Exception {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class);
@@ -518,6 +545,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testLONGVARCHAR() throws Exception {
String columnName = "LONGVARCHAR_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -538,6 +566,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(longvarcharValue, columnValue);
}
+ @Test
public void testLONGVARCHAR2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -557,6 +586,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(longvarcharValue, columnValue);
}
+ @Test
public void testNUMERIC() throws Exception {
String columnName = "NUMERIC_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -573,6 +603,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(numericValue, columnValue);
}
+ @Test
public void testNUMERIC2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -588,6 +619,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(numericValue, columnValue);
}
+ @Test
public void testREAL() throws Exception {
String columnName = "REAL_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -612,6 +644,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testREAL2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -627,6 +660,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(realValue, columnValue);
}
+ @Test
public void testSMALLINT() throws Exception {
String columnName = "SMALLINT_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -643,6 +677,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(smallintValue, columnValue);
}
+ @Test
public void testSMALLINT2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -658,6 +693,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(smallintValue, columnValue);
}
+ @Test
public void testTIME() throws Exception {
String columnName = "TIME_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -678,6 +714,7 @@ public class ReturnTypesMappingIT extends ServerCase {
.toString());
}
+ @Test
public void testTIME2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -696,6 +733,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(timeValue.toString(), new Time(columnValue.getTime()).toString());
}
+ @Test
public void testSQLTemplateTime() throws Exception {
DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity");
@@ -717,6 +755,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(now.toString(), new Time(columnValue.getTime()).toString());
}
+ @Test
public void testTIMESTAMP() throws Exception {
String columnName = "TIMESTAMP_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -737,6 +776,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertTrue(delta < 1000);
}
+ @Test
public void testTIMESTAMP2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -755,6 +795,7 @@ public class ReturnTypesMappingIT extends ServerCase {
long delta = timestampValue.getTime() - ((Date) columnValue).getTime();
assertTrue(delta < 1000); }
+ @Test
public void testTINYINT() throws Exception {
String columnName = "TINYINT_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -771,6 +812,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(tinyintValue.intValue(), ((Number)columnValue).intValue());
}
+ @Test
public void testTINYINT2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -786,6 +828,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(tinyintValue, columnValue);
}
+ @Test
public void testVARBINARY() throws Exception {
if (unitDbAdapter.supportsLobs()) {
String columnName = "VARBINARY_COLUMN";
@@ -806,6 +849,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testVARBINARY2() throws Exception {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class);
@@ -825,6 +869,7 @@ public class ReturnTypesMappingIT extends ServerCase {
}
}
+ @Test
public void testVARCHAR() throws Exception {
String columnName = "VARCHAR_COLUMN";
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
@@ -841,6 +886,7 @@ public class ReturnTypesMappingIT extends ServerCase {
assertEquals(varcharValue, columnValue);
}
+ @Test
public void testVARCHAR2() throws Exception {
ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
index 1c84092..99e5f41 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
@@ -19,9 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
@@ -33,6 +30,10 @@ 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.Iterator;
+import java.util.List;
/**
* Tests IncrementalFaultList behavior when fetching data rows.
@@ -100,6 +101,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
tArtist.insert(33025, "artist25");
}
+ @Test
public void testGet1() throws Exception {
assertEquals(1, list.idWidth);
assertTrue(list.elements.get(0) instanceof Long);
@@ -113,6 +115,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
assertEquals("artist20", ((DataRow) a).get("ARTIST_NAME"));
}
+ @Test
public void testIndexOf1() throws Exception {
Expression qual = ExpressionFactory.matchExp("artistName", "artist20");
@@ -132,6 +135,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
assertEquals(-1, list.indexOf(row));
}
+ @Test
public void testIndexOf2() throws Exception {
// resolve first page
@@ -151,6 +155,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
assertEquals(-1, list.indexOf(row));
}
+ @Test
public void testLastIndexOf1() throws Exception {
// resolve first page
@@ -170,6 +175,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
assertEquals(-1, list.lastIndexOf(row));
}
+ @Test
public void testLastIndexOf2() throws Exception {
Expression qual = ExpressionFactory.matchExp("artistName", "artist20");
@@ -186,6 +192,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
assertEquals(-1, list.lastIndexOf(row));
}
+ @Test
public void testIterator() throws Exception {
assertEquals(1, list.idWidth);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
index ce4e4ea..22e3691 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
import org.apache.cayenne.DataObject;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
@@ -35,6 +31,11 @@ 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.Iterator;
+import java.util.List;
+import java.util.ListIterator;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SimpleIdIncrementalFaultListIT extends ServerCase {
@@ -87,6 +88,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
tArtist.insert(33025, "artist25");
}
+ @Test
public void testRemoveDeleted() throws Exception {
createArtistsDataSet();
@@ -120,21 +122,25 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
return new SimpleIdIncrementalFaultList<Object>(context, query, 10000);
}
+ @Test
public void testSize() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
assertEquals(25, list.size());
}
+ @Test
public void testSmallList() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(49);
assertEquals(25, list.size());
}
+ @Test
public void testOnePageList() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(25);
assertEquals(25, list.size());
}
+ @Test
public void testIterator() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
Iterator<?> it = list.iterator();
@@ -158,6 +164,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
}
}
+ @Test
public void testNewObject() throws Exception {
createArtistsDataSet();
@@ -177,6 +184,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
assertSame(newArtist, list.get(25));
}
+ @Test
public void testListIterator() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
ListIterator<?> it = list.listIterator();
@@ -200,6 +208,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
}
}
+ @Test
public void testSort() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
@@ -216,6 +225,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
}
}
+ @Test
public void testUnfetchedObjects() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
assertEquals(25, list.getUnfetchedObjects());
@@ -225,6 +235,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
assertEquals(0, list.getUnfetchedObjects());
}
+ @Test
public void testPageIndex() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
assertEquals(0, list.pageIndex(0));
@@ -240,6 +251,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
}
}
+ @Test
public void testPagesRead1() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
assertTrue(list.elements.get(0) instanceof Long);
@@ -252,6 +264,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
assertTrue((list.elements.get(list.size() - 1)) instanceof Artist);
}
+ @Test
public void testGet1() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
assertTrue(list.elements.get(0) instanceof Long);
@@ -264,6 +277,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
assertTrue(list.elements.get(8) instanceof Artist);
}
+ @Test
public void testIndexOf() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
Expression qual = ExpressionFactory.matchExp("artistName", "artist20");
@@ -277,6 +291,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
assertEquals(-1, list.indexOf(list.dataContext.newObject("Artist")));
}
+ @Test
public void testLastIndexOf() throws Exception {
SimpleIdIncrementalFaultList<?> list = prepareList(6);
Expression qual = ExpressionFactory.matchExp("artistName", "artist20");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
index d0a1b6e..6194ff8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
@@ -35,6 +35,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.util.List;
@@ -94,6 +95,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase {
tPaining.insert(33007, "P_artist21", 33007, 21000);
}
+ @Test
public void testListType() throws Exception {
createArtistsDataSet();
@@ -110,6 +112,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase {
* Test that all queries specified in prefetch are executed with a single prefetch
* path.
*/
+ @Test
public void testPrefetch1() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -144,6 +147,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase {
/**
* Test that a to-many relationship is initialized.
*/
+ @Test
public void testPrefetch3() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -173,6 +177,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase {
/**
* Test that a to-one relationship is initialized.
*/
+ @Test
public void testPrefetch4() throws Exception {
createArtistsAndPaintingsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java
index 32220f0..31e093c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.inheritance_flat.Role;
import org.apache.cayenne.testdo.inheritance_flat.User;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
/**
* Special test cases per CAY-1378, CAY-1379.
@@ -51,6 +52,7 @@ public class SingleTableInheritance1IT extends ServerCase {
dbHelper.deleteAll("ROLES");
}
+ @Test
public void testGroupActions() throws Exception {
User user = context.newObject(User.class);
@@ -80,6 +82,7 @@ public class SingleTableInheritance1IT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testFlattenedNullifyNullifyDeleteRules() throws Exception {
User user = context.newObject(User.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
index ea76fa7..22a6e8b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
@@ -43,6 +43,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.Arrays;
@@ -151,6 +152,7 @@ public class SingleTableInheritanceIT extends ServerCase {
tPerson.insert(9, "Kelly", "EM", 100000, null, 1);
}
+ @Test
public void testMatchingOnSuperAttributes() throws Exception {
create2PersonDataSet();
@@ -164,6 +166,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertEquals("E2", results.get(0).getName());
}
+ @Test
public void testMatchingOnSuperAttributesWithPrefetch() throws Exception {
create2PersonDataSet();
@@ -178,6 +181,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertEquals("E2", results.get(0).getName());
}
+ @Test
public void testPaginatedQueries() throws Exception {
create5PersonDataSet();
@@ -200,6 +204,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertTrue(results.get(4) instanceof Employee);
}
+ @Test
public void testRelationshipToAbstractSuper() {
context
.performGenericQuery(new SQLTemplate(
@@ -216,6 +221,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertTrue(note.getPerson() instanceof Employee);
}
+ @Test
public void testRelationshipAbstractFromSuperPrefetchingJoint() {
context
.performGenericQuery(new SQLTemplate(
@@ -255,6 +261,7 @@ public class SingleTableInheritanceIT extends ServerCase {
});
}
+ @Test
public void testRelationshipAbstractFromSuperPrefetchingDisjoint() {
context
.performGenericQuery(new SQLTemplate(
@@ -292,6 +299,7 @@ public class SingleTableInheritanceIT extends ServerCase {
});
}
+ @Test
public void testRelationshipAbstractToSuperPrefetchingDisjoint() {
context
.performGenericQuery(new SQLTemplate(
@@ -322,6 +330,7 @@ public class SingleTableInheritanceIT extends ServerCase {
});
}
+ @Test
public void testRelationshipAbstractToSuperPrefetchingJoint() {
context
.performGenericQuery(new SQLTemplate(
@@ -347,6 +356,7 @@ public class SingleTableInheritanceIT extends ServerCase {
}
+ @Test
public void testSave() throws Exception {
ClientCompany company = context.newObject(ClientCompany.class);
company.setName("Boeing");
@@ -373,6 +383,7 @@ public class SingleTableInheritanceIT extends ServerCase {
/**
* Tests that to-one relationship produces correct subclass.
*/
+ @Test
public void testEmployeeAddress() throws Exception {
createEmployeeAddressDataSet();
@@ -386,6 +397,7 @@ public class SingleTableInheritanceIT extends ServerCase {
/**
* Tests that to-one relationship produces correct subclass.
*/
+ @Test
public void testManagerAddress() throws Exception {
createManagerAddressDataSet();
@@ -398,6 +410,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertSame(Manager.class, e.getClass());
}
+ @Test
public void testCAY592() throws Exception {
createManagerAddressDataSet();
@@ -421,6 +434,7 @@ public class SingleTableInheritanceIT extends ServerCase {
/**
* Tests that to-one relationship produces correct subclass.
*/
+ @Test
public void testRepCompany() throws Exception {
createRepCompanyDataSet();
@@ -436,6 +450,7 @@ public class SingleTableInheritanceIT extends ServerCase {
/**
* Tests that to-many relationship produces correct subclasses.
*/
+ @Test
public void testDepartmentEmployees() throws Exception {
createDepartmentEmployeesDataSet();
@@ -449,6 +464,7 @@ public class SingleTableInheritanceIT extends ServerCase {
assertEquals(1, countObjectOfClass(employees, Manager.class));
}
+ @Test
public void testSelectInheritanceResolving() throws Exception {
createSelectDataSet();
@@ -465,6 +481,7 @@ public class SingleTableInheritanceIT extends ServerCase {
* Test for CAY-1008: Reverse relationships may not be correctly set if inheritance is
* used.
*/
+ @Test
public void testCAY1008() {
RelatedEntity related = context.newObject(RelatedEntity.class);
@@ -486,6 +503,7 @@ public class SingleTableInheritanceIT extends ServerCase {
/**
* Test for CAY-1009: Bogus runtime relationships can mess up commit.
*/
+ @Test
public void testCAY1009() {
// We should have only one relationship. DirectToSubEntity -> SubEntity.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java
index 54a555c..e31a0bd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java
@@ -27,6 +27,7 @@ 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.util.PersistentObjectList;
+import org.junit.Test;
import java.lang.reflect.Field;
import java.util.LinkedList;
@@ -62,6 +63,7 @@ public class ToManyListIT extends ServerCase {
return new ToManyList(artist, Artist.PAINTING_ARRAY_PROPERTY);
}
+ @Test
public void testNewAddRemove() throws Exception {
ToManyList list = createForNewArtist();
assertFalse("Expected resolved list when created with a new object", list
@@ -80,6 +82,7 @@ public class ToManyListIT extends ServerCase {
assertEquals(1, list.size());
}
+ @Test
public void testSavedUnresolvedAddRemove() throws Exception {
ToManyList list = createForExistingArtist();
@@ -110,6 +113,7 @@ public class ToManyListIT extends ServerCase {
assertTrue(getValue(list).contains(p2));
}
+ @Test
public void testSavedUnresolvedMerge() throws Exception {
ToManyList list = createForExistingArtist();
@@ -144,6 +148,7 @@ public class ToManyListIT extends ServerCase {
assertTrue(getValue(list).contains(p1));
}
+ @Test
public void testThrowOutDeleted() throws Exception {
ToManyList list = createForExistingArtist();
@@ -191,6 +196,7 @@ public class ToManyListIT extends ServerCase {
.contains(p2));
}
+ @Test
public void testRealRelationship() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("aaa");
@@ -222,6 +228,7 @@ public class ToManyListIT extends ServerCase {
assertEquals(2, size);
}
+ @Test
public void testRealRelationshipRollback() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("aaa");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java
index eb290fd..b4a9b10 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.access;
-import java.sql.Connection;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.query.SelectQuery;
@@ -31,6 +29,9 @@ import org.apache.cayenne.tx.CayenneTransaction;
import org.apache.cayenne.tx.Transaction;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Connection;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class TransactionThreadIT extends ServerCase {
@@ -53,6 +54,7 @@ public class TransactionThreadIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testThreadConnectionReuseOnSelect() throws Exception {
ConnectionCounterTx t = new ConnectionCounterTx(new CayenneTransaction(logger));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
index 9275638..e3cb82e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.UuidPkEntity;
import org.apache.cayenne.testdo.testmap.UuidTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.UUID;
@@ -50,6 +51,7 @@ public class UUIDIT extends ServerCase {
uuidPkEntity = new TableHelper(dbHelper, "UUID_PK_ENTITY", "ID");
}
+ @Test
public void testUUID() throws Exception {
UuidTestEntity test = context.newObject(UuidTestEntity.class);
@@ -67,6 +69,7 @@ public class UUIDIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testUUIDMeaningfulPkInsert() throws Exception {
UUID id = UUID.randomUUID();
@@ -79,6 +82,7 @@ public class UUIDIT extends ServerCase {
assertEquals(id, UUID.fromString(fetched));
}
+ @Test
public void testUUIDMeaningfulPkSelect() throws Exception {
UUID id = UUID.randomUUID();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java
index 5e6c461..3d77739 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.tx.CayenneTransaction;
import org.apache.cayenne.tx.Transaction;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
@@ -40,6 +41,7 @@ public class UserTransactionIT extends ServerCase {
@Inject
private JdbcEventLogger logger;
+ @Test
public void testCommit() throws Exception {
Artist a = context.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
index 46bdc11..c389fa1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.inheritance.vertical.IvSub1Sub1;
import org.apache.cayenne.testdo.inheritance.vertical.IvSub2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.SQLException;
import java.sql.Types;
@@ -65,6 +66,7 @@ public class VerticalInheritanceIT extends ServerCase {
dbHelper.deleteAll("IV2_X");
}
+ @Test
public void testInsert_Root() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -86,6 +88,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertNull(rootData[2]);
}
+ @Test
public void testInsert_Sub1() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -134,6 +137,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("BdE2", subdata[1]);
}
+ @Test
public void testInsert_Sub2() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -200,6 +204,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals(0, ivSub2Table.getRowCount());
}
+ @Test
public void testInsert_Sub1Sub1() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -239,6 +244,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("3DQa", subsubdata[1]);
}
+ @Test
public void testSelectQuery_SuperSub() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -280,6 +286,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("IvSub1", sub1.getDiscriminator());
}
+ @Test
public void testSelectQuery_DeepAndWide() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -349,6 +356,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("xSUB2", sub2.getSub2Name());
}
+ @Test
public void testSelectQuery_MiddleLeaf() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -407,6 +415,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("xSUB1_SUB1", sub1Sub1.getSub1Sub1Name());
}
+ @Test
public void testDelete_Mix() throws Exception {
TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT");
@@ -465,6 +474,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals(2, results.size());
}
+ @Test
public void testSelectQuery_AttributeOverrides() throws Exception {
TableHelper iv1RootTable = new TableHelper(dbHelper, "IV1_ROOT");
@@ -505,6 +515,7 @@ public class VerticalInheritanceIT extends ServerCase {
assertEquals("xSUB1", sub1.getName());
}
+ @Test
public void testInsertWithRelationship() throws SQLException {
TableHelper xTable = new TableHelper(dbHelper, "IV2_X");
TableHelper rootTable = new TableHelper(dbHelper, "IV2_ROOT");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java
index 682d187..8ac759d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java
@@ -18,19 +18,21 @@
****************************************************************/
package org.apache.cayenne.access.dbsync;
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.cayenne.access.MockOperationObserver;
import org.apache.cayenne.access.OperationObserver;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
@UseServerRuntime(ServerCase.SUS_PROJECT)
public class SchemaUpdateStrategyIT extends SchemaUpdateStrategyBase {
+ @Test
public void testCreateIfNoSchemaStrategy() throws Exception {
setStrategy(CreateIfNoSchemaStrategy.class);
@@ -49,6 +51,7 @@ public class SchemaUpdateStrategyIT extends SchemaUpdateStrategyBase {
assertEquals(2, existingTables().size());
}
+ @Test
public void testNoStandardSchema() throws Exception {
String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = new SQLTemplate(Object.class, template);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java
index 138f131..cd7f7af 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java
@@ -18,20 +18,22 @@
****************************************************************/
package org.apache.cayenne.access.dbsync;
-import static org.mockito.Mockito.mock;
-
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.OperationObserver;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.mockito.Mockito.mock;
@UseServerRuntime(ServerCase.SUS_PROJECT)
public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrategyBase {
+ @Test
public void testMixedStrategyTableExist() throws Exception {
createOneTable("SUS1");
@@ -44,6 +46,7 @@ public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrate
node.performQueries(Collections.singletonList(query), mock(OperationObserver.class));
}
+ @Test
public void testMixedStrategyTableNoExist() throws Exception {
String template = "SELECT #result('id' 'int') FROM SUS1";
@@ -60,6 +63,7 @@ public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrate
assertEquals(2, existingTables().size());
}
+ @Test
public void testMixedStrategyWithOneTable() throws Exception {
createOneTable("SUS1");
setStrategy(ThrowOnPartialOrCreateSchemaStrategy.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java
index 383996a..55abbcb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java
@@ -18,18 +18,20 @@
****************************************************************/
package org.apache.cayenne.access.dbsync;
-import java.util.Collections;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.MockOperationObserver;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collections;
@UseServerRuntime(ServerCase.SUS_PROJECT)
public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase {
+ @Test
public void testThrowOnPartialStrategyTableNoExist() throws Exception {
String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID";
@@ -51,6 +53,7 @@ public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase {
}
}
+ @Test
public void testThrowOnPartialStrategyTableExist() throws Exception {
String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID";
@@ -64,6 +67,7 @@ public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase {
node.performQueries(Collections.singletonList(query), observer);
}
+ @Test
public void testThrowOnPartialStrategyWithOneTable() throws Exception {
createOneTable("SUS1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java
index be323bb..f59c4f6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -43,6 +44,7 @@ public class BatchActionIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testHasGeneratedKeys1() throws Exception {
EntityResolver resolver = runtime.getChannel().getEntityResolver();
@@ -62,6 +64,7 @@ public class BatchActionIT extends ServerCase {
assertFalse(new BatchAction(batch2, node, false).hasGeneratedKeys());
}
+ @Test
public void testHasGeneratedKeys2() throws Exception {
EntityResolver resolver = runtime.getChannel().getEntityResolver();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
index 42061b8..89cc849 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
@@ -38,6 +38,7 @@ import org.apache.cayenne.query.DeleteBatchQuery;
import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Arrays;
import java.util.Collection;
@@ -60,6 +61,7 @@ public class BatchActionLockingIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testRunAsIndividualQueriesSuccess() throws Exception {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -101,6 +103,7 @@ public class BatchActionLockingIT extends ServerCase {
assertEquals(0, mockConnection.getNumberRollbacks());
}
+ @Test
public void testRunAsIndividualQueriesOptimisticLockingFailure() throws Exception {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
index ab1b1c9..b9f0240 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
+import org.junit.Test;
import java.sql.Connection;
import java.sql.Date;
@@ -90,6 +91,7 @@ public class SQLTemplateActionIT extends ServerCase {
tArtist.insert(3001, "artist5", date);
}
+ @Test
public void testProperties() throws Exception {
SQLTemplate template = new SQLTemplate(Object.class, "AAAAA");
@@ -98,6 +100,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertSame(node, action.dataNode);
}
+ @Test
public void testExecuteSelect() throws Exception {
createFourArtists();
@@ -139,6 +142,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertTrue(row.containsKey("DATE_OF_BIRTH"));
}
+ @Test
public void testSelectUtilDate() throws Exception {
createFourArtists();
@@ -172,6 +176,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertEquals(java.util.Date.class, row.get("DOB").getClass());
}
+ @Test
public void testSelectSQLDate() throws Exception {
createFourArtists();
@@ -205,6 +210,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertEquals(java.sql.Date.class, row.get("DOB").getClass());
}
+ @Test
public void testSelectSQLTimestamp() throws Exception {
createFourArtists();
@@ -239,6 +245,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertTrue(java.sql.Timestamp.class.isAssignableFrom(row.get("DOB").getClass()));
}
+ @Test
public void testExecuteUpdate() throws Exception {
String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) "
+ "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))";
@@ -271,6 +278,7 @@ public class SQLTemplateActionIT extends ServerCase {
assertEquals("a1", tArtist.getString("ARTIST_NAME").trim());
}
+ @Test
public void testExecuteUpdateNoParameters() throws Exception {
createFourArtists();
@@ -295,6 +303,7 @@ public class SQLTemplateActionIT extends ServerCase {
}
}
+ @Test
public void testExecuteUpdateBatch() throws Exception {
String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) "
+ "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))";
@@ -355,6 +364,7 @@ public class SQLTemplateActionIT extends ServerCase {
// assertEquals(bindings2.get("dob"), row2.get("DATE_OF_BIRTH"));
}
+ @Test
public void testExtractTemplateString() throws Exception {
SQLTemplate template = new SQLTemplate(Artist.class, "A\nBC");
SQLTemplateAction action = new SQLTemplateAction(template, node);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java
index 40849fd..77df179 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.ClobTestRelation;
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.util.List;
@@ -53,6 +54,7 @@ public class SelectActionIT extends ServerCase {
}
}
+ @Test
public void testFetchLimit_DistinctResultIterator() throws Exception {
if (accessStackAdapter.supportsLobs()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java
index 542f7cd..fef421e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.query.BatchQuery;
import org.apache.cayenne.query.BatchQueryRow;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -40,6 +41,7 @@ public class DefaultBatchTranslatorIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testConstructor() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
DefaultBatchTranslator builder = new DefaultBatchTranslator(mock(BatchQuery.class), adapter, null) {
@@ -62,6 +64,7 @@ public class DefaultBatchTranslatorIT extends ServerCase {
assertSame(adapter, builder.adapter);
}
+ @Test
public void testAppendDbAttribute1() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
String trimFunction = "testTrim";
@@ -98,6 +101,7 @@ public class DefaultBatchTranslatorIT extends ServerCase {
assertEquals("testAttr", buf.toString());
}
+ @Test
public void testAppendDbAttribute2() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
[08/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
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();
[09/12] git commit: Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
Apply JUnit4 instead of JUnit3 in IT
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b62c9d01
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b62c9d01
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b62c9d01
Branch: refs/heads/master
Commit: b62c9d018a1b98f47e25a683a7f1c9f748f4e098
Parents: e1ad29f
Author: Savva Kolbechev <s....@gmail.com>
Authored: Tue Nov 4 13:42:27 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Tue Nov 4 13:42:28 2014 +0300
----------------------------------------------------------------------
.../apache/cayenne/CayenneContextCayenneIT.java | 4 ++
.../CayenneContextClientChannelEventsIT.java | 12 +++++
.../cayenne/CayenneContextDeleteRulesIT.java | 5 ++
.../apache/cayenne/CayenneContextEJBQLIT.java | 4 ++
.../CayenneContextGraphDiffCompressorIT.java | 4 ++
.../org/apache/cayenne/CayenneContextIT.java | 12 ++++-
.../cayenne/CayenneContextInheritanceIT.java | 7 ++-
.../CayenneContextMapRelationshipIT.java | 5 +-
.../cayenne/CayenneContextMergeHandlerIT.java | 5 +-
.../CayenneContextNamedQueryCachingIT.java | 8 ++-
.../CayenneContextPaginatedListCachingIT.java | 4 +-
.../cayenne/CayenneContextPrimitiveIT.java | 5 +-
.../cayenne/CayenneContextRefreshQueryIT.java | 2 +
.../cayenne/CayenneContextRelationshipsIT.java | 5 ++
.../cayenne/CayenneContextSQLTemplateIT.java | 5 ++
.../cayenne/CayenneContextServerDiffsIT.java | 5 ++
.../cayenne/CayenneContextValidationIT.java | 4 ++
.../CayenneContextWithDataContextIT.java | 34 ++++++++++--
.../apache/cayenne/NestedCayenneContextIT.java | 47 ++++++++++++++--
.../cayenne/PersistentObjectInContextIT.java | 6 ++-
.../cayenne/access/ClientServerChannelIT.java | 11 +++-
.../access/ClientServerChannelQueryIT.java | 15 +++++-
.../cayenne/map/ClientEntityResolverIT.java | 4 +-
.../cayenne/query/ClientExpressionIT.java | 33 ++++++++----
.../query/ClientSelectQueryExpressionIT.java | 4 +-
.../query/SelectQueryAbstractEntityIT.java | 12 +++--
.../remote/CayenneContextDeletionIT.java | 23 ++++++++
.../remote/ClientChannelServerDiffsIT.java | 4 ++
.../cayenne/remote/LightSuperClassIT.java | 35 ++++++++----
.../remote/NestedObjectContextLocalIT.java | 28 ++++++++--
.../NestedObjectContextParentEventsIT.java | 23 ++++++++
.../remote/NestedObjectContextPeerEventsIT.java | 26 +++++++++
.../remote/NestedObjectContextRollbackIT.java | 26 ++++++++-
.../cayenne/remote/ROPPrefetchToManyMapIT.java | 27 +++++++++-
.../cayenne/remote/RelationshipChangeIT.java | 26 ++++++++-
.../cayenne/remote/RemoteCallbacksIT.java | 27 +++++++++-
.../cayenne/remote/RemoteCayenneCase.java | 17 +-----
.../remote/RemoteIncrementalFaultListIT.java | 14 +++++
.../apache/cayenne/remote/RemoteRollbackIT.java | 30 ++++++++++-
.../apache/cayenne/remote/ValueInjectorIT.java | 24 +++++++++
.../di/client/ClientCaseLifecycleManager.java | 10 ++--
.../unit/di/client/ClientCaseSelfIT.java | 2 +
.../cayenne/util/ObjectDetachOperationIT.java | 5 ++
.../util/ShallowMergeOperation_ClientIT.java | 4 ++
.../cayenne/CDOCollectionRelationshipIT.java | 6 +++
.../java/org/apache/cayenne/CDOMany2OneIT.java | 10 ++++
.../org/apache/cayenne/CDOMany2OneNoRevIT.java | 2 +
.../apache/cayenne/CDOMapRelationshipIT.java | 8 +++
.../java/org/apache/cayenne/CDOOne2ManyIT.java | 8 +++
.../org/apache/cayenne/CDOOne2OneDepIT.java | 6 +++
.../org/apache/cayenne/CDOOneDep2OneIT.java | 4 ++
.../org/apache/cayenne/CDOOneToManyFKIT.java | 2 +
.../org/apache/cayenne/CDOOneToOneFKIT.java | 8 +++
.../apache/cayenne/CDOQualifiedEntitiesIT.java | 3 ++
.../apache/cayenne/CDOReflexiveRelDeleteIT.java | 5 ++
.../org/apache/cayenne/CDOReflexiveRelIT.java | 7 +++
.../apache/cayenne/CDOSetRelationshipIT.java | 6 +++
.../CayenneDataObjectFlattenedRelIT.java | 9 ++++
.../org/apache/cayenne/CayenneDataObjectIT.java | 16 ++++--
.../cayenne/CayenneDataObjectInContextIT.java | 17 ++++++
.../CayenneDataObjectRelationshipsIT.java | 16 ++++++
.../cayenne/CayenneDataObjectValidationIT.java | 4 ++
.../test/java/org/apache/cayenne/CayenneIT.java | 26 ++++++++-
.../org/apache/cayenne/CompoundPkChangeIT.java | 3 ++
.../cayenne/DataContextMaxIdQualifierIT.java | 10 +++-
.../cayenne/DataObjectSerializationIT.java | 5 ++
.../cayenne/FlattenedRelationshipsIT.java | 8 +++
.../org/apache/cayenne/GenericMappingIT.java | 5 ++
.../org/apache/cayenne/ManyToManyNoJoinIT.java | 2 +
.../java/org/apache/cayenne/MeaningfulFKIT.java | 3 ++
.../apache/cayenne/OneWayRelationshipsIT.java | 8 +++
.../cayenne/PersistenceByReachabilityIT.java | 7 +++
.../org/apache/cayenne/PersistentObjectIT.java | 4 ++
.../org/apache/cayenne/PregeneratedPKIT.java | 2 +
.../cayenne/access/DataContextBinaryPKIT.java | 3 ++
.../cayenne/access/DataContextBlobIT.java | 9 +++-
.../cayenne/access/DataContextCallbacksIT.java | 4 ++
.../cayenne/access/DataContextCharPKIT.java | 4 ++
.../cayenne/access/DataContextCharTypeIT.java | 4 +-
.../cayenne/access/DataContextClobIT.java | 6 +++
.../cayenne/access/DataContextCommitIT.java | 2 +
.../access/DataContextCompoundRelIT.java | 4 ++
.../cayenne/access/DataContextCrossDBIT.java | 2 +
.../access/DataContextDataChannelEventsIT.java | 6 +++
.../access/DataContextDecoratedStackIT.java | 3 ++
.../cayenne/access/DataContextDelegateIT.java | 5 ++
.../DataContextDelegateSharedCacheIT.java | 5 ++
.../access/DataContextDeleteRulesIT.java | 8 +++
.../DataContextDisjointByIdPrefetchIT.java | 5 ++
...ataContextDisjointByIdPrefetch_ExtrasIT.java | 7 +++
.../access/DataContextEJBQLArrayResultIT.java | 4 ++
.../access/DataContextEJBQLConditionsIT.java | 20 +++++++
.../DataContextEJBQLConditionsPeopleIT.java | 4 ++
.../access/DataContextEJBQLDeleteIT.java | 5 ++
.../access/DataContextEJBQLFetchJoinIT.java | 6 +++
...ataContextEJBQLFlattenedRelationshipsIT.java | 11 ++++
.../DataContextEJBQLFunctionalExpressions.java | 26 +++++++--
.../access/DataContextEJBQLGroupByHavingIT.java | 12 +++++
.../access/DataContextEJBQLInheritanceIT.java | 2 +
.../access/DataContextEJBQLIsNullIT.java | 8 +++
.../cayenne/access/DataContextEJBQLJoinsIT.java | 9 ++++
.../access/DataContextEJBQLOrderByIT.java | 7 +++
.../cayenne/access/DataContextEJBQLQueryIT.java | 28 ++++++++++
.../access/DataContextEJBQLSubqueryIT.java | 7 +++
.../access/DataContextEJBQLUpdateIT.java | 9 ++++
.../DataContextEntityWithMeaningfulPKIT.java | 6 +++
.../DataContextExtendedTypeOperationsIT.java | 4 ++
.../cayenne/access/DataContextExtrasIT.java | 20 +++++++
.../DataContextFlattenedAttributesIT.java | 13 +++++
.../apache/cayenne/access/DataContextIT.java | 37 +++++++++++++
.../access/DataContextJoinAliasesIT.java | 2 +
.../access/DataContextLocalObjectIT.java | 7 +++
.../cayenne/access/DataContextNoPkIT.java | 3 ++
.../access/DataContextObjectIdQueryIT.java | 4 ++
.../access/DataContextObjectTrackingIT.java | 3 ++
.../cayenne/access/DataContextOrderingIT.java | 3 ++
.../cayenne/access/DataContextOuterJoinsIT.java | 5 ++
.../access/DataContextPaginatedQueryIT.java | 2 +
.../access/DataContextPerformQueryAPIIT.java | 9 ++++
.../access/DataContextPrefetchExtras1IT.java | 2 +
.../access/DataContextPrefetchExtrasIT.java | 4 ++
.../cayenne/access/DataContextPrefetchIT.java | 26 ++++++++-
.../access/DataContextPrefetchMultistepIT.java | 11 +++-
.../DataContextPrefetchQualifierOverlapIT.java | 4 ++
.../access/DataContextProcedureQueryIT.java | 12 +++++
.../access/DataContextQualifiedEntityIT.java | 3 ++
.../access/DataContextQueryCachingIT.java | 5 ++
.../cayenne/access/DataContextQueryChainIT.java | 2 +
.../access/DataContextRefreshQueryIT.java | 13 ++++-
.../cayenne/access/DataContextRefreshingIT.java | 15 ++++++
.../access/DataContextRelationshipQueryIT.java | 3 ++
.../cayenne/access/DataContextRollbackIT.java | 11 +++-
.../access/DataContextSQLTemplateIT.java | 29 +++++++++-
.../DataContextSelectQuerySplitAliasesIT.java | 3 ++
.../access/DataContextSerializationIT.java | 17 ++++--
.../access/DataContextSharedCacheEmpiricIT.java | 4 ++
.../access/DataContextSharedCacheIT.java | 29 +++++++---
.../cayenne/access/DataContextValidationIT.java | 4 ++
.../cayenne/access/DataDomainCallbacksIT.java | 15 +++++-
.../cayenne/access/DataDomainFiltersIT.java | 5 ++
.../org/apache/cayenne/access/DataDomainIT.java | 15 ++++++
.../cayenne/access/DataDomainQueryActionIT.java | 2 +
.../org/apache/cayenne/access/DataNodeIT.java | 6 +++
.../cayenne/access/DataNodeQueriesIT.java | 9 ++++
.../apache/cayenne/access/DataRowStoreIT.java | 13 +++--
.../apache/cayenne/access/DataRowUtilsIT.java | 4 ++
.../apache/cayenne/access/DateTimeTypesIT.java | 8 +++
.../apache/cayenne/access/DbGeneratorIT.java | 7 +++
.../org/apache/cayenne/access/DbLoaderIT.java | 5 ++
.../cayenne/access/DbLoaderPartialIT.java | 2 +
.../apache/cayenne/access/DeleteObjectIT.java | 8 +++
.../apache/cayenne/access/DeleteRulesIT.java | 12 +++++
.../org/apache/cayenne/access/EmbeddingIT.java | 5 ++
.../java/org/apache/cayenne/access/EnumIT.java | 4 ++
.../cayenne/access/FlattenedArcKeyIT.java | 4 ++
.../cayenne/access/FlattenedPrefetchIT.java | 5 ++
.../FlattenedRelationshipInContextIT.java | 2 +
.../cayenne/access/IdentityColumnsIT.java | 11 ++++
.../cayenne/access/IncrementalFaultListIT.java | 2 +
.../apache/cayenne/access/JointPrefetchIT.java | 10 ++++
.../org/apache/cayenne/access/MiscTypesIT.java | 9 +++-
.../access/NestedDataContextLocalCacheIT.java | 2 +
.../access/NestedDataContextParentEventsIT.java | 2 +
.../NestedDataContextParentPeerEventsIT.java | 4 ++
.../access/NestedDataContextPeerEventsIT.java | 5 ++
.../cayenne/access/NestedDataContextReadIT.java | 17 ++++--
.../access/NestedDataContextRollbackIT.java | 3 ++
.../access/NestedDataContextValidationIT.java | 2 +
.../access/NestedDataContextWriteIT.java | 12 +++++
.../access/NestedDataContext_DeadlockIT.java | 8 +--
.../apache/cayenne/access/NumericTypesIT.java | 20 +++++--
.../access/ObjectStoreDiffRetainingIT.java | 3 ++
.../apache/cayenne/access/ObjectStoreGCIT.java | 4 ++
.../apache/cayenne/access/ObjectStoreIT.java | 4 ++
.../cayenne/access/OptimisticLockingIT.java | 26 +++++++--
.../access/PrefetchProcessorTreeBuilderIT.java | 3 ++
.../cayenne/access/PrimitiveAttributesIT.java | 2 +
.../cayenne/access/QuotedIdentifiersIT.java | 13 +++--
.../cayenne/access/ReturnTypesMappingIT.java | 50 ++++++++++++++++-
.../SimpleIdIncrementalFaultListDataRowsIT.java | 13 +++--
.../access/SimpleIdIncrementalFaultListIT.java | 23 ++++++--
.../SimpleIdIncrementalFaultListPrefetchIT.java | 5 ++
.../access/SingleTableInheritance1IT.java | 3 ++
.../access/SingleTableInheritanceIT.java | 18 +++++++
.../org/apache/cayenne/access/ToManyListIT.java | 7 +++
.../cayenne/access/TransactionThreadIT.java | 6 ++-
.../java/org/apache/cayenne/access/UUIDIT.java | 4 ++
.../cayenne/access/UserTransactionIT.java | 2 +
.../cayenne/access/VerticalInheritanceIT.java | 11 ++++
.../access/dbsync/SchemaUpdateStrategyIT.java | 9 ++--
...hrowOnPartialOrCreateSchemaStrategyTest.java | 14 +++--
.../ThrowOnPartialSchemaStrategyTest.java | 8 ++-
.../cayenne/access/jdbc/BatchActionIT.java | 3 ++
.../access/jdbc/BatchActionLockingIT.java | 3 ++
.../access/jdbc/SQLTemplateActionIT.java | 10 ++++
.../cayenne/access/jdbc/SelectActionIT.java | 2 +
.../batch/DefaultBatchTranslatorIT.java | 4 ++
.../batch/DeleteBatchTranslatorIT.java | 6 +++
.../batch/InsertBatchTranslatorIT.java | 4 ++
.../batch/SoftDeleteBatchTranslatorIT.java | 5 ++
.../batch/UpdateBatchTranslatorIT.java | 6 +++
.../ejbql/EJBQLSelectTranslatorIT.java | 24 +++++++++
.../translator/select/OrderingTranslatorIT.java | 7 +++
.../select/QualifierTranslatorIT.java | 7 +++
.../translator/select/QueryAssemblerIT.java | 4 ++
.../translator/select/SelectTranslatorIT.java | 22 ++++++++
.../access/util/DefaultOperationObserverIT.java | 3 ++
.../cayenne/ashwood/AshwoodEntitySorterIT.java | 2 +
.../org/apache/cayenne/cache/QueryCacheIT.java | 4 +-
.../server/JNDIDataSourceFactoryIT.java | 4 ++
.../ServerRuntimeBuilder_InAction_IT.java | 3 ++
.../org/apache/cayenne/conn/PoolManagerIT.java | 7 +++
.../org/apache/cayenne/dba/AutoAdapterIT.java | 3 ++
.../cayenne/dba/ConcurrentPkGeneratorIT.java | 2 +
.../org/apache/cayenne/dba/JdbcAdapterIT.java | 3 ++
.../apache/cayenne/dba/JdbcPkGeneratorIT.java | 2 +
.../org/apache/cayenne/dba/PkGeneratorIT.java | 2 +
.../org/apache/cayenne/dba/TypesMappingIT.java | 5 ++
.../cayenne/dba/hsqldb/HSQLDBAdapterIT.java | 5 +-
.../cayenne/dba/mysql/MySQLAdapterIT.java | 2 +
.../cayenne/dba/oracle/Oracle8AdapterIT.java | 3 ++
.../cayenne/dba/oracle/OracleAdapterIT.java | 3 ++
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 4 ++
.../cayenne/dba/postgres/PostgresAdapterIT.java | 4 +-
.../dba/sqlserver/SQLServerAdapterIT.java | 4 +-
.../dba/sqlserver/SQLServerSnifferIT.java | 2 +
.../ejbql/EJBQLCompiledExpressionIT.java | 6 +++
.../exp/ExpressionFactory_InContextIT.java | 28 ++++++++++
.../cayenne/exp/Expression_InContextIT.java | 3 ++
.../cayenne/exp/ParsedExpQualifierCompatIT.java | 24 +++++++++
.../parser/ExpressionEvaluateInMemoryIT.java | 56 ++++++++++++++++----
.../cayenne/map/ClientEntityResolverIT.java | 10 ++--
.../java/org/apache/cayenne/map/DbEntityIT.java | 17 ++++++
.../apache/cayenne/map/DbRelationshipIT.java | 5 ++
.../java/org/apache/cayenne/map/EntityIT.java | 17 ++++--
.../map/EntityResolverClassDescriptorIT.java | 4 ++
.../map/EntityResolverGenericStackIT.java | 2 +
.../apache/cayenne/map/EntityResolverIT.java | 10 ++++
.../map/EntityResolverInheritanceIT.java | 5 ++
.../org/apache/cayenne/map/ObjEntityIT.java | 36 +++++++++++--
.../apache/cayenne/map/ObjRelationshipIT.java | 21 ++++++++
.../cayenne/merge/AddColumnToModelIT.java | 2 +
.../cayenne/merge/CreateTableToModelIT.java | 2 +
.../cayenne/merge/DropColumnToModelIT.java | 3 ++
.../merge/DropRelationshipToModelIT.java | 2 +
.../cayenne/merge/DropTableToModelIT.java | 2 +
.../apache/cayenne/merge/MergerFactoryIT.java | 7 +++
.../cayenne/merge/SetAllowNullToDbIT.java | 2 +
.../apache/cayenne/merge/SetNotNullToDbIT.java | 6 ++-
.../cayenne/merge/SetPrimaryKeyToDbIT.java | 6 ++-
.../apache/cayenne/merge/ValueForNullIT.java | 2 +
.../org/apache/cayenne/query/EJBQLQueryIT.java | 39 ++++++++++++--
.../cayenne/query/ProcedureQueryCacheKeyIT.java | 6 +++
.../org/apache/cayenne/query/QueryChainIT.java | 3 ++
.../org/apache/cayenne/query/SQLSelectIT.java | 20 ++++++-
.../cayenne/query/SQLTemplateCacheKeyIT.java | 6 +++
.../org/apache/cayenne/query/SQLTemplateIT.java | 16 ++++--
.../org/apache/cayenne/query/SelectByIdIT.java | 12 +++--
.../cayenne/query/SelectQueryCacheKeyIT.java | 12 ++++-
.../query/SelectQueryFetchLimitOrderingIT.java | 2 +
.../org/apache/cayenne/query/SelectQueryIT.java | 51 +++++++++++++++++-
.../SelectQueryPrefetchRouterActionIT.java | 4 ++
...ryPrefetchRouterActionQualifiedEntityIT.java | 3 ++
.../cayenne/query/StatementFetchSizeIT.java | 2 +
.../reflect/LifecycleCallbackRegistryIT.java | 3 ++
...LifecycleCallbackRegistry_InheritanceIT.java | 2 +
.../reflect/MixedPersistenceStrategyIT.java | 3 ++
.../generic/DataObjectDescriptorFactoryIT.java | 3 ++
...jectDescriptorFactory_InheritanceMapsIT.java | 2 +
.../cayenne/tx/DefaultTransactionManagerIT.java | 3 ++
.../java/org/apache/cayenne/unit/di/DICase.java | 16 +++---
.../apache/cayenne/unit/di/DICaseSelfIT.java | 2 +
.../di/DefaultUnitTestLifecycleManager.java | 6 +--
.../unit/di/UnitTestLifecycleManager.java | 6 +--
.../di/server/ServerCaseLifecycleManager.java | 4 +-
.../unit/di/server/ServerCaseSelfIT.java | 2 +
.../org/apache/cayenne/unit/jira/CAY_115IT.java | 3 ++
.../org/apache/cayenne/unit/jira/CAY_191IT.java | 6 ++-
.../org/apache/cayenne/unit/jira/CAY_194IT.java | 3 ++
.../cayenne/util/DeepMergeOperationIT.java | 3 ++
.../util/DeepMergeOperationInheritanceIT.java | 3 ++
.../cayenne/util/EntityMergeSupportIT.java | 8 +--
.../cayenne/util/ShallowMergeOperationIT.java | 4 ++
.../cayenne/velocity/BindDirectiveIT.java | 31 +++++++----
.../cayenne/velocity/ResultDirectiveIT.java | 17 +++---
.../tools/CayenneGeneratorIntegrationTest.java | 18 +++++--
286 files changed, 2378 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
index 31c9d97..43869eb 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
@@ -24,6 +24,9 @@ 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 static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextCayenneIT extends ClientCase {
@@ -40,6 +43,7 @@ public class CayenneContextCayenneIT extends ClientCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testObjectForPK() throws Exception {
context.performGenericQuery(new SQLTemplate(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
index c4af230..f1caca7 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
@@ -32,6 +32,9 @@ import org.apache.cayenne.testdo.mt.ClientMtTable5;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.client.ClientRuntimeProperty;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
/**
* Tests peer context synchronization via ClientChannel events.
@@ -78,6 +81,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
tMtJoin45.setColumns("TABLE4_ID", "TABLE5_ID");
}
+ @Test
public void testSyncNewObject() throws Exception {
CayenneContext c1 = (CayenneContext) runtime.newContext();
@@ -103,6 +107,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncNewDeletedObject() throws Exception {
CayenneContext c1 = (CayenneContext) runtime.newContext();
@@ -128,6 +133,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncNewObjectIntoDirtyContext() throws Exception {
CayenneContext c1 = (CayenneContext) runtime.newContext();
@@ -155,6 +161,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertTrue(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncSimpleProperty() throws Exception {
tMtTable1.insert(1, "g1", "s1");
@@ -185,6 +192,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncToOneRelationship() throws Exception {
tMtTable1.insert(1, "g1", "s1");
@@ -220,6 +228,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncToManyRelationship() throws Exception {
tMtTable1.insert(1, "g1", "s1");
tMtTable2.insert(1, 1, "g1");
@@ -253,6 +262,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncToManyRelationship1() throws Exception {
tMtTable1.insert(1, "g1", "s1");
tMtTable2.insert(1, 1, "g1");
@@ -286,6 +296,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertEquals(2, o2.getTable2Array().size());
}
+ @Test
public void testSyncManyToManyRelationship() throws Exception {
tMtTable4.insert(1);
tMtTable5.insert(1);
@@ -322,6 +333,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
assertFalse(c2.internalGraphManager().hasChanges());
}
+ @Test
public void testSyncManyToManyRelationship1() throws Exception {
CayenneContext c1 = (CayenneContext) runtime.newContext();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
index f9af40f..1c581ab 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.mt.ClientMtDeleteNullify;
import org.apache.cayenne.testdo.mt.ClientMtDeleteRule;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextDeleteRulesIT extends ClientCase {
@@ -33,6 +34,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase {
@Inject
private CayenneContext context;
+ @Test
public void testNullifyToOne() {
ClientMtDeleteNullify object = context.newObject(ClientMtDeleteNullify.class);
@@ -52,6 +54,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase {
context.commitChanges();
}
+ @Test
public void testDenyToOne() {
ClientMtDeleteDeny object = context.newObject(ClientMtDeleteDeny.class);
@@ -72,6 +75,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase {
context.commitChanges();
}
+ @Test
public void testCascadeToOne() {
ClientMtDeleteCascade object = context.newObject(ClientMtDeleteCascade.class);
@@ -91,6 +95,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase {
context.commitChanges();
}
+ @Test
public void testCascadeToOneNewObject() {
ClientMtDeleteRule related = context.newObject(ClientMtDeleteRule.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
index f9805fa..dd83141 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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 java.util.List;
@@ -53,6 +54,7 @@ public class CayenneContextEJBQLIT extends ClientCase {
tMtTable1.insert(2, "g2", "s2");
}
+ @Test
public void testEJBQLSelect() throws Exception {
createTwoRecords();
@@ -62,6 +64,7 @@ public class CayenneContextEJBQLIT extends ClientCase {
assertEquals(2, results.size());
}
+ @Test
public void testEJBQLSelectScalar() throws Exception {
createTwoRecords();
@@ -71,6 +74,7 @@ public class CayenneContextEJBQLIT extends ClientCase {
assertEquals(Long.valueOf(2), results.get(0));
}
+ @Test
public void testEJBQLSelectMixed() throws Exception {
createTwoRecords();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
index 1469c8b..a3d67d8 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.unit.di.DataChannelSyncStats;
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;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextGraphDiffCompressorIT extends ClientCase {
@@ -36,6 +37,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase {
@Inject
protected CayenneContext context;
+ @Test
public void testMultipleSimpleProperties() {
ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
@@ -54,6 +56,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase {
assertEquals(1, stats.nodesCreated);
}
+ @Test
public void testComplimentaryArcs() {
ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
@@ -75,6 +78,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase {
assertEquals(0, stats.arcsDeleted);
}
+ @Test
public void testDelete() {
ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
index 588d56e..c005543 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
@@ -39,6 +39,7 @@ 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.apache.cayenne.util.GenericResponse;
+import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -49,7 +50,7 @@ import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.when;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextIT extends ClientCase {
@@ -57,6 +58,7 @@ public class CayenneContextIT extends ClientCase {
@Inject
private ObjectContext serverContext;
+ @Test
public void testConstructor() {
CayenneContext context = new CayenneContext();
@@ -70,6 +72,7 @@ public class CayenneContextIT extends ClientCase {
assertSame(channel, context.getChannel());
}
+ @Test
public void testChannel() {
MockDataChannel channel = new MockDataChannel();
CayenneContext context = new CayenneContext(channel);
@@ -77,6 +80,7 @@ public class CayenneContextIT extends ClientCase {
assertSame(channel, context.getChannel());
}
+ @Test
public void testCommitUnchanged() {
MockDataChannel channel = new MockDataChannel();
@@ -87,6 +91,7 @@ public class CayenneContextIT extends ClientCase {
assertTrue(channel.getRequestObjects().isEmpty());
}
+ @Test
public void testCommitCommandExecuted() {
MockDataChannel channel = new MockDataChannel(new MockGraphDiff());
@@ -111,6 +116,7 @@ public class CayenneContextIT extends ClientCase {
assertTrue(mainMessage instanceof GraphDiff);
}
+ @Test
public void testCommitChangesNew() {
final CompoundDiff diff = new CompoundDiff();
final Object newObjectId = new ObjectId("test", "key", "generated");
@@ -157,6 +163,7 @@ public class CayenneContextIT extends ClientCase {
assertSame(object, context.graphManager.getNode(newObjectId));
}
+ @Test
public void testNewObject() {
CayenneContext context = new CayenneContext(new MockDataChannel());
@@ -182,6 +189,7 @@ public class CayenneContextIT extends ClientCase {
assertTrue(object.getObjectId().isTemporary());
}
+ @Test
public void testDeleteObject() {
CayenneContext context = new CayenneContext(new MockDataChannel());
@@ -238,6 +246,7 @@ public class CayenneContextIT extends ClientCase {
assertEquals(PersistenceState.DELETED, committed.getPersistenceState());
}
+ @Test
public void testBeforePropertyReadShouldInflateHollow() {
ObjectId gid = new ObjectId("MtTable1", "a", "b");
@@ -303,6 +312,7 @@ public class CayenneContextIT extends ClientCase {
assertEquals(PersistenceState.COMMITTED, hollow.getPersistenceState());
}
+ @Test
public void testBeforeHollowDeleteShouldChangeStateToCommited() {
ObjectId gid = new ObjectId("MtTable1", "a", "b");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
index ec8c43a..b9fbb2b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
@@ -27,9 +27,10 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable1Subclass1;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextInheritanceIT extends ClientCase {
@@ -59,6 +60,7 @@ public class CayenneContextInheritanceIT extends ClientCase {
Types.VARCHAR);
}
+ @Test
public void testInsertSubclass() throws Exception {
ClientMtTable1Subclass1 object = context.newObject(ClientMtTable1Subclass1.class);
@@ -74,6 +76,7 @@ public class CayenneContextInheritanceIT extends ClientCase {
assertEquals("suba1", tMtTable1.getString("SUBCLASS_ATTRIBUTE1"));
}
+ @Test
public void testPerformQueryInheritanceLeaf() throws Exception {
tMtTable1.insert(1, "xxx", "yyy", null);
@@ -87,6 +90,7 @@ public class CayenneContextInheritanceIT extends ClientCase {
assertEquals("sa1", objects.get(0).getSubclass1Attribute1());
}
+ @Test
public void testPerformQueryInheritanceSuper() throws Exception {
tMtTable1.insert(1, "a", "yyy", null);
@@ -116,6 +120,7 @@ public class CayenneContextInheritanceIT extends ClientCase {
assertEquals(2, checkedFields);
}
+ @Test
public void testPerformQueryWithQualifierInheritanceSuper() throws Exception {
tMtTable1.insert(1, "a", "XX", null);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
index 0ff92b1..e080def 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
@@ -28,8 +28,9 @@ import org.apache.cayenne.testdo.mt.ClientMtMapToManyTarget;
import org.apache.cayenne.testdo.mt.MtMapToMany;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
-import java.util.Map;
+import java.util.Map;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMapRelationshipIT extends ClientCase {
@@ -60,6 +61,7 @@ public class CayenneContextMapRelationshipIT extends ClientCase {
tMtMapToManyTarget.insert(1, 1).insert(2, 1).insert(3, 1).insert(4, 2);
}
+ @Test
public void testReadToMany() throws Exception {
createTwoMapToManysWithTargetsDataSet();
@@ -79,6 +81,7 @@ public class CayenneContextMapRelationshipIT extends ClientCase {
assertNotNull(targets.get(new Integer(3)));
}
+ @Test
public void testAddToMany() throws Exception {
createTwoMapToManysWithTargetsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
index a5b4815..7fd1c0d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
@@ -24,8 +24,9 @@ import org.apache.cayenne.graph.GraphEvent;
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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mock;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMergeHandlerIT extends ClientCase {
@@ -33,6 +34,7 @@ public class CayenneContextMergeHandlerIT extends ClientCase {
@Inject
protected CayenneContext context;
+ @Test
public void testShouldProcessEvent() {
CayenneContextMergeHandler handler = new CayenneContextMergeHandler(context);
@@ -63,6 +65,7 @@ public class CayenneContextMergeHandlerIT extends ClientCase {
assertFalse(handler.shouldProcessEvent(e4));
}
+ @Test
public void testNodePropertyChanged() {
ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
index f286274..ade7590 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
@@ -27,9 +27,10 @@ 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 java.util.Collections;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextNamedQueryCachingIT extends ClientCase {
@@ -60,6 +61,7 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase {
tMtTable1.insert(3, "g3", "s3");
}
+ @Test
public void testLocalCache() throws Exception {
createThreeMtTable1sDataSet();
@@ -83,6 +85,7 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase {
assertEquals(3, result3.size());
}
+ @Test
public void testLocalCacheParameterized() throws Exception {
createThreeMtTable1sDataSet();
@@ -121,7 +124,8 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase {
});
}
-
+
+ @Test
public void testParameterizedMappedToEJBQLQueries() throws Exception {
createThreeMtTable1sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
index e59bcc9..3a90802 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
@@ -27,8 +27,9 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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 java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPaginatedListCachingIT extends ClientCase {
@@ -56,6 +57,7 @@ public class CayenneContextPaginatedListCachingIT extends ClientCase {
}
}
+ @Test
public void testLocalCache() throws Exception {
createSevenMtTable1sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
index e3865d0..fd3b795 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
@@ -28,9 +28,10 @@ import org.apache.cayenne.testdo.mt.MtTablePrimitives;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPrimitiveIT extends ClientCase {
@@ -64,6 +65,7 @@ public class CayenneContextPrimitiveIT extends ClientCase {
tMtTablePrimitives.insert(2, accessStackAdapter.supportsBoolean() ? false : 0, 5);
}
+ @Test
public void testSelectPrimitives() throws Exception {
createTwoPrimitivesDataSet();
@@ -78,6 +80,7 @@ public class CayenneContextPrimitiveIT extends ClientCase {
assertEquals(5, results.get(1).getIntColumn());
}
+ @Test
public void testCommitChangesPrimitives() throws Exception {
ClientMtTablePrimitives object = context.newObject(ClientMtTablePrimitives.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
index 2100320..908abe7 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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 static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextRefreshQueryIT extends ClientCase {
@@ -59,6 +60,7 @@ public class CayenneContextRefreshQueryIT extends ClientCase {
tMtTable2.delete().where("TABLE2_ID", 1).execute();
}
+ @Test
public void testRefreshToMany() throws Exception {
createM1AndTwoM2sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
index fbc9f20..458b58b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
@@ -28,6 +28,9 @@ import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.testdo.mt.MtTable2;
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 CayenneContextRelationshipsIT extends ClientCase {
@@ -59,6 +62,7 @@ public class CayenneContextRelationshipsIT extends ClientCase {
tMtTable2.setColumns("TABLE2_ID", "TABLE1_ID", "GLOBAL_ATTRIBUTE");
}
+ @Test
public void testLostUncommittedToOneModifications_Client() throws Exception {
tMtTable1.insert(1, "G1", "S1");
@@ -79,6 +83,7 @@ public class CayenneContextRelationshipsIT extends ClientCase {
assertSame(r2, o.getTable1());
}
+ @Test
public void testLostUncommittedToOneModifications_Server() throws Exception {
tMtTable1.insert(1, "G1", "S1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
index 1cd129b..555dbce 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
@@ -24,6 +24,10 @@ 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 static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextSQLTemplateIT extends ClientCase {
@@ -40,6 +44,7 @@ public class CayenneContextSQLTemplateIT extends ClientCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testObjectRoot() throws Exception {
assertNull(Cayenne.objectForPK(context, ClientMtTable1.class, 1));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
index 4faed91..a0cfaa2 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2;
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 CayenneContextServerDiffsIT extends ClientCase {
@@ -38,6 +39,7 @@ public class CayenneContextServerDiffsIT extends ClientCase {
@Inject
private CayenneContext context;
+ @Test
public void testReturnDiffInPrePersist() {
LifecycleCallbackRegistry callbackRegistry = clientServerChannel
@@ -65,6 +67,7 @@ public class CayenneContextServerDiffsIT extends ClientCase {
}
}
+ @Test
public void testReturnDiffInPreUpdate() {
LifecycleCallbackRegistry callbackRegistry = clientServerChannel
.getEntityResolver()
@@ -96,6 +99,7 @@ public class CayenneContextServerDiffsIT extends ClientCase {
}
}
+ @Test
public void testReturnDiffClientArcChanges() {
LifecycleCallbackRegistry callbackRegistry = clientServerChannel
@@ -123,6 +127,7 @@ public class CayenneContextServerDiffsIT extends ClientCase {
}
}
+ @Test
public void testReturnDiffServerArcChanges() {
LifecycleCallbackRegistry callbackRegistry = clientServerChannel
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
index f8e3c78..37ff005 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
@@ -26,6 +26,9 @@ 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.apache.cayenne.validation.ValidationException;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextValidationIT extends ClientCase {
@@ -42,6 +45,7 @@ public class CayenneContextValidationIT extends ClientCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testValidate() throws Exception {
ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
index a5cf087..ed19ebe 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne;
-import java.sql.Types;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.cayenne.access.ClientServerChannel;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
@@ -46,6 +42,19 @@ 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 java.sql.Types;
+import java.util.Iterator;
+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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextWithDataContextIT extends ClientCase {
@@ -103,6 +112,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testLocalCacheStaysLocal() {
DataContext serverContext = (DataContext) clientServerChannel.getParentChannel();
@@ -122,6 +132,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertEquals(0, serverContext.getQueryCache().size());
}
+ @Test
public void testAddToList() throws Exception {
ClientMtTable1 t1 = clientContext.newObject(ClientMtTable1.class);
@@ -140,6 +151,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertSame(t3, t4.getTable1());
}
+ @Test
public void testSetValueHolder() throws Exception {
ClientMtTable1 t1 = clientContext.newObject(ClientMtTable1.class);
@@ -150,6 +162,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertSame(t1, t2.getTable1());
}
+ @Test
public void testPostAddCallback() throws Exception {
LifecycleCallbackRegistry callbackRegistry = clientServerChannel
@@ -198,6 +211,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testPostAddOnObjectCallback() throws Exception {
final DataContext serverContext = (DataContext) clientServerChannel.getParentChannel();
@@ -235,6 +249,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testPreRemoveCallback() throws Exception {
// an exception was triggered within POST_LOAD callback
@@ -288,6 +303,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testCAY830() throws Exception {
// an exception was triggered within POST_LOAD callback
@@ -341,6 +357,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testRollbackChanges() throws Exception {
ClientMtTable1 o = clientContext.newObject(ClientMtTable1.class);
@@ -356,6 +373,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertTrue(clientContext.modifiedObjects().isEmpty());
}
+ @Test
public void testCreateFault() throws Exception {
tMtTable1.insert(1, "g1", "s1");
@@ -377,6 +395,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertEquals(PersistenceState.COMMITTED, o.getPersistenceState());
}
+ @Test
public void testCreateBadFault() throws Exception {
tMtTable1.insert(1, "g1", "s1");
@@ -397,6 +416,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
}
}
+ @Test
public void testMeaningfulPK() throws Exception {
deleteAndCreateTwoMeaningfulPKsDataSet();
@@ -407,6 +427,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertEquals(2, results.size());
}
+ @Test
public void testPrefetchingToOne() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -440,6 +461,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
});
}
+ @Test
public void testPrefetchingToOneNull() throws Exception {
tMtTable2.insert(15, null, "g3");
@@ -463,6 +485,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
});
}
+ @Test
public void testPrefetchingToMany() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -497,6 +520,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
});
}
+ @Test
public void testPerformPaginatedQuery() throws Exception {
createEightMtTable1s();
@@ -507,6 +531,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
assertTrue(objects instanceof RemoteIncrementalFaultList);
}
+ @Test
public void testPrefetchingToManyEmpty() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -530,6 +555,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
});
}
+ @Test
public void testOIDQueryInterception() throws Exception {
final ClientMtTable1 o = clientContext.newObject(ClientMtTable1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
index 937f39c..7affd25 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.cayenne;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.graph.GraphChangeHandler;
@@ -28,22 +25,31 @@ import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.remote.RemoteCayenneCase;
+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.testdo.mt.ClientMtTooneDep;
import org.apache.cayenne.testdo.mt.ClientMtTooneMaster;
-import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.testdo.testmap.Painting;
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 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.Iterator;
+import java.util.List;
/**
* Tests nested object contexts
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class NestedCayenneContextIT extends RemoteCayenneCase {
@Inject
@@ -55,6 +61,19 @@ public class NestedCayenneContextIT 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 NestedCayenneContextIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
super.setUpAfterInjection();
@@ -63,6 +82,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
dbHelper.deleteAll("MT_TABLE1");
}
+ @Test
public void testChannels() {
ObjectContext child = runtime.newContext(clientContext);
@@ -76,6 +96,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertSame(child, grandchild.getChannel());
}
+ @Test
public void testSelect() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
@@ -113,6 +134,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
}
}
+ @Test
public void testPrefetchingToOne() throws Exception {
final ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class);
clientContext.newObject(ClientMtTable1.class);
@@ -151,6 +173,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
});
}
+ @Test
public void testPrefetchingToMany() throws Exception {
ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class);
mt11.setGlobalAttribute1("1");
@@ -204,6 +227,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
});
}
+ @Test
public void testDeleteNew() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
@@ -228,6 +252,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
/**
* A test case for CAY-698 bug.
*/
+ @Test
public void testNullifyToOne() throws Exception {
ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
ClientMtTable2 b = clientContext.newObject(ClientMtTable2.class);
@@ -304,6 +329,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
});
}
+ @Test
public void testCommitChangesToParent() throws Exception {
clientContext.newObject(ClientMtTable1.class);
clientContext.newObject(ClientMtTable1.class);
@@ -426,6 +452,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
});
}
+ @Test
public void testCommitChangesToParentDeleted() throws Exception {
clientContext.newObject(ClientMtTable1.class);
clientContext.newObject(ClientMtTable1.class);
@@ -468,6 +495,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
/*
* was added for CAY-1636
*/
+ @Test
public void testCAY1636() throws Exception {
ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class);
@@ -506,6 +534,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
}
+ @Test
public void testCAY1636_2() throws Exception {
ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class);
@@ -552,6 +581,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
}
+ @Test
public void testCommitChanges() throws Exception {
clientContext.newObject(ClientMtTable1.class);
clientContext.newObject(ClientMtTable1.class);
@@ -623,6 +653,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertNotNull(parentHollow);
}
+ @Test
public void testAddRemove() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
@@ -647,6 +678,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
}
+ @Test
public void testChangeRel() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
@@ -679,6 +711,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertEquals(0, parentA.getTable2Array().size());
}
+ @Test
public void testCAY1183() throws Exception {
ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
clientContext.commitChanges();
@@ -701,6 +734,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
/**
* CAY1714
*/
+ @Test
public void testQueriesOnTemporaryObject() throws Exception {
ObjectContext clientContext = runtime.newContext((DataChannel) this.clientContext);
ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
@@ -717,6 +751,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertNull(childMt2.getTable3());
}
+ @Test
public void testCAY1194() throws Exception {
ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
ObjectContext child = runtime.newContext(clientContext);
@@ -740,6 +775,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertEquals(parentMt.getTable2Array().get(0).getObjectContext(), clientContext);
}
+ @Test
public void testCommitChangesToParentOneToMany() throws Exception {
ObjectContext child = runtime.newContext(clientContext);
@@ -801,6 +837,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
assertEquals(2, arcDiffs[0]);
}
+ @Test
public void testCommitChangesToParentOneToOne() 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/PersistentObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
index f9775a4..da6cac9 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
@@ -30,8 +30,9 @@ import org.apache.cayenne.testdo.mt.MtTable2;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.PersistentObjectHolder;
+import org.junit.Test;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class PersistentObjectInContextIT extends ClientCase {
@@ -65,6 +66,7 @@ public class PersistentObjectInContextIT extends ClientCase {
tMtTable2.insert(2, 1, "g2");
}
+ @Test
public void testResolveToManyReverseResolved() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -89,6 +91,7 @@ public class PersistentObjectInContextIT extends ClientCase {
}
}
+ @Test
public void testToOneRelationship() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -107,6 +110,7 @@ public class PersistentObjectInContextIT extends ClientCase {
assertEquals("g1", mtTable1.getGlobalAttribute1());
}
+ @Test
public void testResolveToOneReverseResolved() throws Exception {
createTwoMtTable1sAnd2sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
index f5cd8f1..140f6e2 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
@@ -48,8 +48,9 @@ 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.apache.cayenne.util.EqualsBuilder;
+import org.junit.Test;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelIT extends ClientCase {
@@ -101,6 +102,7 @@ public class ClientServerChannelIT extends ClientCase {
tMtTable2.insert(2, 1, "g2");
}
+ @Test
public void testGetEntityResolver() throws Exception {
EntityResolver resolver = clientServerChannel.getEntityResolver();
assertNotNull(resolver);
@@ -108,6 +110,7 @@ public class ClientServerChannelIT extends ClientCase {
assertNotNull(resolver.getClientEntityResolver().getObjEntity(ClientMtTable1.class));
}
+ @Test
public void testSynchronizeCommit() throws Exception {
SelectQuery query = new SelectQuery(MtTable1.class);
@@ -124,6 +127,7 @@ public class ClientServerChannelIT extends ClientCase {
assertEquals(1, serverContext.performQuery(query).size());
}
+ @Test
public void testPerformQueryObjectIDInjection() throws Exception {
tMtTable1.insert(55, "g1", "s1");
@@ -145,6 +149,7 @@ public class ClientServerChannelIT extends ClientCase {
assertEquals(new ObjectId("MtTable1", MtTable1.TABLE1_ID_PK_COLUMN, 55), clientObject.getObjectId());
}
+ @Test
public void testPerformQueryValuePropagation() throws Exception {
byte[] bytes = new byte[] { 1, 2, 3 };
@@ -170,6 +175,7 @@ public class ClientServerChannelIT extends ClientCase {
assertTrue(new EqualsBuilder().append(clientObject.getBinaryColumn(), bytes).isEquals());
}
+ @Test
public void testPerformQueryPropagationInheritance() throws Exception {
tMtTable1.insert(65, "sub1", "xyz");
@@ -191,6 +197,7 @@ public class ClientServerChannelIT extends ClientCase {
assertEquals("sub1", clientObject.getGlobalAttribute1());
}
+ @Test
public void testOnQuery() {
final boolean[] genericDone = new boolean[1];
@@ -209,6 +216,7 @@ public class ClientServerChannelIT extends ClientCase {
assertTrue(genericDone[0]);
}
+ @Test
public void testOnQueryPrefetchingToMany() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -234,6 +242,7 @@ public class ClientServerChannelIT extends ClientCase {
});
}
+ @Test
public void testOnQueryPrefetchingToManyEmpty() throws Exception {
createTwoMtTable1sAnd2sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
index 3210bbe..d4da266 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
@@ -35,9 +35,10 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.PersistentObjectHolder;
import org.apache.cayenne.util.PersistentObjectList;
+import org.junit.Test;
import java.util.Collections;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelQueryIT extends ClientCase {
@@ -82,6 +83,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
tMtTable2.insert(2, 1, "g2");
}
+ @Test
public void testPaginatedQueryServerCacheOverflow() throws Exception {
createSevenMtTable1sDataSet();
@@ -104,6 +106,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(3) instanceof ClientMtTable1);
}
+ @Test
public void testParameterizedMappedToEJBQLQueries() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -113,7 +116,8 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertEquals(1, r1.size());
assertTrue(r1.get(0) instanceof ClientMtTable1);
}
-
+
+ @Test
public void testNamedQuery() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -124,6 +128,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(0) instanceof ClientMtTable1);
}
+ @Test
public void testSelectQueryEntityNameRoot() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -135,6 +140,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(0) instanceof ClientMtTable1);
}
+ @Test
public void testSelectQueryClientClassRoot() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -145,6 +151,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(0) instanceof ClientMtTable1);
}
+ @Test
public void testSelectQuerySimpleQualifier() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -157,6 +164,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(0) instanceof ClientMtTable1);
}
+ @Test
public void testSelectQueryToManyRelationshipQualifier() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -168,6 +176,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(results.get(0) instanceof ClientMtTable1);
}
+ @Test
public void testSelectQueryOrdering() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -195,6 +204,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertTrue(o3.getGlobalAttribute1().compareTo(o4.getGlobalAttribute1()) > 0);
}
+ @Test
public void testSelectQueryPrefetchToOne() throws Exception {
createTwoMtTable1sAnd2sDataSet();
@@ -217,6 +227,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
assertNotNull(target);
}
+ @Test
public void testSelectQueryPrefetchToMany() throws Exception {
createTwoMtTable1sAnd2sDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
index b2a9549..b0add33 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
@@ -22,13 +22,15 @@ import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Collections;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientEntityResolverIT extends ClientCase {
+ @Test
public void testSerializabilityWithHessian() throws Exception {
ObjEntity entity = new ObjEntity("test_entity");
entity.setClassName(Artist.class.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
index 643de29..2c2f006 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
@@ -31,11 +31,12 @@ 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 java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientExpressionIT extends ClientCase {
@@ -68,7 +69,8 @@ public class ClientExpressionIT extends ClientCase {
tMtTable2.insert(i + 10, i, "2_global" + (i + 10));
}
}
-
+
+ @Test
public void testPersistentValueInExpression() throws Exception {
ClientMtTable1 t1 = context.newObject(ClientMtTable1.class);
ClientMtTable1 t2 = context.newObject(ClientMtTable1.class);
@@ -82,7 +84,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(t1.getObjectId(), ((ASTEqual)list.getOperand(0)).getOperand(1));
assertEquals(t2.getObjectId(), ((ASTEqual)list.getOperand(1)).getOperand(1));
}
-
+
+ @Test
public void testListInASTList() throws Exception {
ClientMtTable1 t1 = context.newObject(ClientMtTable1.class);
ClientMtTable1 t2 = context.newObject(ClientMtTable1.class);
@@ -109,7 +112,8 @@ public class ClientExpressionIT extends ClientCase {
assertNotSame(t1.getObjectId(), values[0]);
assertNotSame(t2.getObjectId(), values[1]);
}
-
+
+ @Test
public void testArrayInASTList() throws Exception {
ClientMtTable1 t1 = context.newObject(ClientMtTable1.class);
ClientMtTable1 t2 = context.newObject(ClientMtTable1.class);
@@ -140,7 +144,8 @@ public class ClientExpressionIT extends ClientCase {
assertNotSame(t1.getObjectId(), values[0]);
assertNotSame(t2.getObjectId(), values[1]);
}
-
+
+ @Test
public void testExpressionFactoryMatch() throws Exception {
createDataSet();
@@ -167,7 +172,8 @@ public class ClientExpressionIT extends ClientCase {
assertNotNull(table2List);
assertEquals(2, table2List.size());
}
-
+
+ @Test
public void testExpressionFactoryMatchAll() throws Exception {
createDataSet();
@@ -186,7 +192,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(1, table1List.size());
}
-
+
+ @Test
public void testExpressionFactoryMatchAny() throws Exception {
createDataSet();
@@ -203,7 +210,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(2, table2List.size());
}
-
+
+ @Test
public void testExpressionFactoryIn() throws Exception {
createDataSet();
@@ -228,7 +236,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(4, table2List.size());
}
-
+
+ @Test
public void testExpressionFactoryBetween() throws Exception {
createDataSet();
@@ -253,7 +262,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(6, table2List.size());
}
-
+
+ @Test
public void testExpressionFactoryOperators() throws Exception {
createDataSet();
@@ -291,7 +301,8 @@ public class ClientExpressionIT extends ClientCase {
assertEquals(14, table2List.size());
}
-
+
+ @Test
public void testExpressionWithParameters() throws Exception {
createDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
index 2eabb35..a706de1 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
@@ -27,8 +27,9 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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 java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientSelectQueryExpressionIT extends ClientCase {
@@ -56,6 +57,7 @@ public class ClientSelectQueryExpressionIT extends ClientCase {
}
}
+ @Test
public void testDoubleSelectLikeExpression() throws Exception {
createMtTable1DataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
index 66d3b94..72f505d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
@@ -28,8 +28,9 @@ import org.apache.cayenne.testdo.mt.MtTable1Subclass2;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
-import java.util.List;
+import java.util.List;import static org.junit.Assert.*;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class SelectQueryAbstractEntityIT extends ServerCase {
@@ -61,7 +62,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase {
}
}
-
+
+ @Test
public void testSublclassEntitySelect() throws Exception{
createDataSet();
@@ -76,7 +78,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase {
assertNotNull(sub1List);
assertNotNull(sub2List);
}
-
+
+ @Test
public void test1AbstractEntitySelect() throws Exception{
createDataSet();
@@ -91,7 +94,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase {
}
}
}
-
+
+ @Test
public void test2AbstractEntitySelect() throws Exception{
createDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
index 08df05f..c153b79 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
@@ -18,13 +18,36 @@
****************************************************************/
package org.apache.cayenne.remote;
+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 CayenneContextDeletionIT extends RemoteCayenneCase {
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION},
+ {LocalConnection.JAVA_SERIALIZATION},
+ {LocalConnection.NO_SERIALIZATION},
+ });
+ }
+
+ public CayenneContextDeletionIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Test
public void testDeletion() {
ClientMtTable1 object = clientContext.newObject(ClientMtTable1.class);
clientContext.commitChanges();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
index d3e9e52..2fa875b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2;
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.ArrayList;
import java.util.List;
@@ -46,6 +47,7 @@ public class ClientChannelServerDiffsIT extends ClientCase {
@Inject
private ClientConnection connection;
+ @Test
public void testReturnIdDiff() {
final Object[] ids = new Object[2];
@@ -91,6 +93,7 @@ public class ClientChannelServerDiffsIT extends ClientCase {
assertFalse(((ObjectId) ids[1]).isTemporary());
}
+ @Test
public void testReturnDiffInPrePersist() {
final List<GenericDiff> diffs = new ArrayList<GenericDiff>();
@@ -167,6 +170,7 @@ public class ClientChannelServerDiffsIT extends ClientCase {
}
}
+ @Test
public void testReturnDiffClientArcChanges() {
final NoopGraphChangeHandler diffReader = new NoopGraphChangeHandler();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
index a3ff1b5..8f4f6ca 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
@@ -22,16 +22,25 @@ 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.persistent.Continent;
import org.apache.cayenne.testdo.persistent.Country;
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;
/**
* Test for entites that are implemented in same class on client and server
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+@RunWith(value=Parameterized.class)
public class LightSuperClassIT extends RemoteCayenneCase {
@Inject
@@ -39,6 +48,21 @@ public class LightSuperClassIT extends RemoteCayenneCase {
private boolean server;
+ @Parameters
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {LocalConnection.HESSIAN_SERIALIZATION, true},
+ {LocalConnection.JAVA_SERIALIZATION, true},
+ {LocalConnection.NO_SERIALIZATION, true},
+ {LocalConnection.NO_SERIALIZATION, false},
+ });
+ }
+
+ public LightSuperClassIT(int serializationPolicy, boolean server) {
+ super.serializationPolicy = serializationPolicy;
+ this.server = server;
+ }
+
@Override
public void setUpAfterInjection() throws Exception {
super.setUpAfterInjection();
@@ -47,16 +71,6 @@ public class LightSuperClassIT extends RemoteCayenneCase {
dbHelper.deleteAll("COUNTRY");
}
- @Override
- public void runBare() throws Throwable {
- server = true;
- super.runBare();
- server = false;
-
- // testing ROP with all serialization policies
- runBareSimple();
- }
-
private ObjectContext createContext() {
if (server) {
return serverContext;
@@ -66,6 +80,7 @@ public class LightSuperClassIT extends RemoteCayenneCase {
}
}
+ @Test
public void testServer() throws Exception {
ObjectContext context = createContext();
Continent continent = context.newObject(Continent.class);
[11/12] git commit: adding generics spec to the new parameterized
tests
Posted by aa...@apache.org.
adding generics spec to the new parameterized tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2430e941
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2430e941
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2430e941
Branch: refs/heads/master
Commit: 2430e941dead66cbe8c8f8ed7508d48d098e84dd
Parents: e2a965f
Author: aadamchik <aa...@apache.org>
Authored: Tue Nov 4 20:13:09 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Tue Nov 4 20:14:00 2014 +0300
----------------------------------------------------------------------
.../src/test/java/org/apache/cayenne/NestedCayenneContextIT.java | 2 +-
.../java/org/apache/cayenne/remote/CayenneContextDeletionIT.java | 2 +-
.../src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java | 2 +-
.../java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java | 2 +-
.../apache/cayenne/remote/NestedObjectContextParentEventsIT.java | 2 +-
.../org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java | 2 +-
.../org/apache/cayenne/remote/NestedObjectContextRollbackIT.java | 2 +-
.../java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java | 2 +-
.../test/java/org/apache/cayenne/remote/RelationshipChangeIT.java | 2 +-
.../src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java | 2 +-
.../src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java | 2 +-
.../src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
index 7affd25..8420770 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
@@ -62,7 +62,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase {
private DataChannelInterceptor queryInterceptor;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
index c153b79..686b9ae 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
@@ -35,7 +35,7 @@ import java.util.Collection;
public class CayenneContextDeletionIT extends RemoteCayenneCase {
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
index 8f4f6ca..b0b600d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
@@ -49,7 +49,7 @@ public class LightSuperClassIT extends RemoteCayenneCase {
private boolean server;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION, true},
{LocalConnection.JAVA_SERIALIZATION, true},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 7347063..29eaf61 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
@@ -41,7 +41,7 @@ import java.util.List;
public class NestedObjectContextLocalIT extends RemoteCayenneCase {
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 d36f07f..53ed7ac 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
@@ -46,7 +46,7 @@ public class NestedObjectContextParentEventsIT extends RemoteCayenneCase {
private ClientRuntime runtime;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 e9139e6..bc86734 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
@@ -48,7 +48,7 @@ public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {
private DBHelper dbHelper;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 931be97..9f7df82 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
@@ -41,7 +41,7 @@ public class NestedObjectContextRollbackIT extends RemoteCayenneCase {
private ClientRuntime runtime;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 299bb3d..0eb0226 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
@@ -49,7 +49,7 @@ public class ROPPrefetchToManyMapIT extends RemoteCayenneCase {
private DataChannelInterceptor queryInterceptor;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 26877de..ad88348 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
@@ -39,7 +39,7 @@ import java.util.Collection;
public class RelationshipChangeIT extends RemoteCayenneCase {
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 87d2be5..17c3973 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
@@ -38,7 +38,7 @@ public class RemoteCallbacksIT extends RemoteCayenneCase implements LifecycleLis
private int added, loaded, prePersisted, postPersisted, preRemoved, postRemoved, preUpdated, postUpdated;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 a200247..aeff54a 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
@@ -40,7 +40,7 @@ import java.util.Collection;
public class RemoteRollbackIT extends RemoteCayenneCase {
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2430e941/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 a289a42..a86b12e 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
@@ -44,7 +44,7 @@ public class ValueInjectorIT extends RemoteCayenneCase {
protected DataContext serverContext;
@Parameters
- public static Collection data() {
+ public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{LocalConnection.HESSIAN_SERIALIZATION},
{LocalConnection.JAVA_SERIALIZATION},
[02/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
index 7c4f6c9..b99c369 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
@@ -19,9 +19,6 @@
package org.apache.cayenne.exp.parser;
-import java.math.BigDecimal;
-import java.sql.Types;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -38,6 +35,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.math.BigDecimal;
+import java.sql.Types;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ExpressionEvaluateInMemoryIT extends ServerCase {
@@ -80,6 +81,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
tPainting.insert(3, null, "P3", 3000);
}
+ @Test
public void testEvaluateOBJ_PATH_DataObject() throws Exception {
ASTObjPath node = new ASTObjPath("artistName");
@@ -92,6 +94,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertEquals("123", node.evaluate(a2));
}
+ @Test
public void testEvaluateOBJ_PATH_JavaBean() throws Exception {
ASTObjPath node = new ASTObjPath("property2");
@@ -104,6 +107,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertEquals(new Integer(-3), node.evaluate(b2));
}
+ @Test
public void testEvaluateOBJ_PATH_ObjEntity() throws Exception {
ASTObjPath node = new ASTObjPath("paintingArray.paintingTitle");
@@ -113,6 +117,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue(target instanceof ObjAttribute);
}
+ @Test
public void testEvaluateDB_PATH_DbEntity() throws Exception {
Expression e = Expression.fromString("db:paintingArray.PAINTING_TITLE");
@@ -126,6 +131,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue(dbTarget instanceof DbAttribute);
}
+ @Test
public void testEvaluateEQUAL_TOBigDecimal() throws Exception {
BigDecimal bd1 = new BigDecimal("2.0");
BigDecimal bd2 = new BigDecimal("2.0");
@@ -147,6 +153,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(equalTo.match(p));
}
+ @Test
public void testEvaluateEQUAL_TO() throws Exception {
Expression equalTo = new ASTEqual(new ASTObjPath("artistName"), "abc");
Expression notEqualTo = new ASTNotEqual(new ASTObjPath("artistName"), "abc");
@@ -162,6 +169,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + notEqualTo, notEqualTo.match(noMatch));
}
+ @Test
public void testEvaluateEQUAL_TO_Null() throws Exception {
Expression equalToNull = new ASTEqual(new ASTObjPath("artistName"), null);
Expression equalToNotNull = new ASTEqual(new ASTObjPath("artistName"), "abc");
@@ -175,6 +183,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(equalToNull.match(noMatch));
}
+ @Test
public void testEvaluateNOT_EQUAL_TONull() throws Exception {
Expression notEqualToNull = new ASTNotEqual(new ASTObjPath("artistName"), null);
Expression notEqualToNotNull = new ASTNotEqual(new ASTObjPath("artistName"), "abc");
@@ -188,6 +197,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + notEqualToNull, notEqualToNull.match(noMatch));
}
+ @Test
public void testEvaluateEQUAL_TODataObject() throws Exception {
Artist a1 = (Artist) context.newObject("Artist");
Artist a2 = (Artist) context.newObject("Artist");
@@ -213,6 +223,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(e.match(p3));
}
+ @Test
public void testEvaluateEQUAL_TO_Temp_ObjectId() throws Exception {
Artist a1 = (Artist) context.newObject("Artist");
Artist a2 = (Artist) context.newObject("Artist");
@@ -230,6 +241,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(e.match(p3));
}
+ @Test
public void testEvaluateEQUAL_TO_Id() throws Exception {
createTwoArtistsThreePaintings();
@@ -246,6 +258,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(e.match(p3));
}
+ @Test
public void testEvaluateAND() throws Exception {
Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc");
Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "abc");
@@ -261,6 +274,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(e.match(noMatch));
}
+ @Test
public void testEvaluateOR() throws Exception {
Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc");
Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "xyz");
@@ -280,6 +294,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse("Failed: " + e, e.match(noMatch));
}
+ @Test
public void testEvaluateNOT() throws Exception {
ASTNot e = new ASTNot(new ASTEqual(new ASTObjPath("artistName"), "abc"));
@@ -292,6 +307,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + e, e.match(match));
}
+ @Test
public void testEvaluateLESS_THAN() throws Exception {
Expression e = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -307,7 +323,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
match.setEstimatedPrice(new BigDecimal(9999));
assertTrue("Failed: " + e, e.match(match));
}
-
+
+ @Test
public void testEvaluateLESS_THAN_Null() throws Exception {
Expression ltNull = new ASTLess(new ASTObjPath("estimatedPrice"), null);
Expression ltNotNull = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -317,6 +334,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(ltNotNull.match(noMatch));
}
+ @Test
public void testEvaluateLESS_THAN_EQUAL_TO() throws Exception {
Expression e = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -332,7 +350,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
match.setEstimatedPrice(new BigDecimal(9999));
assertTrue("Failed: " + e, e.match(match));
}
-
+
+ @Test
public void testEvaluateLESS_THAN_EQUAL_TO_Null() throws Exception {
Expression ltNull = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), null);
Expression ltNotNull = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -342,6 +361,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(ltNotNull.match(noMatch));
}
+ @Test
public void testEvaluateGREATER_THAN() throws Exception {
Expression e = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -357,7 +377,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
match.setEstimatedPrice(new BigDecimal(10001));
assertTrue("Failed: " + e, e.match(match));
}
-
+
+ @Test
public void testEvaluateGREATER_THAN_Null() throws Exception {
Expression gtNull = new ASTGreater(new ASTObjPath("estimatedPrice"), null);
Expression gtNotNull = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -367,6 +388,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(gtNotNull.match(noMatch));
}
+ @Test
public void testEvaluateGREATER_THAN_EQUAL_TO() throws Exception {
Expression e = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -382,7 +404,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
match.setEstimatedPrice(new BigDecimal(10001));
assertTrue("Failed: " + e, e.match(match));
}
-
+
+ @Test
public void testEvaluateGREATER_THAN_EQUAL_TO_Null() throws Exception {
Expression gtNull = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), null);
Expression gtNotNull = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -392,6 +415,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(gtNotNull.match(noMatch));
}
+ @Test
public void testEvaluateBETWEEN() throws Exception {
// evaluate both BETWEEN and NOT_BETWEEN
Expression between = new ASTBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d));
@@ -418,7 +442,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + between, between.match(match3));
assertFalse("Failed: " + notBetween, notBetween.match(match3));
}
-
+
+ @Test
public void testEvaluateBETWEEN_Null() throws Exception {
Expression btNull = new ASTBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d));
Expression btNotNull = new ASTNotBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d),
@@ -429,6 +454,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(btNotNull.match(noMatch));
}
+ @Test
public void testEvaluateIN() throws Exception {
Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] { new BigDecimal("10"),
new BigDecimal("20") }));
@@ -456,7 +482,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + in, in.match(match2));
assertFalse("Failed: " + notIn, notIn.match(match2));
}
-
+
+ @Test
public void testEvaluateIN_Null() throws Exception {
Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] {
new BigDecimal("10"), new BigDecimal("20") }));
@@ -468,6 +495,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse(notIn.match(noMatch));
}
+ @Test
public void testEvaluateLIKE1() throws Exception {
Expression like = new ASTLike(new ASTObjPath("artistName"), "abc%d");
Expression notLike = new ASTNotLike(new ASTObjPath("artistName"), "abc%d");
@@ -488,6 +516,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse("Failed: " + notLike, notLike.match(match2));
}
+ @Test
public void testEvaluateLIKE2() throws Exception {
Expression like = new ASTLike(new ASTObjPath("artistName"), "abc?d");
Expression notLike = new ASTNotLike(new ASTObjPath("artistName"), "abc?d");
@@ -508,6 +537,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse("Failed: " + notLike, notLike.match(match));
}
+ @Test
public void testEvaluateLIKE3() throws Exception {
// test special chars
Expression like = new ASTLike(new ASTObjPath("artistName"), "/./");
@@ -521,6 +551,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertTrue("Failed: " + like, like.match(match));
}
+ @Test
public void testEvaluateLIKE_IGNORE_CASE() throws Exception {
Expression like = new ASTLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD");
Expression notLike = new ASTNotLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD");
@@ -541,35 +572,42 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
assertFalse("Failed: " + notLike, notLike.match(match2));
}
+ @Test
public void testEvaluateADD() throws Exception {
Expression add = new ASTAdd(new Object[] { new Integer(1), new Double(5.5) });
assertEquals(6.5, ((Number) add.evaluate(null)).doubleValue(), 0.0001);
}
+ @Test
public void testEvaluateSubtract() throws Exception {
Expression subtract = new ASTSubtract(new Object[] { new Integer(1), new Double(0.1), new Double(0.2) });
assertEquals(0.7, ((Number) subtract.evaluate(null)).doubleValue(), 0.0001);
}
+ @Test
public void testEvaluateMultiply() throws Exception {
Expression multiply = new ASTMultiply(new Object[] { new Integer(2), new Double(3.5) });
assertEquals(7, ((Number) multiply.evaluate(null)).doubleValue(), 0.0001);
}
+ @Test
public void testEvaluateDivide() throws Exception {
Expression divide = new ASTDivide(new Object[] { new BigDecimal("7.0"), new BigDecimal("2.0") });
assertEquals(3.5, ((Number) divide.evaluate(null)).doubleValue(), 0.0001);
}
+ @Test
public void testEvaluateNegate() throws Exception {
assertEquals(-3, ((Number) new ASTNegate(new Integer(3)).evaluate(null)).intValue());
assertEquals(5, ((Number) new ASTNegate(new Integer(-5)).evaluate(null)).intValue());
}
+ @Test
public void testEvaluateTrue() throws Exception {
assertEquals(Boolean.TRUE, new ASTTrue().evaluate(null));
}
+ @Test
public void testEvaluateFalse() throws Exception {
assertEquals(Boolean.FALSE, new ASTFalse().evaluate(null));
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
index 68a4f33..df0466a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
@@ -19,15 +19,16 @@
package org.apache.cayenne.map;
-import java.util.Collection;
-import java.util.Collections;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.MtTable1;
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;
@UseServerRuntime(ServerCase.MULTI_TIER_PROJECT)
public class ClientEntityResolverIT extends ServerCase {
@@ -35,6 +36,7 @@ public class ClientEntityResolverIT extends ServerCase {
@Inject
private EntityResolver serverResolver;
+ @Test
public void testGetClientEntityResolver() {
EntityResolver clientResolver = serverResolver.getClientEntityResolver();
@@ -52,6 +54,7 @@ public class ClientEntityResolverIT extends ServerCase {
assertNull(clientResolver.getObjEntity(MtTable1.class));
}
+ @Test
public void testConstructor() {
ObjEntity entity = new ObjEntity("test_entity");
entity.setClassName("java.lang.String");
@@ -64,6 +67,7 @@ public class ClientEntityResolverIT extends ServerCase {
assertNotNull(resolver.getObjEntity(entity.getName()));
}
+ @Test
public void testInheritance() {
ObjEntity superEntity = new ObjEntity("super_entity");
superEntity.setClassName("java.lang.Object");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
index 9e40bf0..fc9b747 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
import java.util.Collection;
@@ -34,6 +35,7 @@ public class DbEntityIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testSerializability() throws Exception {
DbEntity entity = new DbEntity("entity");
@@ -62,16 +64,19 @@ public class DbEntityIT extends ServerCase {
assertTrue(d2.getGeneratedAttributes().contains(generated2));
}
+ @Test
public void testConstructor1() {
DbEntity ent = new DbEntity();
assertNull(ent.getName());
}
+ @Test
public void testConstructor2() {
DbEntity ent = new DbEntity("abc");
assertEquals("abc", ent.getName());
}
+ @Test
public void testCatalog() {
String tstName = "tst_name";
DbEntity ent = new DbEntity("abc");
@@ -79,6 +84,7 @@ public class DbEntityIT extends ServerCase {
assertEquals(tstName, ent.getCatalog());
}
+ @Test
public void testSchema() {
String tstName = "tst_name";
DbEntity ent = new DbEntity("abc");
@@ -86,6 +92,7 @@ public class DbEntityIT extends ServerCase {
assertEquals(tstName, ent.getSchema());
}
+ @Test
public void testFullyQualifiedName() {
DbEntity e1 = new DbEntity("e1");
@@ -108,6 +115,7 @@ public class DbEntityIT extends ServerCase {
assertEquals("c4.e4", e4.getFullyQualifiedName());
}
+ @Test
public void testGetPrimaryKey() {
DbEntity ent = new DbEntity("abc");
@@ -127,6 +135,7 @@ public class DbEntityIT extends ServerCase {
assertSame(a2, pk.iterator().next());
}
+ @Test
public void testAddPKAttribute() {
DbEntity ent = new DbEntity("abc");
@@ -139,6 +148,7 @@ public class DbEntityIT extends ServerCase {
assertTrue(ent.getPrimaryKeys().isEmpty());
}
+ @Test
public void testChangeAttributeToPK() {
DbEntity ent = new DbEntity("abc");
@@ -152,6 +162,7 @@ public class DbEntityIT extends ServerCase {
assertTrue(ent.getPrimaryKeys().contains(a1));
}
+ @Test
public void testChangePKAttribute() {
DbEntity ent = new DbEntity("abc");
@@ -165,6 +176,7 @@ public class DbEntityIT extends ServerCase {
assertFalse(ent.getPrimaryKeys().contains(a1));
}
+ @Test
public void testRemoveAttribute() {
DbEntity ent = new DbEntity("abc");
@@ -207,6 +219,7 @@ public class DbEntityIT extends ServerCase {
assertEquals(0, rel.getJoins().size());
}
+ @Test
public void testTranslateToRelatedEntityIndependentPath() {
DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
@@ -215,6 +228,7 @@ public class DbEntityIT extends ServerCase {
assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray"), translated);
}
+ @Test
public void testTranslateToRelatedEntityTrimmedPath() {
DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
@@ -224,6 +238,7 @@ public class DbEntityIT extends ServerCase {
translated);
}
+ @Test
public void testTranslateToRelatedEntitySplitHalfWay() {
DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
@@ -233,6 +248,7 @@ public class DbEntityIT extends ServerCase {
Expression.fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), translated);
}
+ @Test
public void testTranslateToRelatedEntityMatchingPath() {
DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
@@ -243,6 +259,7 @@ public class DbEntityIT extends ServerCase {
Expression.fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated);
}
+ @Test
public void testTranslateToRelatedEntityToOne() {
DbEntity paintingE = runtime.getDataDomain().getEntityResolver().getDbEntity("PAINTING");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
index 71a192a..fbe1b24 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
@@ -44,6 +45,7 @@ public class DbRelationshipIT extends ServerCase {
galleryEnt = runtime.getDataDomain().getEntityResolver().getDbEntity("GALLERY");
}
+ @Test
public void testSrcFkSnapshotWithTargetSnapshot() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
Integer id = new Integer(44);
@@ -54,6 +56,7 @@ public class DbRelationshipIT extends ServerCase {
assertEquals(id, targetMap.get("GALLERY_ID"));
}
+ @Test
public void testGetReverseRelationship1() throws Exception {
// start with "to many"
DbRelationship r1 = artistEnt.getRelationship("paintingArray");
@@ -63,6 +66,7 @@ public class DbRelationshipIT extends ServerCase {
assertSame(paintingEnt.getRelationship("toArtist"), r2);
}
+ @Test
public void testGetReverseRelationship2() throws Exception {
// start with "to one"
DbRelationship r1 = paintingEnt.getRelationship("toArtist");
@@ -72,6 +76,7 @@ public class DbRelationshipIT extends ServerCase {
assertSame(artistEnt.getRelationship("paintingArray"), r2);
}
+ @Test
public void testGetReverseRelationshipToSelf() {
// assemble mockup entity
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
index b235267..7f9ab16 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
@@ -19,9 +19,6 @@
package org.apache.cayenne.map;
-import java.util.Collection;
-import java.util.Iterator;
-
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
@@ -30,6 +27,10 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Iterator;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class EntityIT extends ServerCase {
@@ -37,6 +38,7 @@ public class EntityIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testSerializability() throws Exception {
Entity entity = new MockEntity("entity");
@@ -66,6 +68,7 @@ public class EntityIT extends ServerCase {
assertSame(d2.getRelationship("xyz"), d2.getRelationshipMap().get("xyz"));
}
+ @Test
public void testName() {
Entity entity = new MockEntity();
String tstName = "tst_name";
@@ -73,6 +76,7 @@ public class EntityIT extends ServerCase {
assertEquals(tstName, entity.getName());
}
+ @Test
public void testAttribute() {
Entity entity = new MockEntity();
Attribute attribute = new MockAttribute("tst_name");
@@ -88,6 +92,7 @@ public class EntityIT extends ServerCase {
assertNull(entity.getAttribute(attribute.getName()));
}
+ @Test
public void testRelationship() {
Entity entity = new MockEntity();
Relationship rel = new MockRelationship("tst_name");
@@ -103,6 +108,7 @@ public class EntityIT extends ServerCase {
assertNull(entity.getRelationship(rel.getName()));
}
+ @Test
public void testAttributeClashWithRelationship() {
Entity entity = new MockEntity();
Relationship rel = new MockRelationship("tst_name");
@@ -119,6 +125,7 @@ public class EntityIT extends ServerCase {
}
}
+ @Test
public void testRelationshipClashWithAttribute() {
Entity entity = new MockEntity();
Attribute attribute = new MockAttribute("tst_name");
@@ -135,6 +142,7 @@ public class EntityIT extends ServerCase {
}
}
+ @Test
public void testResolveBadObjPath1() {
// test invalid expression path
Expression pathExpr = ExpressionFactory.expressionOfType(Expression.OBJ_PATH);
@@ -154,6 +162,7 @@ public class EntityIT extends ServerCase {
}
}
+ @Test
public void testResolveBadObjPath2() {
// test invalid expression type
Expression badPathExpr = ExpressionFactory.expressionOfType(Expression.IN);
@@ -168,6 +177,7 @@ public class EntityIT extends ServerCase {
}
}
+ @Test
public void testResolveObjPath1() {
Expression pathExpr = ExpressionFactory.expressionOfType(Expression.OBJ_PATH);
pathExpr.setOperand(0, "galleryName");
@@ -184,6 +194,7 @@ public class EntityIT extends ServerCase {
assertSame(galleryEnt.getAttribute("galleryName"), next);
}
+ @Test
public void testRemoveAttribute() {
Entity entity = new MockEntity();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
index 6cb3bcb..68f9df8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.testdo.mt.MtTable2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,6 +41,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testServerDescriptorCaching() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
@@ -54,6 +56,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
assertNotSame(descriptor, descriptor1);
}
+ @Test
public void testServerDescriptorFactory() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
@@ -74,6 +77,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
}
}
+ @Test
public void testArcProperties() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
index 3497f47..69553ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collections;
@@ -32,6 +33,7 @@ public class EntityResolverGenericStackIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testObjEntityLookupDuplicates() {
DataMap generic = resolver.getDataMap("generic");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
index 910c10f..cd4bf49 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.Query;
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.ArrayList;
import java.util.Collection;
@@ -43,27 +44,32 @@ public class EntityResolverIT extends ServerCase {
@Inject
private DataContext context;
+ @Test
public void testGetObjEntity() {
EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
assertIsArtistObjEntity(resolver.getObjEntity("Artist"));
}
+ @Test
public void testLookupObjEntityByClass() {
EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
assertIsArtistObjEntity(resolver.getObjEntity(Artist.class));
}
+ @Test
public void testLookupObjEntityByInstance() {
EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
assertIsArtistObjEntity(resolver.getObjEntity(new Artist()));
}
+ @Test
public void testLookupObjEntityByDataobject() {
EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
Artist artist = (Artist) context.newObject("Artist");
assertIsArtistObjEntity(resolver.getObjEntity(artist));
}
+ @Test
public void testGetDataMapList() {
DataMap m1 = new DataMap();
DataMap m2 = new DataMap();
@@ -78,6 +84,7 @@ public class EntityResolverIT extends ServerCase {
assertTrue(maps.containsAll(list));
}
+ @Test
public void testAddDataMap() {
// create empty resolver
@@ -97,6 +104,7 @@ public class EntityResolverIT extends ServerCase {
assertEquals(resolver, m1.getNamespace());
}
+ @Test
public void testRemoveDataMap() {
// create a resolver with a single map
DataMap m1 = new DataMap();
@@ -116,6 +124,7 @@ public class EntityResolverIT extends ServerCase {
assertNull(resolver.getObjEntity(Object.class));
}
+ @Test
public void testAddObjEntity() {
// create a resolver with a single map
DataMap m1 = new DataMap();
@@ -135,6 +144,7 @@ public class EntityResolverIT extends ServerCase {
assertSame(oe2, resolver.getObjEntity(String.class));
}
+ @Test
public void testGetQuery() {
// create a resolver with a single map
DataMap m1 = new DataMap();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
index 15c81e8..55071d4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.map;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.PEOPLE_PROJECT)
public class EntityResolverInheritanceIT extends ServerCase {
@@ -29,6 +30,7 @@ public class EntityResolverInheritanceIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testGetAbstractPersonTree() throws Exception {
EntityInheritanceTree tree = resolver.getInheritanceTree("AbstractPerson");
assertNotNull(tree);
@@ -36,6 +38,7 @@ public class EntityResolverInheritanceIT extends ServerCase {
assertSame(resolver.getObjEntity("AbstractPerson"), tree.getEntity());
}
+ @Test
public void testGetEmployeeTree() throws Exception {
EntityInheritanceTree tree = resolver.getInheritanceTree("Employee");
assertNotNull(tree);
@@ -43,12 +46,14 @@ public class EntityResolverInheritanceIT extends ServerCase {
assertSame(resolver.getObjEntity("Employee"), tree.getEntity());
}
+ @Test
public void testGetManagerTree() throws Exception {
EntityInheritanceTree tree = resolver.getInheritanceTree("Manager");
assertNotNull(tree);
assertEquals(0, tree.getChildrenCount());
}
+ @Test
public void testLookupTreeRefresh() throws Exception {
ObjEntity super1 = new ObjEntity("super1");
ObjEntity sub1 = new ObjEntity("sub1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
index e7d8847..575cae5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.map;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectContext;
@@ -36,6 +32,11 @@ 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.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ObjEntityIT extends ServerCase {
@@ -58,6 +59,7 @@ public class ObjEntityIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testGetAttributeWithOverrides() {
DataMap map = new DataMap("dm");
@@ -91,6 +93,7 @@ public class ObjEntityIT extends ServerCase {
assertSame(subEntity, a3.getEntity());
}
+ @Test
public void testGetPrimaryKeys() {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
Collection<ObjAttribute> pks = artistE.getPrimaryKeys();
@@ -129,6 +132,7 @@ public class ObjEntityIT extends ServerCase {
assertTrue(clientMeaningfulPKE.getAttributes().contains(clientmpk));
}
+ @Test
public void testAttributes() {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
ObjAttribute attr = artistE.getAttribute("artistName");
@@ -137,6 +141,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals(attr.isMandatory(), attr.getDbAttribute().isMandatory());
}
+ @Test
public void testLastPathComponent() {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
@@ -164,6 +169,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals("toGallery", lastAliasedRelationship.getRelationship().getName());
}
+ @Test
public void testGeneric() {
ObjEntity e1 = new ObjEntity("e1");
assertTrue(e1.isGeneric());
@@ -184,6 +190,7 @@ public class ObjEntityIT extends ServerCase {
assertTrue(e1.isGeneric());
}
+ @Test
public void testServerOnly() {
ObjEntity e1 = new ObjEntity("e1");
@@ -192,6 +199,7 @@ public class ObjEntityIT extends ServerCase {
assertTrue(e1.isServerOnly());
}
+ @Test
public void testClientAllowed() {
ObjEntity e1 = new ObjEntity("e1");
@@ -209,6 +217,7 @@ public class ObjEntityIT extends ServerCase {
assertFalse(e1.isClientAllowed());
}
+ @Test
public void testGetPrimaryKeyNames() {
ObjEntity entity = new ObjEntity("entity");
DbEntity dbentity = new DbEntity("dbe");
@@ -244,6 +253,7 @@ public class ObjEntityIT extends ServerCase {
assertTrue(entity.getPrimaryKeyNames().contains(pk2.getName()));
}
+ @Test
public void testGetClientEntity() {
DataMap map = new DataMap();
@@ -281,6 +291,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals(e1.getRelationships().size(), e2.getRelationships().size());
}
+ @Test
public void testSerializability() throws Exception {
ObjEntity entity = new ObjEntity("entity");
@@ -288,6 +299,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals(entity.getName(), d1.getName());
}
+ @Test
public void testDbEntityName() {
ObjEntity entity = new ObjEntity("entity");
assertNull(entity.getDbEntityName());
@@ -299,6 +311,7 @@ public class ObjEntityIT extends ServerCase {
assertNull(entity.getDbEntityName());
}
+ @Test
public void testDbEntity() {
ObjEntity entity = new ObjEntity("entity");
DbEntity dbentity = new DbEntity("dbe");
@@ -320,6 +333,7 @@ public class ObjEntityIT extends ServerCase {
assertSame(dbentity, entity.getDbEntity());
}
+ @Test
public void testDbEntityNoContainer() {
ObjEntity entity = new ObjEntity("entity");
entity.setDbEntityName("dbe");
@@ -332,6 +346,7 @@ public class ObjEntityIT extends ServerCase {
}
}
+ @Test
public void testClassName() {
ObjEntity entity = new ObjEntity("entity");
String tstName = "tst_name";
@@ -339,6 +354,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals(tstName, entity.getClassName());
}
+ @Test
public void testSuperClassName() {
ObjEntity entity = new ObjEntity("entity");
String tstName = "super_tst_name";
@@ -346,6 +362,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals(tstName, entity.getSuperClassName());
}
+ @Test
public void testAttributeForDbAttribute() throws Exception {
ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
DbEntity dae = ae.getDbEntity();
@@ -354,6 +371,7 @@ public class ObjEntityIT extends ServerCase {
assertNotNull(ae.getAttributeForDbAttribute(dae.getAttribute("ARTIST_NAME")));
}
+ @Test
public void testRelationshipForDbRelationship() throws Exception {
ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
DbEntity dae = ae.getDbEntity();
@@ -362,6 +380,7 @@ public class ObjEntityIT extends ServerCase {
assertNotNull(ae.getRelationshipForDbRelationship(dae.getRelationship("paintingArray")));
}
+ @Test
public void testReadOnly() throws Exception {
ObjEntity entity = new ObjEntity("entity");
assertFalse(entity.isReadOnly());
@@ -369,6 +388,7 @@ public class ObjEntityIT extends ServerCase {
assertTrue(entity.isReadOnly());
}
+ @Test
public void testTranslateToRelatedEntityIndependentPath() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
@@ -377,6 +397,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray"), translated);
}
+ @Test
public void testTranslateToRelatedEntityTrimmedPath() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
@@ -386,6 +407,7 @@ public class ObjEntityIT extends ServerCase {
translated);
}
+ @Test
public void testTranslateToRelatedEntitySplitHalfWay() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
@@ -395,6 +417,7 @@ public class ObjEntityIT extends ServerCase {
Expression.fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), translated);
}
+ @Test
public void testTranslateToRelatedEntityMatchingPath() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
Expression e1 = Expression.fromString("artistExhibitArray.toExhibit");
@@ -403,6 +426,7 @@ public class ObjEntityIT extends ServerCase {
Expression.fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated);
}
+ @Test
public void testTranslateToRelatedEntityMultiplePaths() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
@@ -411,7 +435,8 @@ public class ObjEntityIT extends ServerCase {
assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray = $p "
+ "and db:toArtist.artistExhibitArray.toExhibit.CLOSING_DATE = $d"), translated);
}
-
+
+ @Test
public void testTranslateToRelatedEntityOuterJoin_Flattened() throws Exception {
ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
@@ -420,6 +445,7 @@ public class ObjEntityIT extends ServerCase {
assertEquals("failure: " + translated, Expression.fromString("db:toArtist.artistGroupArray+.toGroup+.NAME"), translated);
}
+ @Test
public void testTranslateNullArg() {
ObjEntity entity = context.getEntityResolver().getObjEntity("Artist");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
index 783481f..4ae579e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -60,6 +61,7 @@ public class ObjRelationshipIT extends ServerCase {
galleryDBEntity = resolver.getDbEntity("GALLERY");
}
+ @Test
public void testEncodeAsXML() {
StringWriter buffer = new StringWriter();
PrintWriter out = new PrintWriter(buffer);
@@ -86,6 +88,7 @@ public class ObjRelationshipIT extends ServerCase {
+ "collection-type=\"java.util.Map\" map-key=\"bla\"/>" + lineBreak, buffer.getBuffer().toString());
}
+ @Test
public void testCollectionType() {
ObjRelationship r = new ObjRelationship("X");
assertNull(r.getCollectionType());
@@ -93,6 +96,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals("java.util.Map", r.getCollectionType());
}
+ @Test
public void testSerializability() throws Exception {
ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
@@ -104,6 +108,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals(r1.getDbRelationshipPath(), r2.getDbRelationshipPath());
}
+ @Test
public void testGetClientRelationship() {
final ObjEntity target = new ObjEntity("te1");
ObjRelationship r1 = new ObjRelationship("r1") {
@@ -124,6 +129,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals(r1.getDeleteRule(), r2.getDeleteRule());
}
+ @Test
public void testGetReverseDbRelationshipPath() {
ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
ObjEntity paintingObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Painting");
@@ -138,6 +144,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals("paintingArray", r2.getReverseDbRelationshipPath());
}
+ @Test
public void testSetDbRelationshipPath() {
ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
@@ -147,6 +154,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals(r.getDbRelationshipPath(), "paintingArray");
}
+ @Test
public void testRefreshFromPath() {
ObjRelationship relationship = new ObjRelationship();
@@ -198,6 +206,7 @@ public class ObjRelationshipIT extends ServerCase {
assertSame(pathR, resolvedPath.get(1));
}
+ @Test
public void testCalculateToMany() {
// assemble fixture....
DataMap map = new DataMap();
@@ -247,6 +256,7 @@ public class ObjRelationshipIT extends ServerCase {
assertTrue(relationship.isToMany());
}
+ @Test
public void testCalculateToManyFromPath() {
// assemble fixture....
DataMap map = new DataMap();
@@ -298,6 +308,7 @@ public class ObjRelationshipIT extends ServerCase {
assertTrue(relationship.isToMany());
}
+ @Test
public void testTargetEntity() throws Exception {
ObjRelationship relationship = new ObjRelationship("some_rel");
relationship.setTargetEntityName("targ");
@@ -323,6 +334,7 @@ public class ObjRelationshipIT extends ServerCase {
assertSame(target, relationship.getTargetEntity());
}
+ @Test
public void testGetReverseRel1() {
ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
@@ -336,6 +348,7 @@ public class ObjRelationshipIT extends ServerCase {
assertSame(paintingObjEnt.getRelationship("toArtist"), r2);
}
+ @Test
public void testGetReverseRel2() {
ObjEntity artistEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
ObjEntity paintingEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Painting");
@@ -348,6 +361,7 @@ public class ObjRelationshipIT extends ServerCase {
assertSame(artistEnt.getRelationship("paintingArray"), r2);
}
+ @Test
public void testSingleDbRelationship() {
ObjRelationship relationship = new ObjRelationship();
DbRelationship r1 = new DbRelationship("X");
@@ -361,6 +375,7 @@ public class ObjRelationshipIT extends ServerCase {
assertEquals(0, relationship.getDbRelationships().size());
}
+ @Test
public void testFlattenedRelationship() {
DbRelationship r1 = new DbRelationship("X");
DbRelationship r2 = new DbRelationship("Y");
@@ -393,6 +408,7 @@ public class ObjRelationshipIT extends ServerCase {
}
+ @Test
public void testReadOnly_Flattened1_1__N_1() {
// check common vertical inheritance relationships
@@ -408,6 +424,7 @@ public class ObjRelationshipIT extends ServerCase {
assertFalse(x.isReadOnly());
}
+ @Test
public void testReadOnlyMoreThan3DbRelsRelationship() {
// Readonly is a flattened relationship that isn't over a single
// many->many link
@@ -440,6 +457,7 @@ public class ObjRelationshipIT extends ServerCase {
// Test for a read-only flattened relationship that is readonly because it's
// dbrel
// sequence is "incorrect" (or rather, unsupported)
+ @Test
public void testIncorrectSequenceReadOnlyRelationship() {
DbRelationship r1 = new DbRelationship("X");
DbRelationship r2 = new DbRelationship("Y");
@@ -462,6 +480,7 @@ public class ObjRelationshipIT extends ServerCase {
// Test a relationship loaded from the test datamap that we know should be
// flattened
+ @Test
public void testKnownFlattenedRelationship() {
ObjEntity artistEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
ObjRelationship theRel = artistEnt.getRelationship("groupArray");
@@ -470,6 +489,7 @@ public class ObjRelationshipIT extends ServerCase {
assertFalse(theRel.isReadOnly());
}
+ @Test
public void testBadDeleteRuleValue() {
ObjRelationship relationship = new ObjRelationship();
@@ -481,6 +501,7 @@ public class ObjRelationshipIT extends ServerCase {
}
}
+ @Test
public void testOkDeleteRuleValue() {
ObjRelationship relationship = new ObjRelationship();
try {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
index db7c086..ddc96ef 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
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;
@@ -31,6 +32,7 @@ import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class AddColumnToModelIT extends MergeCase {
+ @Test
public void testAddColumn() throws Exception {
dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
index d0012a1..bcb58b2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
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;
@@ -30,6 +31,7 @@ import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class CreateTableToModelIT extends MergeCase {
+ @Test
public void testAddTable() throws Exception {
dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
index b11d765..e308b77 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
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;
@@ -34,6 +35,7 @@ import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DropColumnToModelIT extends MergeCase {
+ @Test
public void testSimpleColumn() throws Exception {
dropTableIfPresent("NEW_TABLE");
@@ -91,6 +93,7 @@ public class DropColumnToModelIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testRemoveFKColumnWithoutRelationshipInDb() throws Exception {
dropTableIfPresent("NEW_TABLE");
dropTableIfPresent("NEW_TABLE2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
index cbfe05d..20dff04 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
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;
@@ -34,6 +35,7 @@ import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DropRelationshipToModelIT extends MergeCase {
+ @Test
public void testForeignKey() throws Exception {
dropTableIfPresent("NEW_TABLE");
dropTableIfPresent("NEW_TABLE2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
index bec6005..64ef6ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
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;
@@ -31,6 +32,7 @@ import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DropTableToModelIT extends MergeCase {
+ @Test
public void testDropTable() throws Exception {
dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
index 298acec..40233d5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -38,6 +39,7 @@ public class MergerFactoryIT extends MergeCase {
@Inject
private DataContext context;
+ @Test
public void testAddAndDropColumnToDb() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
@@ -59,6 +61,7 @@ public class MergerFactoryIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testChangeVarcharSizeToDb() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
@@ -89,6 +92,7 @@ public class MergerFactoryIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testMultipleTokensToDb() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
@@ -124,6 +128,7 @@ public class MergerFactoryIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testAddTableToDb() throws Exception {
dropTableIfPresent("NEW_TABLE");
@@ -173,6 +178,7 @@ public class MergerFactoryIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testAddForeignKeyWithTable() throws Exception {
dropTableIfPresent("NEW_TABLE");
@@ -237,6 +243,7 @@ public class MergerFactoryIT extends MergeCase {
assertTokensAndExecute(0, 0);
}
+ @Test
public void testAddForeignKeyAfterTable() throws Exception {
dropTableIfPresent("NEW_TABLE");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
index 067303b..d3f815e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
@@ -22,12 +22,14 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SetAllowNullToDbIT extends MergeCase {
+ @Test
public void test() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
index 28b134c..2656a52 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
@@ -18,14 +18,15 @@
****************************************************************/
package org.apache.cayenne.merge;
-import java.sql.Types;
-
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Types;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SetNotNullToDbIT extends MergeCase {
@@ -43,6 +44,7 @@ public class SetNotNullToDbIT extends MergeCase {
dbHelper.deleteAll("PAINTING");
}
+ @Test
public void test() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
index 9654046..a4a4e25 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
@@ -18,16 +18,18 @@
****************************************************************/
package org.apache.cayenne.merge;
-import java.sql.Types;
-
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Types;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SetPrimaryKeyToDbIT extends MergeCase {
+ @Test
public void test() throws Exception {
dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
index abcef98..ec3effe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.SelectQuery;
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;
@@ -45,6 +46,7 @@ public class ValueForNullIT extends MergeCase {
@Inject
private DataContext context;
+ @Test
public void test() throws Exception {
DbEntity dbEntity = map.getDbEntity("PAINTING");
assertNotNull(dbEntity);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
index af76334..350a774 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
@@ -18,11 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -41,6 +36,12 @@ 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.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class EJBQLQueryIT extends ServerCase {
@@ -97,6 +98,7 @@ public class EJBQLQueryIT extends ServerCase {
tBigIntegerEntity.insert(44001, new Long(744073709551715l));
}
+ @Test
public void testLongParameter() throws Exception {
createBigIntegerEntitiesDataSet();
String ejbql = "SELECT bie FROM BigIntegerEntity bie WHERE bie.bigIntegerField > ?1";
@@ -106,6 +108,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void testLongLiteral() throws Exception {
createBigIntegerEntitiesDataSet();
String ejbql = "SELECT bie FROM BigIntegerEntity bie WHERE bie.bigIntegerField > 744073709551615";
@@ -114,6 +117,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void testParameters() {
String ejbql = "select a FROM Artist a WHERE a.artistName = ?1 OR a.artistName = :name";
EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -128,6 +132,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals("Y", parameters.get("name"));
}
+ @Test
public void testCacheParameters() {
String ejbql1 = "select a FROM Artist a WHERE a.artistName = ?1 OR a.artistName = :name";
EJBQLQuery q1 = new EJBQLQuery(ejbql1);
@@ -152,6 +157,7 @@ public class EJBQLQueryIT extends ServerCase {
.getCacheKey());
}
+ @Test
public void testCacheStrategy() throws Exception {
// insertValue();
@@ -178,6 +184,7 @@ public class EJBQLQueryIT extends ServerCase {
}
+ @Test
public void testDataRows() throws Exception {
// insertValue();
@@ -195,6 +202,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(artistName, artist.getArtistName());
}
+ @Test
public void testGetExpression() {
String ejbql = "select a FROM Artist a";
EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -205,6 +213,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(ejbql, parsed.getSource());
}
+ @Test
public void testGetName() {
String ejbql = "select a FROM Artist a";
EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -214,6 +223,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals("XYZ", query.getName());
}
+ @Test
public void testUniqueKeyEntity() {
// insertValue();
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -230,6 +240,7 @@ public class EJBQLQueryIT extends ServerCase {
.getCacheKey());
}
+ @Test
public void testGetMetadata() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -250,6 +261,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(QueryCacheStrategy.NO_CACHE, md.getCacheStrategy());
}
+ @Test
public void testSelectRelationship() throws Exception {
// insertPaintValue();
@@ -290,6 +302,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(String.class, ((Object[]) result3.get(0))[1].getClass());
}
+ @Test
public void testEncodeAsXML() {
String ejbql = "select a FROM Artist a";
@@ -323,6 +336,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(w.getBuffer().toString(), s.toString());
}
+ @Test
public void testInWithMultipleStringPositionalParameters_withBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.paintingTitle in (?1,?2,?3)");
@@ -333,6 +347,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(2, paintings.size());
}
+ @Test
public void testInWithSingleStringPositionalParameter_withoutBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.paintingTitle in ?1");
@@ -341,6 +356,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(1, paintings.size());
}
+ @Test
public void testInWithSingleCollectionNamedParameter_withoutBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in :artists");
@@ -349,6 +365,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(3, paintings.size());
}
+ @Test
public void testInWithSingleCollectionPositionalParameter_withoutBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in ?1");
@@ -357,6 +374,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(3, paintings.size());
}
+ @Test
public void testInWithSingleCollectionNamedParameter_withBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in (:artists)");
@@ -365,6 +383,7 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(3, paintings.size());
}
+ @Test
public void testInWithSingleCollectionPositionalParameter_withBrackets() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in (?1)");
@@ -373,24 +392,28 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals(3, paintings.size());
}
+ @Test
public void testNullParameter() {
EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist=:x");
query.setParameter("x", null);
context.performQuery(query);
}
+ @Test
public void testNullNotEqualsParameter() {
EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist<>:x");
query.setParameter("x", null);
context.performQuery(query);
}
+ @Test
public void testNullPositionalParameter() {
EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist=?1");
query.setParameter(1, null);
context.performQuery(query);
}
+ @Test
public void testNullAndNotNullParameter() {
EJBQLQuery query = new EJBQLQuery(
"select p from Painting p WHERE p.toArtist=:x OR p.toArtist.artistName=:b");
@@ -399,6 +422,7 @@ public class EJBQLQueryIT extends ServerCase {
context.performQuery(query);
}
+ @Test
public void testLikeWithExplicitEscape() throws Exception {
createPaintingsDataSet();
EJBQLQuery query = new EJBQLQuery("SELECT p FROM Painting p WHERE p.paintingTitle LIKE '|%|%?|_title|%|%|_' ESCAPE '|'");
@@ -407,12 +431,14 @@ public class EJBQLQueryIT extends ServerCase {
assertEquals("%%?_title%%_", paintings.get(0).getPaintingTitle());
}
+ @Test
public void testJoinToJoined() {
EJBQLQuery query = new EJBQLQuery(
"select g from Gallery g inner join g.paintingArray p where p.toArtist.artistName like '%a%'");
context.performQuery(query);
}
+ @Test
public void testJoinAndCount() {
EJBQLQuery query = new EJBQLQuery(
"select count(p) from Painting p where p.toGallery.galleryName LIKE '%a%' AND ("
@@ -433,6 +459,7 @@ public class EJBQLQueryIT extends ServerCase {
// or p.partNumber like '%rimadyl%'
// )
+ @Test
public void testRelationshipWhereClause() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("a");
@@ -449,6 +476,7 @@ public class EJBQLQueryIT extends ServerCase {
assertSame(p, paintings.get(0));
}
+ @Test
public void testRelationshipWhereClause2() throws Exception {
Expression exp = ExpressionFactory.matchExp(Painting.TO_GALLERY_PROPERTY, null);
EJBQLQuery query = new EJBQLQuery("select p.toArtist from Painting p where "
@@ -457,6 +485,7 @@ public class EJBQLQueryIT extends ServerCase {
context.performQuery(query);
}
+ @Test
public void testOrBrackets() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("testOrBrackets");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
index 61ec8f0..4a1f94d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.EntityResolver;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class ProcedureQueryCacheKeyIT extends ServerCase {
@@ -31,6 +32,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testNoCache() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -47,6 +49,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
assertNull(md2.getCacheKey());
}
+ @Test
public void testLocalCache() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -60,6 +63,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
assertNotNull(md1.getCacheKey());
}
+ @Test
public void testSharedCache() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -73,6 +77,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
assertNotNull(md1.getCacheKey());
}
+ @Test
public void testNamedQuery() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -87,6 +92,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
assertEquals("proc:", md1.getCacheKey());
}
+ @Test
public void testCacheFetchOffsetAndLimit() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
index ee23624..2348b45 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class QueryChainIT extends ServerCase {
@@ -30,6 +31,7 @@ public class QueryChainIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testSelectQuery() {
QueryChain chain = new QueryChain();
@@ -43,6 +45,7 @@ public class QueryChainIT extends ServerCase {
assertNull(md.getObjEntity());
}
+ @Test
public void testSelectQueryDataRows() {
QueryChain chain = new QueryChain();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
index 0d7acf0..b7bfdd6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import java.util.List;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
@@ -28,6 +26,9 @@ 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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SQLSelectIT extends ServerCase {
@@ -58,6 +59,7 @@ public class SQLSelectIT extends ServerCase {
}
}
+ @Test
public void test_DataRows_DataMapNameRoot() throws Exception {
createArtistsDataSet();
@@ -70,6 +72,7 @@ public class SQLSelectIT extends ServerCase {
assertTrue(result.get(0) instanceof DataRow);
}
+ @Test
public void test_DataRows_DefaultRoot() throws Exception {
createArtistsDataSet();
@@ -82,6 +85,7 @@ public class SQLSelectIT extends ServerCase {
assertTrue(result.get(0) instanceof DataRow);
}
+ @Test
public void test_DataRows_ClassRoot() throws Exception {
createArtistsDataSet();
@@ -93,6 +97,7 @@ public class SQLSelectIT extends ServerCase {
assertTrue(result.get(0) instanceof Artist);
}
+ @Test
public void test_DataRows_ClassRoot_Parameters() throws Exception {
createArtistsDataSet();
@@ -105,6 +110,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals("artist3", a.getArtistName());
}
+ @Test
public void test_DataRows_ClassRoot_Bind() throws Exception {
createArtistsDataSet();
@@ -117,6 +123,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(2, result.size());
}
+ @Test
public void test_DataRows_ColumnNameCaps() throws Exception {
SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM ARTIST WHERE ARTIST_NAME = 'artist2'");
@@ -130,6 +137,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(CapsStrategy.LOWER, r2.getColumnNamesCapitalization());
}
+ @Test
public void test_DataRows_FetchLimit() throws Exception {
createArtistsDataSet();
@@ -140,6 +148,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(5, context.select(q1).size());
}
+ @Test
public void test_DataRows_FetchOffset() throws Exception {
createArtistsDataSet();
@@ -150,6 +159,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(16, context.select(q1).size());
}
+ @Test
public void test_Append() throws Exception {
createArtistsDataSet();
@@ -161,6 +171,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void test_Select() throws Exception {
createArtistsDataSet();
@@ -171,6 +182,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void test_SelectOne() throws Exception {
createArtistsDataSet();
@@ -181,6 +193,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals("artist3", a.getArtistName());
}
+ @Test
public void test_SelectLong() throws Exception {
createArtistsDataSet();
@@ -191,6 +204,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(3l, id);
}
+ @Test
public void test_SelectLongArray() throws Exception {
createArtistsDataSet();
@@ -202,6 +216,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(2l, ids.get(1).longValue());
}
+ @Test
public void test_SelectCount() throws Exception {
createArtistsDataSet();
@@ -211,6 +226,7 @@ public class SQLSelectIT extends ServerCase {
assertEquals(20, c);
}
+ @Test
public void testSQLTemplate_PositionalParams() throws Exception {
createArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
index 3a8c440..f223657 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.map.EntityResolver;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SQLTemplateCacheKeyIT extends ServerCase {
@@ -30,6 +31,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
@Inject
private EntityResolver resolver;
+ @Test
public void testNoCache() {
SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -44,6 +46,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
assertNull(md2.getCacheKey());
}
+ @Test
public void testLocalCache() {
SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -55,6 +58,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
assertNotNull(md1.getCacheKey());
}
+ @Test
public void testSharedCache() {
SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -66,6 +70,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
assertNotNull(md1.getCacheKey());
}
+ @Test
public void testNamedQuery() {
SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -78,6 +83,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
assertFalse("XYZ".equals(md1.getCacheKey()));
}
+ @Test
public void testCacheFetchLimitAndOffset() {
SQLTemplate q1 = new SQLTemplate(Artist.class, "SELECT ME");
q1.setFetchOffset(5);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
index 5696eba..b71b70e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.query;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.List;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataContext;
@@ -33,6 +29,11 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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.sql.SQLException;
+import java.sql.Types;
+import java.util.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class SQLTemplateIT extends ServerCase {
@@ -58,6 +59,7 @@ public class SQLTemplateIT extends ServerCase {
Types.INTEGER, Types.BIGINT, Types.VARCHAR, Types.DECIMAL);
}
+ @Test
public void testSQLTemplateForDataMap() {
DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
SQLTemplate q1 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", true);
@@ -65,6 +67,7 @@ public class SQLTemplateIT extends ServerCase {
assertEquals(0, result.size());
}
+ @Test
public void testSQLTemplateForDataMapWithInsert() {
DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
@@ -76,6 +79,7 @@ public class SQLTemplateIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void testSQLTemplateForDataMapWithInsertException() {
DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
@@ -93,6 +97,7 @@ public class SQLTemplateIT extends ServerCase {
gotRuntimeException);
}
+ @Test
public void testSQLTemplate_PositionalParams() throws SQLException {
String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -107,6 +112,7 @@ public class SQLTemplateIT extends ServerCase {
assertEquals(10005.d, tPainting.getDouble("ESTIMATED_PRICE"), 0.001);
}
+ @Test
public void testSQLTemplate_PositionalParams_RepeatingVars() throws SQLException {
String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -121,6 +127,7 @@ public class SQLTemplateIT extends ServerCase {
assertEquals(4567.d, tPainting.getDouble("ESTIMATED_PRICE"), 0.001);
}
+ @Test
public void testSQLTemplate_PositionalParams_ToFewParams() throws SQLException {
String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -137,6 +144,7 @@ public class SQLTemplateIT extends ServerCase {
}
}
+ @Test
public void testSQLTemplate_PositionalParams_ToManyParams() throws SQLException {
String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
[07/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
index 16ce817..6acbd18 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class CompoundPkChangeIT extends ServerCase {
@@ -48,6 +49,7 @@ public class CompoundPkChangeIT extends ServerCase {
dbHelper.deleteAll("COMPOUND_PK_TEST");
}
+ @Test
public void testCompoundPkChangeSingleElement() throws Exception {
CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class);
@@ -103,6 +105,7 @@ public class CompoundPkChangeIT extends ServerCase {
assertEquals(object.getObjectId(), refreshedObject.getObjectId());
}
+ @Test
public void testCompoundPkChangeAllElements() throws Exception {
CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
index d0f69eb..4a2f07f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
@@ -31,6 +31,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.SQLException;
import java.sql.Types;
@@ -87,6 +88,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
}
}
+ @Test
public void testDisjointByIdPrefetch() throws Exception {
insertData();
runtime.getDataDomain().setMaxIdQualifierSize(10);
@@ -104,6 +106,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(11, queriesCount);
}
+ @Test
public void testDisjointByIdPrefetch_Zero() throws Exception {
insertData();
runtime.getDataDomain().setMaxIdQualifierSize(0);
@@ -121,6 +124,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(2, queriesCount);
}
+ @Test
public void testDisjointByIdPrefetch_Negative() throws Exception {
insertData();
runtime.getDataDomain().setMaxIdQualifierSize(-1);
@@ -138,6 +142,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(2, queriesCount);
}
+ @Test
public void testIncrementalFaultList_Lower() throws Exception {
insertData_OneBag_100Boxes();
@@ -168,7 +173,8 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(21, queriesCount);
}
-
+
+ @Test
public void testIncrementalFaultList_Higher() throws Exception {
insertData_OneBag_100Boxes();
@@ -200,6 +206,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(2, queriesCount);
}
+ @Test
public void testIncrementalFaultList_Zero() throws Exception {
insertData_OneBag_100Boxes();
@@ -219,6 +226,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase {
assertEquals(2, queriesCount);
}
+ @Test
public void testIncrementalFaultList_Negative() throws Exception {
insertData_OneBag_100Boxes();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
index 13c4228..d34016d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
@@ -25,6 +25,7 @@ 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.apache.cayenne.util.Util;
+import org.junit.Test;
import java.util.List;
@@ -34,6 +35,7 @@ public class DataObjectSerializationIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testSerializeTransient() throws Exception {
Artist artist = new Artist();
artist.setArtistName("artist1");
@@ -46,6 +48,7 @@ public class DataObjectSerializationIT extends ServerCase {
assertEquals("artist1", deserialized.getArtistName());
}
+ @Test
public void testSerializeNew() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("artist1");
@@ -68,6 +71,7 @@ public class DataObjectSerializationIT extends ServerCase {
assertEquals(0, paintings.size());
}
+ @Test
public void testSerializeNewWithFaults() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("artist1");
@@ -88,6 +92,7 @@ public class DataObjectSerializationIT extends ServerCase {
assertFalse(list.isFault());
}
+ @Test
public void testSerializeCommitted() 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/FlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
index b38937c..7246c62 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.relationship.FlattenedTest2;
import org.apache.cayenne.testdo.relationship.FlattenedTest3;
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;
@@ -113,6 +114,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
tComplexJoin.insert(2002, 2, 3, "C");
}
+ @Test
public void testInsertJoinWithPK() throws Exception {
FlattenedTest1 obj01 = context.newObject(FlattenedTest1.class);
FlattenedTest3 obj11 = context.newObject(FlattenedTest3.class);
@@ -140,6 +142,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
assertEquals(2, ((List<?>) related).size());
}
+ @Test
public void testUnsetJoinWithPK() throws Exception {
createCircularJoinDataSet();
@@ -170,6 +173,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
assertEquals(1, context.performQuery(joinSelect).size());
}
+ @Test
public void testQualifyOnToManyFlattened() throws Exception {
FlattenedTest1 obj01 = context.newObject(FlattenedTest1.class);
FlattenedTest2 obj02 = context.newObject(FlattenedTest2.class);
@@ -213,6 +217,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
assertSame(obj11, objects2.get(0));
}
+ @Test
public void testToOneSeriesFlattenedRel() {
FlattenedTest1 ft1 = (FlattenedTest1) context.newObject("FlattenedTest1");
@@ -239,6 +244,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
assertEquals("FT1Name", fetchedFT1.getName());
}
+ @Test
public void testTakeObjectSnapshotFlattenedFault() throws Exception {
createFlattenedTestDataSet();
@@ -257,6 +263,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testRefetchWithFlattenedFaultToOneTarget1() throws Exception {
createFlattenedTestDataSet();
@@ -272,6 +279,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
assertTrue(ft3.readPropertyDirectly("toFT1") instanceof Fault);
}
+ @Test
public void testFlattenedCircular() throws Exception {
createFlattenedCircularDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
index c7bae44..73468d1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -46,6 +47,7 @@ public class GenericMappingIT extends ServerCase {
dbHelper.deleteAll("GENERIC1");
}
+ @Test
public void testInsertSingle() {
DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
@@ -53,6 +55,7 @@ public class GenericMappingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testInsertRelated() {
DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
@@ -64,6 +67,7 @@ public class GenericMappingIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testSelect() {
context.performNonSelectingQuery(new SQLTemplate(
"Generic1",
@@ -82,6 +86,7 @@ public class GenericMappingIT extends ServerCase {
assertEquals(1, result.size());
}
+ @Test
public void testUpdateRelated() {
DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
index 12d676d..9703962 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.testdo.r1.Activity;
import org.apache.cayenne.testdo.r1.ActivityResult;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Date;
@@ -42,6 +43,7 @@ public class ManyToManyNoJoinIT extends ServerCase {
dbHelper.deleteAll("RESULT");
}
+ @Test
public void testValidateForSave1() throws Exception {
ActivityResult result = context.newObject(ActivityResult.class);
result.setAppointDate(new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
index ce4d44a..65ed9a4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.relationship.RelationshipHelper;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.validation.ValidationResult;
+import org.junit.Test;
@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
public class MeaningfulFKIT extends ServerCase {
@@ -41,6 +42,7 @@ public class MeaningfulFKIT extends ServerCase {
dbHelper.deleteAll("MEANINGFUL_FK");
}
+ @Test
public void testValidateForSave1() throws Exception {
MeaningfulFK testObject = context.newObject(MeaningfulFK.class);
@@ -55,6 +57,7 @@ public class MeaningfulFKIT extends ServerCase {
validation.getFailures().size());
}
+ @Test
public void testValidateForSave2() throws Exception {
MeaningfulFK testObject = context.newObject(MeaningfulFK.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
index 0bafab4..bc47ae0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.oneway.OnewayTable3;
import org.apache.cayenne.testdo.oneway.OnewayTable4;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.SQLException;
import java.util.List;
@@ -65,6 +66,7 @@ public class OneWayRelationshipsIT extends ServerCase {
t4Helper.setColumns("ID", "TABLE3_ID");
}
+ @Test
public void testToOne_TwoNew() throws SQLException {
OnewayTable1 t1 = context.newObject(OnewayTable1.class);
@@ -79,6 +81,7 @@ public class OneWayRelationshipsIT extends ServerCase {
assertEquals(t1Pk, t2FK);
}
+ @Test
public void testToOne_Replace() throws SQLException {
t1Helper.insert(1).insert(2);
@@ -99,6 +102,7 @@ public class OneWayRelationshipsIT extends ServerCase {
assertEquals(2, t2FK);
}
+ @Test
public void testToOne_ReplaceWithNull() throws SQLException {
t1Helper.insert(1);
@@ -118,6 +122,7 @@ public class OneWayRelationshipsIT extends ServerCase {
assertNull(t2FK);
}
+ @Test
public void testToMany_TwoNew() throws SQLException {
OnewayTable3 t3 = context.newObject(OnewayTable3.class);
@@ -132,6 +137,7 @@ public class OneWayRelationshipsIT extends ServerCase {
assertEquals(t3Pk, t4FK);
}
+ @Test
public void testToMany_AddNew() throws SQLException {
t3Helper.insert(1);
@@ -159,6 +165,7 @@ public class OneWayRelationshipsIT extends ServerCase {
}
}
+ @Test
public void testToMany_AddExisting() throws SQLException {
t3Helper.insert(1);
@@ -187,6 +194,7 @@ public class OneWayRelationshipsIT extends ServerCase {
}
}
+ @Test
public void testToMany_RemoveExisting() throws SQLException {
t3Helper.insert(1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
index 9139841..24d880f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class PersistenceByReachabilityIT extends ServerCase {
@@ -34,6 +35,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
@Inject
private ObjectContext context1;
+ @Test
public void testToOneTargetTransient() throws Exception {
Painting persistentDO = context.newObject(Painting.class);
@@ -43,6 +45,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
+ @Test
public void testToOneTargetPersistent() throws Exception {
Painting transientDO = context.newObject(Painting.class);
@@ -52,6 +55,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
+ @Test
public void testToOneTargetDifferentContext() throws Exception {
Painting doC1 = context.newObject(Painting.class);
@@ -68,6 +72,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
}
}
+ @Test
public void testToManyTargetDifferentContext() throws Exception {
Painting doC1 = context.newObject(Painting.class);
Artist doC2 = context1.newObject(Artist.class);
@@ -83,6 +88,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
}
}
+ @Test
public void testToManyTargetTransient() throws Exception {
Painting transientDO = context.newObject(Painting.class);
@@ -92,6 +98,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
+ @Test
public void testToManyTargetPersistent() throws Exception {
Painting persistentDO = context.newObject(Painting.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
index 1defd66..baba75a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
@@ -21,12 +21,14 @@ package org.apache.cayenne;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import static org.mockito.Mockito.mock;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class PersistentObjectIT extends ServerCase {
+ @Test
public void testObjectContext() {
ObjectContext context = mock(ObjectContext.class);
PersistentObject object = new MockPersistentObject();
@@ -36,6 +38,7 @@ public class PersistentObjectIT extends ServerCase {
assertSame(context, object.getObjectContext());
}
+ @Test
public void testPersistenceState() {
PersistentObject object = new MockPersistentObject();
assertEquals(PersistenceState.TRANSIENT, object.getPersistenceState());
@@ -43,6 +46,7 @@ public class PersistentObjectIT extends ServerCase {
assertEquals(PersistenceState.DELETED, object.getPersistenceState());
}
+ @Test
public void testObjectID() {
ObjectId id = new ObjectId("test");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
index d8d71b8..05ce2ab 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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;
/**
* This test case ensures that PK pre-generated for the entity manually before commit is
@@ -55,6 +56,7 @@ public class PregeneratedPKIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testLongPk() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("XXX");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
index 3432c76..f7fbddb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.BinaryPKTest2;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextBinaryPKIT extends ServerCase {
@@ -52,6 +53,7 @@ public class DataContextBinaryPKIT extends ServerCase {
}
}
+ @Test
public void testInsertBinaryPK() throws Exception {
if (accessStackAdapter.supportsBinaryPK()) {
@@ -67,6 +69,7 @@ public class DataContextBinaryPKIT extends ServerCase {
}
}
+ @Test
public void testFetchRelationshipBinaryPK() throws Exception {
if (accessStackAdapter.supportsBinaryPK()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
index da19e51..80b355a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.BlobTestEntity;
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.util.List;
@@ -62,7 +63,8 @@ public class DataContextBlobIT extends ServerCase {
protected boolean skipEmptyLOBTests() {
return !accessStackAdapter.handlesNullVsEmptyLOBs();
}
-
+
+ @Test
public void testManyBlobsInOneTX() throws Exception {
if (skipTests()) {
return;
@@ -85,6 +87,7 @@ public class DataContextBlobIT extends ServerCase {
assertEquals(3, objects2.size());
}
+ @Test
public void testEmptyBlob() throws Exception {
if (skipTests()) {
return;
@@ -95,6 +98,7 @@ public class DataContextBlobIT extends ServerCase {
runWithBlobSize(0);
}
+ @Test
public void test5ByteBlob() throws Exception {
if (skipTests()) {
return;
@@ -102,6 +106,7 @@ public class DataContextBlobIT extends ServerCase {
runWithBlobSize(5);
}
+ @Test
public void test5KByteBlob() throws Exception {
if (skipTests()) {
return;
@@ -109,6 +114,7 @@ public class DataContextBlobIT extends ServerCase {
runWithBlobSize(5 * 1024);
}
+ @Test
public void test1MBBlob() throws Exception {
if (skipTests()) {
return;
@@ -116,6 +122,7 @@ public class DataContextBlobIT extends ServerCase {
runWithBlobSize(1024 * 1024);
}
+ @Test
public void testNullBlob() throws Exception {
if (skipTests()) {
return;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
index 9450aea..fdb98d7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextCallbacksIT extends ServerCase {
@@ -56,6 +57,7 @@ public class DataContextCallbacksIT extends ServerCase {
resolver.getCallbackRegistry().clear();
}
+ @Test
public void testPostAddCallbacks() {
LifecycleCallbackRegistry registry = runtime
.getDataDomain()
@@ -92,6 +94,7 @@ public class DataContextCallbacksIT extends ServerCase {
assertSame(a3, listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPrePersistCallbacks() {
LifecycleCallbackRegistry registry = runtime
.getDataDomain()
@@ -130,6 +133,7 @@ public class DataContextCallbacksIT extends ServerCase {
assertSame(a3, listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPreRemoveCallbacks() {
LifecycleCallbackRegistry registry = runtime
.getDataDomain()
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
index f066bd4..5e0ac6a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.CharPkTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -44,6 +45,7 @@ public class DataContextCharPKIT extends ServerCase {
dbHelper.deleteAll("CHAR_PK_TEST");
}
+ @Test
public void testInsert() throws Exception {
CharPkTestEntity object = context.newObject(CharPkTestEntity.class);
object.setOtherCol("object-XYZ");
@@ -74,6 +76,7 @@ public class DataContextCharPKIT extends ServerCase {
assertEquals("PK1", val);
}
+ @Test
public void testDelete() throws Exception {
CharPkTestEntity object = context.newObject(CharPkTestEntity.class);
object.setOtherCol("object-XYZ");
@@ -93,6 +96,7 @@ public class DataContextCharPKIT extends ServerCase {
assertEquals(0, rows.size());
}
+ @Test
public void testUpdate() throws Exception {
CharPkTestEntity object = context.newObject(CharPkTestEntity.class);
object.setOtherCol("object-XYZ");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
index 2a69198..1b920f0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.ReturnTypesMap1;
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.util.List;
@@ -47,7 +48,8 @@ public class DataContextCharTypeIT extends ServerCase {
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("TYPES_MAPPING_TEST1");
}
-
+
+ @Test
public void testCharTrimming() {
if (unitDbAdapter.supportsLobs()) {
ReturnTypesMap1 map1 = context.newObject(ReturnTypesMap1.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
index 4fae72b..1ee5119 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.testmap.ClobTestEntity;
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.util.List;
@@ -62,6 +63,7 @@ public class DataContextClobIT extends ServerCase {
return !accessStackAdapter.handlesNullVsEmptyLOBs();
}
+ @Test
public void testEmptyClob() throws Exception {
if (skipEmptyLOBTests()) {
return;
@@ -69,6 +71,7 @@ public class DataContextClobIT extends ServerCase {
runWithClobSize(0);
}
+ @Test
public void test5ByteClob() throws Exception {
if (skipTests()) {
return;
@@ -76,6 +79,7 @@ public class DataContextClobIT extends ServerCase {
runWithClobSize(5);
}
+ @Test
public void test5KByteClob() throws Exception {
if (skipTests()) {
return;
@@ -83,6 +87,7 @@ public class DataContextClobIT extends ServerCase {
runWithClobSize(5 * 1024);
}
+ @Test
public void test1MBClob() throws Exception {
if (skipTests()) {
return;
@@ -90,6 +95,7 @@ public class DataContextClobIT extends ServerCase {
runWithClobSize(1024 * 1024);
}
+ @Test
public void testNullClob() throws Exception {
if (skipTests()) {
return;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java
index 30784e1..d0510a1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.NullTestEntity;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextCommitIT extends ServerCase {
@@ -48,6 +49,7 @@ public class DataContextCommitIT extends ServerCase {
dbHelper.deleteAll("NULL_TEST");
}
+ @Test
public void testFlushToParent_Commit() {
// commit new object
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java
index fcd2563..c1d8496 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
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.List;
@@ -52,6 +53,7 @@ public class DataContextCompoundRelIT extends ServerCase {
dbHelper.deleteAll("COMPOUND_PK_TEST");
}
+ @Test
public void testInsert() {
CompoundPkTestEntity master = context.newObject(CompoundPkTestEntity.class);
@@ -79,6 +81,7 @@ public class DataContextCompoundRelIT extends ServerCase {
assertEquals("d1", detail.getName());
}
+ @Test
public void testFetchQualifyingToOne() {
CompoundPkTestEntity master = (CompoundPkTestEntity) context
.newObject("CompoundPkTestEntity");
@@ -115,6 +118,7 @@ public class DataContextCompoundRelIT extends ServerCase {
assertEquals("d1", detail.getName());
}
+ @Test
public void testFetchQualifyingToMany() throws Exception {
CompoundPkTestEntity master = (CompoundPkTestEntity) context
.newObject("CompoundPkTestEntity");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java
index 2a50584..3a3d7ed 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.testdo.db2.CrossdbM2E1;
import org.apache.cayenne.testdo.db2.CrossdbM2E2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.MULTINODE_PROJECT)
public class DataContextCrossDBIT extends ServerCase {
@@ -32,6 +33,7 @@ public class DataContextCrossDBIT extends ServerCase {
@Inject
private DataContext context;
+ @Test
public void testMultiDBUpdate() {
// for now testing that no exceptions are thrown... wouldn't hurt to check the
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
index 2f9bdbc..ca04495 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
@@ -30,6 +30,7 @@ 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.apache.cayenne.util.EventUtil;
+import org.junit.Test;
/**
* Tests that DataContext sends DataChannel events.
@@ -46,6 +47,7 @@ public class DataContextDataChannelEventsIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testCommitEvent() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("X");
@@ -69,6 +71,7 @@ public class DataContextDataChannelEventsIT extends ServerCase {
}
+ @Test
public void testRollbackEvent() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("X");
@@ -91,6 +94,7 @@ public class DataContextDataChannelEventsIT extends ServerCase {
}.runTest(10000);
}
+ @Test
public void testChangeEventOnChildChange() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("X");
@@ -117,6 +121,7 @@ public class DataContextDataChannelEventsIT extends ServerCase {
}.runTest(10000);
}
+ @Test
public void testChangeEventOnPeerChange() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("X");
@@ -141,6 +146,7 @@ public class DataContextDataChannelEventsIT extends ServerCase {
}.runTest(10000);
}
+ @Test
public void testChangeEventOnPeerChangeSecondNestingLevel() throws Exception {
ObjectContext childPeer1 = runtime.newContext(context);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
index a740643..0c6c807 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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.Map;
@@ -56,6 +57,7 @@ public class DataContextDecoratedStackIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testCommitDecorated() {
DataDomain dd = runtime.getDataDomain();
DataChannel decorator = new DataChannelDecorator(dd);
@@ -80,6 +82,7 @@ public class DataContextDecoratedStackIT extends ServerCase {
assertEquals(new Integer(1), count.get("x"));
}
+ @Test
public void testGetParentDataDomain() {
DataDomain dd = runtime.getDataDomain();
DataChannel decorator = new DataChannelDecorator(dd);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
index a86b751..38cc1c6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
@@ -67,6 +68,7 @@ public class DataContextDelegateIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testWillPerformGenericQuery() throws Exception {
final List<Query> queriesPerformed = new ArrayList<Query>(1);
@@ -90,6 +92,7 @@ public class DataContextDelegateIT extends ServerCase {
assertTrue("Delegate unexpectedly blocked the query.", query.isRouteCalled());
}
+ @Test
public void testWillPerformGenericQueryBlocked() throws Exception {
final List<Query> queriesPerformed = new ArrayList<Query>(1);
@@ -112,6 +115,7 @@ public class DataContextDelegateIT extends ServerCase {
assertFalse("Delegate couldn't block the query.", query.isRouteCalled());
}
+ @Test
public void testWillPerformQuery() throws Exception {
final List<Query> queriesPerformed = new ArrayList<Query>(1);
@@ -135,6 +139,7 @@ public class DataContextDelegateIT extends ServerCase {
assertNotNull(results);
}
+ @Test
public void testWillPerformQueryBlocked() throws Exception {
final List<Query> queriesPerformed = new ArrayList<Query>(1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
index d18d4de..5f4fc80 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
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.Date;
@@ -55,6 +56,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase {
* Test case to prove that delegate method is invoked on external change of object in
* the store.
*/
+ @Test
public void testShouldMergeChanges() throws Exception {
final boolean[] methodInvoked = new boolean[1];
@@ -98,6 +100,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testBlockedShouldMergeChanges() throws Exception {
String oldName = artist.getArtistName();
@@ -132,6 +135,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testShouldProcessDeleteOnExternalChange() throws Exception {
final boolean[] methodInvoked = new boolean[1];
@@ -175,6 +179,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testBlockShouldProcessDeleteOnExternalChange() throws Exception {
final boolean[] methodInvoked = new boolean[1];
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java
index 47b2ba3..e870521 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java
@@ -32,6 +32,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.sql.Types;
import java.util.List;
@@ -61,6 +62,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testNullifyToOne() {
// ArtGroup toParentGroup
ArtGroup parentGroup = (ArtGroup) context.newObject("ArtGroup");
@@ -94,6 +96,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
* Tests that deleting a source of a flattened relationship with CASCADE rule results
* in deleting a join and a target.
*/
+ @Test
public void testCascadeToManyFlattened() {
// testing Artist.groupArray relationship
ArtGroup aGroup = context.newObject(ArtGroup.class);
@@ -126,6 +129,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
* Tests that deleting a source of a flattened relationship with NULLIFY rule results
* in deleting a join together with the object deleted.
*/
+ @Test
public void testNullifyToManyFlattened() {
// testing ArtGroup.artistArray relationship
ArtGroup aGroup = context.newObject(ArtGroup.class);
@@ -155,6 +159,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
assertEquals(0, joins2.size());
}
+ @Test
public void testNullifyToMany() {
// ArtGroup childGroupsArray
ArtGroup parentGroup = (ArtGroup) context.newObject("ArtGroup");
@@ -180,6 +185,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCascadeToOne() {
// Painting toPaintingInfo
Painting painting = (Painting) context.newObject("Painting");
@@ -201,6 +207,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCascadeToMany() {
// Artist artistExhibitArray
Artist anArtist = (Artist) context.newObject("Artist");
@@ -229,6 +236,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testDenyToMany() {
// Gallery paintingArray
Gallery gallery = (Gallery) context.newObject("Gallery");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java
index 0d91102..cebf478 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java
@@ -33,6 +33,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.ArrayList;
@@ -110,6 +111,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase {
tPaintingInfo.insert(2, "green");
}
+ @Test
public void testOneToMany() throws Exception {
createArtistWithTwoPaintingsDataSet();
@@ -140,6 +142,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase {
});
}
+ @Test
public void testManyToOne() throws Exception {
createArtistWithTwoPaintingsDataSet();
@@ -159,6 +162,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase {
});
}
+ @Test
public void testFetchLimit() throws Exception {
createThreeArtistsWithPlentyOfPaintingsDataSet();
@@ -193,6 +197,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase {
});
}
+ @Test
public void testOneToOneRelationship() throws Exception {
createTwoPaintingsWithInfosDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
index 4c7057f..c46197c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
@@ -37,6 +37,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.util.ArrayList;
import java.util.Arrays;
@@ -191,6 +192,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
context.invalidateObjects(invalidate);
}
+ @Test
public void testFlattenedRelationship() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
@@ -218,6 +220,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
});
}
+ @Test
public void testFlattenedMultiColumnRelationship() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
@@ -245,6 +248,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
});
}
+ @Test
public void testLongFlattenedRelationship() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
@@ -272,6 +276,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
});
}
+ @Test
public void testMultiColumnRelationship() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
@@ -295,6 +300,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchInParent() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
@@ -326,6 +332,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchInChild() throws Exception {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java
index ab9a5b4..fbd80c2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java
@@ -26,6 +26,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.math.BigDecimal;
import java.sql.Types;
@@ -70,6 +71,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase {
tPainting.insert(33003, null, "P3", 5000);
}
+ @Test
public void testSQLResultSetMappingScalar() throws Exception {
String ejbql = "SELECT count(p) FROM Painting p JOIN p.toArtist a";
@@ -83,6 +85,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase {
assertEquals(new Long(2), o1);
}
+ @Test
public void testSQLResultSetMappingScalars() throws Exception {
String ejbql = "SELECT count(p), sum(p.estimatedPrice) FROM Painting p JOIN p.toArtist a";
@@ -101,6 +104,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase {
assertEquals(0, new BigDecimal(8000).compareTo((BigDecimal) array1[1]));
}
+ @Test
public void testSQLResultSetMappingMixed() throws Exception {
String ejbql = "SELECT count(p), a, sum(p.estimatedPrice) "
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java
index 52ee3af..09e35fd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.math.BigDecimal;
import java.sql.Types;
@@ -108,6 +109,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
tPainting.insert(33014, null, "C", 5000);
}
+ @Test
public void testDateParameter() throws Exception {
createCollectionDataSet();
@@ -128,6 +130,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertSame(allArtists.get(0), objects.get(0));
}
+ @Test
public void testArithmetics() throws Exception {
createLikeDataSet();
@@ -153,6 +156,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
// assertTrue(ids.contains(new Integer(33002)));
}
+ @Test
public void testLike1() throws Exception {
createLikeDataSet();
@@ -172,6 +176,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33001)));
}
+ @Test
public void testNotLike() throws Exception {
createLikeDataSet();
@@ -191,6 +196,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertFalse(ids.contains(new Integer(33001)));
}
+ @Test
public void testLike2() throws Exception {
createLikeDataSet();
@@ -212,6 +218,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33005)));
}
+ @Test
public void testLikeEscape() throws Exception {
createLikeDataSet();
@@ -231,6 +238,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33005)));
}
+ @Test
public void testLikeEscape_LikeParameter() throws Exception {
createLikeDataSet();
@@ -252,6 +260,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33005)));
}
+ @Test
public void testLikeNullParameter() {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("a1");
@@ -269,6 +278,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertNotNull(Cayenne.objectForQuery(context, eq2));
}
+ @Test
public void testIn() throws Exception {
createInDataSet();
@@ -289,6 +299,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33007)));
}
+ @Test
public void testNotIn() throws Exception {
createInDataSet();
@@ -308,6 +319,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33008)));
}
+ @Test
public void testInSubquery() throws Exception {
createInSubqueryDataSet();
@@ -330,6 +342,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Integer(33014)));
}
+ @Test
public void testCollectionEmpty() throws Exception {
createCollectionDataSet();
@@ -349,6 +362,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(new Long(33003)));
}
+ @Test
public void testCollectionNotEmpty() throws Exception {
createCollectionDataSet();
@@ -369,6 +383,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(33002l));
}
+ @Test
public void testCollectionNotEmptyExplicitDistinct() throws Exception {
createCollectionDataSet();
@@ -389,6 +404,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(33002l));
}
+ @Test
public void testCollectionMemberOfParameter() throws Exception {
createCollectionDataSet();
@@ -409,6 +425,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(33001l));
}
+ @Test
public void testGreaterOrEquals() throws Exception {
createGreaterThanDataSet();
@@ -420,6 +437,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertEquals(4, objects.size());
}
+ @Test
public void testLessOrEquals() throws Exception {
createGreaterThanDataSet();
@@ -431,6 +449,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertEquals(2, objects.size());
}
+ @Test
public void testCollectionNotMemberOfParameter() throws Exception {
createCollectionDataSet();
@@ -452,6 +471,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase {
assertTrue(ids.contains(33003l));
}
+ @Test
public void testCollectionMemberOfThetaJoin() throws Exception {
createCollectionDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
index 9a921f9..b1b59ef 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.inherit.Department;
import org.apache.cayenne.testdo.inherit.Manager;
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.HashSet;
@@ -112,6 +113,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCollectionMemberOfId() throws Exception {
String ejbql = "SELECT DISTINCT m FROM Manager m JOIN m.managedDepartments d"
@@ -132,6 +134,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
assertTrue(ids.contains("m3"));
}
+ @Test
public void testCollectionNotMemberOfId() throws Exception {
String ejbql = "SELECT DISTINCT m FROM Manager m JOIN m.managedDepartments d"
@@ -151,6 +154,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
assertTrue(ids.contains("m2"));
}
+ @Test
public void testCollectionNotMemberOfToOne() throws Exception {
// need a better test ... this query returns zero rows by definition
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java
index 728adaf..1b21506 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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.sql.Types;
import java.util.List;
@@ -86,6 +87,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase {
}
}
+ @Test
public void testDeleteNoIdVar() throws Exception {
createPaintingsDataSet();
@@ -100,6 +102,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase {
assertEquals(2, count[0]);
}
+ @Test
public void testDeleteNoQualifier() throws Exception {
createPaintingsDataSet();
@@ -114,6 +117,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase {
assertEquals(2, count[0]);
}
+ @Test
public void testDeleteSameEntityQualifier() throws Exception {
createPaintingsDataSet();
@@ -133,6 +137,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase {
assertNull(Cayenne.objectForPK(freshContext, Painting.class, 33002));
}
+ @Test
public void testDeleteIdVar() throws Exception {
createMeaningfulPKDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java
index 2a686d5..8141130 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.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.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Date;
import java.sql.Types;
@@ -118,6 +119,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
tArtistExhibit.insert(1, 2);
}
+ @Test
public void testFetchJoinForOneEntity() throws Exception {
createOneFetchJoinDataSet();
@@ -151,6 +153,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
});
}
+ @Test
public void testSeveralFetchJoins() throws Exception {
createMultipleFetchJoinsDataSet();
@@ -206,6 +209,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
});
}
+ @Test
public void testSeveralEntitiesFetchJoins() throws Exception {
createMultipleFetchJoinsDataSet();
@@ -228,6 +232,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
});
}
+ @Test
public void testSeveralEntitiesAndScalarFetchInnerJoins() throws Exception {
createMultipleFetchJoinsDataSet();
@@ -307,6 +312,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
});
}
+ @Test
public void testSeveralEntitiesAndScalarFetchOuterJoins() throws Exception {
createMultipleFetchJoinsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
index b755c1a..1e48da4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.FlattenedTest1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.HashSet;
import java.util.Iterator;
@@ -80,6 +81,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
ft4Helper.insert(1, 1, "ft4");
}
+ @Test
public void testCollectionMemberOfThetaJoin() throws Exception {
createFt123();
@@ -104,6 +106,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
assertTrue(ids.contains(3));
}
+ @Test
public void testCollectionMemberOfThetaJoinLongRelationshipSequence()
throws Exception {
@@ -135,6 +138,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
assertEquals(0, objects.size());
}
+ @Test
public void testCollectionInnerJoin() throws Exception {
createFt123();
@@ -160,6 +164,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testCollectionAsInnerJoin() throws Exception {
createFt123();
@@ -187,6 +192,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testCollectionThetaJoin() throws Exception {
createFt123();
@@ -210,6 +216,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testCollectionIdentificationVariable() throws Exception {
createFt123();
@@ -236,6 +243,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testAssociationFieldSelect() throws Exception {
createFt123();
@@ -259,6 +267,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testCollectionSubquery() throws Exception {
createFt123();
@@ -281,6 +290,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testCollectionSubquery1() throws Exception {
createFt123();
@@ -306,6 +316,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
}
+ @Test
public void testGroupByFlattenedRelationship() throws Exception {
createFt123();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
index 7884520..60ffb8f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
@@ -18,11 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.List;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.di.Inject;
@@ -38,6 +33,12 @@ import org.apache.cayenne.testdo.testmap.Painting;
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.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.List;
// TODO: renamed as it fails on DB's like Derby. See CAY-1480.
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
@@ -65,6 +66,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
dbHelper.deleteAll("DATE_TEST");
}
+ @Test
public void testCURRENT_DATE() {
Calendar cal = Calendar.getInstance();
@@ -87,6 +89,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o2));
}
+ @Test
public void testCURRENT_TIME() {
Calendar cal = Calendar.getInstance();
@@ -109,6 +112,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o1));
}
+ @Test
public void testCURRENT_TIMESTAMP() {
Calendar cal = Calendar.getInstance();
@@ -133,6 +137,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o1));
}
+ @Test
public void testABS() {
BigDecimalEntity o1 = context.newObject(BigDecimalEntity.class);
@@ -150,6 +155,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o2));
}
+ @Test
public void testSQRT() {
BigDecimalEntity o1 = context.newObject(BigDecimalEntity.class);
@@ -167,6 +173,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o2));
}
+ @Test
public void testMOD() {
BigIntegerEntity o1 = context.newObject(BigIntegerEntity.class);
@@ -184,6 +191,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(o2));
}
+ @Test
public void testSIZE() {
Artist a1 = context.newObject(Artist.class);
@@ -215,6 +223,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
// assertTrue(objects2.contains(a1));
}
+ @Test
public void testCONCAT() {
Painting a1 = context.newObject(Painting.class);
@@ -231,6 +240,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a1));
}
+ @Test
public void testSUBSTRING() {
Artist a1 = context.newObject(Artist.class);
@@ -247,6 +257,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a2));
}
+ @Test
public void testLOWER() {
Artist a1 = context.newObject(Artist.class);
@@ -268,6 +279,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a2));
}
+ @Test
public void testUPPER() {
Artist a1 = context.newObject(Artist.class);
@@ -289,6 +301,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a2));
}
+ @Test
public void testLENGTH() {
Artist a1 = context.newObject(Artist.class);
@@ -309,6 +322,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a2));
}
+ @Test
public void testLOCATE() {
Artist a1 = context.newObject(Artist.class);
@@ -325,6 +339,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
assertTrue(objects.contains(a2));
}
+ @Test
public void testTRIM() {
// insert via a SQL template to prevent adapter trimming and such...
@@ -369,6 +384,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase {
}
+ @Test
public void testTRIMChar() {
if (!accessStackAdapter.supportsTrimChar()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
index f13b7ba..268fb1e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.math.BigDecimal;
import java.sql.Types;
@@ -114,6 +115,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
tPainting.insert(33010, 33001, 33002, "P112", 5000);
}
+ @Test
public void testGroupBy() throws Exception {
createFivePaintings();
@@ -135,6 +137,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertEquals(new Long(2l), row1[1]);
}
+ @Test
public void testGroupByMultipleItems() throws Exception {
createFivePaintings();
@@ -163,6 +166,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertEquals(new Long(2), row2[2]);
}
+ @Test
public void testGroupByRelatedEntity() throws Exception {
createFourArtistsAndTwoPaintings();
@@ -183,6 +187,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(row0[1] instanceof Artist);
}
+ @Test
public void testGroupByIdVariable() throws Exception {
createFivePaintings();
@@ -203,6 +208,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
// }
}
+ @Test
public void testGroupByHavingOnColumn() throws Exception {
createFivePaintings();
@@ -220,6 +226,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertEquals(new Long(2), row0[1]);
}
+ @Test
public void testGroupByHavingOnAggregate() throws Exception {
createFivePaintings();
@@ -237,6 +244,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertEquals(new Long(3l), row0[1]);
}
+ @Test
public void testGroupByHavingOnAggregateMultipleConditions() throws Exception {
createFivePaintings();
@@ -254,6 +262,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertEquals(new Long(3l), row0[1]);
}
+ @Test
public void testGroupByJoinedRelatedEntities() throws Exception {
createFourArtistsAndTwoPaintings();
@@ -278,6 +287,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue("error artistName:" + artistName, expectedArtists.contains(artistName));
}
+ @Test
public void testGroupByJoinedEntities() throws Exception {
createArtistsPaintingGalleries();
EJBQLQuery query = new EJBQLQuery(
@@ -300,6 +310,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
}
}
+ @Test
public void testGroupByJoinedEntityInCount() throws Exception {
createArtistsPaintingGalleries();
@@ -321,6 +332,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
}
}
+ @Test
public void testGroupByChainedJoins() throws Exception {
createFivePaintings();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
index 69cbf00..fd9ab47 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.inherit.Employee;
import org.apache.cayenne.testdo.inherit.Manager;
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;
@@ -64,6 +65,7 @@ public class DataContextEJBQLInheritanceIT extends ServerCase {
person.insert(6, "e", "C", null);
}
+ @Test
public void testSelect() throws Exception {
EJBQLQuery superclass = new EJBQLQuery("select p from AbstractPerson p ORDER BY p.name");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java
index 5bcfe79..8df591f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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;
@@ -81,6 +82,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
tPainting.insert(33003, 33001, "C", 500);
}
+ @Test
public void testCompareToNull() throws Exception {
// the query below can blow up on FrontBase. See CAY-819 for details.
@@ -102,6 +104,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
context.performQuery(query1);
}
+ @Test
public void testCompareToNull2() throws Exception {
if (!accessStackAdapter.supportsEqualNullSyntax()) {
@@ -117,6 +120,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
context.performQuery(query1);
}
+ @Test
public void testCompareToNull3() throws Exception {
if (!accessStackAdapter.supportsEqualNullSyntax()) {
return;
@@ -131,6 +135,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
context.performQuery(query1);
}
+ @Test
public void testIsNull() throws Exception {
createTwoPaintings();
@@ -143,6 +148,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0)));
}
+ @Test
public void testIsNotNull() throws Exception {
createTwoPaintings();
@@ -155,6 +161,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject((Persistent) results.get(0)));
}
+ @Test
public void testToOneIsNull() throws Exception {
createTwoPaintingsAndOneArtist();
@@ -167,6 +174,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0)));
}
+ @Test
public void testToOneIsNotNull() throws Exception {
createTwoPaintingsAndOneArtist();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java
index 774b729..59acfd6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java
@@ -27,6 +27,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.sql.Types;
import java.util.HashSet;
@@ -111,6 +112,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
tPainting.insert(33007, 33001, null, "P2", 5000);
}
+ @Test
public void testThetaJoins() throws Exception {
createFourArtistsFourPaintings();
@@ -133,6 +135,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertTrue(names.contains("BB2"));
}
+ @Test
public void testInnerJoins() throws Exception {
createTwoArtistsOnePainting();
@@ -145,6 +148,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Artist) artists.get(0)));
}
+ @Test
public void testOuterJoins() throws Exception {
createTwoArtistsOnePainting();
@@ -165,6 +169,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertTrue(ids.contains(33005l));
}
+ @Test
public void testChainedJoins() throws Exception {
createTwoArtistsTwoPaintingsTwoGalleries();
@@ -179,6 +184,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
+ @Test
public void testImplicitJoins() throws Exception {
createTwoArtistsTwoPaintingsTwoGalleries();
@@ -196,6 +202,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
+ @Test
public void testPartialImplicitJoins1() throws Exception {
createTwoArtistsTwoPaintingsTwoGalleries();
@@ -208,6 +215,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
+ @Test
public void testPartialImplicitJoins2() throws Exception {
createTwoArtistsTwoPaintingsTwoGalleries();
@@ -220,6 +228,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
+ @Test
public void testMultipleJoinsToTheSameTable() throws Exception {
createTwoArtistsThreePaintings();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java
index 8800098..3450b71 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
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;
@@ -86,6 +87,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
tPainting.insert(33006, 33002, "C", 500);
}
+ @Test
public void testOrderByDefault() throws Exception {
createThreePaintings();
@@ -111,6 +113,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
+ @Test
public void testOrderByAsc() throws Exception {
createThreePaintings();
@@ -136,6 +139,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
+ @Test
public void testOrderByDesc() throws Exception {
createThreePaintings();
@@ -160,6 +164,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
assertEquals(33003, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
+ @Test
public void testOrderByQualified() throws Exception {
createThreePaintings();
@@ -182,6 +187,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(1)));
}
+ @Test
public void testOrderByMultiple() throws Exception {
createFourPaintings();
@@ -197,6 +203,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase {
assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(3)));
}
+ @Test
public void testOrderByPath() throws Exception {
createTwoArtistsTwoPaintings();
[05/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
index 8b512f5..1ba7e74 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.access;
-import java.util.List;
-
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -32,6 +30,9 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextRollbackIT extends ServerCase {
@@ -54,6 +55,7 @@ public class DataContextRollbackIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testRollbackNew() {
Artist artist = (Artist) context.newObject("Artist");
artist.setArtistName("a");
@@ -80,6 +82,7 @@ public class DataContextRollbackIT extends ServerCase {
assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
}
+ @Test
public void testRollbackNewObject() {
String artistName = "revertTestArtist";
Artist artist = (Artist) context.newObject("Artist");
@@ -105,6 +108,7 @@ public class DataContextRollbackIT extends ServerCase {
// 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 artistName = "rollbackTestArtist";
String paintingTitle = "rollbackTestPainting";
@@ -133,6 +137,7 @@ public class DataContextRollbackIT extends ServerCase {
assertEquals(0, queryResults.size());
}
+ @Test
public void testRollbackRelationshipModification() {
String artistName = "relationshipModArtist";
String paintingTitle = "relationshipTestPainting";
@@ -169,6 +174,7 @@ public class DataContextRollbackIT extends ServerCase {
assertEquals(artistName, queriedPainting.getToArtist().getArtistName());
}
+ @Test
public void testRollbackDeletedObject() {
String artistName = "deleteTestArtist";
Artist artist = (Artist) context.newObject("Artist");
@@ -195,6 +201,7 @@ public class DataContextRollbackIT extends ServerCase {
assertEquals(1, queryResults.size());
}
+ @Test
public void testRollbackModifiedObject() {
String artistName = "initialTestArtist";
Artist artist = (Artist) context.newObject("Artist");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
index 0fef8f7..04c253f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
@@ -40,6 +40,7 @@ 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.SQLTemplateCustomizer;
+import org.junit.Test;
import java.sql.Types;
import java.util.Collections;
@@ -121,6 +122,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
tCompoundFkTest.insert(7, "b1", "b2");
}
+ @Test
public void testSQLResultSetMappingMixed() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -163,7 +165,8 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(new Integer(0), array4[1]);
assertTrue("Unexpected DataObject: " + array1[0], array1[0] instanceof Artist);
}
-
+
+ @Test
public void testRootless_DataNodeName() throws Exception {
createFourArtists();
@@ -171,13 +174,15 @@ public class DataContextSQLTemplateIT extends ServerCase {
query.setDataNodeName("tstmap");
assertEquals(4, context.performQuery(query).size());
}
-
+
+ @Test
public void testRootless_DefaultDataNode() throws Exception {
createFourArtists();
SQLTemplate query = new SQLTemplate("SELECT * FROM ARTIST", true);
assertEquals(4, context.performQuery(query).size());
}
+ @Test
public void testSQLResultSetMappingScalar() throws Exception {
createFourArtists();
@@ -205,6 +210,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(4, ((Number) o).intValue());
}
+ @Test
public void testSQLResultSetMappingScalarArray() throws Exception {
createFourArtists();
@@ -238,6 +244,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(77, ((Number) row[1]).intValue());
}
+ @Test
public void testColumnNamesCapitalization() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -269,6 +276,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertTrue(row4.containsKey("ARTIST_ID"));
}
+ @Test
public void testFetchDataRows() throws Exception {
createFourArtists();
@@ -288,6 +296,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(new Integer(101), new Integer(id.toString()));
}
+ @Test
public void testFetchObjects() throws Exception {
createFourArtists();
@@ -306,6 +315,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals("artist3", artist2.getArtistName());
}
+ @Test
public void testBindObjectEqualShort() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -324,6 +334,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(7, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectNotEqualShort() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -345,6 +356,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(6, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectEqualFull() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -363,6 +375,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(7, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectEqualFullNonArray() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -381,6 +394,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(7, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectEqualNull() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -397,6 +411,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(8, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectNotEqualFull() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -417,6 +432,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(6, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectEqualCompound() throws Exception {
createTwoCompoundPKsAndCompoundFKsDataSet();
@@ -442,6 +458,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(6, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectNotEqualCompound() throws Exception {
createTwoCompoundPKsAndCompoundFKsDataSet();
@@ -467,6 +484,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(7, Cayenne.intPKForObject(p));
}
+ @Test
public void testBindObjectNotEqualNull() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -486,6 +504,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(7, Cayenne.intPKForObject(p2));
}
+ @Test
public void testBindEqualNull() throws Exception {
createFourArtistsAndThreePaintingsDataSet();
@@ -502,6 +521,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals(8, Cayenne.intPKForObject(p));
}
+ @Test
public void testFetchLimit() throws Exception {
createFourArtists();
@@ -520,6 +540,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertTrue(objects.get(0) instanceof Artist);
}
+ @Test
public void testFetchOffset() throws Exception {
createFourArtists();
@@ -538,6 +559,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertTrue(objects.get(0) instanceof Artist);
}
+ @Test
public void testFetchOffsetFetchLimit() throws Exception {
createFourArtists();
@@ -553,6 +575,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertTrue(objects.get(0) instanceof Artist);
}
+ @Test
public void testPageSize() throws Exception {
createFourArtists();
@@ -588,6 +611,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
assertEquals("artist" + (pageSize + 2), artist.getArtistName());
}
+ @Test
public void testIteratedQuery() throws Exception {
createFourArtists();
@@ -616,6 +640,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
}
}
+ @Test
public void testQueryWithLineBreakAfterMacro() throws Exception {
createFourArtists();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
index f7e35a3..763e28e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
@@ -26,6 +26,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;
@@ -72,6 +73,7 @@ public class DataContextSelectQuerySplitAliasesIT extends ServerCase {
tPainting.insert(3, 2, "X");
}
+ @Test
public void testAliasPathSplits_SinglePath() throws Exception {
createTwoArtistsTwoPaintingsDataSet();
@@ -85,6 +87,7 @@ public class DataContextSelectQuerySplitAliasesIT extends ServerCase {
assertEquals("AA", artists.get(0).getArtistName());
}
+ @Test
public void testAliasPathSplits_SplitJoin() throws Exception {
createTwoArtistsThreePaintingsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
index 4573a1e..bb6970e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.access;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
@@ -37,6 +33,11 @@ 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.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextSerializationIT extends ServerCase {
@@ -78,6 +79,7 @@ public class DataContextSerializationIT extends ServerCase {
CayenneRuntime.bindThreadInjector(null);
}
+ @Test
public void testSerializeResolver() throws Exception {
DataContext deserializedContext = Util.cloneViaSerialization(context);
@@ -86,6 +88,7 @@ public class DataContextSerializationIT extends ServerCase {
assertSame(context.getEntityResolver(), deserializedContext.getEntityResolver());
}
+ @Test
public void testSerializeChannel() throws Exception {
DataContext deserializedContext = Util.cloneViaSerialization(context);
@@ -94,6 +97,7 @@ public class DataContextSerializationIT extends ServerCase {
assertSame(context.getChannel(), deserializedContext.getChannel());
}
+ @Test
public void testSerializeNestedChannel() throws Exception {
ObjectContext child = runtime.newContext(context);
@@ -104,6 +108,7 @@ public class DataContextSerializationIT extends ServerCase {
assertNotNull(deserializedContext.getEntityResolver());
}
+ @Test
public void testSerializeWithSharedCache() throws Exception {
createSingleArtistDataSet();
@@ -131,6 +136,7 @@ public class DataContextSerializationIT extends ServerCase {
deserializedContext.commitChanges();
}
+ @Test
public void testSerializeWithLocalCache() throws Exception {
createSingleArtistDataSet();
@@ -180,6 +186,7 @@ public class DataContextSerializationIT extends ServerCase {
deserializedContext.commitChanges();
}
+ @Test
public void testSerializeNew() throws Exception {
Artist artist = (Artist) context.newObject("Artist");
@@ -204,6 +211,7 @@ public class DataContextSerializationIT extends ServerCase {
assertSame(deserializedContext, deserializedArtist.getObjectContext());
}
+ @Test
public void testSerializeCommitted() throws Exception {
Artist artist = (Artist) context.newObject("Artist");
@@ -237,6 +245,7 @@ public class DataContextSerializationIT extends ServerCase {
assertEquals(0, paintings.size());
}
+ @Test
public void testSerializeModified() throws Exception {
Artist artist = (Artist) context.newObject("Artist");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
index 2168565..3103f9c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
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.Collections;
import java.util.List;
@@ -76,6 +77,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
tArtist.insert(1, "version1");
}
+ @Test
public void testSelectSelectCommitRefresh() throws Exception {
SelectQuery query = new SelectQuery(Artist.class);
@@ -96,6 +98,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
assertOnCommit(a2);
}
+ @Test
public void testSelectSelectCommitRefreshReverse() throws Exception {
SelectQuery query = new SelectQuery(Artist.class);
@@ -115,6 +118,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
assertOnCommit(a2);
}
+ @Test
public void testSelectUpdateSelectCommitRefresh() throws Exception {
SelectQuery query = new SelectQuery(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
index 6428086..b29e55d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
@@ -19,12 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
@@ -40,6 +34,13 @@ 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.SQLTemplateCustomizer;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Test suite for testing behavior of multiple DataContexts that share the same underlying
@@ -84,6 +85,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* Test case to prove that refreshing snapshots as a result of the database fetch will
* be propagated across DataContexts.
*/
+ @Test
public void testSnapshotChangePropagationOnSelect() throws Exception {
String originalName = artist.getArtistName();
final String newName = "version2";
@@ -136,6 +138,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* to the database will be reflected in the peer ObjectStore using the same
* DataRowCache.
*/
+ @Test
public void testSnapshotChangePropagation() throws Exception {
String originalName = artist.getArtistName();
final String newName = "version2";
@@ -179,6 +182,7 @@ public class DataContextSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testSnapshotChangePropagationToModifiedObjects() throws Exception {
String originalName = artist.getArtistName();
Date originalDate = artist.getDateOfBirth();
@@ -228,6 +232,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* database will be reflected in the peer ObjectStore using the same DataRowCache. By
* default COMMITTED objects will be changed to TRANSIENT.
*/
+ @Test
public void testSnapshotDeletePropagationToCommitted() throws Exception {
// make sure we have a fully resolved copy of an artist object
@@ -267,6 +272,7 @@ public class DataContextSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testSnapshotDeletePropagationToHollow() throws Exception {
final Artist altArtist = context1.localObject(artist);
@@ -302,6 +308,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* database will be reflected in the peer ObjectStore using the same DataRowCache. By
* default MODIFIED objects will be changed to NEW.
*/
+ @Test
public void testSnapshotDeletePropagationToModified() throws Exception {
// make sure we have a fully resolved copy of an artist object
@@ -354,6 +361,7 @@ public class DataContextSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testSnapshotDeletePropagationToDeleted() throws Exception {
// make sure we have a fully resolved copy of an artist object
@@ -395,6 +403,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* database will be reflected in the peer ObjectStore using the same DataRowCache,
* including proper processing of deleted object being held in to-many collections.
*/
+ @Test
public void testSnapshotDeletePropagationToManyRefresh() throws Exception {
Painting painting1 = (Painting) context.newObject("Painting");
@@ -465,6 +474,7 @@ public class DataContextSharedCacheIT extends ServerCase {
*
* @throws Exception
*/
+ @Test
public void testSnapshotInsertPropagationToManyRefresh() throws Exception {
Painting painting1 = (Painting) context.newObject("Painting");
@@ -514,6 +524,7 @@ public class DataContextSharedCacheIT extends ServerCase {
* Checks that cache is refreshed when a query "refreshingObjects" property is set to
* true.
*/
+ @Test
public void testCacheRefreshingOnSelect() throws Exception {
String originalName = artist.getArtistName();
final String newName = "version2";
@@ -557,6 +568,7 @@ public class DataContextSharedCacheIT extends ServerCase {
assertEquals(newName, artist.getArtistName());
}
+ @Test
public void testSnapshotEvictedForHollow() throws Exception {
String originalName = artist.getArtistName();
@@ -577,6 +589,7 @@ public class DataContextSharedCacheIT extends ServerCase {
assertEquals(originalName, freshSnapshot.get("ARTIST_NAME"));
}
+ @Test
public void testSnapshotEvictedAndObjectsHollowedForInvalidate() throws Exception {
String originalName = artist.getArtistName();
@@ -619,6 +632,7 @@ public class DataContextSharedCacheIT extends ServerCase {
}
+ @Test
public void testSnapshotEvictedForCommitted() throws Exception {
String newName = "version2";
@@ -643,6 +657,7 @@ public class DataContextSharedCacheIT extends ServerCase {
assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
}
+ @Test
public void testSnapshotEvictedForModified() throws Exception {
String newName = "version2";
@@ -668,6 +683,7 @@ public class DataContextSharedCacheIT extends ServerCase {
assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
}
+ @Test
public void testSnapshotEvictedAndChangedForModified() throws Exception {
String originalName = artist.getArtistName();
String newName = "version2";
@@ -705,6 +721,7 @@ public class DataContextSharedCacheIT extends ServerCase {
assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
}
+ @Test
public void testSnapshotEvictedForDeleted() throws Exception {
// remember ObjectId
ObjectId id = artist.getObjectId();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
index b22daf9..d208844 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.unit.util.ValidationDelegate;
import org.apache.cayenne.validation.ValidationResult;
+import org.junit.Test;
/**
*/
@@ -50,6 +51,7 @@ public class DataContextValidationIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testValidatingObjectsOnCommitProperty() throws Exception {
context.setValidatingObjectsOnCommit(true);
assertTrue(context.isValidatingObjectsOnCommit());
@@ -58,6 +60,7 @@ public class DataContextValidationIT extends ServerCase {
assertFalse(context.isValidatingObjectsOnCommit());
}
+ @Test
public void testValidatingObjectsOnCommit() throws Exception {
// test that validation is called properly
@@ -74,6 +77,7 @@ public class DataContextValidationIT extends ServerCase {
assertFalse(a2.isValidateForSaveCalled());
}
+ @Test
public void testValidationModifyingContext() throws Exception {
ValidationDelegate delegate = new ValidationDelegate() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
index de4fce3..f0fdb46 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataDomainCallbacksIT extends ServerCase {
@@ -60,6 +61,7 @@ public class DataDomainCallbacksIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testPostLoad() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -114,6 +116,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener.getPublicCalledbackEntity());
}
+ @Test
public void testPostLoad_MixedResult() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -137,6 +140,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener.getPublicCalledbackEntity());
}
+ @Test
public void testPostLoad_Relationship() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -171,6 +175,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener.getPublicCalledbackEntity());
}
+ @Test
public void testPostLoad_Prefetch() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -200,6 +205,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener.getPublicCalledbackEntity());
}
+ @Test
public void testPostLoad_LocalObject() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -226,6 +232,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a2, listener.getPublicCalledbackEntity());
}
+ @Test
public void testPostLoad_ThatModifiesObject() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -266,7 +273,8 @@ public class DataDomainCallbacksIT extends ServerCase {
assertEquals(1, a1.getPostLoaded());
assertSame(a1, listener.getPublicCalledbackEntity());
}
-
+
+ @Test
public void testPreUpdate() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -303,6 +311,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPostUpdate() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -341,6 +350,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPostRemove() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -367,6 +377,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPostRemove_UpdatedDeleted() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -398,6 +409,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertSame(a1, listener1.getPublicCalledbackEntity());
}
+ @Test
public void testPostRemove_InsertedUpdatedDeleted() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -433,6 +445,7 @@ public class DataDomainCallbacksIT extends ServerCase {
assertNull(listener2.getPublicCalledbackEntity());
}
+ @Test
public void testPostPersist() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
index c8fa69c..a0be7ac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
@@ -32,6 +32,7 @@ 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.apache.cayenne.util.ListResponse;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
@@ -45,12 +46,14 @@ public class DataDomainFiltersIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testDefaultNoFilters() {
DataDomain domain = runtime.getDataDomain();
assertEquals(0, domain.filters.size());
}
+ @Test
public void testOnQuery_FilterOrdering() {
DataDomain domain = runtime.getDataDomain();
@@ -100,6 +103,7 @@ public class DataDomainFiltersIT extends ServerCase {
assertEquals("f2end", results.get(3));
}
+ @Test
public void testOnSync_FilterOrdering() {
DataDomain domain = runtime.getDataDomain();
@@ -159,6 +163,7 @@ public class DataDomainFiltersIT extends ServerCase {
assertEquals("f2end", results.get(3));
}
+ @Test
public void testOnQuery_Blocking() {
DataDomain domain = runtime.getDataDomain();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
index 8bba81e..0e7779b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.annotations.Tag1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
@@ -50,6 +51,7 @@ public class DataDomainIT extends ServerCase {
@Inject
private JdbcEventLogger logger;
+ @Test
public void testName() throws Exception {
DataDomain domain = new DataDomain("some name");
assertEquals("some name", domain.getName());
@@ -57,6 +59,7 @@ public class DataDomainIT extends ServerCase {
assertEquals("tst_name", domain.getName());
}
+ @Test
public void testLookupDataNode() {
DataDomain domain = new DataDomain("test");
@@ -83,6 +86,7 @@ public class DataDomainIT extends ServerCase {
}
}
+ @Test
public void testLookupDataNode_Default() {
DataDomain domain = new DataDomain("test");
@@ -104,6 +108,7 @@ public class DataDomainIT extends ServerCase {
assertSame(n1, domain.lookupDataNode(new DataMap("m3")));
}
+ @Test
public void testNodes() throws Exception {
DataDomain domain = new DataDomain("dom1");
assertEquals(0, domain.getDataNodes().size());
@@ -117,6 +122,7 @@ public class DataDomainIT extends ServerCase {
assertEquals(2, domain.getDataNodes().size());
}
+ @Test
public void testNodeMaps() throws Exception {
DataDomain domain = new DataDomain("dom1");
assertNull(domain.getDataMap("map"));
@@ -129,6 +135,7 @@ public class DataDomainIT extends ServerCase {
assertNotNull(domain.getDataMap("map"));
}
+ @Test
public void testMaps() throws Exception {
DataDomain d1 = new DataDomain("dom1");
@@ -140,6 +147,7 @@ public class DataDomainIT extends ServerCase {
assertNull(d1.getDataMap(m1.getName()));
}
+ @Test
public void testEntityResolverRefresh() throws Exception {
DataDomain domain = new DataDomain("dom1");
org.apache.cayenne.map.EntityResolver resolver = domain.getEntityResolver();
@@ -154,6 +162,7 @@ public class DataDomainIT extends ServerCase {
assertSame(entity, resolver.getObjEntity("TestEntity"));
}
+ @Test
public void testEntityResolver() {
assertNotNull(runtime.getDataDomain().getEntityResolver());
@@ -161,6 +170,7 @@ public class DataDomainIT extends ServerCase {
assertNotNull(domain.getEntityResolver());
}
+ @Test
public void testInitDataDomainWithSharedCache() throws Exception {
Map<Object, Object> properties = new HashMap<Object, Object>();
properties.put(DataDomain.SHARED_CACHE_ENABLED_PROPERTY, Boolean.TRUE.toString());
@@ -169,6 +179,7 @@ public class DataDomainIT extends ServerCase {
assertTrue(domain.isSharedCacheEnabled());
}
+ @Test
public void testInitDataDomainWithDedicatedCache() throws Exception {
Map<Object, Object> properties = new HashMap<Object, Object>();
properties.put(DataDomain.SHARED_CACHE_ENABLED_PROPERTY, Boolean.FALSE.toString());
@@ -177,6 +188,7 @@ public class DataDomainIT extends ServerCase {
assertFalse(domain.isSharedCacheEnabled());
}
+ @Test
public void testInitDataDomainValidation() throws Exception {
Map<Object, Object> properties = new HashMap<Object, Object>();
properties.put(DataDomain.VALIDATING_OBJECTS_ON_COMMIT_PROPERTY, Boolean.TRUE.toString());
@@ -185,6 +197,7 @@ public class DataDomainIT extends ServerCase {
assertTrue(domain.isValidatingObjectsOnCommit());
}
+ @Test
public void testInitDataDomainNoValidation() throws Exception {
Map<Object, Object> properties = new HashMap<Object, Object>();
properties.put(DataDomain.VALIDATING_OBJECTS_ON_COMMIT_PROPERTY, Boolean.FALSE.toString());
@@ -193,6 +206,7 @@ public class DataDomainIT extends ServerCase {
assertFalse(domain.isValidatingObjectsOnCommit());
}
+ @Test
public void testShutdownCache() {
DataDomain domain = new DataDomain("X");
@@ -212,6 +226,7 @@ public class DataDomainIT extends ServerCase {
assertTrue(cacheShutdown[0]);
}
+ @Test
public void testAddListener() {
DataDomain domain = runtime.getDataDomain();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
index 5e053a1..4e4323e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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.io.Serializable;
import java.util.List;
@@ -62,6 +63,7 @@ public class DataDomainQueryActionIT extends ServerCase {
runtime.getDataDomain().resetProperties();
}
+ @Test
public void testCachedQuery() {
DataDomain domain = runtime.getDataDomain();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
index 86b4005..f41af3d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
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 DataNodeIT extends ServerCase {
@@ -31,6 +32,7 @@ public class DataNodeIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testName() throws Exception {
String tstName = "tst_name";
DataNode node = new DataNode();
@@ -39,6 +41,7 @@ public class DataNodeIT extends ServerCase {
assertEquals(tstName, node.getName());
}
+ @Test
public void testDataSourceLocation() throws Exception {
String tstName = "tst_name";
DataNode node = new DataNode();
@@ -47,6 +50,7 @@ public class DataNodeIT extends ServerCase {
assertEquals(tstName, node.getDataSourceLocation());
}
+ @Test
public void testDataSourceFactory() throws Exception {
String tstName = "tst_name";
DataNode node = new DataNode();
@@ -55,6 +59,7 @@ public class DataNodeIT extends ServerCase {
assertEquals(tstName, node.getDataSourceFactory());
}
+ @Test
public void testNodeEntityResolver() {
DataNode node = new DataNode();
assertNull(node.getEntityResolver());
@@ -64,6 +69,7 @@ public class DataNodeIT extends ServerCase {
assertSame(resolver, node.getEntityResolver());
}
+ @Test
public void testAdapter() throws Exception {
DataNode node = new DataNode();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
index bfe476a..f6e70ba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
+import org.junit.Test;
import java.sql.Date;
import java.util.Collections;
@@ -69,6 +70,7 @@ public class DataNodeQueriesIT extends ServerCase {
tArtist.insert(3001, "artist5");
}
+ @Test
public void testCreatePkSupportForMapEntities() throws Exception {
DbEntity artistEnt = node.getEntityResolver().getDbEntity("ARTIST");
@@ -82,6 +84,7 @@ public class DataNodeQueriesIT extends ServerCase {
exhibitEnt.getPrimaryKeys().iterator().next()));
}
+ @Test
public void testPerfomQueriesSQLTemplate() throws Exception {
String template = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) "
+ "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))";
@@ -105,6 +108,7 @@ public class DataNodeQueriesIT extends ServerCase {
assertEquals("a1", tArtist.getString("ARTIST_NAME").trim());
}
+ @Test
public void testPerfomQueriesSelectingSQLTemplate1() throws Exception {
createFourArtists();
@@ -121,6 +125,7 @@ public class DataNodeQueriesIT extends ServerCase {
assertEquals(201, row.get("ARTIST_ID"));
}
+ @Test
public void testPerfomQueriesSelectingSQLTemplate2() throws Exception {
createFourArtists();
@@ -141,6 +146,7 @@ public class DataNodeQueriesIT extends ServerCase {
assertEquals(201, id.intValue());
}
+ @Test
public void testPerfomQueriesSelectingSQLTemplateAlias() throws Exception {
createFourArtists();
@@ -157,6 +163,7 @@ public class DataNodeQueriesIT extends ServerCase {
assertEquals(201, row.get("A"));
}
+ @Test
public void testRunMultiLineSQLTemplateUNIX() throws Exception {
String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
+ "\n"
@@ -167,6 +174,7 @@ public class DataNodeQueriesIT extends ServerCase {
new MockOperationObserver());
}
+ @Test
public void testRunMultiLineSQLTemplateWindows() throws Exception {
String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
+ "\r\n"
@@ -177,6 +185,7 @@ public class DataNodeQueriesIT extends ServerCase {
new MockOperationObserver());
}
+ @Test
public void testRunMultiLineSQLTemplateMac() throws Exception {
String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
+ "\r"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
index 306b678..0496f5c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
@@ -19,20 +19,22 @@
package org.apache.cayenne.access;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.event.DefaultEventManager;
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.Collections;
+import java.util.HashMap;
+import java.util.Map;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataRowStoreIT extends ServerCase {
+ @Test
public void testDefaultConstructor() {
DataRowStore cache = new DataRowStore(
"cacheXYZ",
@@ -46,6 +48,7 @@ public class DataRowStoreIT extends ServerCase {
.isNotifyingRemoteListeners());
}
+ @Test
public void testConstructorWithProperties() {
Map<Object, Object> props = new HashMap<Object, Object>();
props.put(DataRowStore.REMOTE_NOTIFICATION_PROPERTY, String
@@ -60,6 +63,7 @@ public class DataRowStoreIT extends ServerCase {
.isNotifyingRemoteListeners());
}
+ @Test
public void testNotifyingRemoteListeners() {
DataRowStore cache = new DataRowStore(
"cacheXYZ",
@@ -77,6 +81,7 @@ public class DataRowStoreIT extends ServerCase {
/**
* Tests LRU cache behavior.
*/
+ @Test
public void testMaxSize() throws Exception {
Map<Object, Object> props = new HashMap<Object, Object>();
props.put(DataRowStore.SNAPSHOT_CACHE_SIZE_PROPERTY, String.valueOf(2));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
index 7d9c18d..e61a4c7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
@@ -32,6 +32,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.List;
@@ -75,6 +76,7 @@ public class DataRowUtilsIT extends ServerCase {
tPainting.insert(6, "p_artist2", 11, 1000);
}
+ @Test
public void testMerge() throws Exception {
createOneArtist();
@@ -99,6 +101,7 @@ public class DataRowUtilsIT extends ServerCase {
assertEquals(s2.get("DATE_OF_BIRTH"), a1.getDateOfBirth());
}
+ @Test
public void testIsToOneTargetModified() throws Exception {
createOneArtist();
@@ -131,6 +134,7 @@ public class DataRowUtilsIT extends ServerCase {
assertTrue(DataRowUtils.isToOneTargetModified(toArtist, painting, diff));
}
+ @Test
public void testIsToOneTargetModifiedWithNewTarget() throws Exception {
createOneArtistAndOnePainting();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
index 2e01bd1..f5f8dc4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.CalendarEntity;
import org.apache.cayenne.testdo.testmap.DateTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Time;
import java.util.Calendar;
@@ -51,6 +52,7 @@ public class DateTimeTypesIT extends ServerCase {
dbHelper.deleteAll("DATE_TEST");
}
+ @Test
public void testCalendar() throws Exception {
CalendarEntity test = context.newObject(CalendarEntity.class);
@@ -71,6 +73,7 @@ public class DateTimeTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testDate() throws Exception {
DateTestEntity test = context.newObject(DateTestEntity.class);
@@ -88,6 +91,7 @@ public class DateTimeTypesIT extends ServerCase {
assertEquals(Date.class, testRead.getDateColumn().getClass());
}
+ @Test
public void testTime() throws Exception {
DateTestEntity test = context.newObject(DateTestEntity.class);
@@ -112,6 +116,7 @@ public class DateTimeTypesIT extends ServerCase {
assertTrue("" + delta, Math.abs(delta) <= 1000 * 60 * 60);
}
+ @Test
public void testTimestamp() throws Exception {
DateTestEntity test = context.newObject(DateTestEntity.class);
@@ -132,6 +137,7 @@ public class DateTimeTypesIT extends ServerCase {
assertEquals(now, testRead.getTimestampColumn());
}
+ @Test
public void testSQLTemplateTimestamp() throws Exception {
DateTestEntity test = context.newObject(DateTestEntity.class);
@@ -153,6 +159,7 @@ public class DateTimeTypesIT extends ServerCase {
assertEquals(now, columnValue);
}
+ @Test
public void testSQLTemplateDate() throws Exception {
DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity");
@@ -174,6 +181,7 @@ public class DateTimeTypesIT extends ServerCase {
assertEquals(now.toString(), new java.sql.Date(columnValue.getTime()).toString());
}
+ @Test
public void testSQLTemplateTime() throws Exception {
DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
index a5db4e9..ab177f3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
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 DbGeneratorIT extends ServerCase {
@@ -49,10 +50,12 @@ public class DbGeneratorIT extends ServerCase {
.getDataMap("tstmap"), logger);
}
+ @Test
public void testAdapter() throws Exception {
assertSame(adapter, generator.getAdapter());
}
+ @Test
public void testPkFilteringLogic() throws Exception {
DataMap map = runtime.getDataDomain().getDataMap("tstmap");
DbEntity artistExhibit = map.getDbEntity("ARTIST_EXHIBIT");
@@ -68,6 +71,7 @@ public class DbGeneratorIT extends ServerCase {
assertFalse(generator.dbEntitiesRequiringAutoPK.contains(artistExhibit));
}
+ @Test
public void testCreatePkSupport() throws Exception {
assertTrue(generator.shouldCreatePKSupport());
generator.setShouldCreatePKSupport(false);
@@ -75,12 +79,14 @@ public class DbGeneratorIT extends ServerCase {
}
+ @Test
public void testShouldCreateTables() throws Exception {
assertTrue(generator.shouldCreateTables());
generator.setShouldCreateTables(false);
assertFalse(generator.shouldCreateTables());
}
+ @Test
public void testDropPkSupport() throws Exception {
assertFalse(generator.shouldDropPKSupport());
@@ -88,6 +94,7 @@ public class DbGeneratorIT extends ServerCase {
assertTrue(generator.shouldDropPKSupport());
}
+ @Test
public void testShouldDropTables() throws Exception {
assertFalse(generator.shouldDropTables());
generator.setShouldDropTables(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
index b294cc8..8ca7676 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
import java.util.Collection;
@@ -65,6 +66,7 @@ public class DbLoaderIT extends ServerCase {
loader.getConnection().close();
}
+ @Test
public void testGetTableTypes() throws Exception {
List<?> tableTypes = loader.getTableTypes();
@@ -82,6 +84,7 @@ public class DbLoaderIT extends ServerCase {
}
}
+ @Test
public void testGetTables() throws Exception {
String tableLabel = adapter.tableTypeForTable();
@@ -102,6 +105,7 @@ public class DbLoaderIT extends ServerCase {
assertTrue("'ARTIST' is missing from the table list: " + tables, foundArtist);
}
+ @Test
public void testLoadWithMeaningfulPK() throws Exception {
DataMap map = new DataMap();
@@ -128,6 +132,7 @@ public class DbLoaderIT extends ServerCase {
* individual tests would require multiple reads of metatdata which is
* extremely slow on some RDBMS (Sybase).
*/
+ @Test
public void testLoad() throws Exception {
boolean supportsUnique = runtime.getDataDomain().getDataNodes().iterator().next().getAdapter()
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
index 69a99cc..18ce6d5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collection;
@@ -67,6 +68,7 @@ public class DbLoaderPartialIT extends ServerCase {
* ARTIST and GALLERY should remain unmodified, and all PAINTING relationships should
* be loaded.
*/
+ @Test
public void testPartialLoad() throws Exception {
DataMap map = new DataMap();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
index cb5783d..bddf3bf 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.ArrayList;
import java.util.Iterator;
@@ -84,6 +85,7 @@ public class DeleteObjectIT extends ServerCase {
tPainting.insert(3, "painting3", 1);
}
+ @Test
public void testDeleteObject() throws Exception {
createObjectDataSet();
@@ -96,6 +98,7 @@ public class DeleteObjectIT extends ServerCase {
assertNull(artist.getObjectContext());
}
+ @Test
public void testDeleteObjects1() throws Exception {
createObjectsDataSet();
@@ -115,6 +118,7 @@ public class DeleteObjectIT extends ServerCase {
// Similar to testDeleteObjects2, but extract ObjectContext instead of
// DataContext.
+ @Test
public void testDeleteObjects2() throws Exception {
createObjectsDataSet();
@@ -138,6 +142,7 @@ public class DeleteObjectIT extends ServerCase {
}
}
+ @Test
public void testDeleteObjectsRelationshipCollection() throws Exception {
createObjectsRelationshipCollectionDataSet();
@@ -167,6 +172,7 @@ public class DeleteObjectIT extends ServerCase {
}
}
+ @Test
public void testDeleteObjectInIterator() throws Exception {
createObjectsRelationshipCollectionDataSet();
@@ -198,6 +204,7 @@ public class DeleteObjectIT extends ServerCase {
}
}
+ @Test
public void testDeleteHollow() throws Exception {
createHollowDataSet();
@@ -211,6 +218,7 @@ public class DeleteObjectIT extends ServerCase {
assertEquals(PersistenceState.DELETED, a.getPersistenceState());
}
+ @Test
public void testDeleteNew() throws Exception {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("a");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
index 3a21da1..8dda83f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
import org.apache.cayenne.testdo.relationship.DeleteRuleTest3;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.Collection;
@@ -59,6 +60,7 @@ public class DeleteRulesIT extends ServerCase {
dbHelper.deleteAll("DELETE_RULE_FLATA");
}
+ @Test
public void testDenyToOne() {
DeleteRuleTest1 test1 = context.newObject(DeleteRuleTest1.class);
@@ -76,6 +78,7 @@ public class DeleteRulesIT extends ServerCase {
}
+ @Test
public void testNoActionToOne() {
DeleteRuleTest2 test2 = context.newObject(DeleteRuleTest2.class);
DeleteRuleTest3 test3 = context.newObject(DeleteRuleTest3.class);
@@ -87,6 +90,7 @@ public class DeleteRulesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testNoActionToMany() {
DeleteRuleTest2 test2 = context.newObject(DeleteRuleTest2.class);
DeleteRuleTest3 test3 = context.newObject(DeleteRuleTest3.class);
@@ -99,6 +103,7 @@ public class DeleteRulesIT extends ServerCase {
// don't commit, since this will cause a constraint exception
}
+ @Test
public void testNoActionFlattened() {
// temporarily set delete rule to NOACTION...
int oldRule = changeDeleteRule(DeleteRule.NO_ACTION);
@@ -125,6 +130,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testNoActionFlattenedNoReverse() {
// temporarily set delete rule to NOACTION...
int oldRule = changeDeleteRule(DeleteRule.NO_ACTION);
@@ -151,6 +157,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testCascadeFlattened() {
// temporarily set delete rule to CASCADE...
int oldRule = changeDeleteRule(DeleteRule.CASCADE);
@@ -175,6 +182,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testCascadeFlattenedNoReverse() {
// temporarily set delete rule to CASCADE...
int oldRule = changeDeleteRule(DeleteRule.CASCADE);
@@ -200,6 +208,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testNullifyFlattened() {
// temporarily set delete rule to NULLIFY...
int oldRule = changeDeleteRule(DeleteRule.NULLIFY);
@@ -224,6 +233,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testNullifyFlattenedNoReverse() {
// temporarily set delete rule to NULLIFY...
int oldRule = changeDeleteRule(DeleteRule.NULLIFY);
@@ -249,6 +259,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testDenyFlattened() {
// temporarily set delete rule to DENY...
int oldRule = changeDeleteRule(DeleteRule.DENY);
@@ -271,6 +282,7 @@ public class DeleteRulesIT extends ServerCase {
}
}
+ @Test
public void testDenyFlattenedNoReverse() {
// temporarily set delete rule to DENY...
int oldRule = changeDeleteRule(DeleteRule.DENY);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
index 8e9a3db..8f8be6d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.embeddable.EmbedEntity1;
import org.apache.cayenne.testdo.embeddable.Embeddable1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -64,6 +65,7 @@ public class EmbeddingIT extends ServerCase {
tEmbedEntity1.insert(1, "n1", "e1", "e2", "e3", "e4");
}
+ @Test
public void testSelect() throws Exception {
createSelectDataSet();
@@ -100,6 +102,7 @@ public class EmbeddingIT extends ServerCase {
assertEquals("ex4", e22.getEmbedded20());
}
+ @Test
public void testInsert() throws Exception {
EmbedEntity1 o1 = context.newObject(EmbedEntity1.class);
@@ -131,6 +134,7 @@ public class EmbeddingIT extends ServerCase {
assertEquals("E22", row.get("EMBEDDED40"));
}
+ @Test
public void testUpdateEmbeddedProperties() throws Exception {
createUpdateDataSet();
@@ -153,6 +157,7 @@ public class EmbeddingIT extends ServerCase {
assertEquals("x1", row.get("EMBEDDED10"));
}
+ @Test
public void testUpdateEmbedded() throws Exception {
createUpdateDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
index 45e15fd..c2a3b9f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Enum1;
import org.apache.cayenne.testdo.testmap.EnumEntity;
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 EnumIT extends ServerCase {
@@ -55,12 +56,14 @@ public class EnumIT extends ServerCase {
tEnumEntity.insert(2, "one");
}
+ @Test
public void testInsert() {
EnumEntity e = context.newObject(EnumEntity.class);
e.setEnumAttribute(Enum1.one);
context.commitChanges();
}
+ @Test
public void testSelectQuery() throws Exception {
createDataSet();
@@ -74,6 +77,7 @@ public class EnumIT extends ServerCase {
assertSame(Enum1.one, e.getEnumAttribute());
}
+ @Test
public void testSQLTemplate() throws Exception {
createDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
index 96c0191..3d60f01 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.FlattenedTest1;
import org.apache.cayenne.testdo.relationship.FlattenedTest3;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
public class FlattenedArcKeyIT extends ServerCase {
@@ -34,6 +35,7 @@ public class FlattenedArcKeyIT extends ServerCase {
@Inject
private EntityResolver entityResolver;
+ @Test
public void testAttributes() {
ObjectId src = new ObjectId("X");
ObjectId target = new ObjectId("Y");
@@ -47,6 +49,7 @@ public class FlattenedArcKeyIT extends ServerCase {
assertSame(r1, update.relationship);
}
+ @Test
public void testHashCode() {
ObjectId src = new ObjectId("X");
ObjectId target = new ObjectId("Y");
@@ -69,6 +72,7 @@ public class FlattenedArcKeyIT extends ServerCase {
assertFalse(h == h2);
}
+ @Test
public void testEquals() {
ObjectId src = new ObjectId("X");
ObjectId target = new ObjectId("Y");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
index 92cea2f..aa4d9ff 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.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.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
import java.util.HashSet;
@@ -116,6 +117,7 @@ public class FlattenedPrefetchIT extends ServerCase {
tPainting.insert(33003, "P_artist21", 33002, 3000);
}
+ @Test
public void testManyToMany() throws Exception {
createPrefetchDataSet1();
@@ -150,6 +152,7 @@ public class FlattenedPrefetchIT extends ServerCase {
});
}
+ @Test
public void testMultiPrefetch() throws Exception {
createPrefetchDataSet2();
@@ -187,6 +190,7 @@ public class FlattenedPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointManyToMany() throws Exception {
createPrefetchDataSet1();
@@ -223,6 +227,7 @@ public class FlattenedPrefetchIT extends ServerCase {
}
+ @Test
public void testJointMultiPrefetch() throws Exception {
createPrefetchDataSet2();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
index b3fbc2e..7f81b24 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.FlattenedTest3;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -71,6 +72,7 @@ public class FlattenedRelationshipInContextIT extends ServerCase {
tFlattenedTest3.insert(1, 1, "ft3");
}
+ @Test
public void testIsToOneTargetModifiedFlattenedFault1() throws Exception {
createFlattenedTestDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
index b637efd..22adb11 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
@@ -39,6 +39,7 @@ import org.apache.cayenne.testdo.testmap.GeneratedF1;
import org.apache.cayenne.testdo.testmap.GeneratedF2;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
@@ -75,6 +76,7 @@ public class IdentityColumnsIT extends ServerCase {
* Tests a bug casued by the ID Java type mismatch vs the default JDBC type
* of the ID column.
*/
+ @Test
public void testCAY823() throws Exception {
GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);
@@ -96,6 +98,7 @@ public class IdentityColumnsIT extends ServerCase {
assertEquals(id, ((Persistent) results.get(0)).getObjectId());
}
+ @Test
public void testNewObject() throws Exception {
GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);
@@ -117,6 +120,7 @@ public class IdentityColumnsIT extends ServerCase {
assertEquals(name, object.getName());
}
+ @Test
public void testGeneratedJoinInFlattenedRelationship() throws Exception {
// before saving objects, let's manually access PKGenerator to get a
@@ -149,6 +153,7 @@ public class IdentityColumnsIT extends ServerCase {
/**
* Tests CAY-422 bug.
*/
+ @Test
public void testUnrelatedUpdate() throws Exception {
GeneratedColumnTestEntity m = context.newObject(GeneratedColumnTestEntity.class);
@@ -175,6 +180,7 @@ public class IdentityColumnsIT extends ServerCase {
* Tests that insert in two tables with identity pk does not generate a
* conflict. See CAY-341 for the original bug.
*/
+ @Test
public void testMultipleNewObjectsSeparateTables() throws Exception {
GeneratedColumnTestEntity idObject1 = context.newObject(GeneratedColumnTestEntity.class);
@@ -186,6 +192,7 @@ public class IdentityColumnsIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testMultipleNewObjects() throws Exception {
String[] names = new String[] { "n1_" + System.currentTimeMillis(), "n2_" + System.currentTimeMillis(),
@@ -216,6 +223,7 @@ public class IdentityColumnsIT extends ServerCase {
}
}
+ @Test
public void testCompoundPKWithGeneratedColumn() throws Exception {
if (adapter.supportsGeneratedKeys()) {
// only works for generated keys, as the entity tested has one
@@ -263,6 +271,7 @@ public class IdentityColumnsIT extends ServerCase {
}
}
+ @Test
public void testUpdateDependentWithNewMaster() throws Exception {
GeneratedColumnTestEntity master1 = context.newObject(GeneratedColumnTestEntity.class);
@@ -295,6 +304,7 @@ public class IdentityColumnsIT extends ServerCase {
assertNotNull(Cayenne.objectForPK(context, GeneratedColumnDep.class, id2));
}
+ @Test
public void testGeneratedDefaultValue() throws Exception {
// fail("TODO: test insert with DEFAULT generated column...need custom
@@ -302,6 +312,7 @@ public class IdentityColumnsIT extends ServerCase {
// build such table");
}
+ @Test
public void testPropagateToDependent() throws Exception {
GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
index c233c59..6c954b2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
@@ -24,6 +24,7 @@ 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.apache.cayenne.util.Util;
+import org.junit.Test;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class IncrementalFaultListIT extends ServerCase {
@@ -31,6 +32,7 @@ public class IncrementalFaultListIT extends ServerCase {
@Inject
protected DataContext context;
+ @Test
public void testSerialization() throws Exception {
SelectQuery query = new SelectQuery(Artist.class);
query.setPageSize(10);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
index 0fbfdc7..c4a0216 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
@@ -44,6 +44,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.Date;
import java.util.Collections;
@@ -120,6 +121,7 @@ public class JointPrefetchIT extends ServerCase {
tPainting.insert(33003, "P_artist21", 33002, 3000, 33002);
}
+ @Test
public void testJointPrefetch_ToOne_FetchLimit() throws Exception {
createJointPrefetchDataSet1();
@@ -148,6 +150,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetch_ToMany_FetchLimit() throws Exception {
createJointPrefetchDataSet1();
@@ -180,6 +183,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchDataRows() throws Exception {
createJointPrefetchDataSet1();
@@ -229,6 +233,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchSQLTemplate() throws Exception {
createJointPrefetchDataSet1();
@@ -283,6 +288,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchToOne() throws Exception {
createJointPrefetchDataSet1();
@@ -313,6 +319,7 @@ public class JointPrefetchIT extends ServerCase {
/**
* Tests that joined entities can have non-standard type mappings.
*/
+ @Test
public void testJointPrefetchDataTypes() throws Exception {
// prepare... can't load from XML, as it doesn't yet support dates..
SQLTemplate artistSQL = new SQLTemplate(
@@ -364,6 +371,7 @@ public class JointPrefetchIT extends ServerCase {
}
}
+ @Test
public void testJointPrefetchToMany() throws Exception {
createJointPrefetchDataSet1();
@@ -399,6 +407,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchToManyNonConflictingQualifier() throws Exception {
createJointPrefetchDataSet1();
@@ -440,6 +449,7 @@ public class JointPrefetchIT extends ServerCase {
});
}
+ @Test
public void testJointPrefetchMultiStep() throws Exception {
createJointPrefetchDataSet2();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
index 3ed721f..731d8c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.SerializableEntity;
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.lang.reflect.Array;
@@ -54,6 +55,7 @@ public class MiscTypesIT extends ServerCase {
dbHelper.deleteAll("CHARACTER_ENTITY");
}
+ @Test
public void testSerializable() throws Exception {
// this test requires BLOB support
@@ -77,6 +79,7 @@ public class MiscTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testByteArray() {
ArraysEntity test = context.newObject(ArraysEntity.class);
@@ -95,6 +98,7 @@ public class MiscTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCharArray() {
ArraysEntity test = context.newObject(ArraysEntity.class);
@@ -113,6 +117,7 @@ public class MiscTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testCharacterArray() {
ArraysEntity test = context.newObject(ArraysEntity.class);
@@ -130,7 +135,8 @@ public class MiscTypesIT extends ServerCase {
test.setCharWrapperArray(null);
context.commitChanges();
}
-
+
+ @Test
public void testCharacter() {
CharacterEntity test = context.newObject(CharacterEntity.class);
@@ -146,6 +152,7 @@ public class MiscTypesIT extends ServerCase {
context.commitChanges();
}
+ @Test
public void testByteWrapperArray() {
ArraysEntity test = context.newObject(ArraysEntity.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
index 01bf924..c492165 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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;
@@ -54,6 +55,7 @@ public class NestedDataContextLocalCacheIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testLocalCacheStaysLocal() {
SelectQuery query = new SelectQuery(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
index fa87bc8..6665160 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContextParentEventsIT extends ServerCase {
@@ -36,6 +37,7 @@ public class NestedDataContextParentEventsIT extends ServerCase {
@Inject
private DataContext context;
+ @Test
public void testParentUpdatedId() throws Exception {
ObjectContext child1 = runtime.newContext(context);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
index cf2454a..5273235 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.Child;
import org.apache.cayenne.testdo.relationship.Master;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
public class NestedDataContextParentPeerEventsIT extends ServerCase {
@@ -40,6 +41,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
@Inject
private DataContext parentContext2;
+ @Test
public void testPeerObjectUpdatedSimpleProperty() throws Exception {
Master a = parentContext1.newObject(Master.class);
a.setName("X");
@@ -67,6 +69,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
}.runTest(2000);
}
+ @Test
public void testPeerObjectUpdatedToOneRelationship() throws Exception {
Master a = parentContext1.newObject(Master.class);
Master altA = parentContext1.newObject(Master.class);
@@ -102,6 +105,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
}.runTest(2000);
}
+ @Test
public void testPeerObjectUpdatedToManyRelationship() throws Exception {
Master a = parentContext1.newObject(Master.class);
a.setName("X");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
index 9afd2c7..3da5090 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class NestedDataContextPeerEventsIT extends ServerCase {
@@ -38,6 +39,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
@Inject
private ServerRuntime runtime;
+ @Test
public void testPeerObjectUpdatedTempOID() throws Exception {
ObjectContext peer1 = runtime.newContext(context);
@@ -66,6 +68,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
}.runTest(2000);
}
+ @Test
public void testPeerObjectUpdatedSimpleProperty() throws Exception {
Artist a = context.newObject(Artist.class);
a.setArtistName("X");
@@ -95,6 +98,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
}
+ @Test
public void testPeerObjectUpdatedToOneRelationship() throws Exception {
Artist a = context.newObject(Artist.class);
@@ -135,6 +139,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
}
+ @Test
public void testPeerObjectUpdatedToManyRelationship() throws Exception {
Artist a = context.newObject(Artist.class);
[10/12] git commit: Optimize Imports in cayenne-client module
Posted by aa...@apache.org.
Optimize Imports in cayenne-client module
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e2a965ff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e2a965ff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e2a965ff
Branch: refs/heads/master
Commit: e2a965ff040cc1ec91fea258b702398b5f1ff068
Parents: b62c9d0
Author: Savva Kolbechev <s....@gmail.com>
Authored: Tue Nov 4 14:06:25 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Tue Nov 4 14:06:25 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/CayenneContextCayenneIT.java | 2 --
.../cayenne/CayenneContextClientChannelEventsIT.java | 2 --
.../test/java/org/apache/cayenne/CayenneContextIT.java | 2 +-
.../org/apache/cayenne/CayenneContextInheritanceIT.java | 2 +-
.../apache/cayenne/CayenneContextMapRelationshipIT.java | 2 +-
.../apache/cayenne/CayenneContextMergeHandlerIT.java | 2 +-
.../cayenne/CayenneContextNamedQueryCachingIT.java | 2 +-
.../cayenne/CayenneContextPaginatedListCachingIT.java | 2 +-
.../org/apache/cayenne/CayenneContextPrimitiveIT.java | 2 +-
.../apache/cayenne/CayenneContextRefreshQueryIT.java | 2 +-
.../apache/cayenne/CayenneContextRelationshipsIT.java | 2 --
.../org/apache/cayenne/CayenneContextSQLTemplateIT.java | 3 ---
.../org/apache/cayenne/CayenneContextServerDiffsIT.java | 2 +-
.../org/apache/cayenne/CayenneContextValidationIT.java | 2 --
.../apache/cayenne/CayenneContextWithDataContextIT.java | 8 --------
.../org/apache/cayenne/PersistentObjectInContextIT.java | 2 +-
.../apache/cayenne/access/ClientServerChannelIT.java | 2 +-
.../cayenne/access/ClientServerChannelQueryIT.java | 2 +-
.../org/apache/cayenne/map/ClientEntityResolverIT.java | 2 +-
.../org/apache/cayenne/query/ClientExpressionIT.java | 2 +-
.../cayenne/query/ClientSelectQueryExpressionIT.java | 2 +-
.../java/org/apache/cayenne/query/SQLTemplateTest.java | 12 ++++++------
.../java/org/apache/cayenne/query/SelectByIdTest.java | 8 ++++----
.../cayenne/query/SelectQueryAbstractEntityIT.java | 2 +-
.../apache/cayenne/unit/di/client/ClientCaseSelfIT.java | 2 +-
.../apache/cayenne/util/ObjectDetachOperationIT.java | 2 --
.../cayenne/util/ShallowMergeOperation_ClientIT.java | 2 +-
27 files changed, 28 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
index 43869eb..8f3cdbe 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
@@ -26,8 +26,6 @@ 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 CayenneContextCayenneIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
index f1caca7..1e2e6cd 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
@@ -34,8 +34,6 @@ import org.apache.cayenne.unit.di.client.ClientRuntimeProperty;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* Tests peer context synchronization via ClientChannel events.
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
index c005543..d8c8911 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
@@ -50,7 +50,7 @@ import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
index b9fbb2b..fc65b4c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.sql.Types;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextInheritanceIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
index e080def..869ac6f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.Map;import static org.junit.Assert.*;
+import java.util.Map;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMapRelationshipIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
index 7fd1c0d..ea06418 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import static org.mockito.Mockito.mock;import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMergeHandlerIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
index ade7590..4205221 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextNamedQueryCachingIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
index 3a90802..ee50cb4 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPaginatedListCachingIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
index fd3b795..ee948b0 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.sql.Types;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPrimitiveIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
index 908abe7..5583605 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
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 static org.junit.Assert.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextRefreshQueryIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
index 458b58b..10dccbc 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
@@ -30,8 +30,6 @@ 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 CayenneContextRelationshipsIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
index 555dbce..9eff4c3 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
@@ -26,9 +26,6 @@ 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.assertNotNull;
-import static org.junit.Assert.assertNull;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextSQLTemplateIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
index a0cfaa2..ae0b006 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2;
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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextServerDiffsIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
index 37ff005..68f3b8f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.validation.ValidationException;
import org.junit.Test;
-import static org.junit.Assert.*;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextValidationIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
index ed19ebe..5ef8b5b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
@@ -48,14 +48,6 @@ import java.sql.Types;
import java.util.Iterator;
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.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextWithDataContextIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
index da6cac9..df94fe1 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.PersistentObjectHolder;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class PersistentObjectInContextIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
index 140f6e2..f2dab9b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
@@ -50,7 +50,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.EqualsBuilder;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
index d4da266..2fc7386 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.util.PersistentObjectList;
import org.junit.Test;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelQueryIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
index b0add33..9ff9666 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.util.Collection;
-import java.util.Collections;import static org.junit.Assert.*;
+import java.util.Collections;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientEntityResolverIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
index 2c2f006..d6685d2 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientExpressionIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
index a706de1..213da28 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientSelectQueryExpressionIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
index d432fe1..9e6e4bd 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
@@ -18,16 +18,16 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Collections;
-
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.junit.Test;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
public class SQLTemplateTest {
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
index 84b2e06..087c84c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.apache.cayenne.testdo.testmap.Artist;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
public class SelectByIdTest {
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
index 72f505d..fcc55e5 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class SelectQueryAbstractEntityIT extends ServerCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 a0f77bc..b8e31ae 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,7 +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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientCaseSelfIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 4dc37ef..4857c5f 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
@@ -32,8 +32,6 @@ 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 {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 bbb9f4b..3a22a38 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,7 +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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ShallowMergeOperation_ClientIT extends ClientCase {
[03/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
index e43e8bd..6384c07 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
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.util.Arrays;
import java.util.Collection;
@@ -54,6 +55,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testConstructor() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
@@ -62,6 +64,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
assertSame(adapter, builder.adapter);
}
+ @Test
public void testCreateSqlString() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -77,6 +80,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
assertEquals("DELETE FROM " + entity.getName() + " WHERE LOCKING_TEST_ID = ?", generatedSql);
}
+ @Test
public void testCreateSqlStringWithNulls() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -95,6 +99,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
assertEquals("DELETE FROM " + entity.getName() + " WHERE LOCKING_TEST_ID = ? AND NAME IS NULL", generatedSql);
}
+ @Test
public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -120,6 +125,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
}
+ @Test
public void testCreateSqlStringWithNullsWithIdentifiersQuote() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
index 1a631db..ad28d6e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
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 static org.mockito.Mockito.mock;
@@ -47,6 +48,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testConstructor() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
@@ -55,6 +57,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
assertSame(adapter, builder.adapter);
}
+ @Test
public void testCreateSqlString() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -68,6 +71,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
generatedSql);
}
+ @Test
public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
index 1309e7c..1860cc1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.testdo.locking.SoftDelete;
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.util.Arrays;
import java.util.Collection;
@@ -69,6 +70,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
return (DeleteBatchTranslator) new SoftDeleteTranslatorFactory().translator(query, adapter, null);
}
+ @Test
public void testCreateSqlString() throws Exception {
DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
@@ -81,6 +83,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ?", generatedSql);
}
+ @Test
public void testCreateSqlStringWithNulls() throws Exception {
DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
@@ -95,6 +98,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ? AND NAME IS NULL", generatedSql);
}
+ @Test
public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
try {
@@ -121,6 +125,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
}
+ @Test
public void testUpdate() throws Exception {
final DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
index 4b77c84..8f3eea2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
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.util.Arrays;
import java.util.Collection;
@@ -53,12 +54,14 @@ public class UpdateBatchTranslatorIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testConstructor() throws Exception {
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
UpdateBatchTranslator builder = new UpdateBatchTranslator(mock(UpdateBatchQuery.class), adapter, null);
assertSame(adapter, builder.adapter);
}
+ @Test
public void testCreateSqlString() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -76,6 +79,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
assertEquals("UPDATE " + entity.getName() + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ?", generatedSql);
}
+ @Test
public void testCreateSqlStringWithNulls() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -97,6 +101,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
generatedSql);
}
+ @Test
public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
@@ -125,6 +130,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
}
}
+ @Test
public void testCreateSqlStringWithNullsWithIdentifiersQuote() throws Exception {
DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
.getDbEntity();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
index 0da0982..7db9fe3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
@@ -63,6 +64,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
return tr.getQuery();
}
+ @Test
public void testSelectFrom() {
SQLTemplate query = translateSelect("select a from Artist a");
String sql = query.getDefaultTemplate();
@@ -76,6 +78,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith(" FROM ARTIST t0"));
}
+ @Test
public void testSelectMultipleJoinsToTheSameTable() throws Exception {
SQLTemplate query = translateSelect("SELECT a "
+ "FROM Artist a JOIN a.paintingArray b JOIN a.paintingArray c "
@@ -88,6 +91,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.indexOf("INNER JOIN PAINTING t2 ON (t0.ARTIST_ID = t2.ARTIST_ID)") > 0);
}
+ @Test
public void testSelectImplicitColumnJoins() throws Exception {
SQLTemplate query = translateSelect("SELECT a.paintingArray.toGallery.galleryName "
+ "FROM Artist a JOIN a.paintingArray b");
@@ -109,6 +113,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
// assertTrue(sql, i2 < 0);
}
+ @Test
public void testSelectDistinct() {
SQLTemplate query = translateSelect("select distinct a from Artist a");
String sql = query.getDefaultTemplate();
@@ -116,6 +121,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.startsWith("SELECT DISTINCT "));
}
+ @Test
public void testSelectFromWhereEqual() {
SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali'");
String sql = query.getDefaultTemplate();
@@ -125,6 +131,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith(" FROM ARTIST t0 WHERE t0.ARTIST_NAME =" + " #bind('Dali' 'VARCHAR')"));
}
+ @Test
public void testSelectFromWhereOrEqual() {
SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali' "
+ "or a.artistName = 'Malevich'");
@@ -143,6 +150,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertEquals(2, countDelimiters(sql1, " OR ", sql.indexOf("WHERE ")));
}
+ @Test
public void testSelectFromWhereAndEqual() {
SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali' "
@@ -162,6 +170,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertEquals(2, countDelimiters(sql1, " AND ", sql1.indexOf("WHERE ")));
}
+ @Test
public void testSelectFromWhereNot() {
SQLTemplate query = translateSelect("select a from Artist a where not (a.artistName = 'Dali')");
String sql = query.getDefaultTemplate();
@@ -170,6 +179,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("WHERE NOT " + "t0.ARTIST_NAME = #bind('Dali' 'VARCHAR')"));
}
+ @Test
public void testSelectFromWhereGreater() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice > 1.0");
String sql = query.getDefaultTemplate();
@@ -178,24 +188,28 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE > #bind($id0 'DECIMAL')"));
}
+ @Test
public void testSelectFromWhereGreaterOrEqual() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice >= 2");
String sql = query.getDefaultTemplate();
assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE >= #bind($id0 'INTEGER')"));
}
+ @Test
public void testSelectFromWhereLess() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice < 1.0");
String sql = query.getDefaultTemplate();
assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE < #bind($id0 'DECIMAL')"));
}
+ @Test
public void testSelectFromWhereLessOrEqual() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice <= 1.0");
String sql = query.getDefaultTemplate();
assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE <= #bind($id0 'DECIMAL')"));
}
+ @Test
public void testSelectFromWhereNotEqual() {
SQLTemplate query = translateSelect("select a from Artist a where a.artistName <> 'Dali'");
String sql = query.getDefaultTemplate();
@@ -203,6 +217,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("WHERE t0.ARTIST_NAME <> #bind('Dali' 'VARCHAR')"));
}
+ @Test
public void testSelectFromWhereBetween() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice between 3 and 5");
String sql = query.getDefaultTemplate();
@@ -211,6 +226,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
+ "BETWEEN #bind($id0 'INTEGER') AND #bind($id1 'INTEGER')"));
}
+ @Test
public void testSelectFromWhereNotBetween() {
SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice not between 3 and 5");
String sql = query.getDefaultTemplate();
@@ -219,6 +235,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
+ "NOT BETWEEN #bind($id0 'INTEGER') AND #bind($id1 'INTEGER')"));
}
+ @Test
public void testSelectFromWhereLike() {
SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle like 'Stuff'");
String sql = query.getDefaultTemplate();
@@ -226,6 +243,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("WHERE t0.PAINTING_TITLE " + "LIKE #bind('Stuff' 'VARCHAR')"));
}
+ @Test
public void testSelectFromWhereNotLike() {
SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle NOT like 'Stuff'");
String sql = query.getDefaultTemplate();
@@ -233,6 +251,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("WHERE t0.PAINTING_TITLE " + "NOT LIKE #bind('Stuff' 'VARCHAR')"));
}
+ @Test
public void testSelectPositionalParameters() {
Map<Integer, Object> params = new HashMap<Integer, Object>();
params.put(new Integer(1), "X");
@@ -243,6 +262,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
assertTrue(sql, sql.endsWith("t0.ARTIST_NAME = #bind($id0) OR t0.ARTIST_NAME = #bind($id1)"));
}
+ @Test
public void testMax() {
SQLTemplate query = translateSelect("select max(p.estimatedPrice) from Painting p");
String sql = query.getDefaultTemplate();
@@ -251,6 +271,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
+ "FROM PAINTING t0"));
}
+ @Test
public void testDistinctSum() {
SQLTemplate query = translateSelect("select sum( distinct p.estimatedPrice) from Painting p");
String sql = query.getDefaultTemplate();
@@ -260,6 +281,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
+ "FROM PAINTING t0"));
}
+ @Test
public void testColumnPaths() {
SQLTemplate query = translateSelect("select p.estimatedPrice, p.toArtist.artistName from Painting p");
String sql = query.getDefaultTemplate();
@@ -281,6 +303,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
// if parameter value is null (in this test x := null) we will generate
// "IS NULL"
+ @Test
public void testEqualsNullParameter() {
String ejbql = "select p from Painting p WHERE p.toArtist=:x";
EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -296,6 +319,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
}
// if parameter value is null and more than one parameter in query
+ @Test
public void testEqualsNullAndNotNullParameter() {
String ejbql = "select p from Painting p WHERE p.toArtist=:x OR p.toArtist.artistName=:b";
EJBQLParser parser = EJBQLParserFactory.getParser();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
index fc580f3..d5a8e5a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
@@ -55,6 +56,7 @@ public class OrderingTranslatorIT extends ServerCase {
/**
* Tests ascending ordering on string attribute.
*/
+ @Test
public void testDoTranslation1() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering("artistName", SortOrder.ASCENDING);
@@ -73,6 +75,7 @@ public class OrderingTranslatorIT extends ServerCase {
/**
* Tests descending ordering on string attribute.
*/
+ @Test
public void testDoTranslation2() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering("artistName", SortOrder.DESCENDING);
@@ -91,6 +94,7 @@ public class OrderingTranslatorIT extends ServerCase {
/**
* Tests ascending case-insensitive ordering on string attribute.
*/
+ @Test
public void testDoTranslation4() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering("artistName", SortOrder.ASCENDING_INSENSITIVE);
@@ -108,6 +112,7 @@ public class OrderingTranslatorIT extends ServerCase {
tstCase.assertTranslatedWell(orderBySql);
}
+ @Test
public void testDoTranslation5() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering("artistName", SortOrder.DESCENDING_INSENSITIVE);
@@ -132,6 +137,7 @@ public class OrderingTranslatorIT extends ServerCase {
tstCase.assertTranslatedWell(orderBySql);
}
+ @Test
public void testDoTranslation6() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering("artistName", SortOrder.ASCENDING_INSENSITIVE);
@@ -158,6 +164,7 @@ public class OrderingTranslatorIT extends ServerCase {
tstCase.assertTranslatedWell(orderBySql);
}
+ @Test
public void testDoTranslation3() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
index c463839..8dddbe0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
@@ -61,6 +62,7 @@ public class QualifierTranslatorIT extends ServerCase {
connection.close();
}
+ @Test
public void testNonQualifiedQuery() throws Exception {
TstQueryAssembler qa = new TstQueryAssembler(new MockQuery(), node, connection);
@@ -72,6 +74,7 @@ public class QualifierTranslatorIT extends ServerCase {
}
}
+ @Test
public void testNullQualifier() throws Exception {
TstQueryAssembler qa = new TstQueryAssembler(new SelectQuery<Object>(), node, connection);
@@ -80,18 +83,22 @@ public class QualifierTranslatorIT extends ServerCase {
assertEquals(0, out.length());
}
+ @Test
public void testUnary() throws Exception {
doExpressionTest(new TstUnaryExpSuite());
}
+ @Test
public void testBinary() throws Exception {
doExpressionTest(new TstBinaryExpSuite());
}
+ @Test
public void testTernary() throws Exception {
doExpressionTest(new TstTernaryExpSuite());
}
+ @Test
public void testExtras() throws Exception {
ObjectId oid1 = new ObjectId("Gallery", "GALLERY_ID", 1);
ObjectId oid2 = new ObjectId("Gallery", "GALLERY_ID", 2);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
index e2b299b..c731bb8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
@@ -53,10 +54,12 @@ public class QueryAssemblerIT extends ServerCase {
connection.close();
}
+ @Test
public void testGetQuery() throws Exception {
assertNotNull(qa.getQuery());
}
+ @Test
public void testAddToParamList() throws Exception {
assertEquals(0, qa.getAttributes().size());
@@ -67,6 +70,7 @@ public class QueryAssemblerIT extends ServerCase {
assertEquals(1, qa.getValues().size());
}
+ @Test
public void testCreateStatement() throws Exception {
assertNotNull(qa.createStatement());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
index c8129a7..a225b7e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
@@ -41,6 +41,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
import java.util.Date;
@@ -88,6 +89,7 @@ public class SelectTranslatorIT extends ServerCase {
/**
* Tests query creation with qualifier and ordering.
*/
+ @Test
public void testCreateSqlString1() throws Exception {
// query with qualifier and ordering
SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class, ExpressionFactory.likeExp("artistName", "a%"));
@@ -106,6 +108,7 @@ public class SelectTranslatorIT extends ServerCase {
/**
* Tests query creation with qualifier and ordering.
*/
+ @Test
public void testDbEntityQualifier() throws Exception {
SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class);
@@ -138,6 +141,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testDbEntityQualifier_OuterJoin() throws Exception {
SelectQuery q = new SelectQuery(Painting.class);
@@ -173,6 +177,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testDbEntityQualifier_FlattenedRel() throws Exception {
SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class, ExpressionFactory.matchExp("groupArray.name",
@@ -208,6 +213,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testDbEntityQualifier_RelatedMatch() throws Exception {
SelectQuery<Artist> q = new SelectQuery(Painting.class,
@@ -246,6 +252,7 @@ public class SelectTranslatorIT extends ServerCase {
/**
* Tests query creation with "distinct" specified.
*/
+ @Test
public void testCreateSqlString2() throws Exception {
// query with "distinct" set
SelectQuery q = new SelectQuery(Artist.class);
@@ -263,6 +270,7 @@ public class SelectTranslatorIT extends ServerCase {
* translation of relationship path "ArtistExhibit.toArtist.artistName" and
* "ArtistExhibit.toExhibit.toGallery.paintingArray.toArtist.artistName".
*/
+ @Test
public void testCreateSqlString5() throws Exception {
// query with qualifier and ordering
SelectQuery q = new SelectQuery(ArtistExhibit.class);
@@ -293,6 +301,7 @@ public class SelectTranslatorIT extends ServerCase {
* translation of relationship path "ArtistExhibit.toArtist.artistName" and
* "ArtistExhibit.toArtist.paintingArray.paintingTitle".
*/
+ @Test
public void testCreateSqlString6() throws Exception {
// query with qualifier and ordering
SelectQuery q = new SelectQuery(ArtistExhibit.class);
@@ -320,6 +329,7 @@ public class SelectTranslatorIT extends ServerCase {
* Test query when qualifying on the same attribute more than once. Check
* translation "Artist.dateOfBirth > ? AND Artist.dateOfBirth < ?".
*/
+ @Test
public void testCreateSqlString7() throws Exception {
SelectQuery q = new SelectQuery(Artist.class);
q.setQualifier(ExpressionFactory.greaterExp("dateOfBirth", new Date()));
@@ -351,6 +361,7 @@ public class SelectTranslatorIT extends ServerCase {
* "Painting.toArtist.dateOfBirth > ? AND Painting.toArtist.dateOfBirth <
* ?".
*/
+ @Test
public void testCreateSqlString8() throws Exception {
SelectQuery q = new SelectQuery();
q.setRoot(Painting.class);
@@ -376,6 +387,7 @@ public class SelectTranslatorIT extends ServerCase {
assertTrue("No second DOB comparison: " + i4 + ", " + i3, i4 > i3);
}
+ @Test
public void testCreateSqlString9() throws Exception {
// query for a compound ObjEntity with qualifier
SelectQuery q = new SelectQuery(CompoundPainting.class, ExpressionFactory.likeExp("artistName", "a%"));
@@ -427,6 +439,7 @@ public class SelectTranslatorIT extends ServerCase {
}
+ @Test
public void testCreateSqlString10() throws Exception {
// query with to-many joint prefetches
SelectQuery q = new SelectQuery(Artist.class);
@@ -449,6 +462,7 @@ public class SelectTranslatorIT extends ServerCase {
assertEquals(1, transl.joinStack.size());
}
+ @Test
public void testCreateSqlString11() throws Exception {
// query with joint prefetches and other joins
SelectQuery q = new SelectQuery(Artist.class, Expression.fromString("paintingArray.paintingTitle = 'a'"));
@@ -462,6 +476,7 @@ public class SelectTranslatorIT extends ServerCase {
assertEquals(2, transl.joinStack.size());
}
+ @Test
public void testCreateSqlString12() throws Exception {
// query with to-one joint prefetches
SelectQuery q = new SelectQuery(Painting.class);
@@ -485,6 +500,7 @@ public class SelectTranslatorIT extends ServerCase {
assertEquals(1, transl.joinStack.size());
}
+ @Test
public void testCreateSqlString13() throws Exception {
// query with invalid joint prefetches
SelectQuery q = new SelectQuery(Painting.class);
@@ -498,6 +514,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testCreateSqlStringWithQuoteSqlIdentifiers() throws Exception {
try {
@@ -534,6 +551,7 @@ public class SelectTranslatorIT extends ServerCase {
}
+ @Test
public void testCreateSqlStringWithQuoteSqlIdentifiers2() throws Exception {
try {
@@ -578,6 +596,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testCreateSqlStringWithQuoteSqlIdentifiers3() throws Exception {
// query with joint prefetches and other joins
@@ -656,6 +675,7 @@ public class SelectTranslatorIT extends ServerCase {
}
}
+ @Test
public void testCreateSqlStringWithQuoteSqlIdentifiers4() throws Exception {
// query with to-one joint prefetches
@@ -721,6 +741,7 @@ public class SelectTranslatorIT extends ServerCase {
/**
* Tests columns generated for a simple object query.
*/
+ @Test
public void testBuildResultColumns1() throws Exception {
SelectQuery q = new SelectQuery(Painting.class);
SelectTranslator tr = new SelectTranslator(q, dataNode, connection);
@@ -738,6 +759,7 @@ public class SelectTranslatorIT extends ServerCase {
/**
* Tests columns generated for an object query with joint prefetch.
*/
+ @Test
public void testBuildResultColumns2() throws Exception {
SelectQuery q = new SelectQuery(Painting.class);
q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
index e1c5cea..948cf37 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
@@ -22,10 +22,12 @@ package org.apache.cayenne.access.util;
import org.apache.cayenne.query.SelectQuery;
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 DefaultOperationObserverIT extends ServerCase {
+ @Test
public void testHasExceptions1() throws Exception {
DefaultOperationObserver observer = new DefaultOperationObserver();
assertFalse(observer.hasExceptions());
@@ -33,6 +35,7 @@ public class DefaultOperationObserverIT extends ServerCase {
assertTrue(observer.hasExceptions());
}
+ @Test
public void testHasExceptions2() throws Exception {
DefaultOperationObserver observer = new DefaultOperationObserver();
assertFalse(observer.hasExceptions());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
index aa82cd4..75c4d82 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
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.Collections;
@@ -60,6 +61,7 @@ public class AshwoodEntitySorterIT extends ServerCase {
.setColumnTypes(Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.VARCHAR);
}
+ @Test
public void testSortObjectsForEntityReflexiveWithFaults() throws Exception {
tRelationshipHelper.insert(1, "rh1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
index 4d47685..13276c6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.query.SelectQuery;
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;
@@ -36,7 +37,8 @@ public class QueryCacheIT extends ServerCase {
@Inject
private ObjectContext context2;
-
+
+ @Test
public void testLocalCache() {
Artist a = context1.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
index ce2c68d..e140fe1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.di.Injector;
import org.apache.cayenne.unit.JNDISetup;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
@@ -35,6 +36,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
@Inject
private Injector injector;
+ @Test
public void testGetDataSource_NameBound() throws Exception {
DataNodeDescriptor descriptor = new DataNodeDescriptor();
@@ -58,6 +60,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
}
}
+ @Test
public void testGetDataSource_NameBoundWithPrefix() throws Exception {
DataNodeDescriptor descriptor = new DataNodeDescriptor();
@@ -81,6 +84,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
}
}
+ @Test
public void testGetDataSource_NameNotBound() throws Exception {
DataNodeDescriptor descriptor = new DataNodeDescriptor();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
index 53f64eb..ef5f536 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import javax.sql.DataSource;
import java.util.List;
@@ -62,6 +63,7 @@ public class ServerRuntimeBuilder_InAction_IT extends ServerCase {
this.dataSource = runtime.getDataSource("tstmap");
}
+ @Test
public void testConfigFree_WithDataSource() {
ServerRuntime localRuntime = new ServerRuntimeBuilder().dataSource(dataSource).build();
@@ -74,6 +76,7 @@ public class ServerRuntimeBuilder_InAction_IT extends ServerCase {
}
}
+ @Test
public void testConfigFree_WithDBParams() {
ServerRuntime localRuntime = new ServerRuntimeBuilder().jdbcDriver(dsi.getJdbcDriver())
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
index 23c031f..02622d3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.conn;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
@@ -31,6 +32,7 @@ public class PoolManagerIT extends ServerCase {
@Inject
private DataSourceInfo dataSourceInfo;
+ @Test
public void testDataSourceUrl() throws Exception {
String driverName = dataSourceInfo.getJdbcDriver();
String url = dataSourceInfo.getDataSourceUrl();
@@ -45,6 +47,7 @@ public class PoolManagerIT extends ServerCase {
assertEquals(driverName, pm.getJdbcDriver());
}
+ @Test
public void testPassword() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "b") {
@@ -55,6 +58,7 @@ public class PoolManagerIT extends ServerCase {
assertEquals("b", pm.getPassword());
}
+ @Test
public void testUserName() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "a", "") {
@@ -65,6 +69,7 @@ public class PoolManagerIT extends ServerCase {
assertEquals("a", pm.getUserName());
}
+ @Test
public void testMinConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
@@ -75,6 +80,7 @@ public class PoolManagerIT extends ServerCase {
assertEquals(0, pm.getMinConnections());
}
+ @Test
public void testMaxConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
@@ -85,6 +91,7 @@ public class PoolManagerIT extends ServerCase {
assertEquals(3, pm.getMaxConnections());
}
+ @Test
public void testPooling() throws Exception {
PoolManager pm = new PoolManager(dataSourceInfo.getJdbcDriver(), dataSourceInfo
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
index f0918cb..623e603 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.SQLTemplate;
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 static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,6 +39,7 @@ public class AutoAdapterIT extends ServerCase {
@Inject
private DataNode dataNode;
+ @Test
public void testGetAdapter_Proxy() throws Exception {
Provider<DbAdapter> adapterProvider = mock(Provider.class);
when(adapterProvider.get()).thenReturn(dataNode.getAdapter());
@@ -47,6 +49,7 @@ public class AutoAdapterIT extends ServerCase {
assertSame(dataNode.getAdapter(), detected);
}
+ @Test
public void testCreateSQLTemplateAction() {
Provider<DbAdapter> adapterProvider = mock(Provider.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
index eae7470..646e192 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.testdo.qualified.Qualified1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collections;
import java.util.Comparator;
@@ -46,6 +47,7 @@ public class ConcurrentPkGeneratorIT extends ServerCase {
/*
* Attempts to discover any problems regarding thread locking in the PkGenerator
*/
+ @Test
public void testConcurrentInserts() throws Exception {
final DataMap dataMap = runtime.getDataDomain().getDataMap("qualified");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
index eba8631..21ca79c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbKeyGenerator;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -40,6 +41,7 @@ public class JdbcAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testExternalTypesForJdbcType() throws Exception {
// check a few types
checkType(Types.BLOB);
@@ -59,6 +61,7 @@ public class JdbcAdapterIT extends ServerCase {
assertEquals(TypesMapping.getSqlNameByType(type), types[0]);
}
+ @Test
public void testCreateTableQuoteSqlIdentifiers() {
if (dbAdapter instanceof MySQLAdapter) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
index 8113a15..dd56f0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.SchemaBuilder;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Collections;
@@ -61,6 +62,7 @@ public class JdbcPkGeneratorIT extends ServerCase {
}
}
+ @Test
public void testLongPk() throws Exception {
if (!JdbcPkGenerator.class.isAssignableFrom(adapter.getPkGenerator().getClass())) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
index 81c92f8..63e3d91 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.map.DbEntity;
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.util.ArrayList;
import java.util.List;
@@ -53,6 +54,7 @@ public class PkGeneratorIT extends ServerCase {
pkGenerator.reset();
}
+ @Test
public void testGeneratePkForDbEntity() throws Exception {
List<Object> pkList = new ArrayList<Object>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
index e10d0f1..f3163ff 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.MockSerializable;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
+import org.junit.Test;
import java.math.BigInteger;
import java.sql.Connection;
@@ -38,6 +39,7 @@ public class TypesMappingIT extends ServerCase {
@Inject
private ServerCaseDataSourceFactory dataSourceFactory;
+ @Test
public void testGetSqlTypeByJava() throws Exception {
assertEquals(Types.VARCHAR, TypesMapping.getSqlTypeByJava(String.class));
@@ -58,6 +60,7 @@ public class TypesMappingIT extends ServerCase {
assertEquals(Types.VARBINARY, TypesMapping.getSqlTypeByJava(Byte[].class));
}
+ @Test
public void testGetSqlTypeByJavaString() throws Exception {
assertEquals(Types.VARCHAR, TypesMapping.getSqlTypeByJava(String.class.getName()));
@@ -85,11 +88,13 @@ public class TypesMappingIT extends ServerCase {
assertEquals(Types.VARBINARY, TypesMapping.getSqlTypeByJava("java.lang.Byte[]"));
}
+ @Test
public void testGetSqlTypeByJavaPrimitive() throws Exception {
assertEquals(Types.INTEGER, TypesMapping.getSqlTypeByJava(Integer.TYPE));
assertEquals(Types.BIGINT, TypesMapping.getSqlTypeByJava(Long.TYPE));
}
+ @Test
public void testTypeInfoCompleteness() throws Exception {
// check counts
// since more then 1 database type can map to a single JDBC type
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
index 9fa1f1e..414a28b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -34,6 +35,7 @@ public class HSQLDBAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testCreateTableIgnoresDoublePrecision() {
HSQLDBAdapter adapter = objectFactory.newInstance(
HSQLDBAdapter.class,
@@ -51,7 +53,8 @@ public class HSQLDBAdapterIT extends ServerCase {
assertTrue(sql.indexOf("DOUBLE") > 0);
assertEquals(-1, sql.indexOf("DOUBLE(22)"));
}
-
+
+ @Test
public void testCreateTableAddsCachedKeyword() {
HSQLDBAdapter adapter = objectFactory.newInstance(
HSQLDBAdapter.class,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
index f80c90b..908a030 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
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 MySQLAdapterIT extends ServerCase {
@@ -32,6 +33,7 @@ public class MySQLAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testCreateTableAppendPKClause() {
MySQLAdapter adapter = objectFactory.newInstance(
MySQLAdapter.class,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
index ff02f16..cfa295e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.net.URL;
import java.sql.Types;
@@ -33,6 +34,7 @@ public class Oracle8AdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testTimestampMapping() throws Exception {
Oracle8Adapter adapter = objectFactory.newInstance(
@@ -45,6 +47,7 @@ public class Oracle8AdapterIT extends ServerCase {
assertEquals("DATE", types[0]);
}
+ @Test
public void testFindAdapterResource() throws Exception {
Oracle8Adapter adapter = objectFactory.newInstance(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
index c471daa..edcde29 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.query.InsertBatchQuery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -38,6 +39,7 @@ public class OracleAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testUpdatesLOBColumns() throws Exception {
DataMap map = runtime.getDataDomain().getDataMap("tstmap");
assertTrue(OracleAdapter.updatesLOBColumns(new InsertBatchQuery(map
@@ -48,6 +50,7 @@ public class OracleAdapterIT extends ServerCase {
.getDbEntity("ARTIST"), 1)));
}
+ @Test
public void testTimestampMapping() throws Exception {
OracleAdapter adapter = objectFactory.newInstance(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
index 9000f76..603944b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbKeyGenerator;
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 OraclePkGeneratorIT extends ServerCase {
@@ -44,11 +45,13 @@ public class OraclePkGeneratorIT extends ServerCase {
pkGenerator = new OraclePkGenerator(adapter);
}
+ @Test
public void testSequenceNameDefault() throws Exception {
DbEntity entity = new DbEntity("TEST_ENTITY");
assertEquals("pk_test_entity", pkGenerator.sequenceName(entity));
}
+ @Test
public void testSequenceNameCustom1() throws Exception {
DbEntity entity = new DbEntity("TEST_ENTITY");
DbKeyGenerator customGenerator = new DbKeyGenerator();
@@ -58,6 +61,7 @@ public class OraclePkGeneratorIT extends ServerCase {
assertEquals("custom_generator", pkGenerator.sequenceName(entity));
}
+ @Test
public void testSequenceNameCustom2() throws Exception {
DbEntity entity = new DbEntity("TEST_ENTITY");
DbKeyGenerator customGenerator = new DbKeyGenerator();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
index ea00534..adada5b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -32,7 +33,8 @@ public class PostgresAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
-
+
+ @Test
public void testCreateTableWithFloatAttributeWithScale () {
PostgresAdapter adapter = objectFactory.newInstance(
PostgresAdapter.class,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
index 7fbbb51..198b2b1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Types;
@@ -32,7 +33,8 @@ public class SQLServerAdapterIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
-
+
+ @Test
public void testCreateTableWithFloatAttributeWithScale () {
SQLServerAdapter adapter = objectFactory.newInstance(
SQLServerAdapter.class,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
index 7fa3a0a..fc27cf9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Connection;
import java.sql.SQLException;
@@ -43,6 +44,7 @@ public class SQLServerSnifferIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
+ @Test
public void testCreateAdapter() throws Exception {
SQLServerSniffer sniffer = new SQLServerSniffer(objectFactory);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
index e86d4bc..1a6ecac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.EntityResolver;
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 EJBQLCompiledExpressionIT extends ServerCase {
@@ -30,6 +31,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
@Inject
protected ServerRuntime runtime;
+ @Test
public void testGetSource() {
String source = "select a from Artist a";
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -39,6 +41,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
assertEquals(source, select.getSource());
}
+ @Test
public void testGetExpression() {
String source = "select a from Artist a";
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -48,6 +51,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
assertNotNull(select.getExpression());
}
+ @Test
public void testGetEntityDescriptor() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -71,6 +75,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
.getEntityDescriptor("p.toArtist"));
}
+ @Test
public void testGetRootDescriptor() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -83,6 +88,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
.getClassDescriptor("Artist"), select.getRootDescriptor());
}
+ @Test
public void testGetEntityDescriptorCaseSensitivity() {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
EJBQLParser parser = EJBQLParserFactory.getParser();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
index b8aab38..917a18a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.ArrayList;
import java.util.List;
@@ -38,6 +39,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Test
public void testExpressionOfBadType() throws Exception {
// non existing type
@@ -51,6 +53,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
}
}
+ @Test
public void testBetweenExp() throws Exception {
Object v1 = new Object();
Object v2 = new Object();
@@ -61,6 +64,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testBetweenDbExp() throws Exception {
Object v1 = new Object();
Object v2 = new Object();
@@ -71,6 +75,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testNotBetweenExp() throws Exception {
Object v1 = new Object();
Object v2 = new Object();
@@ -81,6 +86,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testNotBetweenDbExp() throws Exception {
Object v1 = new Object();
Object v2 = new Object();
@@ -91,12 +97,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testGreaterExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.greaterExp("abc", v);
assertEquals(Expression.GREATER_THAN, exp.getType());
}
+ @Test
public void testGreaterDbExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.greaterDbExp("abc", v);
@@ -106,12 +114,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testGreaterOrEqualExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.greaterOrEqualExp("abc", v);
assertEquals(Expression.GREATER_THAN_EQUAL_TO, exp.getType());
}
+ @Test
public void testGreaterOrEqualDbExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.greaterOrEqualDbExp("abc", v);
@@ -121,12 +131,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testLessExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.lessExp("abc", v);
assertEquals(Expression.LESS_THAN, exp.getType());
}
+ @Test
public void testLessDbExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.lessDbExp("abc", v);
@@ -136,6 +148,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testLessOrEqualExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.lessOrEqualExp("abc", v);
@@ -145,6 +158,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testLessOrEqualDbExp() throws Exception {
Object v = new Object();
Expression exp = ExpressionFactory.lessOrEqualDbExp("abc", v);
@@ -154,11 +168,13 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testInExp1() throws Exception {
Expression exp = ExpressionFactory.inExp("abc", "a", "b");
assertEquals(Expression.IN, exp.getType());
}
+ @Test
public void testInExp2() throws Exception {
List<Object> v = new ArrayList<Object>();
v.add("a");
@@ -167,12 +183,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.IN, exp.getType());
}
+ @Test
public void testInExp3() throws Exception {
List<Object> v = new ArrayList<Object>();
Expression exp = ExpressionFactory.inExp("abc", v);
assertEquals(Expression.FALSE, exp.getType());
}
+ @Test
public void testLikeExp() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeExp("abc", v);
@@ -182,6 +200,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testLikeDbExp() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeDbExp("abc", v);
@@ -191,6 +210,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testLikeExpEscape() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeExp("=abc", v, '=');
@@ -202,6 +222,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testLikeIgnoreCaseExp() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeIgnoreCaseExp("abc", v);
@@ -212,6 +233,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testLikeIgnoreCaseExpEscape() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeIgnoreCaseExp("=abc", v, '=');
@@ -222,6 +244,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.OBJ_PATH, path.getType());
}
+ @Test
public void testLikeIgnoreCaseDbExp() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.likeIgnoreCaseDbExp("abc", v);
@@ -231,6 +254,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertEquals(Expression.DB_PATH, path.getType());
}
+ @Test
public void testNotLikeIgnoreCaseExp() throws Exception {
String v = "abc";
Expression exp = ExpressionFactory.notLikeIgnoreCaseExp("abc", v);
@@ -238,6 +262,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
}
// testing CAY-941 bug
+ @Test
public void testLikeExpNull() throws Exception {
Expression exp = ExpressionFactory.likeExp("abc", null);
assertEquals(Expression.LIKE, exp.getType());
@@ -248,6 +273,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
}
// CAY-416
+ @Test
public void testCollectionMatch() {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("artist");
@@ -284,6 +310,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertFalse(ExpressionFactory.notInExp("paintingTitle", "p3").match(p3));
}
+ @Test
public void testIn() {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("a1");
@@ -298,6 +325,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
assertTrue(in.match(a1));
}
+ @Test
public void testEscapeCharacter() {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("A_1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
index d75aceb..e8af55b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.ArrayList;
import java.util.List;
@@ -56,6 +57,7 @@ public class Expression_InContextIT extends ServerCase {
dbHelper.deleteAll("GALLERY");
}
+ @Test
public void testMatch() {
assertTrue(context instanceof DataContext);
@@ -105,6 +107,7 @@ public class Expression_InContextIT extends ServerCase {
assertFalse(ex.match(objects.get(0)));
}
+ @Test
public void testFirst() {
List<Painting> paintingList = new ArrayList<Painting>();
Painting p1 = context.newObject(Painting.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
index af64722..5e4c5cd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.HashMap;
import java.util.List;
@@ -89,6 +90,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
return context.performQuery(query);
}
+ @Test
public void testOr() throws Exception {
createTwentyFiveArtists();
@@ -102,6 +104,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(3, execute(Artist.class, parsed).size());
}
+ @Test
public void testAnd() throws Exception {
createTwentyFiveArtists();
@@ -113,6 +116,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(0, execute(Artist.class, parsed).size());
}
+ @Test
public void testNot() throws Exception {
createTwentyFiveArtists();
@@ -124,6 +128,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25 - 1, execute(Artist.class, parsed2).size());
}
+ @Test
public void testEqual() throws Exception {
createTwentyFiveArtists();
@@ -138,6 +143,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(1, execute(Artist.class, parsed2).size());
}
+ @Test
public void testNotEqual() throws Exception {
createTwentyFiveArtists();
@@ -149,36 +155,42 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25 - 1, execute(Artist.class, parsed2).size());
}
+ @Test
public void testLessThan() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression.fromString("estimatedPrice < 2000.0");
assertEquals(1, execute(Painting.class, parsed1).size());
}
+ @Test
public void testLessThanEqualTo() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression.fromString("estimatedPrice <= 2000.0");
assertEquals(2, execute(Painting.class, parsed1).size());
}
+ @Test
public void testGreaterThan() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression.fromString("estimatedPrice > 2000");
assertEquals(25 - 2, execute(Painting.class, parsed1).size());
}
+ @Test
public void testGreaterThanEqualTo() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression.fromString("estimatedPrice >= 2000");
assertEquals(25 - 1, execute(Painting.class, parsed1).size());
}
+ @Test
public void testLike() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression.fromString("artistName like 'artist%2'");
assertEquals(3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testLikeIgnoreCase() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression
@@ -186,12 +198,14 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testNotLike() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression.fromString("artistName not like 'artist%2'");
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testNotLikeIgnoreCase() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression
@@ -199,6 +213,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testIn() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression
@@ -206,6 +221,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testNotIn() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression
@@ -213,6 +229,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
+ @Test
public void testBetween() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression
@@ -220,6 +237,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(3, execute(Painting.class, parsed1).size());
}
+ @Test
public void testNotBetween() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression
@@ -227,6 +245,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25 - 3, execute(Painting.class, parsed1).size());
}
+ @Test
public void testParameter() throws Exception {
createTwentyFiveArtists();
Map<String, Object> parameters = new HashMap<String, Object>();
@@ -236,18 +255,21 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(1, execute(Artist.class, parsed1).size());
}
+ @Test
public void testDbExpression() throws Exception {
createTwentyFiveArtists();
Expression parsed1 = Expression.fromString("db:ARTIST_NAME='artist3'");
assertEquals(1, execute(Artist.class, parsed1).size());
}
+ @Test
public void testFloatExpression() throws Exception {
createTwentyFiveArtistsAndPaintings();
Expression parsed1 = Expression.fromString("estimatedPrice < 2001.01");
assertEquals(2, execute(Painting.class, parsed1).size());
}
+ @Test
public void testNullExpression() throws Exception {
createTwentyFiveArtists();
@@ -258,6 +280,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(0, execute(Artist.class, parsed2).size());
}
+ @Test
public void testTrueExpression() throws Exception {
createTwentyFiveArtistsAndPaintings();
@@ -272,6 +295,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
assertEquals(25, execute(Painting.class, parsed3).size());
}
+ @Test
public void testFalseExpression() throws Exception {
createTwentyFiveArtistsAndPaintings();
[12/12] git commit: random tests cleanup
Posted by aa...@apache.org.
random tests cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8990e655
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8990e655
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8990e655
Branch: refs/heads/master
Commit: 8990e65545d4d65773a0e5d1350a9e602a0d3d77
Parents: 2430e94
Author: aadamchik <aa...@apache.org>
Authored: Tue Nov 4 20:16:05 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Tue Nov 4 20:21:01 2014 +0300
----------------------------------------------------------------------
.../apache/cayenne/NestedCayenneContextIT.java | 1309 +++++++++---------
.../org/apache/cayenne/remote/MockMessage.java | 50 -
.../remote/NestedObjectContextLocalIT.java | 2 +-
.../cayenne/remote/ROPPrefetchToManyMapIT.java | 2 +-
.../remote/RemoteIncrementalFaultListIT.java | 483 +++----
.../apache/cayenne/remote/ValueInjectorIT.java | 5 +-
6 files changed, 906 insertions(+), 945 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
index 8420770..d40ed76 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
@@ -18,6 +18,11 @@
****************************************************************/
package org.apache.cayenne;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.cayenne.configuration.rop.client.ClientRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.graph.GraphChangeHandler;
@@ -40,862 +45,864 @@ 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.Iterator;
-import java.util.List;
-
/**
* Tests nested object contexts
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
-@RunWith(value=Parameterized.class)
+@RunWith(value = Parameterized.class)
public class NestedCayenneContextIT extends RemoteCayenneCase {
- @Inject
- private ClientRuntime runtime;
-
- @Inject
- private DBHelper dbHelper;
+ @Inject
+ private ClientRuntime runtime;
+
+ @Inject
+ private DBHelper dbHelper;
+
+ @Inject
+ private DataChannelInterceptor queryInterceptor;
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ { LocalConnection.HESSIAN_SERIALIZATION },
+ { LocalConnection.JAVA_SERIALIZATION },
+ { LocalConnection.NO_SERIALIZATION }, });
+ }
+
+ public NestedCayenneContextIT(int serializationPolicy) {
+ super.serializationPolicy = serializationPolicy;
+ }
+
+ @Override
+ public void setUpAfterInjection() throws Exception {
+ super.setUpAfterInjection();
+
+ dbHelper.deleteAll("MT_TABLE2");
+ dbHelper.deleteAll("MT_TABLE1");
+ }
+
+ @Test
+ public void testChannels() {
+ ObjectContext child = runtime.newContext(clientContext);
+
+ assertNotNull(child);
+ assertSame(clientContext, child.getChannel());
+
+ // second level of nesting
+ ObjectContext grandchild = runtime.newContext((DataChannel) child);
+
+ assertNotNull(grandchild);
+ assertSame(child, grandchild.getChannel());
+ }
+
+ @Test
+ public void testSelect() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
+
+ ClientMtTable1 committed = clientContext
+ .newObject(ClientMtTable1.class);
+ ClientMtTable1 deleted = clientContext.newObject(ClientMtTable1.class);
+ ClientMtTable1 modified = clientContext.newObject(ClientMtTable1.class);
+
+ clientContext.commitChanges();
+ int modifiedid = Cayenne.intPKForObject(modified);
+
+ // test how different object states appear in the child on select
+
+ clientContext.deleteObjects(deleted);
+ modified.setGlobalAttribute1("a");
+
+ ClientMtTable1 _new = clientContext.newObject(ClientMtTable1.class);
- @Inject
- private DataChannelInterceptor queryInterceptor;
+ assertEquals(PersistenceState.COMMITTED,
+ committed.getPersistenceState());
+ assertEquals(PersistenceState.MODIFIED, modified.getPersistenceState());
+ assertEquals(PersistenceState.DELETED, deleted.getPersistenceState());
+ assertEquals(PersistenceState.NEW, _new.getPersistenceState());
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {LocalConnection.HESSIAN_SERIALIZATION},
- {LocalConnection.JAVA_SERIALIZATION},
- {LocalConnection.NO_SERIALIZATION},
- });
- }
+ List<ClientMtTable1> objects = child
+ .select(new SelectQuery<ClientMtTable1>(ClientMtTable1.class));
+ assertEquals("All but NEW object must have been included", 3,
+ objects.size());
- public NestedCayenneContextIT(int serializationPolicy) {
- super.serializationPolicy = serializationPolicy;
- }
+ for (ClientMtTable1 next : objects) {
+ assertEquals(PersistenceState.COMMITTED, next.getPersistenceState());
- @Override
- public void setUpAfterInjection() throws Exception {
- super.setUpAfterInjection();
+ int id = Cayenne.intPKForObject(next);
+ if (id == modifiedid) {
+ assertEquals("a", next.getGlobalAttribute1());
+ }
+ }
+ }
- dbHelper.deleteAll("MT_TABLE2");
- dbHelper.deleteAll("MT_TABLE1");
- }
+ @Test
+ public void testPrefetchingToOne() throws Exception {
+ final ClientMtTable1 mt11 = clientContext
+ .newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ ClientMtTable2 mt21 = clientContext.newObject(ClientMtTable2.class);
+ ClientMtTable2 mt22 = clientContext.newObject(ClientMtTable2.class);
- @Test
- public void testChannels() {
- ObjectContext child = runtime.newContext(clientContext);
+ mt21.setTable1(mt11);
+ mt22.setTable1(mt11);
- assertNotNull(child);
- assertSame(clientContext, child.getChannel());
+ clientContext.commitChanges();
- // second level of nesting
- ObjectContext grandchild = runtime.newContext((DataChannel) child);
+ final ObjectContext child = runtime.newContext(clientContext);
- assertNotNull(grandchild);
- assertSame(child, grandchild.getChannel());
- }
+ SelectQuery<ClientMtTable2> q = new SelectQuery<ClientMtTable2>(
+ ClientMtTable2.class);
+ q.addPrefetch(ClientMtTable2.TABLE1_PROPERTY);
- @Test
- public void testSelect() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
+ final List<ClientMtTable2> results = child.select(q);
- ClientMtTable1 committed = clientContext.newObject(ClientMtTable1.class);
- ClientMtTable1 deleted = clientContext.newObject(ClientMtTable1.class);
- ClientMtTable1 modified = clientContext.newObject(ClientMtTable1.class);
+ queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
- clientContext.commitChanges();
- int modifiedid = Cayenne.intPKForObject(modified);
+ public void execute() {
+ assertEquals(2, results.size());
+ Iterator<?> it = results.iterator();
+ while (it.hasNext()) {
+ ClientMtTable2 o = (ClientMtTable2) it.next();
+ assertEquals(PersistenceState.COMMITTED,
+ o.getPersistenceState());
+ assertSame(child, o.getObjectContext());
- // test how different object states appear in the child on select
+ ClientMtTable1 o1 = o.getTable1();
+ assertNotNull(o1);
+ assertEquals(PersistenceState.COMMITTED,
+ o1.getPersistenceState());
+ assertSame(child, o1.getObjectContext());
+ assertEquals(mt11.getObjectId(), o1.getObjectId());
+ }
+ }
+ });
+ }
- clientContext.deleteObjects(deleted);
- modified.setGlobalAttribute1("a");
+ @Test
+ public void testPrefetchingToMany() throws Exception {
+ ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class);
+ mt11.setGlobalAttribute1("1");
- ClientMtTable1 _new = clientContext.newObject(ClientMtTable1.class);
+ ClientMtTable1 mt12 = clientContext.newObject(ClientMtTable1.class);
+ mt12.setGlobalAttribute1("2");
- assertEquals(PersistenceState.COMMITTED, committed.getPersistenceState());
- assertEquals(PersistenceState.MODIFIED, modified.getPersistenceState());
- assertEquals(PersistenceState.DELETED, deleted.getPersistenceState());
- assertEquals(PersistenceState.NEW, _new.getPersistenceState());
+ ClientMtTable2 mt21 = clientContext.newObject(ClientMtTable2.class);
+ ClientMtTable2 mt22 = clientContext.newObject(ClientMtTable2.class);
- List<?> objects = child.performQuery(new SelectQuery(ClientMtTable1.class));
- assertEquals("All but NEW object must have been included", 3, objects.size());
+ mt21.setTable1(mt11);
+ mt22.setTable1(mt11);
- Iterator<?> it = objects.iterator();
- while (it.hasNext()) {
- ClientMtTable1 next = (ClientMtTable1) it.next();
- assertEquals(PersistenceState.COMMITTED, next.getPersistenceState());
+ clientContext.commitChanges();
- int id = Cayenne.intPKForObject(next);
- if (id == modifiedid) {
- assertEquals("a", next.getGlobalAttribute1());
- }
- }
- }
+ final ObjectContext child = runtime.newContext(clientContext);
- @Test
- public void testPrefetchingToOne() throws Exception {
- final ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- ClientMtTable2 mt21 = clientContext.newObject(ClientMtTable2.class);
- ClientMtTable2 mt22 = clientContext.newObject(ClientMtTable2.class);
+ SelectQuery<ClientMtTable1> q = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class);
+ q.addOrdering("globalAttribute1", SortOrder.ASCENDING);
+ q.addPrefetch(ClientMtTable1.TABLE2ARRAY_PROPERTY);
- mt21.setTable1(mt11);
- mt22.setTable1(mt11);
+ final List<ClientMtTable1> results = child.select(q);
- clientContext.commitChanges();
+ queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
- final ObjectContext child = runtime.newContext(clientContext);
+ public void execute() {
+ ClientMtTable1 o1 = results.get(0);
+ assertEquals(PersistenceState.COMMITTED,
+ o1.getPersistenceState());
+ assertSame(child, o1.getObjectContext());
- SelectQuery q = new SelectQuery(ClientMtTable2.class);
- q.addPrefetch(ClientMtTable2.TABLE1_PROPERTY);
+ List<ClientMtTable2> children1 = o1.getTable2Array();
- final List<?> results = child.performQuery(q);
+ assertEquals(2, children1.size());
+ Iterator<ClientMtTable2> it = children1.iterator();
+ while (it.hasNext()) {
+ ClientMtTable2 o = it.next();
+ assertEquals(PersistenceState.COMMITTED,
+ o.getPersistenceState());
+ assertSame(child, o.getObjectContext());
- queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
+ assertEquals(o1, o.getTable1());
+ }
- public void execute() {
- assertEquals(2, results.size());
- Iterator<?> it = results.iterator();
- while (it.hasNext()) {
- ClientMtTable2 o = (ClientMtTable2) it.next();
- assertEquals(PersistenceState.COMMITTED, o.getPersistenceState());
- assertSame(child, o.getObjectContext());
+ ClientMtTable1 o2 = results.get(1);
+ assertEquals(PersistenceState.COMMITTED,
+ o2.getPersistenceState());
+ assertSame(child, o2.getObjectContext());
- ClientMtTable1 o1 = o.getTable1();
- assertNotNull(o1);
- assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
- assertSame(child, o1.getObjectContext());
- assertEquals(mt11.getObjectId(), o1.getObjectId());
- }
- }
- });
- }
+ List<?> children2 = o2.getTable2Array();
- @Test
- public void testPrefetchingToMany() throws Exception {
- ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class);
- mt11.setGlobalAttribute1("1");
+ assertEquals(0, children2.size());
+ }
+ });
+ }
- ClientMtTable1 mt12 = clientContext.newObject(ClientMtTable1.class);
- mt12.setGlobalAttribute1("2");
+ @Test
+ public void testDeleteNew() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
- ClientMtTable2 mt21 = clientContext.newObject(ClientMtTable2.class);
- ClientMtTable2 mt22 = clientContext.newObject(ClientMtTable2.class);
+ ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
+ clientContext.commitChanges();
- mt21.setTable1(mt11);
- mt22.setTable1(mt11);
+ ClientMtTable2 p = child.newObject(ClientMtTable2.class);
+ ClientMtTable1 aChild = (ClientMtTable1) Cayenne.objectForPK(child,
+ a.getObjectId());
+ p.setGlobalAttribute("X");
+ aChild.addToTable2Array(p);
- clientContext.commitChanges();
+ child.commitChangesToParent();
- final ObjectContext child = runtime.newContext(clientContext);
+ child.deleteObjects(p);
+ aChild.removeFromTable2Array(p);
- SelectQuery q = new SelectQuery(ClientMtTable1.class);
- q.addOrdering("globalAttribute1", SortOrder.ASCENDING);
- q.addPrefetch(ClientMtTable1.TABLE2ARRAY_PROPERTY);
+ child.commitChangesToParent();
+ }
- final List<?> results = child.performQuery(q);
+ /**
+ * A test case for CAY-698 bug.
+ */
+ @Test
+ public void testNullifyToOne() throws Exception {
+ ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
+ ClientMtTable2 b = clientContext.newObject(ClientMtTable2.class);
+ a.addToTable2Array(b);
- queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
+ clientContext.commitChanges();
- public void execute() {
- ClientMtTable1 o1 = (ClientMtTable1) results.get(0);
- assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
- assertSame(child, o1.getObjectContext());
+ final ObjectContext child = runtime.newContext(clientContext);
+ ObjectContext childPeer = runtime.newContext(clientContext);
- List<ClientMtTable2> children1 = o1.getTable2Array();
+ final ClientMtTable2 childP1 = (ClientMtTable2) Cayenne.objectForPK(
+ child, b.getObjectId());
- assertEquals(2, children1.size());
- Iterator<ClientMtTable2> it = children1.iterator();
- while (it.hasNext()) {
- ClientMtTable2 o = it.next();
- assertEquals(PersistenceState.COMMITTED, o.getPersistenceState());
- assertSame(child, o.getObjectContext());
+ // trigger object creation in the peer nested DC
+ Cayenne.objectForPK(childPeer, b.getObjectId());
+ childP1.setTable1(null);
- assertEquals(o1, o.getTable1());
- }
+ queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
- ClientMtTable1 o2 = (ClientMtTable1) results.get(1);
- assertEquals(PersistenceState.COMMITTED, o2.getPersistenceState());
- assertSame(child, o2.getObjectContext());
+ public void execute() {
+ child.commitChangesToParent();
+ assertEquals(PersistenceState.COMMITTED,
+ childP1.getPersistenceState());
- List<?> children2 = o2.getTable2Array();
+ ClientMtTable2 parentP1 = (ClientMtTable2) clientContext
+ .getGraphManager().getNode(childP1.getObjectId());
- assertEquals(0, children2.size());
- }
- });
- }
+ assertNotNull(parentP1);
+ assertEquals(PersistenceState.MODIFIED,
+ parentP1.getPersistenceState());
+ assertNull(parentP1.getTable1());
- @Test
- public void testDeleteNew() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
+ // check that arc changes got recorded in the parent context
+ GraphDiff diffs = clientContext.internalGraphManager()
+ .getDiffs();
+ final int[] arcDiffs = new int[1];
- ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
- clientContext.commitChanges();
+ diffs.apply(new GraphChangeHandler() {
- ClientMtTable2 p = child.newObject(ClientMtTable2.class);
- ClientMtTable1 aChild = (ClientMtTable1) Cayenne.objectForPK(
- child,
- a.getObjectId());
- p.setGlobalAttribute("X");
- aChild.addToTable2Array(p);
+ public void arcCreated(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]++;
+ }
- child.commitChangesToParent();
+ public void arcDeleted(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]--;
+ }
- child.deleteObjects(p);
- aChild.removeFromTable2Array(p);
+ public void nodeCreated(Object nodeId) {
- child.commitChangesToParent();
- }
+ }
- /**
- * A test case for CAY-698 bug.
- */
- @Test
- public void testNullifyToOne() throws Exception {
- ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class);
- ClientMtTable2 b = clientContext.newObject(ClientMtTable2.class);
- a.addToTable2Array(b);
+ public void nodeIdChanged(Object nodeId, Object newId) {
+ }
- clientContext.commitChanges();
+ public void nodePropertyChanged(Object nodeId,
+ String property, Object oldValue, Object newValue) {
+ }
- final ObjectContext child = runtime.newContext(clientContext);
- ObjectContext childPeer = runtime.newContext(clientContext);
+ public void nodeRemoved(Object nodeId) {
- final ClientMtTable2 childP1 = (ClientMtTable2) Cayenne.objectForPK(
- child,
- b.getObjectId());
+ }
+ });
- // trigger object creation in the peer nested DC
- Cayenne.objectForPK(childPeer, b.getObjectId());
- childP1.setTable1(null);
+ assertEquals(-2, arcDiffs[0]);
+ }
+ });
+ }
- queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
+ @Test
+ public void testCommitChangesToParent() throws Exception {
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.commitChanges();
- public void execute() {
- child.commitChangesToParent();
- assertEquals(PersistenceState.COMMITTED, childP1.getPersistenceState());
+ final ObjectContext child = runtime.newContext(clientContext);
- ClientMtTable2 parentP1 = (ClientMtTable2) clientContext
- .getGraphManager()
- .getNode(childP1.getObjectId());
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class);
+ List<ClientMtTable1> objects = child.select(query);
- assertNotNull(parentP1);
- assertEquals(PersistenceState.MODIFIED, parentP1.getPersistenceState());
- assertNull(parentP1.getTable1());
+ assertEquals(4, objects.size());
- // check that arc changes got recorded in the parent context
- GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
- final int[] arcDiffs = new int[1];
+ final ClientMtTable1 childNew = child.newObject(ClientMtTable1.class);
+ childNew.setGlobalAttribute1("NNN");
- diffs.apply(new GraphChangeHandler() {
+ final ClientMtTable1 childModified = objects.get(0);
+ childModified.setGlobalAttribute1("MMM");
- public void arcCreated(
- Object nodeId,
- Object targetNodeId,
- Object arcId) {
- arcDiffs[0]++;
- }
-
- public void arcDeleted(
- Object nodeId,
- Object targetNodeId,
- Object arcId) {
- arcDiffs[0]--;
- }
-
- public void nodeCreated(Object nodeId) {
-
- }
+ final ClientMtTable1 childCommitted = objects.get(1);
- public void nodeIdChanged(Object nodeId, Object newId) {
- }
+ final ClientMtTable1 childHollow = objects.get(3);
+ child.invalidateObjects(childHollow);
- public void nodePropertyChanged(
- Object nodeId,
- String property,
- Object oldValue,
- Object newValue) {
- }
+ queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
- public void nodeRemoved(Object nodeId) {
+ public void execute() {
+ child.commitChangesToParent();
- }
- });
+ // * all modified child objects must be in committed state now
+ // * all modifications should be propagated to the parent
+ // * no actual commit should occur.
- assertEquals(-2, arcDiffs[0]);
- }
- });
- }
+ assertEquals(PersistenceState.COMMITTED,
+ childNew.getPersistenceState());
+ assertEquals(PersistenceState.COMMITTED,
+ childModified.getPersistenceState());
+ assertEquals(PersistenceState.COMMITTED,
+ childCommitted.getPersistenceState());
+ assertEquals(PersistenceState.HOLLOW,
+ childHollow.getPersistenceState());
- @Test
- public void testCommitChangesToParent() throws Exception {
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.commitChanges();
+ ClientMtTable1 parentNew = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childNew.getObjectId());
+ final ClientMtTable1 parentModified = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childModified.getObjectId());
+ ClientMtTable1 parentCommitted = (ClientMtTable1) clientContext
+ .getGraphManager()
+ .getNode(childCommitted.getObjectId());
+ ClientMtTable1 parentHollow = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childHollow.getObjectId());
- final ObjectContext child = runtime.newContext(clientContext);
+ assertNotNull(parentNew);
+ assertEquals(PersistenceState.NEW,
+ parentNew.getPersistenceState());
+ assertEquals("NNN", parentNew.getGlobalAttribute1());
- SelectQuery query = new SelectQuery(ClientMtTable1.class);
- List<?> objects = child.performQuery(query);
+ assertNotNull(parentModified);
+ assertEquals(PersistenceState.MODIFIED,
+ parentModified.getPersistenceState());
+ assertEquals("MMM", parentModified.getGlobalAttribute1());
- assertEquals(4, objects.size());
+ assertNotNull(parentCommitted);
+ assertEquals(PersistenceState.COMMITTED,
+ parentCommitted.getPersistenceState());
- final ClientMtTable1 childNew = child.newObject(ClientMtTable1.class);
- childNew.setGlobalAttribute1("NNN");
+ assertNotNull(parentHollow);
- final ClientMtTable1 childModified = (ClientMtTable1) objects.get(0);
- childModified.setGlobalAttribute1("MMM");
+ // check that arc changes got recorded in the parent context
+ GraphDiff diffs = clientContext.internalGraphManager()
+ .getDiffs();
- final ClientMtTable1 childCommitted = (ClientMtTable1) objects.get(1);
+ final int[] modifiedProperties = new int[1];
- final ClientMtTable1 childHollow = (ClientMtTable1) objects.get(3);
- child.invalidateObjects(childHollow);
+ diffs.apply(new GraphChangeHandler() {
- queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
+ @Override
+ public void arcCreated(Object nodeId, Object targetNodeId,
+ Object arcId) {
- public void execute() {
- child.commitChangesToParent();
+ }
- // * all modified child objects must be in committed state now
- // * all modifications should be propagated to the parent
- // * no actual commit should occur.
+ @Override
+ public void arcDeleted(Object nodeId, Object targetNodeId,
+ Object arcId) {
- assertEquals(PersistenceState.COMMITTED, childNew.getPersistenceState());
- assertEquals(
- PersistenceState.COMMITTED,
- childModified.getPersistenceState());
- assertEquals(
- PersistenceState.COMMITTED,
- childCommitted.getPersistenceState());
- assertEquals(PersistenceState.HOLLOW, childHollow.getPersistenceState());
+ }
- ClientMtTable1 parentNew = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childNew.getObjectId());
- final ClientMtTable1 parentModified = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childModified.getObjectId());
- ClientMtTable1 parentCommitted = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childCommitted.getObjectId());
- ClientMtTable1 parentHollow = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childHollow.getObjectId());
+ @Override
+ public void nodeCreated(Object nodeId) {
- assertNotNull(parentNew);
- assertEquals(PersistenceState.NEW, parentNew.getPersistenceState());
- assertEquals("NNN", parentNew.getGlobalAttribute1());
+ }
- assertNotNull(parentModified);
- assertEquals(
- PersistenceState.MODIFIED,
- parentModified.getPersistenceState());
- assertEquals("MMM", parentModified.getGlobalAttribute1());
+ @Override
+ public void nodeIdChanged(Object nodeId, Object newId) {
+ }
- assertNotNull(parentCommitted);
- assertEquals(
- PersistenceState.COMMITTED,
- parentCommitted.getPersistenceState());
+ @Override
+ public void nodePropertyChanged(Object nodeId,
+ String property, Object oldValue, Object newValue) {
- assertNotNull(parentHollow);
+ if (nodeId.equals(parentModified.getObjectId())) {
+ modifiedProperties[0]++;
+ }
+ }
- // check that arc changes got recorded in the parent context
- GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
+ @Override
+ public void nodeRemoved(Object nodeId) {
- final int[] modifiedProperties = new int[1];
+ }
+ });
- diffs.apply(new GraphChangeHandler() {
+ assertEquals(1, modifiedProperties[0]);
+ }
+ });
+ }
- public void arcCreated(
- Object nodeId,
- Object targetNodeId,
- Object arcId) {
+ @Test
+ public void testCommitChangesToParentDeleted() throws Exception {
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.commitChanges();
- }
+ ObjectContext child = runtime.newContext(clientContext);
- public void arcDeleted(
- Object nodeId,
- Object targetNodeId,
- Object arcId) {
+ // make sure we fetch in predictable order
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class);
+ List<ClientMtTable1> objects = child.select(query);
- }
+ assertEquals(4, objects.size());
- public void nodeCreated(Object nodeId) {
+ // delete AND modify
+ ClientMtTable1 childDeleted = objects.get(2);
+ child.deleteObjects(childDeleted);
+ childDeleted.setGlobalAttribute1("DDD");
- }
+ // don't block queries - on delete Cayenne may need to resolve delete
+ // rules via fetch
+ child.commitChangesToParent();
- public void nodeIdChanged(Object nodeId, Object newId) {
- }
+ // * all modified child objects must be in committed state now
+ // * all modifications should be propagated to the parent
+ // * no actual commit should occur.
- public void nodePropertyChanged(
- Object nodeId,
- String property,
- Object oldValue,
- Object newValue) {
+ assertEquals(PersistenceState.TRANSIENT,
+ childDeleted.getPersistenceState());
- if (nodeId.equals(parentModified.getObjectId())) {
- modifiedProperties[0]++;
- }
- }
+ ClientMtTable1 parentDeleted = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childDeleted.getObjectId());
- public void nodeRemoved(Object nodeId) {
+ assertNotNull(parentDeleted);
+ assertEquals(PersistenceState.DELETED,
+ parentDeleted.getPersistenceState());
+ assertEquals("DDD", parentDeleted.getGlobalAttribute1());
+ }
- }
- });
+ /*
+ * was added for CAY-1636
+ */
+ @Test
+ public void testCAY1636() throws Exception {
- assertEquals(1, modifiedProperties[0]);
- }
- });
- }
+ ClientMtTooneMaster A = clientContext
+ .newObject(ClientMtTooneMaster.class);
+ clientContext.commitChanges();
- @Test
- public void testCommitChangesToParentDeleted() throws Exception {
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.commitChanges();
+ ClientMtTooneDep B = clientContext.newObject(ClientMtTooneDep.class);
+ A.setToDependent(B);
+ clientContext.commitChanges();
- ObjectContext child = runtime.newContext(clientContext);
+ ObjectContext child = runtime.newContext(clientContext);
- // make sure we fetch in predictable order
- SelectQuery query = new SelectQuery(ClientMtTable1.class);
- List<?> objects = child.performQuery(query);
+ SelectQuery<ClientMtTooneMaster> query = new SelectQuery<ClientMtTooneMaster>(
+ ClientMtTooneMaster.class);
+ List<ClientMtTooneMaster> objects = child.select(query);
- assertEquals(4, objects.size());
+ assertEquals(1, objects.size());
- // delete AND modify
- ClientMtTable1 childDeleted = (ClientMtTable1) objects.get(2);
- child.deleteObjects(childDeleted);
- childDeleted.setGlobalAttribute1("DDD");
+ ClientMtTooneMaster childDeleted = (ClientMtTooneMaster) objects.get(0);
- // don't block queries - on delete Cayenne may need to resolve delete rules via
- // fetch
- child.commitChangesToParent();
+ child.deleteObjects(childDeleted);
- // * all modified child objects must be in committed state now
- // * all modifications should be propagated to the parent
- // * no actual commit should occur.
+ child.commitChangesToParent();
- assertEquals(PersistenceState.TRANSIENT, childDeleted.getPersistenceState());
+ ClientMtTooneMaster parentDeleted = (ClientMtTooneMaster) clientContext
+ .getGraphManager().getNode(childDeleted.getObjectId());
- ClientMtTable1 parentDeleted = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childDeleted.getObjectId());
+ assertNotNull(parentDeleted);
+ assertEquals(PersistenceState.DELETED,
+ parentDeleted.getPersistenceState());
- assertNotNull(parentDeleted);
- assertEquals(PersistenceState.DELETED, parentDeleted.getPersistenceState());
- assertEquals("DDD", parentDeleted.getGlobalAttribute1());
- }
+ clientContext.commitChanges();
- /*
- * was added for CAY-1636
- */
- @Test
- public void testCAY1636() throws Exception {
+ SelectQuery<ClientMtTooneMaster> query2 = new SelectQuery<ClientMtTooneMaster>(
+ ClientMtTooneMaster.class);
+ List<ClientMtTooneMaster> objects2 = child.select(query2);
- ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class);
- clientContext.commitChanges();
+ assertEquals(0, objects2.size());
- ClientMtTooneDep B = clientContext.newObject(ClientMtTooneDep.class);
- A.setToDependent(B);
- clientContext.commitChanges();
+ }
- ObjectContext child = runtime.newContext(clientContext);
+ @Test
+ public void testCAY1636_2() throws Exception {
- SelectQuery query = new SelectQuery(ClientMtTooneMaster.class);
- List<?> objects = child.performQuery(query);
+ ClientMtTooneMaster A = clientContext
+ .newObject(ClientMtTooneMaster.class);
+ clientContext.commitChanges();
- assertEquals(1, objects.size());
+ ClientMtTooneDep B = clientContext.newObject(ClientMtTooneDep.class);
+ A.setToDependent(B);
+ clientContext.commitChanges();
- ClientMtTooneMaster childDeleted = (ClientMtTooneMaster) objects.get(0);
+ ObjectContext child = runtime.newContext(clientContext);
- child.deleteObjects(childDeleted);
+ SelectQuery<ClientMtTooneDep> queryB = new SelectQuery<ClientMtTooneDep>(
+ ClientMtTooneDep.class);
+ List<?> objectsB = child.performQuery(queryB);
- child.commitChangesToParent();
+ assertEquals(1, objectsB.size());
- ClientMtTooneMaster parentDeleted = (ClientMtTooneMaster) clientContext
- .getGraphManager()
- .getNode(childDeleted.getObjectId());
+ ClientMtTooneDep childBDeleted = (ClientMtTooneDep) objectsB.get(0);
+ child.deleteObjects(childBDeleted);
- assertNotNull(parentDeleted);
- assertEquals(PersistenceState.DELETED, parentDeleted.getPersistenceState());
+ SelectQuery<ClientMtTooneMaster> query = new SelectQuery<ClientMtTooneMaster>(
+ ClientMtTooneMaster.class);
+ List<ClientMtTooneMaster> objects = child.select(query);
- clientContext.commitChanges();
+ assertEquals(1, objects.size());
- SelectQuery query2 = new SelectQuery(ClientMtTooneMaster.class);
- List<?> objects2 = child.performQuery(query2);
+ ClientMtTooneMaster childDeleted = objects.get(0);
- assertEquals(0, objects2.size());
+ child.deleteObjects(childDeleted);
- }
+ child.commitChangesToParent();
- @Test
- public void testCAY1636_2() throws Exception {
+ ClientMtTooneMaster parentDeleted = (ClientMtTooneMaster) clientContext
+ .getGraphManager().getNode(childDeleted.getObjectId());
- ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class);
- clientContext.commitChanges();
+ assertNotNull(parentDeleted);
+ assertEquals(PersistenceState.DELETED,
+ parentDeleted.getPersistenceState());
- ClientMtTooneDep B = clientContext.newObject(ClientMtTooneDep.class);
- A.setToDependent(B);
- clientContext.commitChanges();
+ clientContext.commitChanges();
- ObjectContext child = runtime.newContext(clientContext);
+ SelectQuery<ClientMtTooneMaster> query2 = new SelectQuery<ClientMtTooneMaster>(
+ ClientMtTooneMaster.class);
+ List<ClientMtTooneMaster> objects2 = child.select(query2);
- SelectQuery queryB = new SelectQuery(ClientMtTooneDep.class);
- List<?> objectsB = child.performQuery(queryB);
+ assertEquals(0, objects2.size());
- assertEquals(1, objectsB.size());
+ }
- ClientMtTooneDep childBDeleted = (ClientMtTooneDep) objectsB.get(0);
- child.deleteObjects(childBDeleted);
+ @Test
+ public void testCommitChanges() throws Exception {
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.newObject(ClientMtTable1.class);
+ clientContext.commitChanges();
- SelectQuery query = new SelectQuery(ClientMtTooneMaster.class);
- List<?> objects = child.performQuery(query);
+ ObjectContext child = runtime.newContext(clientContext);
- assertEquals(1, objects.size());
+ // make sure we fetch in predictable order
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class);
+ List<ClientMtTable1> objects = child.select(query);
- ClientMtTooneMaster childDeleted = (ClientMtTooneMaster) objects.get(0);
+ assertEquals(4, objects.size());
- child.deleteObjects(childDeleted);
+ ClientMtTable1 childNew = child.newObject(ClientMtTable1.class);
+ childNew.setGlobalAttribute1("NNN");
- child.commitChangesToParent();
+ ClientMtTable1 childModified = objects.get(0);
+ childModified.setGlobalAttribute1("MMM");
- ClientMtTooneMaster parentDeleted = (ClientMtTooneMaster) clientContext
- .getGraphManager()
- .getNode(childDeleted.getObjectId());
+ ClientMtTable1 childCommitted = objects.get(1);
- assertNotNull(parentDeleted);
- assertEquals(PersistenceState.DELETED, parentDeleted.getPersistenceState());
+ // delete AND modify
+ ClientMtTable1 childDeleted = objects.get(2);
+ child.deleteObjects(childDeleted);
+ childDeleted.setGlobalAttribute1("DDD");
- clientContext.commitChanges();
+ ClientMtTable1 childHollow = objects.get(3);
+ child.invalidateObjects(childHollow);
- SelectQuery query2 = new SelectQuery(ClientMtTooneMaster.class);
- List<?> objects2 = child.performQuery(query2);
+ child.commitChanges();
- assertEquals(0, objects2.size());
+ assertEquals(PersistenceState.COMMITTED, childNew.getPersistenceState());
+ assertEquals(PersistenceState.COMMITTED,
+ childModified.getPersistenceState());
+ assertEquals(PersistenceState.COMMITTED,
+ childCommitted.getPersistenceState());
+ assertEquals(PersistenceState.TRANSIENT,
+ childDeleted.getPersistenceState());
+ assertEquals(PersistenceState.HOLLOW, childHollow.getPersistenceState());
- }
+ ClientMtTable1 parentNew = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childNew.getObjectId());
+ ClientMtTable1 parentModified = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childModified.getObjectId());
+ ClientMtTable1 parentCommitted = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childCommitted.getObjectId());
+ ClientMtTable1 parentDeleted = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childDeleted.getObjectId());
+ ClientMtTable1 parentHollow = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(childHollow.getObjectId());
- @Test
- public void testCommitChanges() throws Exception {
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.newObject(ClientMtTable1.class);
- clientContext.commitChanges();
+ assertNotNull(parentNew);
+ assertEquals(PersistenceState.COMMITTED,
+ parentNew.getPersistenceState());
+ assertEquals("NNN", parentNew.getGlobalAttribute1());
- ObjectContext child = runtime.newContext(clientContext);
+ assertNotNull(parentModified);
+ assertEquals(PersistenceState.COMMITTED,
+ parentModified.getPersistenceState());
+ assertEquals("MMM", parentModified.getGlobalAttribute1());
- // make sure we fetch in predictable order
- SelectQuery query = new SelectQuery(ClientMtTable1.class);
- List<?> objects = child.performQuery(query);
+ assertNull("Deleted object should not be registered.", parentDeleted);
- assertEquals(4, objects.size());
+ assertNotNull(parentCommitted);
+ assertEquals(PersistenceState.COMMITTED,
+ parentCommitted.getPersistenceState());
- ClientMtTable1 childNew = child.newObject(ClientMtTable1.class);
- childNew.setGlobalAttribute1("NNN");
+ assertNotNull(parentHollow);
+ }
- ClientMtTable1 childModified = (ClientMtTable1) objects.get(0);
- childModified.setGlobalAttribute1("MMM");
+ @Test
+ public void testAddRemove() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
- ClientMtTable1 childCommitted = (ClientMtTable1) objects.get(1);
+ ClientMtTable1 a = child.newObject(ClientMtTable1.class);
+ a.setGlobalAttribute1("X");
+ child.commitChanges();
- // delete AND modify
- ClientMtTable1 childDeleted = (ClientMtTable1) objects.get(2);
- child.deleteObjects(childDeleted);
- childDeleted.setGlobalAttribute1("DDD");
+ ClientMtTable2 p1 = child.newObject(ClientMtTable2.class);
+ p1.setGlobalAttribute("P1");
+ a.addToTable2Array(p1);
- ClientMtTable1 childHollow = (ClientMtTable1) objects.get(3);
- child.invalidateObjects(childHollow);
+ ClientMtTable2 p2 = child.newObject(ClientMtTable2.class);
+ p2.setGlobalAttribute("P2");
+ a.addToTable2Array(p2);
- child.commitChanges();
+ a.removeFromTable2Array(p2);
- assertEquals(PersistenceState.COMMITTED, childNew.getPersistenceState());
- assertEquals(PersistenceState.COMMITTED, childModified.getPersistenceState());
- assertEquals(PersistenceState.COMMITTED, childCommitted.getPersistenceState());
- assertEquals(PersistenceState.TRANSIENT, childDeleted.getPersistenceState());
- assertEquals(PersistenceState.HOLLOW, childHollow.getPersistenceState());
+ // this causes an error on commit
+ child.deleteObjects(p2);
- ClientMtTable1 parentNew = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childNew.getObjectId());
- ClientMtTable1 parentModified = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childModified.getObjectId());
- ClientMtTable1 parentCommitted = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childCommitted.getObjectId());
- ClientMtTable1 parentDeleted = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childDeleted.getObjectId());
- ClientMtTable1 parentHollow = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(childHollow.getObjectId());
+ child.commitChangesToParent();
+
+ }
+
+ @Test
+ public void testChangeRel() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
+
+ ClientMtTable1 a = child.newObject(ClientMtTable1.class);
+ ClientMtTable2 b = child.newObject(ClientMtTable2.class);
+ child.commitChanges();
- assertNotNull(parentNew);
- assertEquals(PersistenceState.COMMITTED, parentNew.getPersistenceState());
- assertEquals("NNN", parentNew.getGlobalAttribute1());
+ assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
- assertNotNull(parentModified);
- assertEquals(PersistenceState.COMMITTED, parentModified.getPersistenceState());
- assertEquals("MMM", parentModified.getGlobalAttribute1());
+ a.addToTable2Array(b);
+ assertEquals(PersistenceState.MODIFIED, a.getPersistenceState());
+
+ child.commitChangesToParent();
+ ClientMtTable1 parentA = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(a.getObjectId());
+ assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
+ assertEquals(PersistenceState.MODIFIED, parentA.getPersistenceState());
+ assertEquals(1, parentA.getTable2Array().size());
+
+ clientContext.commitChanges();
+ assertEquals(PersistenceState.COMMITTED, parentA.getPersistenceState());
+
+ a.removeFromTable2Array(b);
+ assertEquals(PersistenceState.MODIFIED, a.getPersistenceState());
+
+ child.commitChangesToParent();
+ assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
+ assertEquals(PersistenceState.MODIFIED, parentA.getPersistenceState());
+ assertEquals(0, parentA.getTable2Array().size());
+ }
+
+ @Test
+ public void testCAY1183() throws Exception {
+ ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
+ clientContext.commitChanges();
+
+ ObjectContext child = runtime.newContext(clientContext);
+ ClientMtTable1 childMt = (ClientMtTable1) Cayenne.objectForPK(child,
+ parentMt.getObjectId());
+ childMt.setGlobalAttribute1("1183");
+ ClientMtTable2 childMt2 = child.newObject(ClientMtTable2.class);
+ childMt2.setGlobalAttribute("1183");
+ childMt2.setTable1(childMt);
- assertNull("Deleted object should not be registered.", parentDeleted);
+ child.commitChangesToParent();
- assertNotNull(parentCommitted);
- assertEquals(PersistenceState.COMMITTED, parentCommitted.getPersistenceState());
+ // fetching other relationship... this fails per CAY-1183
+ childMt2.getTable3();
+ }
- assertNotNull(parentHollow);
- }
+ /**
+ * CAY1714
+ */
+ @Test
+ public void testQueriesOnTemporaryObject() throws Exception {
+ ObjectContext clientContext = runtime
+ .newContext((DataChannel) this.clientContext);
+ ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
- @Test
- public void testAddRemove() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
+ ObjectContext childContext = runtime
+ .newContext((DataChannel) clientContext);
+ ClientMtTable1 childMt = (ClientMtTable1) Cayenne.objectForPK(
+ childContext, parentMt.getObjectId());
+ childMt.setGlobalAttribute1("1183");
+ ClientMtTable2 childMt2 = childContext.newObject(ClientMtTable2.class);
+ childMt2.setGlobalAttribute("1183");
+ childMt2.setTable1(childMt);
- ClientMtTable1 a = child.newObject(ClientMtTable1.class);
- a.setGlobalAttribute1("X");
- child.commitChanges();
+ childContext.commitChangesToParent();
- ClientMtTable2 p1 = child.newObject(ClientMtTable2.class);
- p1.setGlobalAttribute("P1");
- a.addToTable2Array(p1);
+ assertNull(childMt2.getTable3());
+ }
- ClientMtTable2 p2 = child.newObject(ClientMtTable2.class);
- p2.setGlobalAttribute("P2");
- a.addToTable2Array(p2);
+ @Test
+ public void testCAY1194() throws Exception {
+ ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
+ ObjectContext child = runtime.newContext(clientContext);
- a.removeFromTable2Array(p2);
+ ClientMtTable2 childMt2 = child.newObject(ClientMtTable2.class);
+ childMt2.setGlobalAttribute("222");
- // this causes an error on commit
- child.deleteObjects(p2);
+ ClientMtTable1 localParentMt = child.localObject(parentMt);
+ assertEquals(0, parentMt.getTable2Array().size());
+ assertEquals(0, localParentMt.getTable2Array().size());
- child.commitChangesToParent();
+ childMt2.setTable1(localParentMt);
- }
-
- @Test
- public void testChangeRel() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
-
- ClientMtTable1 a = child.newObject(ClientMtTable1.class);
- ClientMtTable2 b = child.newObject(ClientMtTable2.class);
- child.commitChanges();
+ assertEquals(0, parentMt.getTable2Array().size());
+ assertEquals(1, localParentMt.getTable2Array().size());
- assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
+ assertEquals(localParentMt.getTable2Array().get(0).getObjectContext(),
+ child);
- a.addToTable2Array(b);
- assertEquals(PersistenceState.MODIFIED, a.getPersistenceState());
-
- child.commitChangesToParent();
- ClientMtTable1 parentA = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(a.getObjectId());
- assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
- assertEquals(PersistenceState.MODIFIED, parentA.getPersistenceState());
- assertEquals(1, parentA.getTable2Array().size());
-
- clientContext.commitChanges();
- assertEquals(PersistenceState.COMMITTED, parentA.getPersistenceState());
-
- a.removeFromTable2Array(b);
- assertEquals(PersistenceState.MODIFIED, a.getPersistenceState());
-
- child.commitChangesToParent();
- assertEquals(PersistenceState.COMMITTED, a.getPersistenceState());
- assertEquals(PersistenceState.MODIFIED, parentA.getPersistenceState());
- assertEquals(0, parentA.getTable2Array().size());
- }
-
- @Test
- public void testCAY1183() throws Exception {
- ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
- clientContext.commitChanges();
-
- ObjectContext child = runtime.newContext(clientContext);
- ClientMtTable1 childMt = (ClientMtTable1) Cayenne.objectForPK(
- child,
- parentMt.getObjectId());
- childMt.setGlobalAttribute1("1183");
- ClientMtTable2 childMt2 = child.newObject(ClientMtTable2.class);
- childMt2.setGlobalAttribute("1183");
- childMt2.setTable1(childMt);
-
- child.commitChangesToParent();
-
- // fetching other relationship... this fails per CAY-1183
- childMt2.getTable3();
- }
-
- /**
- * CAY1714
- */
- @Test
- public void testQueriesOnTemporaryObject() throws Exception {
- ObjectContext clientContext = runtime.newContext((DataChannel) this.clientContext);
- ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
+ child.commitChangesToParent();
+ assertEquals(1, parentMt.getTable2Array().size());
+ assertEquals(parentMt.getTable2Array().get(0).getObjectContext(),
+ clientContext);
+ }
- ObjectContext childContext = runtime.newContext((DataChannel) clientContext);
- ClientMtTable1 childMt = (ClientMtTable1) Cayenne.objectForPK(childContext, parentMt.getObjectId());
- childMt.setGlobalAttribute1("1183");
- ClientMtTable2 childMt2 = childContext.newObject(ClientMtTable2.class);
- childMt2.setGlobalAttribute("1183");
- childMt2.setTable1(childMt);
+ @Test
+ public void testCommitChangesToParentOneToMany() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
- childContext.commitChangesToParent();
+ ClientMtTable1 master = child.newObject(ClientMtTable1.class);
+ ClientMtTable2 dep = child.newObject(ClientMtTable2.class);
+ master.addToTable2Array(dep);
- assertNull(childMt2.getTable3());
- }
+ child.commitChangesToParent();
- @Test
- public void testCAY1194() throws Exception {
- ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class);
- ObjectContext child = runtime.newContext(clientContext);
+ ClientMtTable1 masterParent = (ClientMtTable1) clientContext
+ .getGraphManager().getNode(master.getObjectId());
+ ClientMtTable2 depParent = (ClientMtTable2) clientContext
+ .getGraphManager().getNode(dep.getObjectId());
- ClientMtTable2 childMt2 = child.newObject(ClientMtTable2.class);
- childMt2.setGlobalAttribute("222");
+ assertNotNull(masterParent);
+ assertNotNull(depParent);
- ClientMtTable1 localParentMt = child.localObject(parentMt);
- assertEquals(0, parentMt.getTable2Array().size());
- assertEquals(0, localParentMt.getTable2Array().size());
+ assertSame(masterParent, depParent.getTable1());
+ assertTrue(masterParent.getTable2Array().contains(depParent));
- childMt2.setTable1(localParentMt);
+ // check that arc changes got recorded in the parent context
+ GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
- assertEquals(0, parentMt.getTable2Array().size());
- assertEquals(1, localParentMt.getTable2Array().size());
+ final int[] arcDiffs = new int[1];
+ final int[] newNodes = new int[1];
- assertEquals(localParentMt.getTable2Array().get(0).getObjectContext(), child);
+ diffs.apply(new GraphChangeHandler() {
- child.commitChangesToParent();
- assertEquals(1, parentMt.getTable2Array().size());
- assertEquals(parentMt.getTable2Array().get(0).getObjectContext(), clientContext);
- }
+ public void arcCreated(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]++;
+ }
- @Test
- public void testCommitChangesToParentOneToMany() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
-
- ClientMtTable1 master = child.newObject(ClientMtTable1.class);
- ClientMtTable2 dep = child.newObject(ClientMtTable2.class);
- master.addToTable2Array(dep);
+ public void arcDeleted(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]--;
+ }
- child.commitChangesToParent();
+ public void nodeCreated(Object nodeId) {
+ newNodes[0]++;
+ }
- ClientMtTable1 masterParent = (ClientMtTable1) clientContext
- .getGraphManager()
- .getNode(master.getObjectId());
- ClientMtTable2 depParent = (ClientMtTable2) clientContext
- .getGraphManager()
- .getNode(dep.getObjectId());
-
- assertNotNull(masterParent);
- assertNotNull(depParent);
-
- assertSame(masterParent, depParent.getTable1());
- assertTrue(masterParent.getTable2Array().contains(depParent));
-
- // check that arc changes got recorded in the parent context
- GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
-
- final int[] arcDiffs = new int[1];
- final int[] newNodes = new int[1];
-
- diffs.apply(new GraphChangeHandler() {
-
- public void arcCreated(Object nodeId, Object targetNodeId, Object arcId) {
- arcDiffs[0]++;
- }
-
- public void arcDeleted(Object nodeId, Object targetNodeId, Object arcId) {
- arcDiffs[0]--;
- }
-
- public void nodeCreated(Object nodeId) {
- newNodes[0]++;
- }
-
- public void nodeIdChanged(Object nodeId, Object newId) {
- }
+ public void nodeIdChanged(Object nodeId, Object newId) {
+ }
- public void nodePropertyChanged(
- Object nodeId,
- String property,
- Object oldValue,
- Object newValue) {
- }
+ public void nodePropertyChanged(Object nodeId, String property,
+ Object oldValue, Object newValue) {
+ }
- public void nodeRemoved(Object nodeId) {
- newNodes[0]--;
- }
- });
+ public void nodeRemoved(Object nodeId) {
+ newNodes[0]--;
+ }
+ });
- assertEquals(2, newNodes[0]);
- assertEquals(2, arcDiffs[0]);
- }
+ assertEquals(2, newNodes[0]);
+ assertEquals(2, arcDiffs[0]);
+ }
- @Test
- public void testCommitChangesToParentOneToOne() throws Exception {
- ObjectContext child = runtime.newContext(clientContext);
+ @Test
+ public void testCommitChangesToParentOneToOne() throws Exception {
+ ObjectContext child = runtime.newContext(clientContext);
- ClientMtTooneMaster master = child.newObject(ClientMtTooneMaster.class);
- ClientMtTooneDep dep = child.newObject(ClientMtTooneDep.class);
- master.setToDependent(dep);
+ ClientMtTooneMaster master = child.newObject(ClientMtTooneMaster.class);
+ ClientMtTooneDep dep = child.newObject(ClientMtTooneDep.class);
+ master.setToDependent(dep);
- child.commitChangesToParent();
+ child.commitChangesToParent();
- ClientMtTooneMaster masterParent = (ClientMtTooneMaster) clientContext
- .getGraphManager()
- .getNode(master.getObjectId());
- ClientMtTooneDep depParent = (ClientMtTooneDep) clientContext
- .getGraphManager()
- .getNode(dep.getObjectId());
+ ClientMtTooneMaster masterParent = (ClientMtTooneMaster) clientContext
+ .getGraphManager().getNode(master.getObjectId());
+ ClientMtTooneDep depParent = (ClientMtTooneDep) clientContext
+ .getGraphManager().getNode(dep.getObjectId());
- assertNotNull(masterParent);
- assertNotNull(depParent);
+ assertNotNull(masterParent);
+ assertNotNull(depParent);
- assertSame(masterParent, depParent.getToMaster());
- assertSame(depParent, masterParent.getToDependent());
+ assertSame(masterParent, depParent.getToMaster());
+ assertSame(depParent, masterParent.getToDependent());
- // check that arc changes got recorded in the parent context
- GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
+ // check that arc changes got recorded in the parent context
+ GraphDiff diffs = clientContext.internalGraphManager().getDiffs();
- final int[] arcDiffs = new int[1];
- final int[] newNodes = new int[1];
+ final int[] arcDiffs = new int[1];
+ final int[] newNodes = new int[1];
- diffs.apply(new GraphChangeHandler() {
+ diffs.apply(new GraphChangeHandler() {
- public void arcCreated(Object nodeId, Object targetNodeId, Object arcId) {
- arcDiffs[0]++;
- }
+ public void arcCreated(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]++;
+ }
- public void arcDeleted(Object nodeId, Object targetNodeId, Object arcId) {
- arcDiffs[0]--;
- }
+ public void arcDeleted(Object nodeId, Object targetNodeId,
+ Object arcId) {
+ arcDiffs[0]--;
+ }
- public void nodeCreated(Object nodeId) {
- newNodes[0]++;
- }
+ public void nodeCreated(Object nodeId) {
+ newNodes[0]++;
+ }
- public void nodeIdChanged(Object nodeId, Object newId) {
- }
+ public void nodeIdChanged(Object nodeId, Object newId) {
+ }
- public void nodePropertyChanged(
- Object nodeId,
- String property,
- Object oldValue,
- Object newValue) {
- }
+ public void nodePropertyChanged(Object nodeId, String property,
+ Object oldValue, Object newValue) {
+ }
- public void nodeRemoved(Object nodeId) {
- newNodes[0]--;
- }
- });
+ public void nodeRemoved(Object nodeId) {
+ newNodes[0]--;
+ }
+ });
- assertEquals(2, newNodes[0]);
- assertEquals(2, arcDiffs[0]);
- }
+ assertEquals(2, newNodes[0]);
+ assertEquals(2, arcDiffs[0]);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/cayenne-client/src/test/java/org/apache/cayenne/remote/MockMessage.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/MockMessage.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/MockMessage.java
deleted file mode 100644
index 0ed1de9..0000000
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/MockMessage.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-
-package org.apache.cayenne.remote;
-
-import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.remote.ClientMessage;
-
-public class MockMessage implements ClientMessage {
-
- DataChannel lastChannel;
-
- public MockMessage() {
-
- }
-
- public Object dispatch(DataChannel channel) {
- this.lastChannel = channel;
- return null;
- }
-
- public DataChannel getLastChannel() {
- return lastChannel;
- }
-
- /**
- * Returns a description of the type of message. In this case always "Mock message".
- */
- @Override
- public String toString() {
- return "Mock message";
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/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 29eaf61..418841a 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
@@ -59,7 +59,7 @@ public class NestedObjectContextLocalIT extends RemoteCayenneCase {
@Test
public void testLocalCacheStaysLocal() {
- SelectQuery query = new SelectQuery(ClientMtTable1.class);
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(ClientMtTable1.class);
query.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
BaseContext child1 = (BaseContext) runtime.newContext(clientContext);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/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 0eb0226..07cefec 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
@@ -78,7 +78,7 @@ public class ROPPrefetchToManyMapIT extends RemoteCayenneCase {
context.performQuery(new RefreshQuery());
- SelectQuery query = new SelectQuery(ClientMtMapToMany.class);
+ SelectQuery<ClientMtMapToMany> query = new SelectQuery<ClientMtMapToMany>(ClientMtMapToMany.class);
query.addPrefetch("targets");
final ClientMtMapToMany mapToMany = (ClientMtMapToMany) Cayenne.objectForQuery(context, query);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/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 c0faac4..77f15f4 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
@@ -19,6 +19,10 @@
package org.apache.cayenne.remote;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
import org.apache.cayenne.CayenneContext;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.di.Inject;
@@ -34,247 +38,246 @@ 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;
-import java.util.ListIterator;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class RemoteIncrementalFaultListIT extends ClientCase {
- private static final int COUNT = 25;
-
- @Inject
- private CayenneContext clientContext;
-
- @Inject
- private DBHelper dbHelper;
-
- private TableHelper tMTTable;
-
- private RemoteIncrementalFaultList list;
- private SelectQuery query;
-
- @Override
- protected void setUpAfterInjection() throws Exception {
- dbHelper.deleteAll("MT_TABLE2");
- dbHelper.deleteAll("MT_TABLE1");
-
- tMTTable = new TableHelper(dbHelper, "MT_TABLE1");
- tMTTable.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
- }
-
- protected void createObjectsDataSet() throws Exception {
- tMTTable.insert(1, "g1", "s1");
- tMTTable.insert(2, "g2", "s2");
- tMTTable.insert(3, "g3", "s3");
- tMTTable.insert(4, "g4", "s4");
- tMTTable.insert(5, "g5", "s5");
- tMTTable.insert(6, "g6", "s6");
- tMTTable.insert(7, "g7", "s7");
- tMTTable.insert(8, "g8", "s8");
- tMTTable.insert(9, "g9", "s9");
- tMTTable.insert(10, "g10", "s10");
- tMTTable.insert(11, "g11", "s11");
- tMTTable.insert(12, "g12", "s12");
- tMTTable.insert(13, "g13", "s13");
- tMTTable.insert(14, "g14", "s14");
- tMTTable.insert(15, "g15", "s15");
- tMTTable.insert(16, "g16", "s16");
- tMTTable.insert(17, "g17", "s17");
- tMTTable.insert(18, "g18", "s18");
- tMTTable.insert(19, "g19", "s19");
- tMTTable.insert(20, "g20", "s20");
- tMTTable.insert(21, "g21", "s21");
- tMTTable.insert(22, "g22", "s22");
- tMTTable.insert(23, "g23", "s23");
- tMTTable.insert(24, "g24", "s24");
- tMTTable.insert(25, "g25", "s25");
- }
-
- private void prepareList(int pageSize) throws Exception {
-
- createObjectsDataSet();
-
- query = new SelectQuery(ClientMtTable1.class);
-
- // make sure total number of objects is not divisable
- // by the page size, to test the last smaller page
- query.setPageSize(pageSize);
- query.addOrdering("db:" + MtTable1.TABLE1_ID_PK_COLUMN, SortOrder.ASCENDING);
-
- 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();
-
- assertTrue(it.hasNext());
-
- int counter = 0;
- while (it.hasNext()) {
- Object obj = it.next();
- assertNotNull(obj);
- assertTrue(obj instanceof Persistent);
-
- // iterator must be resolved page by page
- int expectedResolved = list.pageIndex(counter)
- * list.getPageSize()
- + list.getPageSize();
- if (expectedResolved > list.size()) {
- expectedResolved = list.size();
- }
-
- assertEquals(list.size() - expectedResolved, list.getUnfetchedObjects());
-
- counter++;
- }
- }
-
- @Test
- public void testUnfetchedObjects() throws Exception {
- prepareList(6);
- assertEquals(COUNT - 6, list.getUnfetchedObjects());
- list.get(7);
- assertEquals(COUNT - 12, list.getUnfetchedObjects());
- list.resolveAll();
- assertEquals(0, list.getUnfetchedObjects());
- }
-
- @Test
- public void testPageIndex() throws Exception {
- prepareList(6);
- assertEquals(0, list.pageIndex(0));
- assertEquals(0, list.pageIndex(1));
- assertEquals(1, list.pageIndex(6));
-
- try {
- assertEquals(13, list.pageIndex(82));
- fail("Element index beyound array size must throw an IndexOutOfBoundsException.");
- }
- catch (IndexOutOfBoundsException ex) {
- // exception expercted
- }
- }
-
- @Test
- public void testPagesRead1() throws Exception {
- prepareList(6);
- assertTrue(list.elements.get(0) instanceof ClientMtTable1);
- assertSame(RemoteIncrementalFaultList.PLACEHOLDER, list.elements.get(8));
-
- list.resolveInterval(5, 10);
- assertTrue(list.elements.get(7) instanceof ClientMtTable1);
-
- list.resolveAll();
- assertTrue((list.elements.get(list.size() - 1)) instanceof ClientMtTable1);
- }
-
- @Test
- public void testGet1() throws Exception {
- prepareList(6);
- assertTrue(list.elements.get(0) instanceof ClientMtTable1);
- assertSame(RemoteIncrementalFaultList.PLACEHOLDER, list.elements.get(8));
-
- Object a = list.get(8);
-
- assertNotNull(a);
- assertTrue(a instanceof ClientMtTable1);
- assertTrue(list.elements.get(8) instanceof ClientMtTable1);
- }
-
- @Test
- public void testIndexOf() throws Exception {
- prepareList(6);
-
- Expression qual = ExpressionFactory.matchExp(
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- "g20");
- SelectQuery query = new SelectQuery(ClientMtTable1.class, qual);
- List<?> artists = list.context.performQuery(query);
-
- assertEquals(1, artists.size());
-
- ClientMtTable1 row = (ClientMtTable1) artists.get(0);
- assertEquals(19, list.indexOf(row));
- assertEquals(-1, list.indexOf(list.context.newObject(ClientMtTable1.class)));
- }
-
- @Test
- public void testLastIndexOf() throws Exception {
- prepareList(6);
- Expression qual = ExpressionFactory.matchExp(
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- "g20");
- SelectQuery query = new SelectQuery(ClientMtTable1.class, qual);
- List<?> objects = list.context.performQuery(query);
-
- assertEquals(1, objects.size());
-
- ClientMtTable1 row = (ClientMtTable1) objects.get(0);
- assertEquals(19, list.lastIndexOf(row));
- assertEquals(-1, list.lastIndexOf(list.context.newObject(ClientMtTable1.class)));
- }
-
- private void doTestIterator(int size) throws Exception {
- prepareList(size);
- Iterator<?> it = list.iterator();
-
- assertTrue(it.hasNext());
-
- int counter = 0;
- while (it.hasNext()) {
- Object obj = it.next();
- assertNotNull(obj);
- assertTrue(obj instanceof Persistent);
-
- // iterator must be resolved page by page
- int expectedResolved = list.pageIndex(counter)
- * list.getPageSize()
- + list.getPageSize();
- if (expectedResolved > list.size()) {
- expectedResolved = list.size();
- }
-
- assertEquals(list.size() - expectedResolved, list.getUnfetchedObjects());
-
- counter++;
- }
- }
+ private static final int COUNT = 25;
+
+ @Inject
+ private CayenneContext clientContext;
+
+ @Inject
+ private DBHelper dbHelper;
+
+ private TableHelper tMTTable;
+
+ private RemoteIncrementalFaultList list;
+
+ @Override
+ protected void setUpAfterInjection() throws Exception {
+ dbHelper.deleteAll("MT_TABLE2");
+ dbHelper.deleteAll("MT_TABLE1");
+
+ tMTTable = new TableHelper(dbHelper, "MT_TABLE1");
+ tMTTable.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1",
+ "SERVER_ATTRIBUTE1");
+ }
+
+ protected void createObjectsDataSet() throws Exception {
+ tMTTable.insert(1, "g1", "s1");
+ tMTTable.insert(2, "g2", "s2");
+ tMTTable.insert(3, "g3", "s3");
+ tMTTable.insert(4, "g4", "s4");
+ tMTTable.insert(5, "g5", "s5");
+ tMTTable.insert(6, "g6", "s6");
+ tMTTable.insert(7, "g7", "s7");
+ tMTTable.insert(8, "g8", "s8");
+ tMTTable.insert(9, "g9", "s9");
+ tMTTable.insert(10, "g10", "s10");
+ tMTTable.insert(11, "g11", "s11");
+ tMTTable.insert(12, "g12", "s12");
+ tMTTable.insert(13, "g13", "s13");
+ tMTTable.insert(14, "g14", "s14");
+ tMTTable.insert(15, "g15", "s15");
+ tMTTable.insert(16, "g16", "s16");
+ tMTTable.insert(17, "g17", "s17");
+ tMTTable.insert(18, "g18", "s18");
+ tMTTable.insert(19, "g19", "s19");
+ tMTTable.insert(20, "g20", "s20");
+ tMTTable.insert(21, "g21", "s21");
+ tMTTable.insert(22, "g22", "s22");
+ tMTTable.insert(23, "g23", "s23");
+ tMTTable.insert(24, "g24", "s24");
+ tMTTable.insert(25, "g25", "s25");
+ }
+
+ private void prepareList(int pageSize) throws Exception {
+
+ createObjectsDataSet();
+
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class);
+
+ // make sure total number of objects is not divisable
+ // by the page size, to test the last smaller page
+ query.setPageSize(pageSize);
+ query.addOrdering("db:" + MtTable1.TABLE1_ID_PK_COLUMN,
+ SortOrder.ASCENDING);
+
+ 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();
+
+ assertTrue(it.hasNext());
+
+ int counter = 0;
+ while (it.hasNext()) {
+ Object obj = it.next();
+ assertNotNull(obj);
+ assertTrue(obj instanceof Persistent);
+
+ // iterator must be resolved page by page
+ int expectedResolved = list.pageIndex(counter) * list.getPageSize()
+ + list.getPageSize();
+ if (expectedResolved > list.size()) {
+ expectedResolved = list.size();
+ }
+
+ assertEquals(list.size() - expectedResolved,
+ list.getUnfetchedObjects());
+
+ counter++;
+ }
+ }
+
+ @Test
+ public void testUnfetchedObjects() throws Exception {
+ prepareList(6);
+ assertEquals(COUNT - 6, list.getUnfetchedObjects());
+ list.get(7);
+ assertEquals(COUNT - 12, list.getUnfetchedObjects());
+ list.resolveAll();
+ assertEquals(0, list.getUnfetchedObjects());
+ }
+
+ @Test
+ public void testPageIndex() throws Exception {
+ prepareList(6);
+ assertEquals(0, list.pageIndex(0));
+ assertEquals(0, list.pageIndex(1));
+ assertEquals(1, list.pageIndex(6));
+
+ try {
+ assertEquals(13, list.pageIndex(82));
+ fail("Element index beyound array size must throw an IndexOutOfBoundsException.");
+ } catch (IndexOutOfBoundsException ex) {
+ // exception expercted
+ }
+ }
+
+ @Test
+ public void testPagesRead1() throws Exception {
+ prepareList(6);
+ assertTrue(list.elements.get(0) instanceof ClientMtTable1);
+ assertSame(RemoteIncrementalFaultList.PLACEHOLDER, list.elements.get(8));
+
+ list.resolveInterval(5, 10);
+ assertTrue(list.elements.get(7) instanceof ClientMtTable1);
+
+ list.resolveAll();
+ assertTrue((list.elements.get(list.size() - 1)) instanceof ClientMtTable1);
+ }
+
+ @Test
+ public void testGet1() throws Exception {
+ prepareList(6);
+ assertTrue(list.elements.get(0) instanceof ClientMtTable1);
+ assertSame(RemoteIncrementalFaultList.PLACEHOLDER, list.elements.get(8));
+
+ Object a = list.get(8);
+
+ assertNotNull(a);
+ assertTrue(a instanceof ClientMtTable1);
+ assertTrue(list.elements.get(8) instanceof ClientMtTable1);
+ }
+
+ @Test
+ public void testIndexOf() throws Exception {
+ prepareList(6);
+
+ Expression qual = ExpressionFactory.matchExp(
+ ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, "g20");
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class, qual);
+ List<?> artists = list.context.performQuery(query);
+
+ assertEquals(1, artists.size());
+
+ ClientMtTable1 row = (ClientMtTable1) artists.get(0);
+ assertEquals(19, list.indexOf(row));
+ assertEquals(-1,
+ list.indexOf(list.context.newObject(ClientMtTable1.class)));
+ }
+
+ @Test
+ public void testLastIndexOf() throws Exception {
+ prepareList(6);
+ Expression qual = ExpressionFactory.matchExp(
+ ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, "g20");
+ SelectQuery<ClientMtTable1> query = new SelectQuery<ClientMtTable1>(
+ ClientMtTable1.class, qual);
+ List<?> objects = list.context.performQuery(query);
+
+ assertEquals(1, objects.size());
+
+ ClientMtTable1 row = (ClientMtTable1) objects.get(0);
+ assertEquals(19, list.lastIndexOf(row));
+ assertEquals(-1,
+ list.lastIndexOf(list.context.newObject(ClientMtTable1.class)));
+ }
+
+ private void doTestIterator(int size) throws Exception {
+ prepareList(size);
+ Iterator<?> it = list.iterator();
+
+ assertTrue(it.hasNext());
+
+ int counter = 0;
+ while (it.hasNext()) {
+ Object obj = it.next();
+ assertNotNull(obj);
+ assertTrue(obj instanceof Persistent);
+
+ // iterator must be resolved page by page
+ int expectedResolved = list.pageIndex(counter) * list.getPageSize()
+ + list.getPageSize();
+ if (expectedResolved > list.size()) {
+ expectedResolved = list.size();
+ }
+
+ assertEquals(list.size() - expectedResolved,
+ list.getUnfetchedObjects());
+
+ counter++;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8990e655/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 a86b12e..0503ffc 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
@@ -22,6 +22,7 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1Subclass1;
@@ -66,7 +67,7 @@ public class ValueInjectorIT extends RemoteCayenneCase {
assertEquals(ee.getGlobalAttribute1(), "sub1");
// check AND
- entity.setDeclaredQualifier(qualifier.andExp(Expression.fromString("serverAttribute1 = 'sa'")));
+ entity.setDeclaredQualifier(qualifier.andExp(ExpressionFactory.exp("serverAttribute1 = 'sa'")));
ee = serverContext.newObject(MtTable1Subclass1.class);
assertEquals(ee.getGlobalAttribute1(), "sub1");
assertEquals(ee.getServerAttribute1(), "sa");
@@ -86,7 +87,7 @@ public class ValueInjectorIT extends RemoteCayenneCase {
assertEquals(ee.getGlobalAttribute1(), "sub1");
// check AND
- entity.setDeclaredQualifier(qualifier.andExp(Expression.fromString("serverAttribute1 = 'sa'")));
+ entity.setDeclaredQualifier(qualifier.andExp(ExpressionFactory.exp("serverAttribute1 = 'sa'")));
ee = context.newObject(ClientMtTable1Subclass1.class);
assertEquals(ee.getGlobalAttribute1(), "sub1");
assertEquals(ee.getServerAttribute1(), "sa");
[06/12] Apply JUnit4 instead of JUnit3 in IT
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
index 88c15e4..7c7d812 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
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.math.BigDecimal;
import java.sql.Types;
@@ -112,6 +113,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
/**
* CAY-899: Checks that aggregate results do not cause callbacks execution.
*/
+ @Test
public void testSelectAggregatePostLoadCallback() throws Exception {
createFourArtistsTwoPaintings();
@@ -143,6 +145,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectAggregate() throws Exception {
createFourArtistsTwoPaintings();
@@ -159,6 +162,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
}
+ @Test
public void testSelectAggregateNull() throws Exception {
if (!accessStackAdapter.supportNullRowForAggregateFunctions()) {
@@ -178,6 +182,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(null, aggregates[2]);
}
+ @Test
public void testSelectEntityPathsScalarResult() throws Exception {
createFourArtistsTwoPaintings();
@@ -192,6 +197,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals("P1", data.get(1));
}
+ @Test
public void testSelectEntityPathsArrayResult() throws Exception {
createFourArtistsTwoPaintings();
@@ -215,6 +221,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals("AA2", row1[1]);
}
+ @Test
public void testSimpleSelect() throws Exception {
createFourArtistsTwoPaintings();
@@ -227,6 +234,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertTrue(((Artist) artists.get(0)).getPersistenceState() == PersistenceState.COMMITTED);
}
+ @Test
public void testFetchLimit() throws Exception {
createFourArtistsTwoPaintings();
@@ -238,6 +246,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, artists.size());
}
+ @Test
public void testSelectFromWhereEqual() throws Exception {
createFourArtistsTwoPaintings();
@@ -249,6 +258,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals("AA2", ((Artist) artists.get(0)).getArtistName());
}
+ @Test
public void testSelectFromWhereEqualReverseOrder() throws Exception {
if (!accessStackAdapter.supportsReverseComparison()) {
return;
@@ -264,6 +274,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals("AA2", ((Artist) artists.get(0)).getArtistName());
}
+ @Test
public void testSelectFromWhereNot() throws Exception {
createFourArtistsTwoPaintings();
@@ -279,6 +290,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectFromWhereNotEquals() throws Exception {
createFourArtistsTwoPaintings();
@@ -294,6 +306,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
}
}
+ @Test
public void testSelectFromWhereOrEqual() throws Exception {
createFourArtistsTwoPaintings();
@@ -313,6 +326,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertTrue(names.contains("BB1"));
}
+ @Test
public void testSelectFromWhereAndEqual() throws Exception {
createFourArtistsTwoPaintings();
@@ -328,6 +342,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
+ @Test
public void testSelectFromWhereBetween() throws Exception {
createFourArtistsTwoPaintings();
@@ -342,6 +357,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
+ @Test
public void testSelectFromWhereNotBetween() throws Exception {
createFourArtistsTwoPaintings();
@@ -356,6 +372,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
+ @Test
public void testSelectFromWhereGreater() throws Exception {
createFourArtistsTwoPaintings();
@@ -370,6 +387,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
+ @Test
public void testSelectFromWhereGreaterOrEqual() throws Exception {
createFourArtistsTwoPaintings();
@@ -380,6 +398,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, ps.size());
}
+ @Test
public void testSelectFromWhereLess() throws Exception {
createFourArtistsTwoPaintings();
@@ -394,6 +413,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
+ @Test
public void testSelectFromWhereLessOrEqual() throws Exception {
createFourArtistsTwoPaintings();
@@ -404,6 +424,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, ps.size());
}
+ @Test
public void testSelectFromWhereDecimalNumber() throws Exception {
createFourArtistsTwoPaintings();
@@ -414,6 +435,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, ps.size());
}
+ @Test
public void testSelectFromWhereDecimalNumberPositional() throws Exception {
createFourArtistsTwoPaintings();
@@ -425,6 +447,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, ps.size());
}
+ @Test
public void testSelectFromWhereDecimalNumberNamed() throws Exception {
createFourArtistsTwoPaintings();
@@ -436,6 +459,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(2, ps.size());
}
+ @Test
public void testSelectFromWhereMatchOnObject() throws Exception {
createFourArtistsTwoPaintings();
@@ -452,6 +476,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject(p));
}
+ @Test
public void testSelectFromWhereMatchRelationshipAndScalar() throws Exception {
createFourArtistsTwoPaintings();
@@ -465,6 +490,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject(p));
}
+ @Test
public void testSelectFromWhereMatchOnMultiColumnObject() throws Exception {
createTwoCompoundPKTwoFK();
@@ -487,6 +513,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject(o1));
}
+ @Test
public void testSelectFromWhereMatchOnMultiColumnObjectReverse() throws Exception {
if (!accessStackAdapter.supportsReverseComparison()) {
return;
@@ -513,6 +540,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertEquals(33002, Cayenne.intPKForObject(o1));
}
+ @Test
public void testSelectFromWhereNoMatchOnMultiColumnObject() throws Exception {
createTwoCompoundPKTwoFK();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java
index 37054c4..7b42a27 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.HashSet;
@@ -84,6 +85,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
tPainting.insert(33004, null, "P4", 6000);
}
+ @Test
public void testSubqueryNoQualifier() throws Exception {
if (!accessStackAdapter.supportsAllAnySome()) {
return;
@@ -110,6 +112,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
assertTrue(ids.contains(new Integer(33004)));
}
+ @Test
public void testDifferentEntity() throws Exception {
createTwoArtistsFourPaintings();
@@ -135,6 +138,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
assertTrue("" + objects.get(0), objects.get(0) instanceof Artist);
}
+ @Test
public void testExists() throws Exception {
createTwoArtistsFourPaintings();
@@ -160,6 +164,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
assertTrue(ids.contains(new Integer(33003)));
}
+ @Test
public void testAll() throws Exception {
if (!accessStackAdapter.supportsAllAnySome()) {
return;
@@ -188,6 +193,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
assertTrue(ids.contains(new Integer(33004)));
}
+ @Test
public void testAny() throws Exception {
if (!accessStackAdapter.supportsAllAnySome()) {
return;
@@ -217,6 +223,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
assertTrue(ids.contains(new Integer(33004)));
}
+ @Test
public void testSome() throws Exception {
if (!accessStackAdapter.supportsAllAnySome()) {
return;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java
index a3ba28b..d16eb51 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.BooleanTestEntity;
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.sql.Types;
import java.util.HashMap;
@@ -96,6 +97,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
tCompoundFk.insert(33002, "b1", "b2");
}
+ @Test
public void testUpdateQualifier() throws Exception {
createThreeArtistsTwoPaintings();
@@ -119,6 +121,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(1l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierString() throws Exception {
createThreeArtistsTwoPaintings();
@@ -142,6 +145,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(0l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierNull() throws Exception {
createThreeArtistsTwoPaintings();
@@ -191,6 +195,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
// assertEquals(new Long(0l), notUpdated);
// }
+ @Test
public void testUpdateNoQualifierMultipleItems() throws Exception {
createThreeArtistsTwoPaintings();
@@ -214,6 +219,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(0l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierDecimal() throws Exception {
createThreeArtistsTwoPaintings();
@@ -237,6 +243,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(0l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierBoolean() throws Exception {
BooleanTestEntity o1 = context.newObject(BooleanTestEntity.class);
@@ -270,6 +277,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(3l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierToOne() throws Exception {
createThreeArtistsTwoPaintings();
@@ -297,6 +305,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
assertEquals(new Long(0l), notUpdated);
}
+ @Test
public void testUpdateNoQualifierToOneCompoundPK() throws Exception {
createTwoCompoundPKTwoFK();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
index d8c3366..6ee1311 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.MeaningfulPKDep;
import org.apache.cayenne.testdo.testmap.MeaningfulPKTest1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
import java.util.Map;
@@ -53,6 +54,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
dbHelper.deleteAll("MEANINGFUL_PK_TEST1");
}
+ @Test
public void testInsertWithMeaningfulPK() throws Exception {
MeaningfulPKTest1 obj = context.newObject(MeaningfulPKTest1.class);
obj.setPkAttribute(1000);
@@ -65,6 +67,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
assertEquals(1, context.performQuery(q).size());
}
+ @Test
public void testGeneratedKey() throws Exception {
MeaningfulPKTest1 obj = context.newObject(MeaningfulPKTest1.class);
obj.setDescr("aaa-aaa");
@@ -84,6 +87,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
.get(MeaningfulPKTest1.PK_ATTRIBUTE_PK_COLUMN));
}
+ @Test
public void testChangeKey() throws Exception {
MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
.newObject("MeaningfulPKTest1");
@@ -99,6 +103,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
assertEquals(new Integer(2000), id.getIdSnapshot().get("PK_ATTRIBUTE"));
}
+ @Test
public void testToManyRelationshipWithMeaningfulPK1() throws Exception {
MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
.newObject("MeaningfulPKTest1");
@@ -114,6 +119,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
assertEquals(0, obj.getMeaningfulPKDepArray().size());
}
+ @Test
public void testToManyRelationshipWithMeaningfulPK2() throws Exception {
MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
.newObject("MeaningfulPKTest1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
index 9caaf2b..05a8ece 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.ExtendedTypeEntity;
import org.apache.cayenne.testdo.testmap.StringET1;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.Arrays;
@@ -47,6 +48,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
dbHelper.deleteAll("EXTENDED_TYPE_TEST");
}
+ @Test
public void testStoreExtendedType() {
ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
e1.setName(new StringET1("X"));
@@ -60,6 +62,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
assertEquals(1, e1.getObjectContext().performQuery(checkQ).size());
}
+ @Test
public void testInExpressionExtendedTypeArray() {
ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
e1.setName(new StringET1("X"));
@@ -80,6 +83,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
assertEquals(2, e1.getObjectContext().performQuery(query).size());
}
+ @Test
public void testInExpressionExtendedTypeList() {
ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
e1.setName(new StringET1("X"));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
index 1c6e13e..f8b2ba4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
@@ -41,6 +41,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.sql.Types;
import java.util.Date;
@@ -108,6 +109,7 @@ public class DataContextExtrasIT extends ServerCase {
tPainting.insert(33001, 33001, "P1", 3000);
}
+ @Test
public void testManualIdProcessingOnCommit() throws Exception {
Artist object = context.newObject(Artist.class);
@@ -125,6 +127,7 @@ public class DataContextExtrasIT extends ServerCase {
assertEquals(manualId, object.getObjectId());
}
+ @Test
public void testResolveFault() {
Artist o1 = context.newObject(Artist.class);
@@ -140,6 +143,7 @@ public class DataContextExtrasIT extends ServerCase {
assertEquals("a", o1.readPropertyDirectly("artistName"));
}
+ @Test
public void testResolveFaultFailure() {
Persistent o1 = context.findOrCreateObject(new ObjectId(
@@ -156,6 +160,7 @@ public class DataContextExtrasIT extends ServerCase {
}
}
+ @Test
public void testUserProperties() {
assertNull(context.getUserProperty("ABC"));
@@ -165,6 +170,7 @@ public class DataContextExtrasIT extends ServerCase {
assertSame(object, context.getUserProperty("ABC"));
}
+ @Test
public void testHasChangesNew() {
assertTrue("No changes expected in context", !context.hasChanges());
@@ -174,6 +180,7 @@ public class DataContextExtrasIT extends ServerCase {
context.hasChanges());
}
+ @Test
public void testNewObject() {
Artist a1 = (Artist) context.newObject("Artist");
@@ -181,6 +188,7 @@ public class DataContextExtrasIT extends ServerCase {
assertTrue(context.newObjects().contains(a1));
}
+ @Test
public void testNewObjectWithClass() {
Artist a1 = context.newObject(Artist.class);
@@ -188,6 +196,7 @@ public class DataContextExtrasIT extends ServerCase {
assertTrue(context.newObjects().contains(a1));
}
+ @Test
public void testIdObjectFromDataRow() {
DataRow row = new DataRow(10);
@@ -200,6 +209,7 @@ public class DataContextExtrasIT extends ServerCase {
assertNull(context.getObjectStore().getCachedSnapshot(obj.getObjectId()));
}
+ @Test
public void testPartialObjectFromDataRow() {
DataRow row = new DataRow(10);
@@ -212,6 +222,7 @@ public class DataContextExtrasIT extends ServerCase {
assertNull(context.getObjectStore().getCachedSnapshot(obj.getObjectId()));
}
+ @Test
public void testFullObjectFromDataRow() {
DataRow row = new DataRow(10);
@@ -226,6 +237,7 @@ public class DataContextExtrasIT extends ServerCase {
assertEquals("ArtistXYZ", obj.getArtistName());
}
+ @Test
public void testCommitChangesError() {
DataDomain domain = context.getParentDataDomain();
@@ -273,6 +285,7 @@ public class DataContextExtrasIT extends ServerCase {
/**
* Testing behavior of Cayenne when a database exception is thrown in SELECT query.
*/
+ @Test
public void testSelectException() {
SQLTemplate q = new SQLTemplate(Artist.class, "SELECT * FROM NON_EXISTENT_TABLE");
@@ -287,10 +300,12 @@ public class DataContextExtrasIT extends ServerCase {
}
+ @Test
public void testEntityResolver() {
assertNotNull(context.getEntityResolver());
}
+ @Test
public void testPhantomModificationsValidate() throws Exception {
createPhantomModificationDataSet();
@@ -323,6 +338,7 @@ public class DataContextExtrasIT extends ServerCase {
assertFalse(a1.isValidateForSaveCalled());
}
+ @Test
public void testPhantomModificationsValidateToOne() throws Exception {
createPhantomModificationsValidateToOneDataSet();
@@ -339,6 +355,7 @@ public class DataContextExtrasIT extends ServerCase {
p1.isValidateForSaveCalled());
}
+ @Test
public void testValidateOnToManyChange() throws Exception {
createValidateOnToManyChangeDataSet();
@@ -355,6 +372,7 @@ public class DataContextExtrasIT extends ServerCase {
assertFalse(a1.isValidateForSaveCalled());
}
+ @Test
public void testPhantomAttributeModificationCommit() throws Exception {
createPhantomModificationDataSet();
@@ -371,6 +389,7 @@ public class DataContextExtrasIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
}
+ @Test
public void testPhantomRelationshipModificationCommit() throws Exception {
createPhantomRelationshipModificationCommitDataSet();
@@ -396,6 +415,7 @@ public class DataContextExtrasIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, newArtist.getPersistenceState());
}
+ @Test
public void testPhantomRelationshipModificationValidate() throws Exception {
createPhantomRelationshipModificationCommitDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
index 6cb1ec4..3357d28 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
@@ -34,6 +34,7 @@ import org.apache.cayenne.testdo.testmap.CompoundPaintingLongNames;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.math.BigDecimal;
import java.sql.Types;
@@ -112,6 +113,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
+ @Test
public void testSelectCompound1() throws Exception {
createTestDataSet();
SelectQuery query = new SelectQuery(CompoundPainting.class);
@@ -162,6 +164,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
// attributes, while
// EJBQLQuery does an OUTER JOIN... which seems like a better idea...
// 14/01/2010 now it uses LEFT JOIN
+ @Test
public void testSelectCompound2() throws Exception {
createTestDataSet();
SelectQuery query = new SelectQuery(
@@ -196,6 +199,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
* {@link PersistentDescriptor}[105] That forced an error during the building of the
* SelectQuery statement, CAY-1484
*/
+ @Test
public void testSelectCompoundLongNames() throws Exception {
createTestDataSet();
SelectQuery query = new SelectQuery(CompoundPaintingLongNames.class);
@@ -204,6 +208,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
assertNotNull(objects);
}
+ @Test
public void testSelectEJQBQL() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery(
@@ -222,6 +227,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
}
+ @Test
public void testSelectEJQBQLCollectionTheta() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery(
@@ -241,6 +247,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
}
+ @Test
public void testSelectEJQBQLLike() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery(
@@ -260,6 +267,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
}
+ @Test
public void testSelectEJQBQLBetween() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery("SELECT a FROM CompoundPainting a "
@@ -279,6 +287,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
}
+ @Test
public void testSelectEJQBQLSubquery() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery(
@@ -294,6 +303,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
}
+ @Test
public void testSelectEJQBQLHaving() throws Exception {
createTestDataSet();
EJBQLQuery query = new EJBQLQuery(
@@ -311,6 +321,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
assertEquals(3L, galleryItem[1]);
}
+ @Test
public void testInsert() {
CompoundPainting o1 = context.newObject(CompoundPainting.class);
o1.setArtistName("A1");
@@ -333,6 +344,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
assertEquals(1, galleryCount.intValue());
}
+ @Test
public void testDelete() throws Exception {
// throw in a bit of random overlapping data, to make sure FK/PK correspondence is
// not purely coincidental
@@ -364,6 +376,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
assertEquals(0, galleryCount.intValue());
}
+ @Test
public void testUpdate() {
CompoundPainting o1 = context.newObject(CompoundPainting.class);
o1.setArtistName("A1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java
index ca4f923..fcc66db 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java
@@ -54,6 +54,7 @@ import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.math.BigDecimal;
import java.sql.Timestamp;
@@ -164,6 +165,7 @@ public class DataContextIT extends ServerCase {
tPainting.insert(33007, "P_artist21", 33007, 21000);
}
+ @Test
public void testCurrentSnapshot1() throws Exception {
createSingleArtistDataSet();
@@ -176,6 +178,7 @@ public class DataContextIT extends ServerCase {
assertEquals(artist.getDateOfBirth(), snapshot.get("DATE_OF_BIRTH"));
}
+ @Test
public void testCurrentSnapshot2() throws Exception {
createSingleArtistDataSet();
@@ -195,6 +198,7 @@ public class DataContextIT extends ServerCase {
assertNull(snapshot.get("DATE_OF_BIRTH"));
}
+ @Test
public void testCurrentSnapshot3() throws Exception {
createSingleArtistDataSet();
@@ -216,6 +220,7 @@ public class DataContextIT extends ServerCase {
/**
* Testing snapshot with to-one fault. This was a bug CAY-96.
*/
+ @Test
public void testCurrentSnapshotWithToOneFault() throws Exception {
createGalleriesAndExhibitsDataSet();
@@ -244,6 +249,7 @@ public class DataContextIT extends ServerCase {
* would pad a CHAR column with extra spaces, returned to the client.
* Cayenne should trim it.
*/
+ @Test
public void testCharFetch() throws Exception {
createSingleArtistDataSet();
@@ -257,6 +263,7 @@ public class DataContextIT extends ServerCase {
* databases (Oracle...) would pad a CHAR column with extra spaces, returned
* to the client. Cayenne should trim it.
*/
+ @Test
public void testCharInQualifier() throws Exception {
createArtistsDataSet();
@@ -270,6 +277,7 @@ public class DataContextIT extends ServerCase {
* Test fetching query with multiple relationship paths between the same 2
* entities used in qualifier.
*/
+ @Test
public void testMultiObjRelFetch() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -285,6 +293,7 @@ public class DataContextIT extends ServerCase {
* Test fetching query with multiple relationship paths between the same 2
* entities used in qualifier.
*/
+ @Test
public void testMultiDbRelFetch() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -296,6 +305,7 @@ public class DataContextIT extends ServerCase {
assertEquals(2, results.size());
}
+ @Test
public void testSelectDate() throws Exception {
createGalleriesAndExhibitsDataSet();
@@ -306,6 +316,7 @@ public class DataContextIT extends ServerCase {
assertEquals(java.util.Date.class, e1.getClosingDate().getClass());
}
+ @Test
public void testCaseInsensitiveOrdering() throws Exception {
if (!accessStackAdapter.supportsCaseInsensitiveOrder()) {
return;
@@ -337,6 +348,7 @@ public class DataContextIT extends ServerCase {
assertEquals("aRtist5", objects.get(4).getArtistName());
}
+ @Test
public void testSelect_DataRows() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -348,6 +360,7 @@ public class DataContextIT extends ServerCase {
assertTrue("DataRow expected, got " + objects.get(0).getClass(), objects.get(0) instanceof DataRow);
}
+ @Test
public void testPerformSelectQuery1() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -359,6 +372,7 @@ public class DataContextIT extends ServerCase {
assertTrue("Artist expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Artist);
}
+ @Test
public void testPerformSelectQuery2() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -377,6 +391,7 @@ public class DataContextIT extends ServerCase {
assertTrue("Artist expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Artist);
}
+ @Test
public void testPerformQuery_Routing() {
Query query = mock(Query.class);
QueryMetadata md = mock(QueryMetadata.class);
@@ -385,6 +400,7 @@ public class DataContextIT extends ServerCase {
verify(query).route(any(QueryRouter.class), eq(context.getEntityResolver()), (Query) isNull());
}
+ @Test
public void testPerformNonSelectingQuery() throws Exception {
createSingleArtistDataSet();
@@ -400,6 +416,7 @@ public class DataContextIT extends ServerCase {
assertEquals(1, context.performQuery(select).size());
}
+ @Test
public void testPerformNonSelectingQueryCounts1() throws Exception {
createArtistsDataSet();
@@ -422,6 +439,7 @@ public class DataContextIT extends ServerCase {
assertEquals(1, counts[0]);
}
+ @Test
public void testPerformNonSelectingQueryCounts2() throws Exception {
createArtistsDataSet();
@@ -456,6 +474,7 @@ public class DataContextIT extends ServerCase {
assertEquals(3, counts[0]);
}
+ @Test
public void testPerformPaginatedQuery() throws Exception {
createArtistsDataSet();
@@ -470,6 +489,7 @@ public class DataContextIT extends ServerCase {
assertTrue(objects.get(0) instanceof Artist);
}
+ @Test
public void testPerformPaginatedQuery1() throws Exception {
createArtistsDataSet();
@@ -484,6 +504,7 @@ public class DataContextIT extends ServerCase {
assertTrue(objects.get(0) instanceof Artist);
}
+ @Test
public void testPerformPaginatedQueryBigPage() throws Exception {
createArtistsDataSet();
@@ -501,6 +522,7 @@ public class DataContextIT extends ServerCase {
});
}
+ @Test
public void testPerformDataRowQuery() throws Exception {
createArtistsDataSet();
@@ -514,6 +536,7 @@ public class DataContextIT extends ServerCase {
assertTrue("Map expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Map<?, ?>);
}
+ @Test
public void testCommitChangesRO1() throws Exception {
ROArtist a1 = (ROArtist) context.newObject("ROArtist");
@@ -529,6 +552,7 @@ public class DataContextIT extends ServerCase {
}
}
+ @Test
public void testCommitChangesRO2() throws Exception {
createArtistsDataSet();
@@ -546,6 +570,7 @@ public class DataContextIT extends ServerCase {
}
}
+ @Test
public void testCommitChangesRO3() throws Exception {
createArtistsDataSet();
@@ -564,6 +589,7 @@ public class DataContextIT extends ServerCase {
}
}
+ @Test
public void testCommitChangesRO4() throws Exception {
createArtistsDataSet();
@@ -585,6 +611,7 @@ public class DataContextIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
}
+ @Test
public void testIterate() throws Exception {
createArtistsDataSet();
@@ -605,6 +632,7 @@ public class DataContextIT extends ServerCase {
assertEquals(7, count[0]);
}
+ @Test
public void testIterateDataRows() throws Exception {
createArtistsDataSet();
@@ -624,6 +652,7 @@ public class DataContextIT extends ServerCase {
assertEquals(7, count[0]);
}
+ @Test
public void testIterator() throws Exception {
createArtistsDataSet();
@@ -644,6 +673,7 @@ public class DataContextIT extends ServerCase {
}
}
+ @Test
public void testPerformIteratedQuery1() throws Exception {
createArtistsDataSet();
@@ -664,6 +694,7 @@ public class DataContextIT extends ServerCase {
}
}
+ @Test
public void testPerformIteratedQuery2() throws Exception {
createArtistsAndPaintingsDataSet();
@@ -693,6 +724,7 @@ public class DataContextIT extends ServerCase {
* Tests that hasChanges performs correctly when an object is "modified" and
* the property is simply set to the same value (an unreal modification)
*/
+ @Test
public void testHasChangesPhantom() {
String artistName = "ArtistName";
@@ -716,6 +748,7 @@ public class DataContextIT extends ServerCase {
* Tests that hasChanges performs correctly when an object is "modified" and
* the property is simply set to the same value (an unreal modification)
*/
+ @Test
public void testHasChangesRealModify() {
Artist artist = (Artist) context.newObject("Artist");
artist.setArtistName("ArtistName");
@@ -725,6 +758,7 @@ public class DataContextIT extends ServerCase {
assertTrue(context.hasChanges());
}
+ @Test
public void testInvalidateObjects_Vararg() throws Exception {
DataRow row = new DataRow(10);
@@ -747,6 +781,7 @@ public class DataContextIT extends ServerCase {
assertSame(object, context.getObjectStore().getNode(oid));
}
+ @Test
public void testInvalidateObjects() throws Exception {
DataRow row = new DataRow(10);
@@ -769,6 +804,7 @@ public class DataContextIT extends ServerCase {
assertSame(object, context.getObjectStore().getNode(oid));
}
+ @Test
public void testBeforeHollowDeleteShouldChangeStateToCommited() throws Exception {
createSingleArtistDataSet();
@@ -784,6 +820,7 @@ public class DataContextIT extends ServerCase {
assertEquals(PersistenceState.DELETED, hollow.getPersistenceState());
}
+ @Test
public void testCommitUnchangedInsert() throws Exception {
// see CAY-1444 - reproducible on DB's that support auto incremented PK
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java
index b6ba8ee..a3ec14f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.sql.Timestamp;
import java.util.List;
@@ -92,6 +93,7 @@ public class DataContextJoinAliasesIT extends ServerCase {
tArtistExhibit.insert(5, 2);
}
+ @Test
public void testMatchAll() throws Exception {
// select all galleries that have exhibits by both Picasso and Dali...
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
index c0cd1c1..5bccd04 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
@@ -31,6 +31,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;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextLocalObjectIT extends ServerCase {
@@ -66,6 +67,7 @@ public class DataContextLocalObjectIT extends ServerCase {
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
+ @Test
public void testLocalObject_InCache() throws Exception {
tArtist.insert(456, "Bla");
@@ -82,6 +84,7 @@ public class DataContextLocalObjectIT extends ServerCase {
});
}
+ @Test
public void testLocalObject_SameContext() throws Exception {
tArtist.insert(456, "Bla");
@@ -96,6 +99,7 @@ public class DataContextLocalObjectIT extends ServerCase {
});
}
+ @Test
public void testLocalObject_NotInCache() throws Exception {
tArtist.insert(456, "Bla");
@@ -112,6 +116,7 @@ public class DataContextLocalObjectIT extends ServerCase {
});
}
+ @Test
public void testLocalObject_FFE_InvalidID() throws Exception {
tArtist.insert(777, "AA");
@@ -137,6 +142,7 @@ public class DataContextLocalObjectIT extends ServerCase {
}
+ @Test
public void testLocalObject_TempId() throws Exception {
final Artist a1 = context1.newObject(Artist.class);
@@ -163,6 +169,7 @@ public class DataContextLocalObjectIT extends ServerCase {
});
}
+ @Test
public void testLocalObject_TempId_NestedContext() throws Exception {
final Artist a1 = context1.newObject(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java
index 88dc6a5..3719e69 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.NoPkTestEntity;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
import java.util.List;
import java.util.Map;
@@ -50,6 +51,7 @@ public class DataContextNoPkIT extends ServerCase {
noPkTestTable.insert(2);
}
+ @Test
public void testNoPkFetchObjects() throws Exception {
try {
List objects = context.performQuery(new SelectQuery(NoPkTestEntity.class));
@@ -62,6 +64,7 @@ public class DataContextNoPkIT extends ServerCase {
}
}
+ @Test
public void testNoPkFetchDataRows() throws Exception {
SelectQuery query = new SelectQuery(NoPkTestEntity.class);
query.setFetchingDataRows(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
index f9536e9..fbbec3c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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.Collections;
import java.util.Date;
@@ -50,6 +51,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testRefreshNullifiedValuesNew() {
Artist a = context.newObject(Artist.class);
@@ -73,6 +75,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
assertEquals("X", a1.getArtistName());
}
+ @Test
public void testNoRefreshValuesNew() {
Artist a = context.newObject(Artist.class);
@@ -94,6 +97,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
assertEquals("X", a1.getArtistName());
}
+ @Test
public void testRefreshNullifiedValuesExisting() {
SQLTemplate insert = new SQLTemplate(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
index 3b2f043..8b5b1c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
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.Collections;
@@ -93,6 +94,7 @@ public class DataContextObjectTrackingIT extends ServerCase {
tPainting.insert(33003, 33003, "P_artist3", 3000);
}
+ @Test
public void testUnregisterObject() {
DataRow row = new DataRow(10);
@@ -115,6 +117,7 @@ public class DataContextObjectTrackingIT extends ServerCase {
assertNull(context.getObjectStore().getCachedSnapshot(oid));
}
+ @Test
public void testInvalidateObjects_Vararg() {
DataRow row = new DataRow(10);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
index 9d40879..9d9471e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.math.BigDecimal;
import java.util.Calendar;
@@ -51,6 +52,7 @@ public class DataContextOrderingIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testMultipleOrdering() throws Exception {
Calendar c = Calendar.getInstance();
@@ -82,6 +84,7 @@ public class DataContextOrderingIT extends ServerCase {
assertSame(a1, list.get(2));
}
+ @Test
public void testMultipleOrderingInSelectClauseCAY_1074() throws Exception {
Calendar c = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java
index a081b86..0b8fd4e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.sql.Types;
import java.util.List;
@@ -77,6 +78,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
artistHelper.deleteAll();
}
+ @Test
public void testSelectWithOuterJoinFlattened() throws Exception {
artistHelper.insert(33001, "AA1");
@@ -101,6 +103,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
assertEquals("BB1", artists.get(0).getArtistName());
}
+ @Test
public void testSelectWithOuterJoin() throws Exception {
artistHelper.insert(33001, "AA1");
@@ -137,6 +140,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
assertEquals("BB2", artists.get(2).getArtistName());
}
+ @Test
public void testSelectWithOuterJoinFromString() throws Exception {
artistHelper.insert(33001, "AA1");
@@ -171,6 +175,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
assertEquals("BB2", artists.get(2).getArtistName());
}
+ @Test
public void testSelectWithOuterOrdering() throws Exception {
artistHelper.insert(33001, "AA1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java
index 4299b02..cd22677 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java
@@ -26,6 +26,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;
@@ -64,6 +65,7 @@ public class DataContextPaginatedQueryIT extends ServerCase {
tArtist.insert(33010, "artist10");
}
+ @Test
public void testLocalCache() throws Exception {
createArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
index b6298be..ac06353 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
@@ -35,6 +35,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.math.BigDecimal;
import java.sql.Types;
@@ -97,6 +98,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
tPainting.insert(7, 11, "p_artist2", 2000);
}
+ @Test
public void testObjectQueryStringBoolean() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -105,6 +107,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals(2, paintings.size());
}
+ @Test
public void testObjectQueryStringMapBoolean() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -116,6 +119,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals(1, paintings.size());
}
+ @Test
public void testProcedureQueryStringMapBoolean() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
@@ -151,6 +155,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals(11, ((Number) artist.getObjectId().getIdSnapshot().get(Artist.ARTIST_ID_PK_COLUMN)).intValue());
}
+ @Test
public void testNonSelectingQueryString() throws Exception {
int[] counts = context.performNonSelectingQuery("NonSelectingQuery");
@@ -163,6 +168,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals("No Painting Like This", p.getPaintingTitle());
}
+ @Test
public void testNonSelectingQueryStringMap() throws Exception {
Map<String, Object> parameters = new HashMap<String, Object>();
@@ -180,6 +186,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals("Go Figure", p.getPaintingTitle());
}
+ @Test
public void testPerfomQueryNonSelecting() throws Exception {
Artist a = context.newObject(Artist.class);
@@ -196,6 +203,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
assertEquals(0, result.size());
}
+ @Test
public void testObjectQueryWithLocalCache() throws Exception {
createTwoArtists();
@@ -211,6 +219,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
});
}
+ @Test
public void testObjectQueryWithSharedCache() throws Exception {
createTwoArtists();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
index a6d632a..0534635 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
@@ -28,6 +28,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;
@@ -66,6 +67,7 @@ public class DataContextPrefetchExtras1IT extends ServerCase {
}
}
+ @Test
public void testPrefetchToOne() throws Exception {
createDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
index 2676819..524251d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
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.List;
@@ -99,6 +100,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
tCompoundFkTest.insert(303, "101", "201", "CFK3");
}
+ @Test
public void testPrefetchToManyOnCharKey() throws Exception {
createPrefetchToManyOnCharKeyDataSet();
@@ -124,6 +126,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
/**
* Tests to-one prefetching over relationships with compound keys.
*/
+ @Test
public void testPrefetch10() throws Exception {
createCompoundDataSet();
@@ -149,6 +152,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
/**
* Tests to-many prefetching over relationships with compound keys.
*/
+ @Test
public void testPrefetch11() throws Exception {
createCompoundDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
index 39525fd..ec04fb0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
@@ -43,6 +43,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.Timestamp;
import java.sql.Types;
@@ -149,6 +150,7 @@ public class DataContextPrefetchIT extends ServerCase {
tArtistExhibit.insert(101, 4);
}
+ @Test
public void testPrefetchToMany_ViaProperty() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -177,6 +179,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToMany_WithQualfier() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -216,6 +219,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToManyNoQualifier() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -248,6 +252,7 @@ public class DataContextPrefetchIT extends ServerCase {
* Test that a to-many relationship is initialized when a target entity has
* a compound PK only partially involved in relationship.
*/
+ @Test
public void testPrefetchToMany_OnJoinTableDisjoinedPrefetch() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -288,6 +293,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToManyOnJoinTableJoinedPrefetch_ViaProperty() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -332,6 +338,7 @@ public class DataContextPrefetchIT extends ServerCase {
* Test that a to-many relationship is initialized when a target entity has
* a compound PK only partially involved in relationship.
*/
+ @Test
public void testPrefetchToManyOnJoinTableJoinedPrefetch() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -376,6 +383,7 @@ public class DataContextPrefetchIT extends ServerCase {
* Test that a to-many relationship is initialized when there is no inverse
* relationship
*/
+ @Test
public void testPrefetch_ToManyNoReverse() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -403,6 +411,7 @@ public class DataContextPrefetchIT extends ServerCase {
}
}
+ @Test
public void testPrefetch_ToManyNoReverseWithQualifier() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -434,6 +443,7 @@ public class DataContextPrefetchIT extends ServerCase {
}
}
+ @Test
public void testPrefetch_ToOne() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -459,6 +469,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetch_ToOne_DbPath() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -471,6 +482,7 @@ public class DataContextPrefetchIT extends ServerCase {
assertEquals(1, results.size());
}
+ @Test
public void testPrefetch_ToOne_ObjPath() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -482,6 +494,7 @@ public class DataContextPrefetchIT extends ServerCase {
assertEquals(1, results.size());
}
+ @Test
public void testPrefetch_ReflexiveRelationship() throws Exception {
ArtGroup parent = (ArtGroup) context.newObject("ArtGroup");
parent.setName("parent");
@@ -508,6 +521,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetch_ToOneWithQualifierOverlappingPrefetchPath() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -530,7 +544,8 @@ public class DataContextPrefetchIT extends ServerCase {
}
});
}
-
+
+ @Test
public void testPrefetch_ToOneWith_OuterJoinFlattenedQualifier() throws Exception {
tArtGroup.insert(1, "AG");
@@ -564,6 +579,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetch9() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -595,6 +611,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetch_OneToOneWithQualifier() throws Exception {
createArtistWithTwoPaintingsAndTwoInfosDataSet();
@@ -629,6 +646,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToMany_DateInQualifier() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -642,6 +660,7 @@ public class DataContextPrefetchIT extends ServerCase {
context.performQuery(q);
}
+ @Test
public void testPrefetchingToOneNull() throws Exception {
tPainting.insert(6, "p_Xty", null, 1000);
@@ -662,6 +681,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToOneSharedCache() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -697,6 +717,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToOneLocalCache() throws Exception {
createTwoArtistsAndTwoPaintingsDataSet();
@@ -732,6 +753,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToOneWithBackRelationship() throws Exception {
createArtistWithTwoPaintingsAndTwoInfosDataSet();
@@ -754,6 +776,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchPaintingOverToOneAndToMany() throws Exception {
createArtistWithTwoPaintingsAndTwoInfosDataSet();
@@ -777,6 +800,7 @@ public class DataContextPrefetchIT extends ServerCase {
});
}
+ @Test
public void testPrefetchToOneWithBackRelationship_Joint() throws Exception {
createArtistWithTwoPaintingsAndTwoInfosDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
index 7adfbbf..82dfb55 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
@@ -36,6 +36,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.sql.Timestamp;
import java.util.Collections;
@@ -111,6 +112,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
tGallery.insert(45, "gallery3");
}
+ @Test
public void testToManyToManyFirstStepUnresolved() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -160,6 +162,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, ae2.getPersistenceState());
}
+ @Test
public void testToManyToManyFirstStepResolved() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -195,6 +198,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
}
+ @Test
public void testMixedPrefetch1() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -231,6 +235,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
}
+ @Test
public void testMixedPrefetch2() throws Exception {
createTwoArtistsWithExhibitsDataSet();
@@ -268,7 +273,8 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
ArtistExhibit ae1 = aexhibits.get(0);
assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
}
-
+
+ @Test
public void testToManyToOne_EmptyToMany() throws Exception {
createGalleriesAndArtists();
@@ -288,7 +294,8 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
assertFalse(((ValueHolder) exhibits).isFault());
assertEquals(0, exhibits.size());
}
-
+
+ @Test
public void testToManyToOne_EmptyToMany_NoRootQualifier() throws Exception {
createGalleriesAndArtists();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
index dd6e52e..7c3915e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
@@ -28,6 +28,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;
@@ -65,6 +66,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
tPainting.insert(3, "ACC", 1);
}
+ @Test
public void testToManyDisjointOverlappingQualifierWithInnerJoin() throws Exception {
createTwoArtistsThreePaintingsDataSet();
@@ -81,6 +83,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
assertEquals(3, a.getPaintingArray().size());
}
+ @Test
public void testToManyJointOverlappingQualifierWithInnerJoin() throws Exception {
createTwoArtistsThreePaintingsDataSet();
@@ -97,6 +100,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
assertEquals(3, a.getPaintingArray().size());
}
+ @Test
public void testToManyJointOverlappingQualifierWithOuterJoin() throws Exception {
createTwoArtistsThreePaintingsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index 2937935..8660d20 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.tx.ExternalTransaction;
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.math.BigDecimal;
import java.sql.Types;
@@ -75,6 +76,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testUpdate() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -111,6 +113,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2000, p.getEstimatedPrice().intValue());
}
+ @Test
public void testUpdateNoParam() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -146,6 +149,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2000, p.getEstimatedPrice().intValue());
}
+ @Test
public void testSelect1() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -171,6 +175,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2000, p.getEstimatedPrice().intValue());
}
+ @Test
public void testSelect2() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -197,6 +202,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2000, p.getEstimatedPrice().intValue());
}
+ @Test
public void testSelect3() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -225,6 +231,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2000, p.getEstimatedPrice().intValue());
}
+ @Test
public void testFetchLimit() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -244,6 +251,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(2, artists.size());
}
+ @Test
public void testFetchOffset() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -263,6 +271,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(1, artists.size());
}
+ @Test
public void testColumnNameCapitalization() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -290,6 +299,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
}
+ @Test
public void testOutParams() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -310,6 +320,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(40, price.intValue());
}
+ @Test
public void testSelectDataObject() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
@@ -338,6 +349,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
assertEquals(1101.01, p.getEstimatedPrice().doubleValue(), 0.02);
}
+ @Test
public void testSelectWithRowDescriptor() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
index 3d61ee6..7f692f5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.inherit.Employee;
import org.apache.cayenne.testdo.inherit.Manager;
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 DataContextQualifiedEntityIT extends ServerCase {
tPerson.insert(null, null, null, "c1", 6, "C", null);
}
+ @Test
public void testSelect() throws Exception {
createPersonsDataSet();
@@ -109,6 +111,7 @@ public class DataContextQualifiedEntityIT extends ServerCase {
assertEquals(2, managers.size());
}
+ @Test
public void testPrefetch() throws Exception {
createPersonsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
index 14c1954..54137ac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
@@ -32,6 +32,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.ArrayList;
import java.util.List;
@@ -97,6 +98,7 @@ public class DataContextQueryCachingIT extends ServerCase {
tArtist.update().set("ARTIST_NAME", "ccc").where("ARTIST_ID", 33001).execute();
}
+ @Test
public void testLocalCacheDataRowsRefresh() throws Exception {
SelectQuery select = new SelectQuery(Artist.class);
select.setFetchingDataRows(true);
@@ -135,6 +137,7 @@ public class DataContextQueryCachingIT extends ServerCase {
}
}
+ @Test
public void testSharedCacheDataRowsRefresh() throws Exception {
SelectQuery select = new SelectQuery(Artist.class);
@@ -176,6 +179,7 @@ public class DataContextQueryCachingIT extends ServerCase {
}
}
+ @Test
public void testLocalCacheDataObjectsRefresh() throws Exception {
SelectQuery select = new SelectQuery(Artist.class);
@@ -216,6 +220,7 @@ public class DataContextQueryCachingIT extends ServerCase {
}
}
+ @Test
public void testLocalCacheRefreshObjectsRefresh() throws Exception {
createInsertDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
index 97dd1b0..4e190f9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
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;
@@ -49,6 +50,7 @@ public class DataContextQueryChainIT extends ServerCase {
dbHelper.deleteAll("ARTIST");
}
+ @Test
public void testSelectQuery() {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("X");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
index bbbb8ba..cdac918 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.util.List;
-
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
@@ -36,6 +34,9 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.List;
@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
public class DataContextRefreshQueryIT extends ServerCase {
@@ -89,6 +90,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
tPainting.delete().where("PAINTING_ID", 33001).execute();
}
+ @Test
public void testRefreshCollection() throws Exception {
createRefreshCollectionDataSet();
@@ -132,6 +134,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
.isFault());
}
+ @Test
public void testRefreshCollectionToOne() throws Exception {
createRefreshCollectionDataSet();
@@ -176,6 +179,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
assertEquals("b", p1.getToArtist().getArtistName());
}
+ @Test
public void testRefreshSingleObject() throws Exception {
createRefreshCollectionDataSet();
@@ -206,6 +210,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
.isFault());
}
+ @Test
public void testRefreshObjectToMany() throws Exception {
createRefreshObjectToManyDataSet();
@@ -220,6 +225,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
assertEquals(1, a.getPaintingArray().size());
}
+ @Test
public void testRefreshQueryResultsLocalCache() throws Exception {
createRefreshCollectionDataSet();
@@ -274,6 +280,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
assertEquals("b", p2.getToArtist().getArtistName());
}
+ @Test
public void testRefreshQueryResultsSharedCache() throws Exception {
createRefreshCollectionDataSet();
@@ -328,6 +335,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
assertEquals("b", p2.getToArtist().getArtistName());
}
+ @Test
public void testRefreshQueryResultGroupLocal() throws Exception {
createRefreshCollectionDataSet();
@@ -383,6 +391,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
assertEquals("b", p2.getToArtist().getArtistName());
}
+ @Test
public void testRefreshAll() throws Exception {
createRefreshCollectionDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
index 91fb0ef..620507d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
@@ -31,6 +31,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.Date;
@@ -99,6 +100,7 @@ public class DataContextRefreshingIT extends ServerCase {
tPainting.insert(4, "p", 5, 1000);
}
+ @Test
public void testRefetchRootWithUpdatedAttributes() throws Exception {
createSingleArtistDataSet();
@@ -128,6 +130,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(nameAfter, artist.getArtistName());
}
+ @Test
public void testRefetchRootWithNullifiedToOne() throws Exception {
createSingleArtistAndPaintingDataSet();
@@ -147,6 +150,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertNull(painting.getToArtist());
}
+ @Test
public void testRefetchRootWithChangedToOneTarget() throws Exception {
createTwoArtistsAndPaintingDataSet();
@@ -167,6 +171,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals("artist3", painting.getToArtist().getArtistName());
}
+ @Test
public void testRefetchRootWithNullToOneTargetChangedToNotNull() throws Exception {
createSingleArtistAndUnrelatedPaintingDataSet();
@@ -185,6 +190,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals("artist2", painting.getToArtist().getArtistName());
}
+ @Test
public void testRefetchRootWithDeletedToMany() throws Exception {
createSingleArtistAndPaintingDataSet();
@@ -208,6 +214,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(0, artist.getPaintingArray().size());
}
+ @Test
public void testRefetchRootWithAddedToMany() throws Exception {
createSingleArtistDataSet();
@@ -229,6 +236,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(artist.getPaintingArray().size(), 1);
}
+ @Test
public void testInvalidateRootWithUpdatedAttributes() throws Exception {
createSingleArtistDataSet();
@@ -247,6 +255,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(nameAfter, artist.getArtistName());
}
+ @Test
public void testInvalidateRootWithNullifiedToOne() throws Exception {
createSingleArtistAndPaintingDataSet();
@@ -263,6 +272,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertNull(painting.getToArtist());
}
+ @Test
public void testInvalidateRootWithChangedToOneTarget() throws Exception {
createTwoArtistsAndPaintingDataSet();
@@ -279,6 +289,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals("artist3", painting.getToArtist().getArtistName());
}
+ @Test
public void testInvalidateRootWithNullToOneTargetChangedToNotNull() throws Exception {
createSingleArtistAndUnrelatedPaintingDataSet();
@@ -293,6 +304,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals("artist2", painting.getToArtist().getArtistName());
}
+ @Test
public void testInvalidateRootWithDeletedToMany() throws Exception {
createSingleArtistAndPaintingDataSet();
@@ -306,6 +318,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(artist.getPaintingArray().size(), 0);
}
+ @Test
public void testInvaliateRootWithAddedToMany() throws Exception {
createSingleArtistDataSet();
@@ -321,6 +334,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(artist.getPaintingArray().size(), 1);
}
+ @Test
public void testInvalidateThenModify() throws Exception {
createSingleArtistDataSet();
@@ -345,6 +359,7 @@ public class DataContextRefreshingIT extends ServerCase {
assertEquals(PersistenceState.MODIFIED, artist.getPersistenceState());
}
+ @Test
public void testModifyHollow() throws Exception {
createSingleArtistAndPaintingDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
index bb38882..68067b3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
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.List;
@@ -63,6 +64,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
tPainting.insert(1, "p1", 1);
}
+ @Test
public void testUnrefreshingToOne() throws Exception {
createOneArtistOnePaintingDataSet();
@@ -99,6 +101,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
a.getPropertyWrittenDirectly());
}
+ @Test
public void testRefreshingToOne() throws Exception {
createOneArtistOnePaintingDataSet();