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 2010/06/14 15:35:33 UTC
svn commit: r954454 [2/2] - in /cayenne/main/trunk:
build-tools/cayenne-test-utilities/
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/
framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/
framework/c...
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseProperties.java (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseProperties.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseProperties.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseProperties.java Mon Jun 14 13:35:32 2010
@@ -16,17 +16,20 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.unit;
+package org.apache.cayenne.unit.di.server;
/**
- * A superclass of test cases using "inheritance" DataMap for its access stack.
- *
+ * Stores various unit test properties. This object should be bound in a unit test scope.
*/
-public abstract class InheritanceCase extends CayenneCase {
- public static final String INHERITANCE_ACCESS_STACK = "InheritanceStack";
+public class ServerCaseProperties {
- @Override
- protected AccessStack buildAccessStack() {
- return CayenneResources.getResources().getAccessStack(INHERITANCE_ACCESS_STACK);
+ protected String configurationLocation;
+
+ public String getConfigurationLocation() {
+ return configurationLocation;
+ }
+
+ public void setConfigurationLocation(String configurationLocation) {
+ this.configurationLocation = configurationLocation;
}
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfTest.java (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfTest.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfTest.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfTest.java Mon Jun 14 13:35:32 2010
@@ -16,17 +16,31 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.unit;
+package org.apache.cayenne.unit.di.server;
-/**
- * A superclass of test cases using "inheritance" DataMap for its access stack.
- *
- */
-public abstract class InheritanceCase extends CayenneCase {
- public static final String INHERITANCE_ACCESS_STACK = "InheritanceStack";
-
- @Override
- protected AccessStack buildAccessStack() {
- return CayenneResources.getResources().getAccessStack(INHERITANCE_ACCESS_STACK);
+import org.apache.cayenne.di.Inject;
+
+@UseServerRuntime("xUy")
+public class ServerCaseSelfTest extends ServerCase {
+
+ @Inject
+ protected ServerRuntimeFactory runtimeFactory;
+
+ @Inject
+ protected ServerCaseProperties properties;
+
+ public void testSetup_TearDown_Runtime() throws Exception {
+
+ assertNotNull(properties);
+ assertEquals("xUy", properties.getConfigurationLocation());
+
+ ServerRuntimeFactory localFactory = this.runtimeFactory;
+ assertNotNull(localFactory);
+
+ tearDown();
+
+ setUp();
+ assertSame(localFactory, this.runtimeFactory);
}
+
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeFactory.java (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeFactory.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeFactory.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeFactory.java Mon Jun 14 13:35:32 2010
@@ -16,17 +16,11 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.unit;
+package org.apache.cayenne.unit.di.server;
-/**
- * A superclass of test cases using "inheritance" DataMap for its access stack.
- *
- */
-public abstract class InheritanceCase extends CayenneCase {
- public static final String INHERITANCE_ACCESS_STACK = "InheritanceStack";
+import org.apache.cayenne.configuration.server.ServerRuntime;
- @Override
- protected AccessStack buildAccessStack() {
- return CayenneResources.getResources().getAccessStack(INHERITANCE_ACCESS_STACK);
- }
+public interface ServerRuntimeFactory {
+
+ ServerRuntime get(String configurationLocation);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UseServerRuntime.java (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UseServerRuntime.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UseServerRuntime.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/InheritanceCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UseServerRuntime.java Mon Jun 14 13:35:32 2010
@@ -16,17 +16,22 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.unit;
+package org.apache.cayenne.unit.di.server;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
- * A superclass of test cases using "inheritance" DataMap for its access stack.
- *
+ * Used to annotate unit test classes to indicate which runtime should be in the backend
+ * of injected ObjectContext and other Cayenne objects.
*/
-public abstract class InheritanceCase extends CayenneCase {
- public static final String INHERITANCE_ACCESS_STACK = "InheritanceStack";
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface UseServerRuntime {
- @Override
- protected AccessStack buildAccessStack() {
- return CayenneResources.getResources().getAccessStack(INHERITANCE_ACCESS_STACK);
- }
+ String value();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml?rev=954454&r1=954453&r2=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml Mon Jun 14 13:35:32 2010
@@ -2,16 +2,12 @@
<domain project-version="6">
<map name="embeddable"/>
<map name="generic"/>
- <map name="inheritance"/>
- <map name="inheritance-flat"/>
- <map name="inheritance-vertical"/>
<map name="locking"/>
<map name="map-db1"/>
<map name="map-db2"/>
<map name="multi-tier"/>
<map name="people"/>
<map name="qualified"/>
- <map name="quotemap"/>
<map name="relationships"/>
<map name="sus-map"/>
<map name="testmap"/>
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-single-table1.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-single-table1.xml?rev=954454&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-single-table1.xml (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-single-table1.xml Mon Jun 14 13:35:32 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="6">
+ <map name="inheritance-single-table1"/>
+</domain>
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-vertical.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-vertical.xml?rev=954454&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-vertical.xml (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-inheritance-vertical.xml Mon Jun 14 13:35:32 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="6">
+ <map name="inheritance-vertical"/>
+</domain>
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-quoted-identifiers.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-quoted-identifiers.xml?rev=954454&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-quoted-identifiers.xml (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-quoted-identifiers.xml Mon Jun 14 13:35:32 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="6">
+ <map name="quoted-identifiers"/>
+</domain>
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-single-table1.map.xml (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-flat.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-single-table1.map.xml?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-single-table1.map.xml&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-flat.map.xml&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-flat.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-single-table1.map.xml Mon Jun 14 13:35:32 2010
@@ -4,32 +4,32 @@
xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
project-version="6">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/>
- <db-entity name="GroupMembers">
+ <db-entity name="GROUP_MEMBERS">
<db-attribute name="group_id" type="BIGINT" isMandatory="true"/>
<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="role_id" type="BIGINT" isMandatory="true"/>
</db-entity>
- <db-entity name="GroupProperties">
+ <db-entity name="GROUP_PROPERTIES">
<db-attribute name="description" type="VARCHAR" length="100"/>
<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
</db-entity>
- <db-entity name="Roles">
+ <db-entity name="ROLES">
<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="name" type="VARCHAR" isMandatory="true" length="32"/>
<db-attribute name="type" type="SMALLINT" isMandatory="true"/>
</db-entity>
- <db-entity name="UserProperties">
+ <db-entity name="USER_PROPERTIES">
<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="nickname" type="VARCHAR" length="32"/>
</db-entity>
<obj-entity name="Group" superEntityName="User" className="org.apache.cayenne.testdo.inheritance_flat.Group">
<qualifier><![CDATA[type = 2]]></qualifier>
</obj-entity>
- <obj-entity name="GroupProperties" className="org.apache.cayenne.testdo.inheritance_flat.GroupProperties" dbEntityName="GroupProperties">
+ <obj-entity name="GroupProperties" className="org.apache.cayenne.testdo.inheritance_flat.GroupProperties" dbEntityName="GROUP_PROPERTIES">
<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
<obj-attribute name="id" type="java.lang.Long" db-attribute-path="id"/>
</obj-entity>
- <obj-entity name="Role" className="org.apache.cayenne.testdo.inheritance_flat.Role" dbEntityName="Roles">
+ <obj-entity name="Role" className="org.apache.cayenne.testdo.inheritance_flat.Role" dbEntityName="ROLES">
<qualifier><![CDATA[type = 0]]></qualifier>
<obj-attribute name="id" type="long" db-attribute-path="id"/>
<obj-attribute name="name" type="java.lang.String" lock="true" db-attribute-path="name"/>
@@ -43,32 +43,32 @@
<attribute-override name="name" db-attribute-path="name"/>
<attribute-override name="type" db-attribute-path="type"/>
</obj-entity>
- <obj-entity name="UserProperties" className="org.apache.cayenne.testdo.inheritance_flat.UserProperties" dbEntityName="UserProperties">
+ <obj-entity name="UserProperties" className="org.apache.cayenne.testdo.inheritance_flat.UserProperties" dbEntityName="USER_PROPERTIES">
<obj-attribute name="id" type="java.lang.Long" db-attribute-path="id"/>
<obj-attribute name="nickname" type="java.lang.String" db-attribute-path="nickname"/>
</obj-entity>
- <db-relationship name="group" source="GroupMembers" target="Roles" toMany="false">
+ <db-relationship name="group" source="GROUP_MEMBERS" target="ROLES" toMany="false">
<db-attribute-pair source="group_id" target="id"/>
</db-relationship>
- <db-relationship name="role" source="GroupMembers" target="Roles" toMany="false">
+ <db-relationship name="role" source="GROUP_MEMBERS" target="ROLES" toMany="false">
<db-attribute-pair source="role_id" target="id"/>
</db-relationship>
- <db-relationship name="group" source="GroupProperties" target="Roles" toMany="false">
+ <db-relationship name="group" source="GROUP_PROPERTIES" target="ROLES" toMany="false">
<db-attribute-pair source="id" target="id"/>
</db-relationship>
- <db-relationship name="group_members" source="Roles" target="GroupMembers" toMany="true">
+ <db-relationship name="group_members" source="ROLES" target="GROUP_MEMBERS" toMany="true">
<db-attribute-pair source="id" target="group_id"/>
</db-relationship>
- <db-relationship name="group_properties" source="Roles" target="GroupProperties" toDependentPK="true" toMany="false">
+ <db-relationship name="group_properties" source="ROLES" target="GROUP_PROPERTIES" toDependentPK="true" toMany="false">
<db-attribute-pair source="id" target="id"/>
</db-relationship>
- <db-relationship name="role_groups" source="Roles" target="GroupMembers" toMany="true">
+ <db-relationship name="role_groups" source="ROLES" target="GROUP_MEMBERS" toMany="true">
<db-attribute-pair source="id" target="role_id"/>
</db-relationship>
- <db-relationship name="user_properties" source="Roles" target="UserProperties" toDependentPK="true" toMany="false">
+ <db-relationship name="user_properties" source="ROLES" target="USER_PROPERTIES" toDependentPK="true" toMany="false">
<db-attribute-pair source="id" target="id"/>
</db-relationship>
- <db-relationship name="user" source="UserProperties" target="Roles" toMany="false">
+ <db-relationship name="user" source="USER_PROPERTIES" target="ROLES" toMany="false">
<db-attribute-pair source="id" target="id"/>
</db-relationship>
<obj-relationship name="groupMembers" source="Group" target="Role" deleteRule="Nullify" db-relationship-path="group_members.role"/>
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml (from r954444, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quotemap.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quotemap.map.xml&r1=954444&r2=954454&rev=954454&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quotemap.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml Mon Jun 14 13:35:32 2010
@@ -5,8 +5,8 @@
project-version="6">
<property name="defaultPackage" value="org.apache.cayenne.testdo.quotemap"/>
<property name="quoteSqlIdentifiers" value="true"/>
- <db-entity name="QUOTE_ADRESS">
- <db-attribute name="ADRES ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-entity name="QUOTED_ADDRESS">
+ <db-attribute name="ADDRESS ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="City" type="VARCHAR" length="200"/>
</db-entity>
<db-entity name="quote Person">
@@ -16,7 +16,7 @@
<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="salary" type="INTEGER"/>
</db-entity>
- <obj-entity name="QuoteAdress" className="org.apache.cayenne.testdo.quotemap.QuoteAdress" dbEntityName="QUOTE_ADRESS">
+ <obj-entity name="QuoteAdress" className="org.apache.cayenne.testdo.quotemap.QuoteAdress" dbEntityName="QUOTED_ADDRESS">
<obj-attribute name="city" type="java.lang.String" db-attribute-path="City"/>
</obj-entity>
<obj-entity name="Quote_Person" className="org.apache.cayenne.testdo.quotemap.Quote_Person" dbEntityName="quote Person">
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=954454&r1=954453&r2=954454&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 Mon Jun 14 13:35:32 2010
@@ -103,14 +103,11 @@
<bean id="QualifiedMap" class="org.apache.cayenne.unit.DataMapFactory">
<constructor-arg><value>qualified.map.xml</value></constructor-arg>
</bean>
- <bean id="InheritanceMap" class="org.apache.cayenne.unit.DataMapFactory">
- <constructor-arg><value>inheritance.map.xml</value></constructor-arg>
- </bean>
<bean id="QuoteMap" class="org.apache.cayenne.unit.DataMapFactory">
- <constructor-arg><value>quotemap.map.xml</value></constructor-arg>
+ <constructor-arg><value>quoted-identifiers.map.xml</value></constructor-arg>
</bean>
- <bean id="InheritanceFlatMap" class="org.apache.cayenne.unit.DataMapFactory">
- <constructor-arg><value>inheritance-flat.map.xml</value></constructor-arg>
+ <bean id="InheritanceSingleTable1Map" class="org.apache.cayenne.unit.DataMapFactory">
+ <constructor-arg><value>inheritance-single-table1.map.xml</value></constructor-arg>
</bean>
<bean id="InheritanceVerticalMap" class="org.apache.cayenne.unit.DataMapFactory">
<constructor-arg><value>inheritance-vertical.map.xml</value></constructor-arg>
@@ -179,26 +176,6 @@
<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
<constructor-arg><list><ref bean="QualifiedMap"/></list></constructor-arg>
</bean>
- <bean id="InheritanceStack" 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="InheritanceMap"/></list></constructor-arg>
- </bean>
- <bean id="QuoteMapStack" 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="QuoteMap"/></list></constructor-arg>
- </bean>
- <bean id="InheritanceFlatStack" 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="InheritanceFlatMap"/></list></constructor-arg>
- </bean>
- <bean id="InheritanceVerticalStack" 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="InheritanceVerticalMap"/></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>
@@ -215,9 +192,8 @@
<ref bean="DB2Map"/>
<ref bean="EmbeddingMap"/>
<ref bean="QualifiedMap"/>
- <ref bean="InheritanceMap"/>
<ref bean="QuoteMap"/>
- <ref bean="InheritanceFlatMap"/>
+ <ref bean="InheritanceSingleTable1Map"/>
<ref bean="InheritanceVerticalMap"/>
</list>
</constructor-arg>