Author: aadamchik
Date: Sun May 22 16:39:42 2011
New Revision: 1126062
URL: http://svn.apache.org/viewvc?rev=1126062&view=rev
Log:
unit test refactoring
removing XML datasetfactory
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DataSetFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/XMLDataSetFactory.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/spring-test-resources.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java?rev=1126062&r1=1126061&r2=1126062&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
Sun May 22 16:39:42 2011
@@ -19,8 +19,6 @@
package org.apache.cayenne.unit;
-import java.util.Map;
-
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.UnitTestDomain;
@@ -33,9 +31,6 @@ public interface AccessStack {
UnitTestDomain getDataDomain();
- void createTestData(Class<?> testCase, String testName, Map parameters)
- throws Exception;
-
void deleteTestData() throws Exception;
void dropSchema() throws Exception;
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java?rev=1126062&r1=1126061&r2=1126062&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
Sun May 22 16:39:42 2011
@@ -20,8 +20,6 @@
package org.apache.cayenne.unit;
import java.sql.Connection;
-import java.util.Collections;
-import java.util.Map;
import junit.framework.TestCase;
@@ -29,7 +27,6 @@ import org.apache.cayenne.CayenneRuntime
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.UnitTestDomain;
-import org.apache.cayenne.cache.MapQueryCache;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
@@ -102,18 +99,6 @@ public abstract class CayenneCase extend
return customizer;
}
- /**
- * Creates test data via a mechanism preconfigured in the access stack.
Default
- * mechanism is loading test data DML from XML file.
- */
- protected void createTestData(String testName) throws Exception {
- accessStack.createTestData(this.getClass(), testName,
Collections.EMPTY_MAP);
- }
-
- protected void createTestData(String testName, Map parameters) throws
Exception {
- accessStack.createTestData(this.getClass(), testName, parameters);
- }
-
protected DataNode getNode() {
return getDomain().getDataNodes().iterator().next();
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java?rev=1126062&r1=1126061&r2=1126062&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
Sun May 22 16:39:42 2011
@@ -31,7 +31,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
-import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
@@ -48,7 +47,6 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.query.Query;
import org.apache.cayenne.testdo.testmap.StringET1ExtendedType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -68,18 +66,15 @@ public class SimpleAccessStack implement
protected CayenneResources resources;
protected UnitTestDomain domain;
- protected DataSetFactory dataSetFactory;
- public SimpleAccessStack(CayenneResources resources, DataSetFactory
dataSetFactory,
- DataMap[] maps) throws Exception {
+ public SimpleAccessStack(CayenneResources resources, DataMap[] maps)
throws Exception {
- this.dataSetFactory = dataSetFactory;
this.resources = resources;
this.domain = new UnitTestDomain("domain");
domain.setEventManager(new DefaultEventManager(2));
domain.setEntitySorter(new AshwoodEntitySorter());
domain.setQueryCache(new MapQueryCache(50));
-
+
for (DataMap map : maps) {
initNode(map);
}
@@ -123,12 +118,6 @@ public class SimpleAccessStack implement
return domain;
}
- public void createTestData(Class<?> testCase, String testName, Map
parameters)
- throws Exception {
- Query query = dataSetFactory.getDataSetQuery(testCase, testName,
parameters);
- getDataDomain().onQuery(null, query);
- }
-
/**
* Deletes all data from the database tables mentioned in the DataMap.
*/
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/spring-test-resources.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/spring-test-resources.xml?rev=1126062&r1=1126061&r2=1126062&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/spring-test-resources.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/spring-test-resources.xml
Sun May 22 16:39:42 2011
@@ -113,73 +113,54 @@
<constructor-arg><value>inheritance-vertical.map.xml</value></constructor-arg>
</bean>
-
- <!-- ======================================= -->
- <!-- DataSetFactory -->
- <!-- ======================================= -->
- <bean id="DataSetFactory"
class="org.apache.cayenne.unit.XMLDataSetFactory">
- <property name="location"><value>dml</value></property>
- </bean>
-
<!-- ======================================= -->
<!-- Access Stacks -->
<!-- ======================================= -->
<bean id="TestStack" class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="TestMap"/></list></constructor-arg>
</bean>
<bean id="PeopleStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="PeopleMap"/></list></constructor-arg>
</bean>
<bean id="EmbeddingStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="EmbeddingMap"/></list></constructor-arg>
</bean>
<bean id="LockingStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="LockingMap"/></list></constructor-arg>
</bean>
<bean id="RelationshipStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="RelationshipMap"/></list></constructor-arg>
</bean>
<bean id="OneWayStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="OneWayMap"/></list></constructor-arg>
</bean>
<bean id="MultiNodeStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg>
<list><ref bean="DB1Map"/><ref bean="DB2Map"/></list>
</constructor-arg>
</bean>
<bean id="MultiTierStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="MultiTierMap"/></list></constructor-arg>
</bean>
<bean id="GenericStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="GenericMap"/></list></constructor-arg>
</bean>
<bean id="QualifiedStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref
bean="QualifiedMap"/></list></constructor-arg>
</bean>
<!-- Used to create DB schema to avoid conflicts when schema for
individual stacks is generated. -->
<bean id="SchemaSetupStack"
class="org.apache.cayenne.unit.SimpleAccessStack">
<constructor-arg><ref bean="TestResources"/></constructor-arg>
- <constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg>
<list>
<ref bean="TestMap"/>
