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 [3/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/...
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_194Tst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_194Tst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_194Tst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_194Tst.java Mon Oct 9 22:46:56 2006
@@ -33,7 +33,7 @@
*
* @author Andrus Adamchik
*/
-// TODO: this is really a qualifier translator general test... need to
+// TODO: this is really a qualifier translator general test... need to
// find an approprtaite place in unit tests..
public class CAY_194Tst extends RelationshipTestCase {
@@ -47,14 +47,14 @@
DataContext context = createDataContext();
ReflexiveAndToOne ox = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
ox.setName("ox");
ReflexiveAndToOne o1 = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
o1.setName("o1");
ReflexiveAndToOne o2 = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
@@ -77,14 +77,14 @@
DataContext context = createDataContext();
ReflexiveAndToOne ox = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
ox.setName("ox");
ReflexiveAndToOne o1 = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
o1.setName("o1");
ReflexiveAndToOne o2 = (ReflexiveAndToOne) context
- .createAndRegisterNewObject(ReflexiveAndToOne.class);
+ .newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_207Tst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_207Tst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_207Tst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/unit/jira/CAY_207Tst.java Mon Oct 9 22:46:56 2006
@@ -62,8 +62,7 @@
Object p1 = o1.readProperty("clientContactType");
assertNotNull(p1);
-
- assertTrue(
+ assertTrue(
"Invalid property class: " + p1.getClass().getName(),
p1 instanceof CAY_207String1);
}
@@ -147,7 +146,7 @@
try {
CAY_207Manager2 o2 = (CAY_207Manager2) context
- .createAndRegisterNewObject(CAY_207Manager2.class);
+ .newObject(CAY_207Manager2.class);
o2.setPersonType("M2");
o2.setName("aaaa");
o2.setClientContactType(new CAY_207String1("T1:AAAAA"));
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTst.java Mon Oct 9 22:46:56 2006
@@ -41,19 +41,19 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Department d1 = (Department) context.createAndRegisterNewObject(Department.class);
+ Department d1 = (Department) context.newObject(Department.class);
d1.setName("D1");
// need to do double commit as Ashwood sorter blows on Employees/Departments
// ordering...
context.commitChanges();
- Employee e1 = (Employee) context.createAndRegisterNewObject(Employee.class);
+ Employee e1 = (Employee) context.newObject(Employee.class);
e1.setName("E1");
e1.setPersonType("EE");
d1.addToEmployees(e1);
- Manager e2 = (Manager) context.createAndRegisterNewObject(Manager.class);
+ Manager e2 = (Manager) context.newObject(Manager.class);
e2.setName("E2");
e2.setPersonType("EM");
d1.addToEmployees(e2);
@@ -68,7 +68,7 @@
context1.performQuery(new SelectQuery(Employee.class));
DeepMergeOperation op = new DeepMergeOperation(context1);
-
+
blockQueries();
try {
Department d2 = (Department) op.merge(d1, d);
@@ -98,19 +98,19 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Department d1 = (Department) context.createAndRegisterNewObject(Department.class);
+ Department d1 = (Department) context.newObject(Department.class);
d1.setName("D1");
// need to do double commit as Ashwood sorter blows on Employees/Departments
// ordering...
context.commitChanges();
- Employee e1 = (Employee) context.createAndRegisterNewObject(Employee.class);
+ Employee e1 = (Employee) context.newObject(Employee.class);
e1.setName("E1");
e1.setPersonType("EE");
d1.addToEmployees(e1);
- Manager e2 = (Manager) context.createAndRegisterNewObject(Manager.class);
+ Manager e2 = (Manager) context.newObject(Manager.class);
e2.setName("E2");
e2.setPersonType("EM");
d1.addToEmployees(e2);
@@ -121,7 +121,7 @@
// strangeness...
d1.getEmployees().size();
DeepMergeOperation op = new DeepMergeOperation(context1);
-
+
blockQueries();
try {
Department d2 = (Department) op.merge(d1, d);
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java?view=diff&rev=454624&r1=454623&r2=454624
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/DeepMergeOperationTst.java Mon Oct 9 22:46:56 2006
@@ -36,7 +36,7 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Artist a = (Artist) context.createAndRegisterNewObject(Artist.class);
+ Artist a = (Artist) context.newObject(Artist.class);
a.setArtistName("AAA");
context.commitChanges();
@@ -60,14 +60,14 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Artist a = (Artist) context.createAndRegisterNewObject(Artist.class);
+ Artist a = (Artist) context.newObject(Artist.class);
a.setArtistName("AAA");
context.commitChanges();
Artist a1 = (Artist) DataObjectUtils.objectForPK(context1, a.getObjectId());
a1.setArtistName("BBB");
DeepMergeOperation op = new DeepMergeOperation(context1);
-
+
blockQueries();
try {
Artist a2 = (Artist) op.merge(a, d);