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 2011/05/22 19:38:44 UTC
svn commit: r1126121 - in /cayenne/main/trunk:
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java
framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java
Author: aadamchik
Date: Sun May 22 17:38:44 2011
New Revision: 1126121
URL: http://svn.apache.org/viewvc?rev=1126121&view=rev
Log:
unit test refactoring
porting test to DI
Modified:
cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java
Modified: cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java?rev=1126121&r1=1126120&r2=1126121&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java (original)
+++ cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UpdateTemplate.java Sun May 22 17:38:44 2011
@@ -49,7 +49,7 @@ class UpdateTemplate {
}
else {
throw new IllegalStateException(
- "No type inmformation for null value at index " + i);
+ "No type information for null value at index " + i);
}
}
else {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java?rev=1126121&r1=1126120&r2=1126121&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java Sun May 22 17:38:44 2011
@@ -19,49 +19,60 @@
package org.apache.cayenne.unit.jira;
+import java.sql.Types;
import java.util.List;
import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
-import org.apache.cayenne.unit.RelationshipCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
/**
* Testing qualifier translator correctness on reflexive relationships.
- *
*/
// TODO: this is really a qualifier translator general test... need to
-// find an approprtaite place in unit tests..
-public class CAY_194Test extends RelationshipCase {
+// find an appropriate place in unit tests..
+@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+public class CAY_194Test extends ServerCase {
+
+ @Inject
+ protected DataContext context;
+
+ @Inject
+ private DBHelper dbHelper;
@Override
- protected void setUp() throws Exception {
- super.setUp();
+ protected void setUpAfterInjection() throws Exception {
+ TableHelper tReflexive = new TableHelper(dbHelper, "REFLEXIVE_AND_TO_ONE");
+ tReflexive.setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID");
+
+ tReflexive.update().set("PARENT_ID", null, Types.INTEGER).execute();
- deleteTestData();
+ dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE");
+ dbHelper.deleteAll("TO_ONEFK1");
}
public void testQualifyOnToMany() {
- DataContext context = createDataContext();
- ReflexiveAndToOne ox = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne ox = context.newObject(ReflexiveAndToOne.class);
ox.setName("ox");
- ReflexiveAndToOne o1 = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne o1 = context.newObject(ReflexiveAndToOne.class);
o1.setName("o1");
- ReflexiveAndToOne o2 = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne o2 = context.newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
context.commitChanges();
Expression qualifier = ExpressionFactory.matchExp("children", o2);
- List parents = context.performQuery(new SelectQuery(
+ List<?> parents = context.performQuery(new SelectQuery(
ReflexiveAndToOne.class,
qualifier));
assertEquals(1, parents.size());
@@ -74,24 +85,20 @@ public class CAY_194Test extends Relatio
}
public void testQualifyOnToOne() {
- DataContext context = createDataContext();
- ReflexiveAndToOne ox = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne ox = context.newObject(ReflexiveAndToOne.class);
ox.setName("ox");
- ReflexiveAndToOne o1 = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne o1 = context.newObject(ReflexiveAndToOne.class);
o1.setName("o1");
- ReflexiveAndToOne o2 = context
- .newObject(ReflexiveAndToOne.class);
+ ReflexiveAndToOne o2 = context.newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
context.commitChanges();
Expression qualifier = ExpressionFactory.matchExp("toParent", o1);
- List children = context.performQuery(new SelectQuery(
+ List<?> children = context.performQuery(new SelectQuery(
ReflexiveAndToOne.class,
qualifier));
assertEquals(1, children.size());