Author: aadamchik
Date: Sun May 22 22:52:45 2011
New Revision: 1126270
URL: http://svn.apache.org/viewvc?rev=1126270&view=rev
Log:
unit test refactoring
attempt at injectable CayenneResources
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.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/CayenneResources.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java?rev=1126270&r1=1126269&r2=1126270&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
Sun May 22 22:52:45 2011
@@ -100,13 +100,6 @@ public class CayenneResources {
return node;
}
- /**
- * Returns connection information.
- */
- public DataSourceInfo getConnectionInfo() {
- return connectionInfo;
- }
-
public DataSource createDataSource() {
try {
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=1126270&r1=1126269&r2=1126270&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 22:52:45 2011
@@ -116,48 +116,6 @@
<!-- ======================================= -->
<!-- Access Stacks -->
<!-- ======================================= -->
- <bean id="TestStack" class="org.apache.cayenne.unit.SimpleAccessStack">
- <constructor-arg><ref bean="TestResources"/></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><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><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><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><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><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>
- <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><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><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><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>
