svn commit: r1126278 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server: CayenneResourcesProvider.java SchemaHelper.java

[aadamchik]

Author: aadamchik
Date: Mon May 23 00:04:36 2011
New Revision: 1126278

URL: http://svn.apache.org/viewvc?rev=1126278&view=rev
Log:
unit test refactoring

cleaning up access stack Spring stuff

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/CayenneResourcesProvider.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/CayenneResourcesProvider.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/CayenneResourcesProvider.java?rev=1126278&r1=1126277&r2=1126278&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/CayenneResourcesProvider.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/CayenneResourcesProvider.java
 Mon May 23 00:04:36 2011
@@ -20,6 +20,8 @@ package org.apache.cayenne.unit.di.serve
 
 import java.io.InputStream;
 
+import javax.sql.DataSource;
+
 import org.apache.cayenne.ConfigurationException;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.di.Inject;
@@ -54,6 +56,9 @@ public class CayenneResourcesProvider im
     };
 
     @Inject
+    private DataSource dataSource;
+
+    @Inject
     private DataSourceInfo dataSourceInfo;
 
     public CayenneResources get() throws ConfigurationException {
@@ -115,7 +120,7 @@ public class CayenneResourcesProvider im
             maps[i] = new MapLoader().loadDataMap(in);
         }
 
-        SchemaHelper schemaHelper = new SchemaHelper(resources, maps);
+        SchemaHelper schemaHelper = new SchemaHelper(dataSource, resources, 
maps);
 
         schemaHelper.dropSchema();
         schemaHelper.dropPKSupport();

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java?rev=1126278&r1=1126277&r2=1126278&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java
 Mon May 23 00:04:36 2011
@@ -31,6 +31,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
 
+import javax.sql.DataSource;
+
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.access.UnitTestDomain;
@@ -64,9 +66,12 @@ class SchemaHelper {
 
     protected CayenneResources resources;
     protected UnitTestDomain domain;
+    private DataSource dataSource;
 
-    public SchemaHelper(CayenneResources resources, DataMap[] maps) throws 
Exception {
+    public SchemaHelper(DataSource dataSource, CayenneResources resources, 
DataMap[] maps)
+            throws Exception {
 
+        this.dataSource = dataSource;
         this.resources = resources;
         this.domain = new UnitTestDomain("domain");
         domain.setEventManager(new DefaultEventManager(2));
@@ -95,15 +100,6 @@ class SchemaHelper {
 
         node.addDataMap(map);
 
-        // use shared data source in all cases but the multi-node...
-
-        if ("map-db1".equals(node.getName()) || 
"map-db1".equals(node.getName())) {
-            node.setDataSource(resources.createDataSource());
-        }
-        else {
-            node.setDataSource(resources.getDataSource());
-        }
-
         node.setSchemaUpdateStrategy(new SkipSchemaUpdateStrategy());
         domain.addNode(node);
     }
@@ -210,7 +206,7 @@ class SchemaHelper {
     }
 
     private void dropSchema(DataNode node, DataMap map) throws Exception {
-        Connection conn = node.getDataSource().getConnection();
+        Connection conn = dataSource.getConnection();
         List<DbEntity> list = dbEntitiesInInsertOrder(node, map);
 
         try {
@@ -272,7 +268,7 @@ class SchemaHelper {
     }
 
     private void createSchema(DataNode node, DataMap map) throws Exception {
-        Connection conn = node.getDataSource().getConnection();
+        Connection conn = dataSource.getConnection();
 
         try {
             getAdapter(node).willCreateTables(conn, map);