You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/11/24 21:58:07 UTC
svn commit: r883872 [2/3] - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/u...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectInContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectInContextTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectInContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectInContextTest.java Tue Nov 24 20:58:03 2009
@@ -34,6 +34,7 @@
import org.apache.cayenne.unit.AccessStack;
import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.unit.CayenneResources;
+import org.apache.cayenne.util.Cayenne;
import org.apache.cayenne.util.PersistentObjectHolder;
public class PersistentObjectInContextTest extends CayenneCase {
@@ -61,7 +62,7 @@
"MtTable1",
MtTable1.TABLE1_ID_PK_COLUMN,
new Integer(1));
- ClientMtTable1 t1 = (ClientMtTable1) DataObjectUtils.objectForQuery(
+ ClientMtTable1 t1 = (ClientMtTable1) Cayenne.objectForQuery(
context,
new ObjectIdQuery(gid));
@@ -88,7 +89,7 @@
"MtTable2",
MtTable2.TABLE2_ID_PK_COLUMN,
new Integer(1));
- ClientMtTable2 mtTable21 = (ClientMtTable2) DataObjectUtils.objectForQuery(
+ ClientMtTable2 mtTable21 = (ClientMtTable2) Cayenne.objectForQuery(
context,
new ObjectIdQuery(gid));
@@ -108,7 +109,7 @@
"MtTable2",
MtTable2.TABLE2_ID_PK_COLUMN,
new Integer(1));
- ClientMtTable2 mtTable21 = (ClientMtTable2) DataObjectUtils.objectForQuery(
+ ClientMtTable2 mtTable21 = (ClientMtTable2) Cayenne.objectForQuery(
context,
new ObjectIdQuery(gid));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java Tue Nov 24 20:58:03 2009
@@ -24,6 +24,7 @@
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
* This test case ensures that PK pre-generated for the entity manually before commit is
@@ -52,7 +53,7 @@
Object pk = a.getObjectId().getReplacementIdMap().get(Artist.ARTIST_ID_PK_COLUMN);
assertNotNull(pk);
- assertEquals(pk, DataObjectUtils.longPKForObject(a));
+ assertEquals(pk, Cayenne.longPKForObject(a));
context.commitChanges();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java Tue Nov 24 20:58:03 2009
@@ -22,7 +22,6 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
@@ -33,6 +32,7 @@
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextDecoratedStackTest extends CayenneCase {
@@ -61,7 +61,7 @@
query.setTemplate(
OpenBaseAdapter.class.getName(),
"select #result('COUNT(ARTIST_ID)' 'int' 'x') from ARTIST");
- Map<?, ?> count = (Map<?, ?>) DataObjectUtils.objectForQuery(context, query);
+ Map<?, ?> count = (Map<?, ?>) Cayenne.objectForQuery(context, query);
assertNotNull(count);
assertEquals(new Integer(1), count.get("x"));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsTest.java Tue Nov 24 20:58:03 2009
@@ -27,12 +27,12 @@
import org.apache.art.Artist;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLConditionsTest extends CayenneCase {
@@ -80,7 +80,7 @@
// Set<Object> ids = new HashSet<Object>();
// Iterator<?> it = objects.iterator();
// while (it.hasNext()) {
- // Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ // Object id = Cayenne.pkForObject((Persistent) it.next());
// ids.add(id);
// }
//
@@ -100,7 +100,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -119,7 +119,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -138,7 +138,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -159,7 +159,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -178,7 +178,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -198,7 +198,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -219,7 +219,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -239,7 +239,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -258,7 +258,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -278,7 +278,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -294,7 +294,7 @@
ObjectContext context = createDataContext();
EJBQLQuery query = new EJBQLQuery(ejbql);
- query.setParameter("x", DataObjectUtils.objectForPK(
+ query.setParameter("x", Cayenne.objectForPK(
context,
Painting.class,
33010));
@@ -304,7 +304,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -345,7 +345,7 @@
ObjectContext context = createDataContext();
EJBQLQuery query = new EJBQLQuery(ejbql);
- query.setParameter("x", DataObjectUtils.objectForPK(
+ query.setParameter("x", Cayenne.objectForPK(
context,
Painting.class,
33010));
@@ -355,7 +355,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -376,7 +376,7 @@
Set<Object> ids = new HashSet<Object>();
Iterator<?> it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java Tue Nov 24 20:58:03 2009
@@ -22,10 +22,10 @@
import org.apache.art.MeaningfulPKTest1;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLDeleteTest extends CayenneCase {
@@ -78,9 +78,9 @@
assertEquals(1, count.length);
assertEquals(1, count[0]);
- assertNotNull(DataObjectUtils
+ assertNotNull(Cayenne
.objectForPK(createDataContext(), Painting.class, 33001));
- assertNull(DataObjectUtils
+ assertNull(Cayenne
.objectForPK(createDataContext(), Painting.class, 33002));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsTest.java Tue Nov 24 20:58:03 2009
@@ -18,11 +18,11 @@
****************************************************************/
package org.apache.cayenne.access;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.testdo.relationship.FlattenedTest1;
import org.apache.cayenne.unit.RelationshipCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLFlattenedRelationshipsTest extends RelationshipCase {
@@ -33,7 +33,7 @@
+ "WHERE f MEMBER OF ft.ft3Array AND ft = :ft";
ObjectContext context = createDataContext();
- FlattenedTest1 ft = DataObjectUtils.objectForPK(context, FlattenedTest1.class, 1);
+ FlattenedTest1 ft = Cayenne.objectForPK(context, FlattenedTest1.class, 1);
EJBQLQuery query = new EJBQLQuery(ejbql);
query.setParameter("ft", ft);
@@ -45,7 +45,7 @@
// Set<Object> ids = new HashSet<Object>();
// Iterator<?> it = objects.iterator();
// while (it.hasNext()) {
- // Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ // Object id = Cayenne.pkForObject((Persistent) it.next());
// ids.add(id);
// }
//
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java Tue Nov 24 20:58:03 2009
@@ -28,12 +28,12 @@
import org.apache.art.BigIntegerEntity;
import org.apache.art.DateTestEntity;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.QueryChain;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLFunctionalExpressions extends CayenneCase {
@@ -334,8 +334,8 @@
"INSERT INTO ARTIST (ARTIST_ID,ARTIST_NAME) VALUES(2, 'A ')"));
context.performGenericQuery(inserts);
- Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 1);
- Artist a2 = DataObjectUtils.objectForPK(context, Artist.class, 2);
+ Artist a1 = Cayenne.objectForPK(context, Artist.class, 1);
+ Artist a2 = Cayenne.objectForPK(context, Artist.class, 2);
EJBQLQuery query = new EJBQLQuery(
"SELECT a FROM Artist a WHERE TRIM(a.artistName) = 'A'");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java Tue Nov 24 20:58:03 2009
@@ -20,10 +20,10 @@
import java.util.List;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLIsNullTest extends CayenneCase {
@@ -89,7 +89,7 @@
List results = createDataContext().performQuery(query1);
assertEquals(1, results.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results.get(0)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0)));
}
public void testIsNotNull() throws Exception {
@@ -101,7 +101,7 @@
List results = createDataContext().performQuery(query1);
assertEquals(1, results.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results.get(0)));
}
public void testToOneIsNull() throws Exception {
@@ -113,7 +113,7 @@
List results = createDataContext().performQuery(query1);
assertEquals(1, results.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results.get(0)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0)));
}
public void testToOneIsNotNull() throws Exception {
@@ -125,6 +125,6 @@
List results = createDataContext().performQuery(query1);
assertEquals(1, results.size());
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results.get(0)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results.get(0)));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java Tue Nov 24 20:58:03 2009
@@ -24,9 +24,9 @@
import java.util.Set;
import org.apache.art.Artist;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLJoinsTest extends CayenneCase {
@@ -66,7 +66,7 @@
List artists = createDataContext().performQuery(new EJBQLQuery(ejbql));
assertEquals(1, artists.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33001, Cayenne.intPKForObject((Artist) artists.get(0)));
}
public void testOuterJoins() throws Exception {
@@ -82,7 +82,7 @@
Iterator it = artists.iterator();
while (it.hasNext()) {
Artist a = (Artist) it.next();
- ids.add(DataObjectUtils.pkForObject(a));
+ ids.add(Cayenne.pkForObject(a));
}
assertTrue(ids.contains(33001l));
@@ -101,7 +101,7 @@
+ query.getExpression(getDomain().getEntityResolver()).getExpression());
List artists = createDataContext().performQuery(query);
assertEquals(1, artists.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
public void testImplicitJoins() throws Exception {
@@ -117,7 +117,7 @@
List artists = createDataContext().performQuery(query);
assertEquals(1, artists.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
public void testPartialImplicitJoins1() throws Exception {
@@ -128,7 +128,7 @@
List artists = createDataContext().performQuery(new EJBQLQuery(ejbql));
assertEquals(1, artists.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
public void testPartialImplicitJoins2() throws Exception {
@@ -139,7 +139,7 @@
List artists = createDataContext().performQuery(new EJBQLQuery(ejbql));
assertEquals(1, artists.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0)));
}
public void testMultipleJoinsToTheSameTable() throws Exception {
@@ -150,6 +150,6 @@
List artists = createDataContext().performQuery(new EJBQLQuery(ejbql));
assertEquals(1, artists.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Artist) artists.get(0)));
+ assertEquals(33001, Cayenne.intPKForObject((Artist) artists.get(0)));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByTest.java Tue Nov 24 20:58:03 2009
@@ -20,10 +20,10 @@
import java.util.List;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLOrderByTest extends CayenneCase {
@@ -37,9 +37,9 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(3, results1.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results1.get(2)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results1.get(2)));
String ejbql2 = "SELECT p FROM Painting p ORDER BY p.estimatedPrice";
EJBQLQuery query2 = new EJBQLQuery(ejbql2);
@@ -47,9 +47,9 @@
List results2 = createDataContext().performQuery(query2);
assertEquals(3, results2.size());
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results2.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results2.get(1)));
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results2.get(2)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results2.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results2.get(1)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
public void testOrderByAsc() throws Exception {
@@ -62,9 +62,9 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(3, results1.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results1.get(2)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results1.get(2)));
String ejbql2 = "SELECT p FROM Painting p ORDER BY p.estimatedPrice ASC";
EJBQLQuery query2 = new EJBQLQuery(ejbql2);
@@ -72,9 +72,9 @@
List results2 = createDataContext().performQuery(query2);
assertEquals(3, results2.size());
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results2.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results2.get(1)));
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results2.get(2)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results2.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results2.get(1)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
public void testOrderByDesc() throws Exception {
@@ -87,9 +87,9 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(3, results1.size());
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results1.get(2)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(2)));
String ejbql2 = "SELECT p FROM Painting p ORDER BY p.estimatedPrice DESC";
EJBQLQuery query2 = new EJBQLQuery(ejbql2);
@@ -97,9 +97,9 @@
List results2 = createDataContext().performQuery(query2);
assertEquals(3, results2.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results2.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results2.get(1)));
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results2.get(2)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results2.get(1)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results2.get(2)));
}
public void testOrderByQualified() throws Exception {
@@ -112,8 +112,8 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(2, results1.size());
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results1.get(1)));
String ejbql2 = "SELECT p FROM Painting p WHERE p.estimatedPrice > 1000 ORDER BY p.estimatedPrice ASC";
EJBQLQuery query2 = new EJBQLQuery(ejbql2);
@@ -121,8 +121,8 @@
List results2 = createDataContext().performQuery(query2);
assertEquals(2, results2.size());
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results2.get(0)));
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results2.get(1)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results2.get(0)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(1)));
}
public void testOrderByMultiple() throws Exception {
@@ -135,10 +135,10 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(4, results1.size());
- assertEquals(33003, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33004, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
- assertEquals(33002, DataObjectUtils.intPKForObject((Persistent) results1.get(2)));
- assertEquals(33001, DataObjectUtils.intPKForObject((Persistent) results1.get(3)));
+ assertEquals(33003, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33004, Cayenne.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33002, Cayenne.intPKForObject((Persistent) results1.get(2)));
+ assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(3)));
}
public void testOrderByPath() throws Exception {
@@ -151,8 +151,8 @@
List results1 = createDataContext().performQuery(query1);
assertEquals(2, results1.size());
- assertEquals(33005, DataObjectUtils.intPKForObject((Persistent) results1.get(0)));
- assertEquals(33006, DataObjectUtils.intPKForObject((Persistent) results1.get(1)));
+ assertEquals(33005, Cayenne.intPKForObject((Persistent) results1.get(0)));
+ assertEquals(33006, Cayenne.intPKForObject((Persistent) results1.get(1)));
String ejbql2 = "SELECT p FROM Painting p ORDER BY p.toArtist.artistName DESC";
EJBQLQuery query2 = new EJBQLQuery(ejbql2);
@@ -160,7 +160,7 @@
List results2 = createDataContext().performQuery(query2);
assertEquals(2, results2.size());
- assertEquals(33006, DataObjectUtils.intPKForObject((Persistent) results2.get(0)));
- assertEquals(33005, DataObjectUtils.intPKForObject((Persistent) results2.get(1)));
+ assertEquals(33006, Cayenne.intPKForObject((Persistent) results2.get(0)));
+ assertEquals(33005, Cayenne.intPKForObject((Persistent) results2.get(1)));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java Tue Nov 24 20:58:03 2009
@@ -30,13 +30,13 @@
import org.apache.art.CompoundFkTestEntity;
import org.apache.art.CompoundPkTestEntity;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.map.LifecycleEvent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLQueryTest extends CayenneCase {
@@ -381,7 +381,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String ejbql = "select P from Painting P WHERE p.toArtist = :param";
EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -391,7 +391,7 @@
assertEquals(1, ps.size());
Painting p = (Painting) ps.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testSelectFromWhereMatchRelationshipAndScalar() throws Exception {
@@ -406,7 +406,7 @@
assertEquals(1, ps.size());
Painting p = (Painting) ps.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testSelectFromWhereMatchOnMultiColumnObject() throws Exception {
@@ -417,7 +417,7 @@
Map<String, String> key1 = new HashMap<String, String>();
key1.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "b1");
key1.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "b2");
- CompoundPkTestEntity a = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity a = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
key1);
@@ -430,7 +430,7 @@
assertEquals(1, ps.size());
CompoundFkTestEntity o1 = (CompoundFkTestEntity) ps.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(o1));
+ assertEquals(33002, Cayenne.intPKForObject(o1));
}
public void testSelectFromWhereMatchOnMultiColumnObjectReverse() throws Exception {
@@ -445,7 +445,7 @@
Map<String, String> key1 = new HashMap<String, String>();
key1.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "b1");
key1.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "b2");
- CompoundPkTestEntity a = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity a = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
key1);
@@ -458,7 +458,7 @@
assertEquals(1, ps.size());
CompoundFkTestEntity o1 = (CompoundFkTestEntity) ps.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(o1));
+ assertEquals(33002, Cayenne.intPKForObject(o1));
}
public void testSelectFromWhereNoMatchOnMultiColumnObject() throws Exception {
@@ -469,7 +469,7 @@
Map<String, String> key1 = new HashMap<String, String>();
key1.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "b1");
key1.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "b2");
- CompoundPkTestEntity a = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity a = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
key1);
@@ -482,6 +482,6 @@
assertEquals(1, ps.size());
CompoundFkTestEntity o1 = (CompoundFkTestEntity) ps.get(0);
- assertEquals(33001, DataObjectUtils.intPKForObject(o1));
+ assertEquals(33001, Cayenne.intPKForObject(o1));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java Tue Nov 24 20:58:03 2009
@@ -24,10 +24,10 @@
import java.util.Set;
import org.apache.art.Artist;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLSubqueryTest extends CayenneCase {
@@ -55,7 +55,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -78,7 +78,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -104,7 +104,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -132,7 +132,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -160,7 +160,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
@@ -189,7 +189,7 @@
Set ids = new HashSet();
Iterator it = objects.iterator();
while (it.hasNext()) {
- Object id = DataObjectUtils.pkForObject((Persistent) it.next());
+ Object id = Cayenne.pkForObject((Persistent) it.next());
ids.add(id);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateTest.java Tue Nov 24 20:58:03 2009
@@ -24,11 +24,11 @@
import org.apache.art.Artist;
import org.apache.art.BooleanTestEntity;
import org.apache.art.CompoundPkTestEntity;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextEJBQLUpdateTest extends CayenneCase {
@@ -45,7 +45,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.paintingTitle is NULL or p.paintingTitle <> 'XX'");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.paintingTitle = 'XX' WHERE p.paintingTitle = 'P1'";
@@ -58,7 +58,7 @@
assertEquals(1, count.length);
assertEquals(1, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(1l), notUpdated);
}
@@ -70,7 +70,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.paintingTitle is NULL or p.paintingTitle <> 'XX'");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.paintingTitle = 'XX'";
@@ -83,7 +83,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
@@ -95,7 +95,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.estimatedPrice is not null");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.estimatedPrice = NULL";
@@ -108,7 +108,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
@@ -122,7 +122,7 @@
// EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
// + "WHERE p.paintingTitle is NULL or p.estimatedPrice <= 5000");
//
-// Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+// Object notUpdated = Cayenne.objectForQuery(context, check);
// assertEquals(new Long(2l), notUpdated);
//
// String ejbql = "UPDATE Painting AS p SET p.estimatedPrice = p.estimatedPrice * 2";
@@ -135,7 +135,7 @@
// assertEquals(1, count.length);
// assertEquals(2, count[0]);
//
-// notUpdated = DataObjectUtils.objectForQuery(context, check);
+// notUpdated = Cayenne.objectForQuery(context, check);
// assertEquals(new Long(0l), notUpdated);
// }
@@ -147,7 +147,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.estimatedPrice is NULL or p.estimatedPrice <> 1");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.paintingTitle = 'XX', p.estimatedPrice = 1";
@@ -160,7 +160,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
@@ -172,7 +172,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.estimatedPrice is NULL or p.estimatedPrice <> 1.1");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.estimatedPrice = 1.1";
@@ -185,7 +185,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
@@ -209,7 +209,7 @@
EJBQLQuery check = new EJBQLQuery("select count(p) from BooleanTestEntity p "
+ "WHERE p.booleanColumn = true");
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(1l), notUpdated);
String ejbql = "UPDATE BooleanTestEntity AS p SET p.booleanColumn = true";
@@ -222,7 +222,7 @@
assertEquals(1, count.length);
assertEquals(3, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(3l), notUpdated);
}
@@ -230,14 +230,14 @@
createTestData("prepare");
ObjectContext context = createDataContext();
- Artist object = DataObjectUtils
+ Artist object = Cayenne
.objectForPK(context, Artist.class, 33003);
EJBQLQuery check = new EJBQLQuery("select count(p) from Painting p "
+ "WHERE p.toArtist <> :artist");
check.setParameter("artist", object);
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(2l), notUpdated);
String ejbql = "UPDATE Painting AS p SET p.toArtist = :artist";
@@ -251,7 +251,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
@@ -262,7 +262,7 @@
Map<String, String> key1 = new HashMap<String, String>();
key1.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "b1");
key1.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "b2");
- CompoundPkTestEntity object = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity object = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
key1);
@@ -271,7 +271,7 @@
"select count(e) from CompoundFkTestEntity e WHERE e.toCompoundPk <> :param");
check.setParameter("param", object);
- Object notUpdated = DataObjectUtils.objectForQuery(context, check);
+ Object notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(1l), notUpdated);
String ejbql = "UPDATE CompoundFkTestEntity e SET e.toCompoundPk = :param";
@@ -285,7 +285,7 @@
assertEquals(1, count.length);
assertEquals(2, count[0]);
- notUpdated = DataObjectUtils.objectForQuery(context, check);
+ notUpdated = Cayenne.objectForQuery(context, check);
assertEquals(new Long(0l), notUpdated);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java Tue Nov 24 20:58:03 2009
@@ -24,11 +24,11 @@
import org.apache.art.MeaningfulPKDep;
import org.apache.art.MeaningfulPKTest1;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
*/
@@ -64,10 +64,10 @@
context.commitChanges();
assertNotNull(obj.getPkAttribute());
- assertSame(obj, DataObjectUtils.objectForPK(context, MeaningfulPKTest1.class, obj
+ assertSame(obj, Cayenne.objectForPK(context, MeaningfulPKTest1.class, obj
.getPkAttribute()));
- int id = DataObjectUtils.intPKForObject(obj);
+ int id = Cayenne.intPKForObject(obj);
Map snapshot = context.getObjectStore().getDataRowCache().getCachedSnapshot(
obj.getObjectId());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Tue Nov 24 20:58:03 2009
@@ -27,7 +27,6 @@
import org.apache.art.Painting;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataObject;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
@@ -39,6 +38,7 @@
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
* "Lightweight" test cases for DataContext. These tests do not require any additional
@@ -317,7 +317,7 @@
Painting p1 = (Painting) objects.get(0);
Artist oldArtist = p1.getToArtist();
- Artist newArtist = DataObjectUtils.objectForPK(
+ Artist newArtist = Cayenne.objectForPK(
context,
Artist.class,
33002);
@@ -346,7 +346,7 @@
Painting p1 = (Painting) objects.get(0);
Artist oldArtist = p1.getToArtist();
- Artist newArtist = DataObjectUtils.objectForPK(
+ Artist newArtist = Cayenne.objectForPK(
context,
Artist.class,
33002);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java Tue Nov 24 20:58:03 2009
@@ -28,12 +28,12 @@
import org.apache.art.Artist;
import org.apache.art.CompoundPainting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
*/
@@ -211,16 +211,16 @@
context.commitChanges();
- Number artistCount = (Number) DataObjectUtils.objectForQuery(
+ Number artistCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Artist a"));
assertEquals(1, artistCount.intValue());
- Number paintingCount = (Number) DataObjectUtils.objectForQuery(
+ Number paintingCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Painting a"));
assertEquals(1, paintingCount.intValue());
- Number galleryCount = (Number) DataObjectUtils.objectForQuery(
+ Number galleryCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Gallery a"));
assertEquals(1, galleryCount.intValue());
@@ -245,16 +245,16 @@
context.deleteObject(o1);
context.commitChanges();
- Number artistCount = (Number) DataObjectUtils.objectForQuery(
+ Number artistCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Artist a"));
assertEquals(1, artistCount.intValue());
- Number paintingCount = (Number) DataObjectUtils.objectForQuery(
+ Number paintingCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Painting a"));
assertEquals(0, paintingCount.intValue());
- Number galleryCount = (Number) DataObjectUtils.objectForQuery(
+ Number galleryCount = (Number) Cayenne.objectForQuery(
context,
new EJBQLQuery("select count(a) from Gallery a"));
assertEquals(0, galleryCount.intValue());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java Tue Nov 24 20:58:03 2009
@@ -25,11 +25,11 @@
import org.apache.art.Artist;
import org.apache.art.Gallery;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextJoinAliasesTest extends CayenneCase {
@@ -50,8 +50,8 @@
ObjectContext context = createDataContext();
- Artist picasso = DataObjectUtils.objectForPK(context, Artist.class, 1);
- Artist dali = DataObjectUtils.objectForPK(context, Artist.class, 2);
+ Artist picasso = Cayenne.objectForPK(context, Artist.class, 1);
+ Artist dali = Cayenne.objectForPK(context, Artist.class, 2);
SelectQuery query = new SelectQuery(Gallery.class);
query.andQualifier(ExpressionFactory.matchAllExp(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryTest.java Tue Nov 24 20:58:03 2009
@@ -22,11 +22,11 @@
import java.util.Date;
import org.apache.art.Artist;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextObjectIdQueryTest extends CayenneCase {
@@ -51,13 +51,13 @@
Artist.class,
"UPDATE ARTIST SET DATE_OF_BIRTH = NULL"));
- long id = DataObjectUtils.longPKForObject(a);
+ long id = Cayenne.longPKForObject(a);
ObjectIdQuery query = new ObjectIdQuery(new ObjectId(
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
id), false, ObjectIdQuery.CACHE_REFRESH);
- Artist a1 = (Artist) DataObjectUtils.objectForQuery(context, query);
+ Artist a1 = (Artist) Cayenne.objectForQuery(context, query);
assertNull(a1.getDateOfBirth());
assertEquals("X", a1.getArtistName());
}
@@ -75,13 +75,13 @@
Artist.class,
"UPDATE ARTIST SET ARTIST_NAME = 'Y'"));
- long id = DataObjectUtils.longPKForObject(a);
+ long id = Cayenne.longPKForObject(a);
ObjectIdQuery query = new ObjectIdQuery(new ObjectId(
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
id), false, ObjectIdQuery.CACHE);
- Artist a1 = (Artist) DataObjectUtils.objectForQuery(context, query);
+ Artist a1 = (Artist) Cayenne.objectForQuery(context, query);
assertEquals("X", a1.getArtistName());
}
@@ -96,7 +96,7 @@
DataContext context = createDataContext();
context.performGenericQuery(insert);
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 44l);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 44l);
assertNotNull(a.getDateOfBirth());
assertEquals("X", a.getArtistName());
@@ -109,7 +109,7 @@
Artist.ARTIST_ID_PK_COLUMN,
44l), false, ObjectIdQuery.CACHE_REFRESH);
- Artist a1 = (Artist) DataObjectUtils.objectForQuery(context, query);
+ Artist a1 = (Artist) Cayenne.objectForQuery(context, query);
assertNull(a1.getDateOfBirth());
assertEquals("X", a1.getArtistName());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java Tue Nov 24 20:58:03 2009
@@ -24,13 +24,13 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataObject;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
* Tests objects registration in DataContext, transferring objects between contexts and
@@ -101,7 +101,7 @@
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
33001), null);
- DataObject committed = (DataObject) DataObjectUtils.objectForQuery(
+ DataObject committed = (DataObject) Cayenne.objectForQuery(
context,
new ObjectIdQuery(new ObjectId(
"Artist",
@@ -109,14 +109,14 @@
33002)));
int modifiedId = 33003;
- Artist modified = (Artist) DataObjectUtils.objectForQuery(
+ Artist modified = (Artist) Cayenne.objectForQuery(
context,
new ObjectIdQuery(new ObjectId(
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
modifiedId)));
modified.setArtistName("MODDED");
- DataObject deleted = (DataObject) DataObjectUtils.objectForQuery(
+ DataObject deleted = (DataObject) Cayenne.objectForQuery(
context,
new ObjectIdQuery(new ObjectId(
"Artist",
@@ -192,13 +192,13 @@
DataContext peerContext = createDataContext();
int modifiedId = 33003;
- Artist modified = (Artist) DataObjectUtils.objectForQuery(
+ Artist modified = (Artist) Cayenne.objectForQuery(
context,
new ObjectIdQuery(new ObjectId(
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
modifiedId)));
- Artist peerModified = (Artist) DataObjectUtils.objectForQuery(
+ Artist peerModified = (Artist) Cayenne.objectForQuery(
peerContext,
new ObjectIdQuery(new ObjectId(
"Artist",
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java Tue Nov 24 20:58:03 2009
@@ -32,7 +32,6 @@
import org.apache.art.PaintingInfo;
import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.DataObject;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.exp.Expression;
@@ -43,6 +42,7 @@
import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SortOrder;
+import org.apache.cayenne.util.Cayenne;
/**
*/
@@ -458,7 +458,7 @@
assertTrue(o2 instanceof PaintingInfo);
PaintingInfo pi2 = (PaintingInfo) o2;
assertEquals(PersistenceState.COMMITTED, pi2.getPersistenceState());
- assertEquals(DataObjectUtils.intPKForObject(p2), DataObjectUtils
+ assertEquals(Cayenne.intPKForObject(p2), Cayenne
.intPKForObject(pi2));
// testing null to-one target
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java Tue Nov 24 20:58:03 2009
@@ -22,7 +22,6 @@
import org.apache.art.Artist;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.exp.Expression;
@@ -32,6 +31,7 @@
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextRefreshQueryTest extends CayenneCase {
@@ -167,7 +167,7 @@
DataContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33001l);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33001l);
assertEquals(2, a.getPaintingArray().size());
createTestData("testRefreshObjectToManyUpdate");
@@ -194,7 +194,7 @@
List paints = context.performQuery(q);
// fetch P1 separately from cached query
- Painting p1 = DataObjectUtils.objectForPK(context, Painting.class, 33001);
+ Painting p1 = Cayenne.objectForPK(context, Painting.class, 33001);
Painting p2 = (Painting) paints.get(0);
Artist a1 = p2.getToArtist();
@@ -251,7 +251,7 @@
List paints = context.performQuery(q);
// fetch P1 separately from cached query
- Painting p1 = DataObjectUtils.objectForPK(context, Painting.class, 33001);
+ Painting p1 = Cayenne.objectForPK(context, Painting.class, 33001);
Painting p2 = (Painting) paints.get(0);
Artist a1 = p2.getToArtist();
@@ -308,7 +308,7 @@
List paints = context.performQuery(q);
// fetch P1 separately from cached query
- Painting p1 = DataObjectUtils.objectForPK(context, Painting.class, 33001);
+ Painting p1 = Cayenne.objectForPK(context, Painting.class, 33001);
Painting p2 = (Painting) paints.get(0);
Artist a1 = p2.getToArtist();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryTest.java Tue Nov 24 20:58:03 2009
@@ -22,12 +22,12 @@
import org.apache.art.Artist;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.query.QueryChain;
import org.apache.cayenne.query.RelationshipQuery;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class DataContextRelationshipQueryTest extends CayenneCase {
@@ -52,12 +52,12 @@
context.performQuery(chain);
- Painting p = DataObjectUtils.objectForPK(context, Painting.class, 1);
+ Painting p = Cayenne.objectForPK(context, Painting.class, 1);
// resolve artist once before running non-refreshing query, to check that we do
// not refresh the object
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 1);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 1);
long v = a.getSnapshotVersion();
int writeCalls = a.getPropertyWrittenDirectly();
assertEquals("a1", a.getArtistName());
@@ -97,12 +97,12 @@
context.performQuery(chain);
- Painting p = DataObjectUtils.objectForPK(context, Painting.class, 1);
+ Painting p = Cayenne.objectForPK(context, Painting.class, 1);
// resolve artist once before running non-refreshing query, to check that we do
// not refresh the object
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 1);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 1);
long v = a.getSnapshotVersion();
int writeCalls = a.getPropertyWrittenDirectly();
assertEquals("a1", a.getArtistName());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java Tue Nov 24 20:58:03 2009
@@ -28,7 +28,6 @@
import org.apache.art.CompoundFkTestEntity;
import org.apache.art.CompoundPkTestEntity;
import org.apache.art.Painting;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
@@ -39,6 +38,7 @@
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
*/
@@ -232,7 +232,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String template = "SELECT * FROM PAINTING "
+ "WHERE #bindObjectEqual($a) ORDER BY PAINTING_ID";
@@ -244,7 +244,7 @@
assertEquals(1, objects.size());
Painting p = (Painting) objects.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testBindObjectNotEqualShort() throws Exception {
@@ -252,7 +252,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String template = "SELECT * FROM PAINTING "
+ "WHERE #bindObjectNotEqual($a) ORDER BY PAINTING_ID";
@@ -267,7 +267,7 @@
assertTrue(objects.size() == 1 || objects.size() == 2);
Painting p = (Painting) objects.get(0);
- assertEquals(33001, DataObjectUtils.intPKForObject(p));
+ assertEquals(33001, Cayenne.intPKForObject(p));
}
public void testBindObjectEqualFull() throws Exception {
@@ -275,7 +275,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String template = "SELECT * FROM PAINTING t0"
+ " WHERE #bindObjectEqual($a [ 't0.ARTIST_ID' ] [ 'ARTIST_ID' ] ) ORDER BY PAINTING_ID";
@@ -287,7 +287,7 @@
assertEquals(1, objects.size());
Painting p = (Painting) objects.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testBindObjectEqualFullNonArray() throws Exception {
@@ -295,7 +295,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String template = "SELECT * FROM PAINTING t0"
+ " WHERE #bindObjectEqual($a 't0.ARTIST_ID' 'ARTIST_ID' ) ORDER BY PAINTING_ID";
@@ -307,7 +307,7 @@
assertEquals(1, objects.size());
Painting p = (Painting) objects.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testBindObjectEqualNull() throws Exception {
@@ -325,7 +325,7 @@
assertEquals(1, objects.size());
Painting p = (Painting) objects.get(0);
- assertEquals(33003, DataObjectUtils.intPKForObject(p));
+ assertEquals(33003, Cayenne.intPKForObject(p));
}
public void testBindObjectNotEqualFull() throws Exception {
@@ -333,7 +333,7 @@
ObjectContext context = createDataContext();
- Artist a = DataObjectUtils.objectForPK(context, Artist.class, 33002);
+ Artist a = Cayenne.objectForPK(context, Artist.class, 33002);
String template = "SELECT * FROM PAINTING t0"
+ " WHERE #bindObjectNotEqual($a [ 't0.ARTIST_ID' ] [ 'ARTIST_ID' ] ) ORDER BY PAINTING_ID";
@@ -347,7 +347,7 @@
assertTrue(objects.size() == 1 || objects.size() == 2);
Painting p = (Painting) objects.get(0);
- assertEquals(33001, DataObjectUtils.intPKForObject(p));
+ assertEquals(33001, Cayenne.intPKForObject(p));
}
public void testBindObjectEqualCompound() throws Exception {
@@ -359,7 +359,7 @@
pk.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "a1");
pk.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "a2");
- CompoundPkTestEntity a = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity a = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
pk);
@@ -374,7 +374,7 @@
assertEquals(1, objects.size());
CompoundFkTestEntity p = (CompoundFkTestEntity) objects.get(0);
- assertEquals(33001, DataObjectUtils.intPKForObject(p));
+ assertEquals(33001, Cayenne.intPKForObject(p));
}
public void testBindObjectNotEqualCompound() throws Exception {
@@ -386,7 +386,7 @@
pk.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "a1");
pk.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "a2");
- CompoundPkTestEntity a = DataObjectUtils.objectForPK(
+ CompoundPkTestEntity a = Cayenne.objectForPK(
context,
CompoundPkTestEntity.class,
pk);
@@ -401,7 +401,7 @@
assertEquals(1, objects.size());
CompoundFkTestEntity p = (CompoundFkTestEntity) objects.get(0);
- assertEquals(33002, DataObjectUtils.intPKForObject(p));
+ assertEquals(33002, Cayenne.intPKForObject(p));
}
public void testBindObjectNotEqualNull() throws Exception {
@@ -419,10 +419,10 @@
assertEquals(2, objects.size());
Painting p1 = (Painting) objects.get(0);
- assertEquals(33001, DataObjectUtils.intPKForObject(p1));
+ assertEquals(33001, Cayenne.intPKForObject(p1));
Painting p2 = (Painting) objects.get(1);
- assertEquals(33002, DataObjectUtils.intPKForObject(p2));
+ assertEquals(33002, Cayenne.intPKForObject(p2));
}
public void testBindEqualNull() throws Exception {
@@ -440,7 +440,7 @@
assertEquals(1, objects.size());
Painting p = (Painting) objects.get(0);
- assertEquals(33003, DataObjectUtils.intPKForObject(p));
+ assertEquals(33003, Cayenne.intPKForObject(p));
}
public void testFetchLimit() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java Tue Nov 24 20:58:03 2009
@@ -22,10 +22,10 @@
import java.util.List;
import org.apache.art.Artist;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.conf.Configuration;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
import org.apache.cayenne.util.Util;
/**
@@ -95,7 +95,7 @@
assertNotNull(deserializedContext.getEntityResolver());
assertSame(context.getEntityResolver(), deserializedContext.getEntityResolver());
- Artist a = DataObjectUtils.objectForPK(deserializedContext, Artist.class, 33001);
+ Artist a = Cayenne.objectForPK(deserializedContext, Artist.class, 33001);
assertNotNull(a);
a.setArtistName(a.getArtistName() + "___");
deserializedContext.commitChanges();
@@ -126,7 +126,7 @@
deserializedContext.getParentDataDomain().getSharedSnapshotCache(),
deserializedContext.getObjectStore().getDataRowCache());
- Artist a = DataObjectUtils.objectForPK(deserializedContext, Artist.class, 33001);
+ Artist a = Cayenne.objectForPK(deserializedContext, Artist.class, 33001);
assertNotNull(a);
a.setArtistName(a.getArtistName() + "___");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java Tue Nov 24 20:58:03 2009
@@ -26,12 +26,12 @@
import org.apache.art.Artist;
import org.apache.art.Painting;
import org.apache.cayenne.DataObject;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.map.DeleteRule;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
/**
*/
@@ -50,7 +50,7 @@
public void testDeleteObject() throws Exception {
createTestData("testDeleteObject");
- Artist artist = DataObjectUtils.objectForPK(context, Artist.class, 1);
+ Artist artist = Cayenne.objectForPK(context, Artist.class, 1);
assertEquals(PersistenceState.COMMITTED, artist.getPersistenceState());
context.deleteObject(artist);
assertEquals(PersistenceState.DELETED, artist.getPersistenceState());
@@ -104,7 +104,7 @@
public void testDeleteObjectsRelationshipCollection() throws Exception {
createTestData("testDeleteObjectsRelationshipCollection");
- Artist artist = DataObjectUtils.objectForPK(context, Artist.class, 1);
+ Artist artist = Cayenne.objectForPK(context, Artist.class, 1);
List paintings = artist.getPaintingArray();
assertEquals(3, paintings.size());
@@ -139,7 +139,7 @@
public void testDeleteObjectInIterator() throws Exception {
createTestData("testDeleteObjectsRelationshipCollection");
- Artist artist = DataObjectUtils.objectForPK(context, Artist.class, 1);
+ Artist artist = Cayenne.objectForPK(context, Artist.class, 1);
List paintings = artist.getPaintingArray();
assertEquals(3, paintings.size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EmbeddingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EmbeddingTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EmbeddingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EmbeddingTest.java Tue Nov 24 20:58:03 2009
@@ -20,7 +20,6 @@
import java.util.List;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
@@ -31,6 +30,7 @@
import org.apache.cayenne.unit.AccessStack;
import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.unit.CayenneResources;
+import org.apache.cayenne.util.Cayenne;
public class EmbeddingTest extends CayenneCase {
@@ -104,7 +104,7 @@
SelectQuery query = new SelectQuery(EmbedEntity1.class);
query.setFetchingDataRows(true);
- DataRow row = (DataRow) DataObjectUtils.objectForQuery(context, query);
+ DataRow row = (DataRow) Cayenne.objectForQuery(context, query);
assertNotNull(row);
assertEquals("E11", row.get("EMBEDDED10"));
assertEquals("E12", row.get("EMBEDDED20"));
@@ -130,7 +130,7 @@
context.commitChanges();
SelectQuery query1 = new SelectQuery(EmbedEntity1.class);
query1.setFetchingDataRows(true);
- DataRow row = (DataRow) DataObjectUtils.objectForQuery(context, query1);
+ DataRow row = (DataRow) Cayenne.objectForQuery(context, query1);
assertNotNull(row);
assertEquals("x1", row.get("EMBEDDED10"));
}
@@ -155,7 +155,7 @@
context.commitChanges();
SelectQuery query1 = new SelectQuery(EmbedEntity1.class);
query1.setFetchingDataRows(true);
- DataRow row = (DataRow) DataObjectUtils.objectForQuery(context, query1);
+ DataRow row = (DataRow) Cayenne.objectForQuery(context, query1);
assertNotNull(row);
assertEquals("x1", row.get("EMBEDDED10"));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EnumTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EnumTest.java?rev=883872&r1=883871&r2=883872&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EnumTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/EnumTest.java Tue Nov 24 20:58:03 2009
@@ -20,13 +20,13 @@
import org.apache.art.Enum1;
import org.apache.art.EnumEntity;
-import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Cayenne;
public class EnumTest extends CayenneCase {
@@ -55,7 +55,7 @@
EnumEntity.ENUM_ATTRIBUTE_PROPERTY,
Enum1.one));
- EnumEntity e = (EnumEntity) DataObjectUtils.objectForQuery(context, q);
+ EnumEntity e = (EnumEntity) Cayenne.objectForQuery(context, q);
assertNotNull(e);
assertSame(Enum1.one, e.getEnumAttribute());
}
@@ -76,7 +76,7 @@
"SELECT * FROM ENUM_ENTITY WHERE ENUM_ATTRIBUTE = 'one'");
q.setColumnNamesCapitalization(CapsStrategy.UPPER);
- EnumEntity e = (EnumEntity) DataObjectUtils.objectForQuery(context, q);
+ EnumEntity e = (EnumEntity) Cayenne.objectForQuery(context, q);
assertNotNull(e);
assertSame(Enum1.one, e.getEnumAttribute());
}