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 2006/10/10 07:46:59 UTC
svn commit: r454624 [1/3] - in
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src:
main/java/org/apache/cayenne/access/ test/java/org/apache/cayenne/
test/java/org/apache/cayenne/access/
test/java/org/apache/cayenne/exp/parser/ test/java/org/apache/...
Author: aadamchik
Date: Mon Oct 9 22:46:56 2006
New Revision: 454624
URL: http://svn.apache.org/viewvc?view=rev&rev=454624
Log:
CAY-683
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOMany2OneNoRevTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOne2ManyTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToManyFKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToOneFKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectRelTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CompoundPkChangeTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectSerializationTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectUtilsTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/FlattenedRelationshipsTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/GenericMappingTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MeaningfulFKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayManyToOneTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayOneToManyTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PersistenceByReachabilityTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PregeneratedPKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTestBase.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DeleteObjectTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DeleteRulesOneWayTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DeleteRulesTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IncrementalFaultListTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/InheritanceTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/NestedDataContextReadTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/NestedDataContextValidationTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/NumericTypesTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ObjectStoreTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/OptimisticLockingTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/ToManyListTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/TransactionThreadTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/UserTransactionTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/map/EntityResolverTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/TestDataDomainTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_194Tst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_207Tst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java Mon Oct 9 22:46:56 2006
@@ -699,68 +699,67 @@
}
/**
- * Instantiates new object and registers it with itself. Object class is determined
- * from ObjEntity. Object class must have a default constructor.
- * <p>
- * <i>Note: preferred way to create new objects is via
- * {@link #createAndRegisterNewObject(Class)}method. It works exactly the same way,
- * but makes the application type-safe. </i>
- * </p>
- *
- * @see #createAndRegisterNewObject(Class)
+ * @deprecated since 3.0, use {@link #newObject(String)} instead.
*/
public DataObject createAndRegisterNewObject(String objEntityName) {
- ClassDescriptor descriptor = getEntityResolver()
- .getClassDescriptor(objEntityName);
+ return (DataObject) newObject(objEntityName);
+ }
+
+ /**
+ * Creates and registers a new persistent object.
+ *
+ * @since 1.2
+ */
+ public Persistent newObject(Class persistentClass) {
+ if (persistentClass == null) {
+ throw new NullPointerException("Null 'persistentClass'");
+ }
+
+ ObjEntity entity = getEntityResolver().lookupObjEntity(persistentClass);
+ if (entity == null) {
+ throw new IllegalArgumentException("Class is not mapped with Cayenne: "
+ + persistentClass.getName());
+ }
+
+ return newObject(entity.getName());
+ }
+
+ /**
+ * Instantiates a new object and registers it with this context. Object class is
+ * determined from the mapped entity. Object class must have a default constructor.
+ * <p/> <i>Note: in most cases {@link #newObject(Class)} method should be used,
+ * however this method is helpful when generic persistent classes are used.</i>
+ *
+ * @since 3.0
+ */
+ public Persistent newObject(String entityName) {
+ ClassDescriptor descriptor = getEntityResolver().getClassDescriptor(entityName);
if (descriptor == null) {
- throw new IllegalArgumentException("Invalid entity name: " + objEntityName);
+ throw new IllegalArgumentException("Invalid entity name: " + entityName);
}
- DataObject dataObject;
+ Persistent object;
try {
- dataObject = (DataObject) descriptor.createObject();
+ object = (DataObject) descriptor.createObject();
}
catch (Exception ex) {
throw new CayenneRuntimeException("Error instantiating object.", ex);
}
// this will initialize to-many lists
- descriptor.injectValueHolders(dataObject);
+ descriptor.injectValueHolders(object);
- ObjectId id = new ObjectId(objEntityName);
+ ObjectId id = new ObjectId(entityName);
// note that the order of initialization of persistence artifacts below is
// important - do not change it lightly
- dataObject.setObjectId(id);
- dataObject.setObjectContext(this);
- dataObject.setPersistenceState(PersistenceState.NEW);
- getObjectStore().registerNode(id, dataObject);
+ object.setObjectId(id);
+ object.setObjectContext(this);
+ object.setPersistenceState(PersistenceState.NEW);
+ getObjectStore().registerNode(id, object);
getObjectStore().nodeCreated(id);
- return dataObject;
- }
-
- /**
- * Creates and registers new persistent object. This is an ObjectContext version of
- * 'createAndRegisterNewObject'.
- *
- * @since 1.2
- */
- public Persistent newObject(Class persistentClass) {
- if (persistentClass == null) {
- throw new NullPointerException("Null 'persistentClass'");
- }
-
- // TODO: only supports DataObject subclasses
- if (!DataObject.class.isAssignableFrom(persistentClass)) {
- throw new IllegalArgumentException(
- this
- + ": this implementation of ObjectContext only supports full DataObjects. Class "
- + persistentClass
- + " is invalid.");
- }
-
- return createAndRegisterNewObject(persistentClass);
+ return object;
}
/**
@@ -768,6 +767,7 @@
* default constructor.
*
* @since 1.1
+ * @deprecated since 3.0, use {@link #newObject(Class)} instead.
*/
public DataObject createAndRegisterNewObject(Class objectClass) {
if (objectClass == null) {
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOMany2OneNoRevTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOMany2OneNoRevTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOMany2OneNoRevTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOMany2OneNoRevTst.java Mon Oct 9 22:46:56 2006
@@ -38,9 +38,9 @@
DataContext context = createDataContext();
- Artist a1 = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist a1 = (Artist) context.newObject("Artist");
a1.setArtistName("a");
- Painting1 p1 = (Painting1) context.createAndRegisterNewObject("Painting1");
+ Painting1 p1 = (Painting1) context.newObject("Painting1");
p1.setPaintingTitle("p");
// *** TESTING THIS ***
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOne2ManyTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOne2ManyTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOne2ManyTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOne2ManyTst.java Mon Oct 9 22:46:56 2006
@@ -191,8 +191,7 @@
ctxt.commitChanges();
// *** TESTING THIS ***
- ArtistExhibit ae1 = (ArtistExhibit) ctxt
- .createAndRegisterNewObject("ArtistExhibit");
+ ArtistExhibit ae1 = (ArtistExhibit) ctxt.newObject("ArtistExhibit");
e1.addToArtistExhibitArray(ae1);
a1.addToArtistExhibitArray(ae1);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToManyFKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToManyFKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToManyFKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToManyFKTst.java Mon Oct 9 22:46:56 2006
@@ -35,15 +35,12 @@
deleteTestData();
DataContext context = createDataContext();
- ToManyRoot2 src2 = (ToManyRoot2) context
- .createAndRegisterNewObject(ToManyRoot2.class);
- ToManyFkRoot src = (ToManyFkRoot) context
- .createAndRegisterNewObject(ToManyFkRoot.class);
+ ToManyRoot2 src2 = (ToManyRoot2) context.newObject(ToManyRoot2.class);
+ ToManyFkRoot src = (ToManyFkRoot) context.newObject(ToManyFkRoot.class);
// this should go away when such mapping becomes fully supported
src.setDepId(new Integer(1));
- ToManyFkDep target = (ToManyFkDep) context
- .createAndRegisterNewObject(ToManyFkDep.class);
+ ToManyFkDep target = (ToManyFkDep) context.newObject(ToManyFkDep.class);
// this should go away when such mapping becomes fully supported
target.setDepId(new Integer(1));
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToOneFKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToOneFKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToOneFKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOOneToOneFKTst.java Mon Oct 9 22:46:56 2006
@@ -42,8 +42,8 @@
}
public void testReadRelationship() {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
- ToOneFK1 target = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
+ ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
src.setToOneToFK(target);
context.commitChanges();
@@ -70,7 +70,7 @@
}
public void test2Null() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
context.commitChanges();
context = createDataContext();
@@ -82,7 +82,7 @@
}
public void testReplaceNull1() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
context.commitChanges();
context = createDataContext();
@@ -96,10 +96,10 @@
}
public void testReplaceNull2() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
context.commitChanges();
- ToOneFK1 target = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
+ ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
// *** TESTING THIS ***
src.setToOneToFK(target);
@@ -120,8 +120,8 @@
}
public void testNewAdd() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
- ToOneFK1 target = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
+ ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
// *** TESTING THIS ***
src.setToOneToFK(target);
@@ -141,26 +141,9 @@
assertEquals(target.getObjectId(), target2.getObjectId());
}
- // technically replacing a related object with a new one is possible...
- // though this seems pretty evil...
- /*
- * public void testReplace() throws Exception { ToOneFK2 src = (ToOneFK2)
- * context.createAndRegisterNewObject(ToOneFK2.class); ToOneFK1 target = (ToOneFK1)
- * context.createAndRegisterNewObject(ToOneFK1.class); src.setToOneToFK(target);
- * assertSame(target, src.getToOneToFK()); context.commitChanges(); // replace target
- * ToOneFK1 target1 = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
- * src.setToOneToFK(target1); assertSame(target1, src.getToOneToFK()); // delete an
- * old target, since the column is not nullable... context.deleteObject(target);
- * context.commitChanges(); context = createDataContext(); // test database data
- * ToOneFK2 src2 = (ToOneFK2) context.refetchObject(src.getObjectId()); ToOneFK1
- * target2 = src2.getToOneToFK(); assertNotNull(target2);
- * assertEquals(src.getObjectId(), src2.getObjectId());
- * assertEquals(target1.getObjectId(), target2.getObjectId()); }
- */
-
public void testTakeObjectSnapshotDependentFault() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
- ToOneFK1 target = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
+ ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
src.setToOneToFK(target);
context.commitChanges();
context = createDataContext();
@@ -174,8 +157,8 @@
}
public void testDelete() throws Exception {
- ToOneFK2 src = (ToOneFK2) context.createAndRegisterNewObject(ToOneFK2.class);
- ToOneFK1 target = (ToOneFK1) context.createAndRegisterNewObject(ToOneFK1.class);
+ ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
+ ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
src.setToOneToFK(target);
context.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTst.java Mon Oct 9 22:46:56 2006
@@ -22,64 +22,68 @@
import org.apache.art.ArtGroup;
public class CDOReflexiveRelDeleteTst extends CayenneDOTestBase {
- private ArtGroup parentGroup;
- private ArtGroup childGroup1;
- private ArtGroup childGroup2;
- private ArtGroup childGroup3;
-
- public void setUp() throws Exception {
- super.setUp();
- ctxt = createDataContext();
-
- parentGroup=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
- parentGroup.setName("parent");
-
- childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
- childGroup1.setName("child1");
- childGroup1.setToParentGroup(parentGroup);
-
- childGroup2=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
- childGroup2.setName("child2");
- childGroup2.setToParentGroup(parentGroup);
-
- childGroup3=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
- childGroup3.setName("subchild");
- childGroup3.setToParentGroup(childGroup1);
-
- ctxt.commitChanges();
- }
- //Test various delete orders. There are more possible literal combinations, but the ones below fairly well
- //encompass the various orders that might be a problem. Add more if additional problems come to light
- public void testReflexiveRelationshipDelete1() {
- ctxt.deleteObject(parentGroup);
- ctxt.deleteObject(childGroup1);
- ctxt.deleteObject(childGroup2);
- ctxt.deleteObject(childGroup3);
- ctxt.commitChanges();
- }
-
- public void testReflexiveRelationshipDelete2() {
- ctxt.deleteObject(childGroup1);
- ctxt.deleteObject(parentGroup);
- ctxt.deleteObject(childGroup2);
- ctxt.deleteObject(childGroup3);
- ctxt.commitChanges();
- }
-
- public void testReflexiveRelationshipDelete3() {
- ctxt.deleteObject(childGroup1);
- ctxt.deleteObject(childGroup3);
- ctxt.deleteObject(parentGroup);
- ctxt.deleteObject(childGroup2);
- ctxt.commitChanges();
- }
-
- public void testReflexiveRelationshipDelete4() {
- ctxt.deleteObject(childGroup3);
- ctxt.deleteObject(parentGroup);
- ctxt.deleteObject(childGroup1);
- ctxt.deleteObject(childGroup2);
- ctxt.commitChanges();
- }
+
+ private ArtGroup parentGroup;
+ private ArtGroup childGroup1;
+ private ArtGroup childGroup2;
+ private ArtGroup childGroup3;
+
+ public void setUp() throws Exception {
+ super.setUp();
+ ctxt = createDataContext();
+
+ parentGroup = (ArtGroup) ctxt.newObject("ArtGroup");
+ parentGroup.setName("parent");
+
+ childGroup1 = (ArtGroup) ctxt.newObject("ArtGroup");
+ childGroup1.setName("child1");
+ childGroup1.setToParentGroup(parentGroup);
+
+ childGroup2 = (ArtGroup) ctxt.newObject("ArtGroup");
+ childGroup2.setName("child2");
+ childGroup2.setToParentGroup(parentGroup);
+
+ childGroup3 = (ArtGroup) ctxt.newObject("ArtGroup");
+ childGroup3.setName("subchild");
+ childGroup3.setToParentGroup(childGroup1);
+
+ ctxt.commitChanges();
+ }
+
+ // Test various delete orders. There are more possible literal combinations, but the
+ // ones below fairly well
+ // encompass the various orders that might be a problem. Add more if additional
+ // problems come to light
+ public void testReflexiveRelationshipDelete1() {
+ ctxt.deleteObject(parentGroup);
+ ctxt.deleteObject(childGroup1);
+ ctxt.deleteObject(childGroup2);
+ ctxt.deleteObject(childGroup3);
+ ctxt.commitChanges();
+ }
+
+ public void testReflexiveRelationshipDelete2() {
+ ctxt.deleteObject(childGroup1);
+ ctxt.deleteObject(parentGroup);
+ ctxt.deleteObject(childGroup2);
+ ctxt.deleteObject(childGroup3);
+ ctxt.commitChanges();
+ }
+
+ public void testReflexiveRelationshipDelete3() {
+ ctxt.deleteObject(childGroup1);
+ ctxt.deleteObject(childGroup3);
+ ctxt.deleteObject(parentGroup);
+ ctxt.deleteObject(childGroup2);
+ ctxt.commitChanges();
+ }
+
+ public void testReflexiveRelationshipDelete4() {
+ ctxt.deleteObject(childGroup3);
+ ctxt.deleteObject(parentGroup);
+ ctxt.deleteObject(childGroup1);
+ ctxt.deleteObject(childGroup2);
+ ctxt.commitChanges();
+ }
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CDOReflexiveRelTst.java Mon Oct 9 22:46:56 2006
@@ -33,10 +33,10 @@
}
public void testAddDeleteNoCommit() {
- ArtGroup parentGroup=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup.setName("parent");
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup);
@@ -48,10 +48,10 @@
}
public void testAddDeleteWithCommit() {
- ArtGroup parentGroup=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup.setName("parent");
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup);
ctxt.commitChanges();
@@ -66,12 +66,12 @@
}
public void testReplaceDeleteNoCommit() {
- ArtGroup parentGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup1.setName("parent1");
- ArtGroup parentGroup2=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup2=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup2.setName("parent2");
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup1);
@@ -86,12 +86,12 @@
}
public void testReplaceDeleteWithCommit() {
- ArtGroup parentGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup1.setName("parent1");
- ArtGroup parentGroup2=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup2=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup2.setName("parent2");
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup1);
childGroup1.setToParentGroup(parentGroup2);
@@ -107,12 +107,12 @@
}
public void testCommitReplaceCommit() {
- ArtGroup parentGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup1.setName("parent1");
- ArtGroup parentGroup2=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup2=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup2.setName("parent2");
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup1);
ctxt.commitChanges();
@@ -121,12 +121,12 @@
}
public void testComplexInsertUpdateOrdering() {
- ArtGroup parentGroup=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup=(ArtGroup)ctxt.newObject("ArtGroup");
parentGroup.setName("parent");
ctxt.commitChanges();
//Check that the update and insert both work write
- ArtGroup childGroup1=(ArtGroup)ctxt.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1=(ArtGroup)ctxt.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup);
ctxt.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDOTestBase.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDOTestBase.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDOTestBase.java Mon Oct 9 22:46:56 2006
@@ -1,4 +1,5 @@
package org.apache.cayenne;
+
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@
* under the License.
****************************************************************/
-
import java.sql.Timestamp;
import java.util.List;
@@ -34,12 +34,15 @@
import org.apache.cayenne.unit.CayenneTestCase;
public class CayenneDOTestBase extends CayenneTestCase {
+
public static final String artistName = "artist with one painting";
public static final String galleryName = "my gallery";
public static final String textReview = "this painting sucks...";
public static final String paintingName = "painting about nothing";
-
- static final byte[] paintingImage = new byte[] { 2, 3, 4, 5 };
+
+ static final byte[] paintingImage = new byte[] {
+ 2, 3, 4, 5
+ };
protected DataContext ctxt;
@@ -49,7 +52,7 @@
}
protected Exhibit newExhibit(Gallery gallery) {
- Exhibit e1 = (Exhibit) ctxt.createAndRegisterNewObject("Exhibit");
+ Exhibit e1 = (Exhibit) ctxt.newObject("Exhibit");
e1.setOpeningDate(new Timestamp(System.currentTimeMillis()));
e1.setClosingDate(new Timestamp(System.currentTimeMillis()));
e1.setToGallery(gallery);
@@ -57,63 +60,60 @@
}
protected ArtistExhibit newArtistExhibit() {
- return (ArtistExhibit) ctxt.createAndRegisterNewObject("ArtistExhibit");
+ return (ArtistExhibit) ctxt.newObject("ArtistExhibit");
}
protected Gallery newGallery() {
- Gallery g1 = (Gallery) ctxt.createAndRegisterNewObject("Gallery");
+ Gallery g1 = (Gallery) ctxt.newObject("Gallery");
g1.setGalleryName(galleryName);
return g1;
}
protected Artist newArtist() {
- Artist a1 = (Artist) ctxt.createAndRegisterNewObject("Artist");
+ Artist a1 = (Artist) ctxt.newObject("Artist");
a1.setArtistName(artistName);
return a1;
}
protected Painting newROPainting() {
- Painting p1 = (Painting) ctxt.createAndRegisterNewObject("ROPainting");
+ Painting p1 = (Painting) ctxt.newObject("ROPainting");
p1.setPaintingTitle(paintingName);
return p1;
}
protected Painting newPainting() {
- Painting p1 = (Painting) ctxt.createAndRegisterNewObject("Painting");
+ Painting p1 = (Painting) ctxt.newObject("Painting");
p1.setPaintingTitle(paintingName);
return p1;
}
protected PaintingInfo newPaintingInfo() {
- PaintingInfo p1 = (PaintingInfo) ctxt.createAndRegisterNewObject("PaintingInfo");
+ PaintingInfo p1 = (PaintingInfo) ctxt.newObject("PaintingInfo");
p1.setTextReview(textReview);
p1.setImageBlob(paintingImage);
return p1;
}
protected Gallery fetchGallery() {
- SelectQuery q =
- new SelectQuery(
- "Gallery",
- ExpressionFactory.matchExp("galleryName", galleryName));
+ SelectQuery q = new SelectQuery("Gallery", ExpressionFactory.matchExp(
+ "galleryName",
+ galleryName));
List gls = ctxt.performQuery(q);
return (gls.size() > 0) ? (Gallery) gls.get(0) : null;
}
protected Artist fetchArtist() {
- SelectQuery q =
- new SelectQuery(
- "Artist",
- ExpressionFactory.matchExp("artistName", artistName));
+ SelectQuery q = new SelectQuery("Artist", ExpressionFactory.matchExp(
+ "artistName",
+ artistName));
List ats = ctxt.performQuery(q);
return (ats.size() > 0) ? (Artist) ats.get(0) : null;
}
protected Painting fetchPainting() {
- SelectQuery q =
- new SelectQuery(
- "Painting",
- ExpressionFactory.matchExp("paintingTitle", paintingName));
+ SelectQuery q = new SelectQuery("Painting", ExpressionFactory.matchExp(
+ "paintingTitle",
+ paintingName));
List pts = ctxt.performQuery(q);
return (pts.size() > 0) ? (Painting) pts.get(0) : null;
}
@@ -121,10 +121,9 @@
protected PaintingInfo fetchPaintingInfo() {
// we are using "LIKE" comparison, since Sybase does not allow
// "=" comparisons on "text" columns
- SelectQuery q =
- new SelectQuery(
- PaintingInfo.class,
- ExpressionFactory.likeExp("textReview", textReview));
+ SelectQuery q = new SelectQuery(PaintingInfo.class, ExpressionFactory.likeExp(
+ "textReview",
+ textReview));
List pts = ctxt.performQuery(q);
return (pts.size() > 0) ? (PaintingInfo) pts.get(0) : null;
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java Mon Oct 9 22:46:56 2006
@@ -89,13 +89,13 @@
public void testCommitChangesInBatch() {
DataContext context = createDataContext();
- Artist a1 = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist a1 = (Artist) context.newObject("Artist");
a1.setArtistName("abc1");
- Artist a2 = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist a2 = (Artist) context.newObject("Artist");
a2.setArtistName("abc2");
- Artist a3 = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist a3 = (Artist) context.newObject("Artist");
a3.setArtistName("abc3");
context.commitChanges();
@@ -230,7 +230,7 @@
public void testSnapshotVersion1() {
DataContext context = createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
assertEquals(DataObject.DEFAULT_VERSION, artist.getSnapshotVersion());
// test versions set on commit
@@ -293,7 +293,7 @@
public void testObjectsCommittedManualOID() {
DataContext context = createDataContext();
- Artist object = (Artist) context.createAndRegisterNewObject(Artist.class);
+ Artist object = (Artist) context.newObject(Artist.class);
object.setArtistName("ABC1");
assertEquals(PersistenceState.NEW, object.getPersistenceState());
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectRelTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectRelTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectRelTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectRelTst.java Mon Oct 9 22:46:56 2006
@@ -150,10 +150,10 @@
public void testReflexiveRelationshipInsertOrder1() {
DataContext dc = this.createDataContext();
- ArtGroup parentGroup = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup = (ArtGroup) dc.newObject("ArtGroup");
parentGroup.setName("parent");
- ArtGroup childGroup1 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1 = (ArtGroup) dc.newObject("ArtGroup");
childGroup1.setName("child1");
childGroup1.setToParentGroup(parentGroup);
dc.commitChanges();
@@ -162,10 +162,10 @@
public void testReflexiveRelationshipInsertOrder2() {
// Create in a different order and see what happens
DataContext dc = this.createDataContext();
- ArtGroup childGroup1 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1 = (ArtGroup) dc.newObject("ArtGroup");
childGroup1.setName("child1");
- ArtGroup parentGroup = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup = (ArtGroup) dc.newObject("ArtGroup");
parentGroup.setName("parent");
childGroup1.setToParentGroup(parentGroup);
@@ -176,15 +176,15 @@
public void testReflexiveRelationshipInsertOrder3() {
// Tey multiple children, one created before parent, one after
DataContext dc = this.createDataContext();
- ArtGroup childGroup1 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1 = (ArtGroup) dc.newObject("ArtGroup");
childGroup1.setName("child1");
- ArtGroup parentGroup = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup = (ArtGroup) dc.newObject("ArtGroup");
parentGroup.setName("parent");
childGroup1.setToParentGroup(parentGroup);
- ArtGroup childGroup2 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup2 = (ArtGroup) dc.newObject("ArtGroup");
childGroup2.setName("child2");
childGroup2.setToParentGroup(parentGroup);
@@ -194,15 +194,15 @@
public void testReflexiveRelationshipInsertOrder4() {
// Tey multiple children, one created before parent, one after
DataContext dc = this.createDataContext();
- ArtGroup childGroup1 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup1 = (ArtGroup) dc.newObject("ArtGroup");
childGroup1.setName("child1");
- ArtGroup parentGroup = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup parentGroup = (ArtGroup) dc.newObject("ArtGroup");
parentGroup.setName("parent");
childGroup1.setToParentGroup(parentGroup);
- ArtGroup childGroup2 = (ArtGroup) dc.createAndRegisterNewObject("ArtGroup");
+ ArtGroup childGroup2 = (ArtGroup) dc.newObject("ArtGroup");
childGroup2.setName("subchild");
childGroup2.setToParentGroup(childGroup1);
@@ -212,10 +212,10 @@
public void testCrossContextRelationshipException() {
DataContext otherContext = getDomain().createDataContext();
// Create this object in one context...
- Artist artist = (Artist) ctxt.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) ctxt.newObject("Artist");
// ...and this object in another context
Painting painting = (Painting) otherContext
- .createAndRegisterNewObject("Painting");
+ .newObject("Painting");
// Check setting a toOne relationship
try {
@@ -242,13 +242,13 @@
}
public void testComplexInsertUpdateOrdering() {
- Artist artist = (Artist) ctxt.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) ctxt.newObject("Artist");
artist.setArtistName("a name");
ctxt.commitChanges();
// Cause an update and an insert that need correct ordering
- Painting painting = (Painting) ctxt.createAndRegisterNewObject("Painting");
+ Painting painting = (Painting) ctxt.newObject("Painting");
painting.setPaintingTitle("a painting");
artist.addToPaintingArray(painting);
@@ -267,7 +267,7 @@
}
public void testNewToMany() throws Exception {
- Artist artist = (Artist) ctxt.createAndRegisterNewObject(Artist.class);
+ Artist artist = (Artist) ctxt.newObject(Artist.class);
artist.setArtistName("test");
assertTrue(artist.readPropertyDirectly("paintingArray") instanceof ToManyList);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTst.java Mon Oct 9 22:46:56 2006
@@ -39,7 +39,7 @@
public void testValidateForSaveMandatoryToOneMissing() throws Exception {
DataContext context = createDataContext();
- Exhibit exhibit = (Exhibit) context.createAndRegisterNewObject(Exhibit.class);
+ Exhibit exhibit = (Exhibit) context.newObject(Exhibit.class);
exhibit.setOpeningDate(new Date());
exhibit.setClosingDate(new Date());
@@ -56,7 +56,7 @@
assertEquals(Exhibit.TO_GALLERY_PROPERTY, failure.getProperty());
// fix the problem and see if it goes away
- Gallery gallery = (Gallery) context.createAndRegisterNewObject(Gallery.class);
+ Gallery gallery = (Gallery) context.newObject(Gallery.class);
exhibit.setToGallery(gallery);
result = new ValidationResult();
exhibit.validateForSave(result);
@@ -65,7 +65,7 @@
public void testValidateForSaveMandatoryAttributeMissing() throws Exception {
DataContext context = createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
ValidationResult result = new ValidationResult();
artist.validateForSave(result);
@@ -88,7 +88,7 @@
public void testValidateForSaveAttributeTooLong() throws Exception {
DataContext context = createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
DbEntity entity = context.getEntityResolver().lookupDbEntity(artist);
int len = ((DbAttribute) entity.getAttribute("ARTIST_NAME")).getMaxLength();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CompoundPkChangeTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CompoundPkChangeTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CompoundPkChangeTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CompoundPkChangeTst.java Mon Oct 9 22:46:56 2006
@@ -22,9 +22,8 @@
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.unit.CayenneTestCase;
-
public class CompoundPkChangeTst extends CayenneTestCase {
-
+
private static final String key1v1 = "-key1-v1-";
private static final String key2v1 = "-key2-v1-";
private static final String key1v2 = "-key1-v2-";
@@ -32,7 +31,6 @@
private static final String key1v3 = "-key1-v3-";
private static final String key2v3 = "-key2-v3-";
-
protected void setUp() throws Exception {
super.setUp();
deleteTestData();
@@ -40,27 +38,31 @@
public void testCompoundPkChangeSingleElement() throws Exception {
DataContext context = createDataContext();
-
+
CompoundPkTestEntity dao = (CompoundPkTestEntity) context
- .createAndRegisterNewObject(CompoundPkTestEntity.class);
+ .newObject(CompoundPkTestEntity.class);
CompoundPkTestEntity refreshedDao = null;
-
+
dao.setKey1(key1v1);
dao.setKey2(key2v1);
dao.setName("testing testing");
context.commitChanges();
- assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
-
+ assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
+
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
dao.setKey2(key2v2);
context.commitChanges();
- assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v2, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
+ assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v2, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
@@ -68,9 +70,11 @@
dao.setKey2(key2v3);
context.commitChanges();
- assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v3, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
-
+ assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v3, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
+
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
@@ -78,20 +82,21 @@
public void testCompoundPkChangeAllElements() throws Exception {
DataContext context = createDataContext();
-
CompoundPkTestEntity dao = (CompoundPkTestEntity) context
- .createAndRegisterNewObject(CompoundPkTestEntity.class);
+ .newObject(CompoundPkTestEntity.class);
CompoundPkTestEntity refreshedDao = null;
-
+
dao.setKey1(key1v1);
dao.setKey2(key2v1);
dao.setName("testing testing");
context.commitChanges();
- assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v1, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
-
+ assertEquals(key1v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v1, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
+
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
@@ -99,8 +104,10 @@
dao.setKey2(key2v2);
context.commitChanges();
- assertEquals(key1v2, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v2, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
+ assertEquals(key1v2, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v2, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
@@ -109,9 +116,11 @@
dao.setKey2(key2v3);
context.commitChanges();
- assertEquals(key1v3, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY1_PK_COLUMN));
- assertEquals(key2v3, dao.getObjectId().getIdSnapshot().get(CompoundPkTestEntity.KEY2_PK_COLUMN));
-
+ assertEquals(key1v3, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY1_PK_COLUMN));
+ assertEquals(key2v3, dao.getObjectId().getIdSnapshot().get(
+ CompoundPkTestEntity.KEY2_PK_COLUMN));
+
refreshedDao = (CompoundPkTestEntity) context.refetchObject(dao.getObjectId());
assertEquals(dao.getObjectId(), refreshedDao.getObjectId());
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectSerializationTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectSerializationTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectSerializationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectSerializationTst.java Mon Oct 9 22:46:56 2006
@@ -46,7 +46,7 @@
public void testSerializeNew() throws Exception {
DataContext context = super.createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
artist.setArtistName("artist1");
// resolve relationship fault
artist.getPaintingArray();
@@ -69,7 +69,7 @@
public void testSerializeNewWithFaults() throws Exception {
DataContext context = super.createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
artist.setArtistName("artist1");
Artist deserialized = (Artist) Util.cloneViaSerialization(artist);
@@ -91,7 +91,7 @@
public void testSerializeCommitted() throws Exception {
DataContext context = super.createDataContext();
- Artist artist = (Artist) context.createAndRegisterNewObject("Artist");
+ Artist artist = (Artist) context.newObject("Artist");
artist.setArtistName("artist1");
context.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectUtilsTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectUtilsTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectUtilsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/DataObjectUtilsTst.java Mon Oct 9 22:46:56 2006
@@ -81,8 +81,8 @@
DataContext context = createDataContext();
- DataObject o1 = context.createAndRegisterNewObject(Artist.class);
- DataObject o2 = context.createAndRegisterNewObject(Artist.class);
+ Persistent o1 = context.newObject(Artist.class);
+ Persistent o2 = context.newObject(Artist.class);
assertSame(o1, DataObjectUtils.objectForPK(context, o1.getObjectId()));
assertSame(o2, DataObjectUtils.objectForPK(context, o2.getObjectId()));
@@ -156,8 +156,10 @@
Map pk = new HashMap();
pk.put(CompoundPkTestEntity.KEY1_PK_COLUMN, "PK1");
pk.put(CompoundPkTestEntity.KEY2_PK_COLUMN, "PK2");
- DataObject object = DataObjectUtils
- .objectForPK(context, CompoundPkTestEntity.class, pk);
+ DataObject object = DataObjectUtils.objectForPK(
+ context,
+ CompoundPkTestEntity.class,
+ pk);
assertNotNull(object);
assertTrue(object instanceof CompoundPkTestEntity);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/FlattenedRelationshipsTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/FlattenedRelationshipsTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/FlattenedRelationshipsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/FlattenedRelationshipsTst.java Mon Oct 9 22:46:56 2006
@@ -48,11 +48,11 @@
public void testInsertJoinWithPK() throws Exception {
FlattenedTest1 obj01 = (FlattenedTest1) context
- .createAndRegisterNewObject(FlattenedTest1.class);
+ .newObject(FlattenedTest1.class);
FlattenedTest3 obj11 = (FlattenedTest3) context
- .createAndRegisterNewObject(FlattenedTest3.class);
+ .newObject(FlattenedTest3.class);
FlattenedTest3 obj12 = (FlattenedTest3) context
- .createAndRegisterNewObject(FlattenedTest3.class);
+ .newObject(FlattenedTest3.class);
obj01.setName("t01");
obj11.setName("t11");
@@ -116,20 +116,20 @@
public void testQualifyOnToManyFlattened() throws Exception {
FlattenedTest1 obj01 = (FlattenedTest1) context
- .createAndRegisterNewObject(FlattenedTest1.class);
+ .newObject(FlattenedTest1.class);
FlattenedTest2 obj02 = (FlattenedTest2) context
- .createAndRegisterNewObject(FlattenedTest2.class);
+ .newObject(FlattenedTest2.class);
FlattenedTest3 obj031 = (FlattenedTest3) context
- .createAndRegisterNewObject(FlattenedTest3.class);
+ .newObject(FlattenedTest3.class);
FlattenedTest3 obj032 = (FlattenedTest3) context
- .createAndRegisterNewObject(FlattenedTest3.class);
+ .newObject(FlattenedTest3.class);
FlattenedTest1 obj11 = (FlattenedTest1) context
- .createAndRegisterNewObject(FlattenedTest1.class);
+ .newObject(FlattenedTest1.class);
FlattenedTest2 obj12 = (FlattenedTest2) context
- .createAndRegisterNewObject(FlattenedTest2.class);
+ .newObject(FlattenedTest2.class);
FlattenedTest3 obj131 = (FlattenedTest3) context
- .createAndRegisterNewObject(FlattenedTest3.class);
+ .newObject(FlattenedTest3.class);
obj01.setName("t01");
obj02.setName("t02");
@@ -166,13 +166,13 @@
public void testToOneSeriesFlattenedRel() {
FlattenedTest1 ft1 = (FlattenedTest1) context
- .createAndRegisterNewObject("FlattenedTest1");
+ .newObject("FlattenedTest1");
ft1.setName("FT1Name");
FlattenedTest2 ft2 = (FlattenedTest2) context
- .createAndRegisterNewObject("FlattenedTest2");
+ .newObject("FlattenedTest2");
ft2.setName("FT2Name");
FlattenedTest3 ft3 = (FlattenedTest3) context
- .createAndRegisterNewObject("FlattenedTest3");
+ .newObject("FlattenedTest3");
ft3.setName("FT3Name");
ft2.setToFT1(ft1);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/GenericMappingTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/GenericMappingTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/GenericMappingTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/GenericMappingTst.java Mon Oct 9 22:46:56 2006
@@ -44,7 +44,7 @@
public void testInsertSingle() {
DataContext context = createDataContext();
- DataObject g1 = context.createAndRegisterNewObject("Generic1");
+ DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
context.commitChanges();
@@ -53,10 +53,10 @@
public void testInsertRelated() {
DataContext context = createDataContext();
- DataObject g1 = context.createAndRegisterNewObject("Generic1");
+ DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
- DataObject g2 = context.createAndRegisterNewObject("Generic2");
+ DataObject g2 = (DataObject) context.newObject("Generic2");
g2.writeProperty("name", "G2 Name");
g2.setToOneTarget("toGeneric1", g1, true);
@@ -86,10 +86,10 @@
public void testUpdateRelated() {
DataContext context = createDataContext();
- DataObject g1 = context.createAndRegisterNewObject("Generic1");
+ DataObject g1 = (DataObject) context.newObject("Generic1");
g1.writeProperty("name", "G1 Name");
- DataObject g2 = context.createAndRegisterNewObject("Generic2");
+ DataObject g2 = (DataObject) context.newObject("Generic2");
g2.writeProperty("name", "G2 Name");
g2.setToOneTarget("toGeneric1", g1, true);
@@ -98,7 +98,7 @@
List r1 = (List) g1.readProperty("generic2s");
assertTrue(r1.contains(g2));
- DataObject g11 = context.createAndRegisterNewObject("Generic1");
+ DataObject g11 = (DataObject) context.newObject("Generic1");
g11.writeProperty("name", "G11 Name");
g2.setToOneTarget("toGeneric1", g11, true);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MeaningfulFKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MeaningfulFKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MeaningfulFKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MeaningfulFKTst.java Mon Oct 9 22:46:56 2006
@@ -30,8 +30,8 @@
public class MeaningfulFKTst extends RelationshipTestCase {
public void testValidateForSave1() throws Exception {
- MeaningfulFK testObject = (MeaningfulFK) createDataContext()
- .createAndRegisterNewObject(MeaningfulFK.class);
+ MeaningfulFK testObject = (MeaningfulFK) createDataContext().newObject(
+ MeaningfulFK.class);
ValidationResult validation = new ValidationResult();
testObject.validateForSave(validation);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayManyToOneTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayManyToOneTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayManyToOneTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayManyToOneTst.java Mon Oct 9 22:46:56 2006
@@ -32,6 +32,7 @@
* @author Andrus Adamchik
*/
public class OneWayManyToOneTst extends OneWayMappingTestCase {
+
protected DataContext ctxt;
protected void setUp() throws Exception {
@@ -46,7 +47,7 @@
Painting p2 = newPainting();
- // *** TESTING THIS ***
+ // *** TESTING THIS ***
p2.setToGallery(g1);
// test before save
@@ -103,38 +104,35 @@
ctxt.rollbackChanges();
assertEquals(g11, p1.getToGallery());
- //Expecting the original gallery to be the one
+ // Expecting the original gallery to be the one
- //And save so we can be sure that the save did the right thing
+ // And save so we can be sure that the save did the right thing
ctxt.commitChanges();
ctxt = createDataContext();
Painting p2 = fetchPainting();
Gallery g21 = p2.getToGallery();
assertNotNull(g21);
- //IT should still be the first one we set
+ // IT should still be the first one we set
assertEquals(g11.getGalleryName(), g21.getGalleryName());
}
protected Painting newPainting() {
- Painting p1 = (Painting) ctxt.createAndRegisterNewObject("Painting");
+ Painting p1 = (Painting) ctxt.newObject("Painting");
p1.setPaintingTitle(CayenneDOTestBase.paintingName);
return p1;
}
protected Gallery newGallery(String name) {
- Gallery g1 = (Gallery) ctxt.createAndRegisterNewObject("Gallery");
+ Gallery g1 = (Gallery) ctxt.newObject("Gallery");
g1.setGalleryName(name);
return g1;
}
protected Painting fetchPainting() {
- SelectQuery q =
- new SelectQuery(
- "Painting",
- ExpressionFactory.matchExp(
- "paintingTitle",
- CayenneDOTestBase.paintingName));
+ SelectQuery q = new SelectQuery("Painting", ExpressionFactory.matchExp(
+ "paintingTitle",
+ CayenneDOTestBase.paintingName));
List pts = ctxt.performQuery(q);
return (pts.size() > 0) ? (Painting) pts.get(0) : null;
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayOneToManyTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayOneToManyTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayOneToManyTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/OneWayOneToManyTst.java Mon Oct 9 22:46:56 2006
@@ -48,81 +48,14 @@
assertEquals(2, a2.getPaintingArray().size());
}
- /*
- public void testAddNew() throws Exception {
- // create a painting that will be saved
- // without ARTIST attached to it
- newPainting("p12");
-
- Artist a1 = newArtist();
- ctxt.commitChanges();
-
- Painting p11 = newPainting("p11");
-
- // **** TESTING THIS *****
- a1.addToPaintingArray(p11);
-
- assertEquals(1, a1.getPaintingArray().size());
- assertEquals(1, ctxt.newObjects().size());
- assertEquals(1, ctxt.modifiedObjects().size());
- ctxt.commitChanges();
-
- // reset context and do a refetch
- ctxt = createDataContext();
- Artist a2 = fetchArtist();
- assertNotNull(a2);
- assertEquals(1, a2.getPaintingArray().size());
- }
-
- public void testAddExisting() throws Exception {
- // prepare and save a gallery
- Painting p11 = newPainting("p11");
- newPainting("p12");
- Artist a1 = newArtist();
- ctxt.commitChanges();
-
- // **** TESTING THIS *****
- a1.addToPaintingArray(p11);
-
- assertEquals(1, a1.getPaintingArray().size());
- assertEquals("Both artist and painting should be modified.", 2, ctxt
- .modifiedObjects()
- .size());
- ctxt.commitChanges();
- }
-
- public void testRevertModification() throws Exception {
- // prepare and save a gallery
- Painting p11 = newPainting("p11");
- Painting p12 = newPainting("p12");
- ctxt.commitChanges();
-
- Artist a1 = newArtist();
- a1.addToPaintingArray(p11);
-
- // test before save
- assertEquals(1, a1.getPaintingArray().size());
- assertEquals(1, ctxt.newObjects().size());
- assertEquals(1, ctxt.modifiedObjects().size());
- ctxt.commitChanges();
-
- a1.addToPaintingArray(p12);
- assertEquals(2, a1.getPaintingArray().size());
- ctxt.rollbackChanges();
-
- assertEquals(1, a1.getPaintingArray().size());
- assertEquals(p11, a1.getPaintingArray().get(0));
- assertFalse(ctxt.hasChanges());
- }*/
-
protected Painting newPainting(String name) {
- Painting p1 = (Painting) ctxt.createAndRegisterNewObject("Painting");
+ Painting p1 = (Painting) ctxt.newObject("Painting");
p1.setPaintingTitle(name);
return p1;
}
protected Artist newArtist() {
- Artist a1 = (Artist) ctxt.createAndRegisterNewObject("Artist");
+ Artist a1 = (Artist) ctxt.newObject("Artist");
a1.setArtistName(CayenneDOTestBase.artistName);
return a1;
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PersistenceByReachabilityTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PersistenceByReachabilityTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PersistenceByReachabilityTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PersistenceByReachabilityTst.java Mon Oct 9 22:46:56 2006
@@ -25,88 +25,79 @@
import org.apache.cayenne.unit.CayenneTestCase;
public class PersistenceByReachabilityTst extends CayenneTestCase {
+
public void testToOneTargetTransient() throws Exception {
DataContext context = createDataContext();
- Painting persistentDO = (Painting) context
- .createAndRegisterNewObject(Painting.class);
+ Painting persistentDO = (Painting) context.newObject(Painting.class);
Artist transientDO = new Artist();
- persistentDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, transientDO,
- false);
+ persistentDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, transientDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
public void testToOneTargetPersistent() throws Exception {
DataContext context = createDataContext();
- Painting transientDO = (Painting) context
- .createAndRegisterNewObject(Painting.class);
+ Painting transientDO = (Painting) context.newObject(Painting.class);
Artist persistentDO = new Artist();
- transientDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, persistentDO,
- false);
+ transientDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, persistentDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
public void testToOneTargetDifferentContext() throws Exception {
DataContext context1 = createDataContext();
- Painting doC1 = (Painting) context1
- .createAndRegisterNewObject(Painting.class);
+ Painting doC1 = (Painting) context1.newObject(Painting.class);
DataContext context2 = createDataContext();
- Artist doC2 = (Artist) context2
- .createAndRegisterNewObject(Artist.class);
+ Artist doC2 = (Artist) context2.newObject(Artist.class);
// this is the case where exception must be thrown as DataContexts are
// different
try {
doC1.setToOneTarget(Painting.TO_ARTIST_PROPERTY, doC2, false);
fail("failed to detect relationship between objects in different DataContexts");
- } catch (CayenneRuntimeException ex) {
+ }
+ catch (CayenneRuntimeException ex) {
}
}
public void testToManyTargetDifferentContext() throws Exception {
DataContext context1 = createDataContext();
- Painting doC1 = (Painting) context1
- .createAndRegisterNewObject(Painting.class);
+ Painting doC1 = (Painting) context1.newObject(Painting.class);
DataContext context2 = createDataContext();
- Artist doC2 = (Artist) context2
- .createAndRegisterNewObject(Artist.class);
+ Artist doC2 = (Artist) context2.newObject(Artist.class);
// this is the case where exception must be thrown as DataContexts are
// different
try {
doC2.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY, doC1, false);
fail("failed to detect relationship between objects in different DataContexts");
- } catch (CayenneRuntimeException ex) {
+ }
+ catch (CayenneRuntimeException ex) {
}
}
public void testToManyTargetTransient() throws Exception {
DataContext context = createDataContext();
- Painting transientDO = (Painting) context
- .createAndRegisterNewObject(Painting.class);
+ Painting transientDO = (Painting) context.newObject(Painting.class);
Artist persistentDO = new Artist();
- persistentDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY,
- transientDO, false);
+ persistentDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY, transientDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
public void testToManyTargetPersistent() throws Exception {
DataContext context = createDataContext();
- Painting persistentDO = (Painting) context
- .createAndRegisterNewObject(Painting.class);
+ Painting persistentDO = (Painting) context.newObject(Painting.class);
Artist transientDO = new Artist();
- transientDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY,
- persistentDO, false);
+ transientDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY, persistentDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PregeneratedPKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PregeneratedPKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PregeneratedPKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/PregeneratedPKTst.java Mon Oct 9 22:46:56 2006
@@ -44,7 +44,7 @@
public void testIntPk() throws Exception {
DataContext context = createDataContext();
- Artist a = (Artist) context.createAndRegisterNewObject(Artist.class);
+ Artist a = (Artist) context.newObject(Artist.class);
a.setArtistName("XXX");
updateId(context, a.getObjectId());
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTst.java Mon Oct 9 22:46:56 2006
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.access;
import org.apache.art.BinaryPKTest1;
@@ -30,6 +29,7 @@
* @author Andrus Adamchik
*/
public class DataContextBinaryPKTst extends CayenneTestCase {
+
protected DataContext context;
protected void setUp() throws Exception {
@@ -44,12 +44,10 @@
return;
}
- BinaryPKTest1 master =
- (BinaryPKTest1) context.createAndRegisterNewObject("BinaryPKTest1");
+ BinaryPKTest1 master = (BinaryPKTest1) context.newObject("BinaryPKTest1");
master.setName("master1");
- BinaryPKTest2 detail =
- (BinaryPKTest2) context.createAndRegisterNewObject("BinaryPKTest2");
+ BinaryPKTest2 detail = (BinaryPKTest2) context.newObject("BinaryPKTest2");
detail.setDetailName("detail2");
master.addToBinaryPKDetails(detail);
@@ -63,12 +61,10 @@
return;
}
- BinaryPKTest1 master =
- (BinaryPKTest1) context.createAndRegisterNewObject("BinaryPKTest1");
+ BinaryPKTest1 master = (BinaryPKTest1) context.newObject("BinaryPKTest1");
master.setName("master1");
- BinaryPKTest2 detail =
- (BinaryPKTest2) context.createAndRegisterNewObject("BinaryPKTest2");
+ BinaryPKTest2 detail = (BinaryPKTest2) context.newObject("BinaryPKTest2");
detail.setDetailName("detail2");
master.addToBinaryPKDetails(detail);
@@ -77,10 +73,8 @@
// create new context
context = createDataContext();
- BinaryPKTest2 fetchedDetail =
- (BinaryPKTest2) context.performQuery(
- new SelectQuery(BinaryPKTest2.class)).get(
- 0);
+ BinaryPKTest2 fetchedDetail = (BinaryPKTest2) context.performQuery(
+ new SelectQuery(BinaryPKTest2.class)).get(0);
assertNotNull(fetchedDetail.readPropertyDirectly("toBinaryPKMaster"));
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java Mon Oct 9 22:46:56 2006
@@ -41,8 +41,7 @@
}
public void testInsert() throws Exception {
- CharPkTestEntity object = (CharPkTestEntity) ctxt
- .createAndRegisterNewObject("CharPkTestEntity");
+ CharPkTestEntity object = (CharPkTestEntity) ctxt.newObject("CharPkTestEntity");
object.setOtherCol("object-XYZ");
object.setPkCol("PK1");
ctxt.commitChanges();
@@ -72,8 +71,7 @@
}
public void testDelete() throws Exception {
- CharPkTestEntity object = (CharPkTestEntity) ctxt
- .createAndRegisterNewObject("CharPkTestEntity");
+ CharPkTestEntity object = (CharPkTestEntity) ctxt.newObject("CharPkTestEntity");
object.setOtherCol("object-XYZ");
object.setPkCol("PK1");
ctxt.commitChanges();
@@ -92,8 +90,7 @@
}
public void testUpdate() throws Exception {
- CharPkTestEntity object = (CharPkTestEntity) ctxt
- .createAndRegisterNewObject("CharPkTestEntity");
+ CharPkTestEntity object = (CharPkTestEntity) ctxt.newObject("CharPkTestEntity");
object.setOtherCol("object-XYZ");
object.setPkCol("PK1");
ctxt.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java Mon Oct 9 22:46:56 2006
@@ -32,7 +32,7 @@
DataContext context = createDataContext();
// commit new object
- Artist a = (Artist) context.createAndRegisterNewObject(Artist.class);
+ Artist a = (Artist) context.newObject(Artist.class);
a.setArtistName("Test");
assertTrue(context.hasChanges());
@@ -57,7 +57,7 @@
assertSame(a.getObjectId(), newIds[0]);
// commit a mix of new and modified
- Painting p = (Painting) context.createAndRegisterNewObject(Painting.class);
+ Painting p = (Painting) context.newObject(Painting.class);
p.setPaintingTitle("PT");
p.setToArtist(a);
a.setArtistName(a.getArtistName() + "_");
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java Mon Oct 9 22:46:56 2006
@@ -76,13 +76,13 @@
public void testFetchQualifyingToOne() {
CompoundPkTestEntity master = (CompoundPkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundPkTestEntity");
+ .newObject("CompoundPkTestEntity");
CompoundPkTestEntity master1 = (CompoundPkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundPkTestEntity");
+ .newObject("CompoundPkTestEntity");
CompoundFkTestEntity detail = (CompoundFkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundFkTestEntity");
+ .newObject("CompoundFkTestEntity");
CompoundFkTestEntity detail1 = (CompoundFkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundFkTestEntity");
+ .newObject("CompoundFkTestEntity");
master.addToCompoundFkArray(detail);
master1.addToCompoundFkArray(detail1);
@@ -114,13 +114,13 @@
public void testFetchQualifyingToMany() throws Exception {
CompoundPkTestEntity master = (CompoundPkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundPkTestEntity");
+ .newObject("CompoundPkTestEntity");
CompoundPkTestEntity master1 = (CompoundPkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundPkTestEntity");
+ .newObject("CompoundPkTestEntity");
CompoundFkTestEntity detail = (CompoundFkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundFkTestEntity");
+ .newObject("CompoundFkTestEntity");
CompoundFkTestEntity detail1 = (CompoundFkTestEntity) ctxt
- .createAndRegisterNewObject("CompoundFkTestEntity");
+ .newObject("CompoundFkTestEntity");
master.addToCompoundFkArray(detail);
master1.addToCompoundFkArray(detail1);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java Mon Oct 9 22:46:56 2006
@@ -39,16 +39,13 @@
DataContext context = createDataContext();
// insert
- CrossdbM1E1 o1 = (CrossdbM1E1) context
- .createAndRegisterNewObject(CrossdbM1E1.class);
+ CrossdbM1E1 o1 = (CrossdbM1E1) context.newObject(CrossdbM1E1.class);
o1.setName("o1");
- CrossdbM2E1 o2 = (CrossdbM2E1) context
- .createAndRegisterNewObject(CrossdbM2E1.class);
+ CrossdbM2E1 o2 = (CrossdbM2E1) context.newObject(CrossdbM2E1.class);
o2.setName("o2");
- CrossdbM2E2 o3 = (CrossdbM2E2) context
- .createAndRegisterNewObject(CrossdbM2E2.class);
+ CrossdbM2E2 o3 = (CrossdbM2E2) context.newObject(CrossdbM2E2.class);
o3.setName("o3");
o3.setToM1E1(o1);
@@ -56,8 +53,7 @@
context.commitChanges();
// update
- CrossdbM1E1 o11 = (CrossdbM1E1) context
- .createAndRegisterNewObject(CrossdbM1E1.class);
+ CrossdbM1E1 o11 = (CrossdbM1E1) context.newObject(CrossdbM1E1.class);
o11.setName("o11");
o3.setToM1E1(o11);
context.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java Mon Oct 9 22:46:56 2006
@@ -44,7 +44,7 @@
context = createDataContextWithSharedCache();
// prepare a single artist record
- artist = (Artist) context.createAndRegisterNewObject("Artist");
+ artist = (Artist) context.newObject("Artist");
artist.setArtistName("version1");
artist.setDateOfBirth(new Date());
context.commitChanges();
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java Mon Oct 9 22:46:56 2006
@@ -47,11 +47,11 @@
context = createDataContextWithSharedCache();
// prepare a single gallery record
- gallery = (Gallery) context.createAndRegisterNewObject("Gallery");
+ gallery = (Gallery) context.newObject("Gallery");
gallery.setGalleryName("version1");
// prepare a single artist record
- artist = (Artist) context.createAndRegisterNewObject("Artist");
+ artist = (Artist) context.newObject("Artist");
artist.setArtistName("version1");
context.commitChanges();