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/23 04:19:20 UTC
svn commit: r1126296 [1/2] - in /cayenne/main/trunk: ./
framework/cayenne-jdk1.5-unpublished/
framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/
framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/
framework...
Author: aadamchik
Date: Mon May 23 02:19:18 2011
New Revision: 1126296
URL: http://svn.apache.org/viewvc?rev=1126296&view=rev
Log:
unit test refactoring
refactoring
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2UnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2UnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2StackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ConnectionProperties.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UnitDbAdapterProvider.java
- copied, changed from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/AccessStackAdapterProvider.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java
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/java/org/apache/cayenne/unit/ConnectionProperties.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2StackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SpringResourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/AccessStackAdapterProvider.java
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/resources/spring-test-resources.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBlobTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsTemp.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MiscTypesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SelectActionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseBatchQueryBuilderFactoryProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_115Test.java
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Mon May 23 02:19:18 2011
@@ -55,11 +55,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java Mon May 23 02:19:18 2011
@@ -26,7 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHe
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.qualified.Qualified1;
import org.apache.cayenne.testdo.qualified.Qualified2;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -37,7 +37,7 @@ public class CDOQualifiedEntitiesTest ex
private ObjectContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBinaryPKTest.java Mon May 23 02:19:18 2011
@@ -27,7 +27,7 @@ import org.apache.cayenne.query.SelectQu
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.BinaryPKTest1;
import org.apache.cayenne.testdo.testmap.BinaryPKTest2;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -41,7 +41,7 @@ public class DataContextBinaryPKTest ext
private DataContext context1;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBlobTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBlobTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBlobTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextBlobTest.java Mon May 23 02:19:18 2011
@@ -26,7 +26,7 @@ import org.apache.cayenne.configuration.
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.testdo.testmap.BlobTestEntity;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -46,7 +46,7 @@ public class DataContextBlobTest extends
protected ServerRuntime runtime;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
protected boolean skipTests() {
return accessStackAdapter.supportsLobs();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextClobTest.java Mon May 23 02:19:18 2011
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.ClobTestEntity;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -42,7 +42,7 @@ public class DataContextClobTest extends
private DataContext context3;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsTemp.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsTemp.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsTemp.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsTemp.java Mon May 23 02:19:18 2011
@@ -35,7 +35,7 @@ import org.apache.cayenne.testdo.testmap
import org.apache.cayenne.testdo.testmap.BigIntegerEntity;
import org.apache.cayenne.testdo.testmap.DateTestEntity;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -50,7 +50,7 @@ public class DataContextEJBQLFunctionalE
private ObjectContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Override
protected void setUpAfterInjection() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullTest.java Mon May 23 02:19:18 2011
@@ -27,7 +27,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -38,7 +38,7 @@ public class DataContextEJBQLIsNullTest
private ObjectContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
protected DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java Mon May 23 02:19:18 2011
@@ -40,7 +40,7 @@ import org.apache.cayenne.testdo.testmap
import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -54,7 +54,7 @@ public class DataContextEJBQLQueryTest e
private DBHelper dbHelper;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
private TableHelper tArtist;
private TableHelper tPainting;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryTest.java Mon May 23 02:19:18 2011
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.EJBQLQue
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -42,7 +42,7 @@ public class DataContextEJBQLSubqueryTes
private ObjectContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java Mon May 23 02:19:18 2011
@@ -32,7 +32,7 @@ import org.apache.cayenne.test.jdbc.DBHe
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.ServerCase;
@@ -51,7 +51,7 @@ public class DataContextPerformQueryAPIT
private DBHelper dbHelper;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DataChannelInterceptor queryInterceptor;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java Mon May 23 02:19:18 2011
@@ -36,7 +36,7 @@ import org.apache.cayenne.query.SelectQu
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -52,7 +52,7 @@ public class DataContextProcedureQueryTe
private DataContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
protected DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java Mon May 23 02:19:18 2011
@@ -63,7 +63,7 @@ import org.apache.cayenne.testdo.testmap
import org.apache.cayenne.testdo.testmap.NullTestEntity;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.ROArtist;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.ServerCase;
@@ -79,7 +79,7 @@ public class DataContextTest extends Ser
protected DBHelper dbHelper;
@Inject
- protected AccessStackAdapter accessStackAdapter;
+ protected UnitDbAdapter accessStackAdapter;
@Inject
protected DataChannelInterceptor queryInterceptor;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java Mon May 23 02:19:18 2011
@@ -36,7 +36,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -53,7 +53,7 @@ public class DbLoaderTest extends Server
private DataSource dataSource;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
private DbLoader loader;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MiscTypesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MiscTypesTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MiscTypesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MiscTypesTest.java Mon May 23 02:19:18 2011
@@ -28,7 +28,7 @@ import org.apache.cayenne.test.jdbc.DBHe
import org.apache.cayenne.testdo.testmap.ArraysEntity;
import org.apache.cayenne.testdo.testmap.CharacterEntity;
import org.apache.cayenne.testdo.testmap.SerializableEntity;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -39,7 +39,7 @@ public class MiscTypesTest extends Serve
private ObjectContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java Mon May 23 02:19:18 2011
@@ -33,7 +33,7 @@ import org.apache.cayenne.query.SQLTempl
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -47,7 +47,7 @@ public class ResultDirectiveTest extends
private ServerRuntime runtime;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SelectActionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SelectActionTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SelectActionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SelectActionTest.java Mon May 23 02:19:18 2011
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.SelectQu
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.testmap.ClobTestEntity;
import org.apache.cayenne.testdo.testmap.ClobTestRelation;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -39,7 +39,7 @@ public class SelectActionTest extends Se
private DataContext context;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DBHelper dbHelper;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java Mon May 23 02:19:18 2011
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbKeyGenerator;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -35,7 +35,7 @@ import org.apache.cayenne.unit.di.server
public class JdbcAdapterTest extends ServerCase {
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
public void testExternalTypesForJdbcType() throws Exception {
// check a few types
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java Mon May 23 02:19:18 2011
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -33,7 +33,7 @@ import org.apache.cayenne.unit.di.server
public class PkGeneratorTest extends ServerCase {
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DataNode node;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferTest.java Mon May 23 02:19:18 2011
@@ -26,8 +26,8 @@ import javax.sql.DataSource;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.unit.AccessStackAdapter;
-import org.apache.cayenne.unit.SQLServerStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
+import org.apache.cayenne.unit.SQLServerUnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -38,7 +38,7 @@ public class SQLServerSnifferTest extend
private DataSource dataSource;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
public void testCreateAdapter() throws Exception {
@@ -59,7 +59,7 @@ public class SQLServerSnifferTest extend
}
}
- if (accessStackAdapter instanceof SQLServerStackAdapter) {
+ if (accessStackAdapter instanceof SQLServerUnitDbAdapter) {
assertNotNull(adapter);
}
else {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java Mon May 23 02:19:18 2011
@@ -35,7 +35,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
public abstract class MergeCase extends ServerCase {
@@ -44,7 +44,7 @@ public abstract class MergeCase extends
private ServerRuntime runtime;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Inject
private DataSource dataSource;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java Mon May 23 02:19:18 2011
@@ -42,7 +42,7 @@ import org.apache.cayenne.testdo.testmap
import org.apache.cayenne.testdo.testmap.Exhibit;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -56,7 +56,7 @@ public class SelectQueryTest extends Ser
private DBHelper dbHelper;
@Inject
- private AccessStackAdapter accessStackAdapter;
+ private UnitDbAdapter accessStackAdapter;
@Override
protected void setUpAfterInjection() throws Exception {
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2UnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2UnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2UnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2UnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -28,9 +28,9 @@ import org.apache.cayenne.map.DataMap;
/**
*/
-public class DB2StackAdapter extends AccessStackAdapter {
+public class DB2UnitDbAdapter extends UnitDbAdapter {
- public DB2StackAdapter(DbAdapter adapter) {
+ public DB2UnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -24,7 +24,7 @@ import org.apache.cayenne.dba.DbAdapter;
/**
*
*/
-public class DerbyStackAdapter extends AccessStackAdapter {
+public class DerbyUnitDbAdapter extends UnitDbAdapter {
static {
// as of Derby 10.1 Alpha, this is needed for Mac OS X:
@@ -32,7 +32,7 @@ public class DerbyStackAdapter extends A
System.setProperty("derby.storage.fileSyncTransactionLog", "true");
}
- public DerbyStackAdapter(DbAdapter adapter) {
+ public DerbyUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/FrontBaseUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -27,9 +27,9 @@ import org.apache.cayenne.map.DataMap;
/**
*/
-public class FrontBaseStackAdapter extends AccessStackAdapter {
+public class FrontBaseUnitDbAdapter extends UnitDbAdapter {
- public FrontBaseStackAdapter(DbAdapter adapter) {
+ public FrontBaseUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2UnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2StackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2UnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2UnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2StackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2StackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/H2UnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -22,9 +22,9 @@ package org.apache.cayenne.unit;
import org.apache.cayenne.dba.DbAdapter;
-public class H2StackAdapter extends AccessStackAdapter {
+public class H2UnitDbAdapter extends UnitDbAdapter {
- public H2StackAdapter(DbAdapter adapter) {
+ public H2UnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -24,9 +24,9 @@ import java.sql.Connection;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.map.DataMap;
-public class HSQLDBStackAdapter extends AccessStackAdapter {
+public class HSQLDBUnitDbAdapter extends UnitDbAdapter {
- public HSQLDBStackAdapter(DbAdapter adapter) {
+ public HSQLDBUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/IngresUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -27,9 +27,9 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
-public class IngresStackAdapter extends AccessStackAdapter {
+public class IngresUnitDbAdapter extends UnitDbAdapter {
- public IngresStackAdapter(DbAdapter adapter) {
+ public IngresUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -30,14 +30,14 @@ import org.apache.cayenne.map.Procedure;
/**
*/
-public class MySQLStackAdapter extends AccessStackAdapter {
+public class MySQLUnitDbAdapter extends UnitDbAdapter {
static final Collection<String> NO_CONSTRAINTS_TABLES = Arrays.asList(
"REFLEXIVE_AND_TO_ONE",
"ARTGROUP",
"FK_OF_DIFFERENT_TYPE");
- public MySQLStackAdapter(DbAdapter adapter) {
+ public MySQLUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OpenBaseUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -27,9 +27,9 @@ import org.apache.cayenne.map.DataMap;
/**
*/
-public class OpenBaseStackAdapter extends AccessStackAdapter {
+public class OpenBaseUnitDbAdapter extends UnitDbAdapter {
- public OpenBaseStackAdapter(DbAdapter adapter) {
+ public OpenBaseUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -38,14 +38,14 @@ import org.apache.cayenne.map.ProcedureP
/**
*/
-public class OracleStackAdapter extends AccessStackAdapter {
+public class OracleUnitDbAdapter extends UnitDbAdapter {
/**
* Constructor for OracleDelegate.
*
* @param adapter
*/
- public OracleStackAdapter(DbAdapter adapter) {
+ public OracleUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -31,9 +31,9 @@ import org.apache.cayenne.map.ProcedureP
/**
*/
-public class PostgresStackAdapter extends AccessStackAdapter {
+public class PostgresUnitDbAdapter extends UnitDbAdapter {
- public PostgresStackAdapter(DbAdapter adapter) {
+ public PostgresUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLServerUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -28,9 +28,9 @@ import org.apache.cayenne.map.DataMap;
/**
* @since 1.1
*/
-public class SQLServerStackAdapter extends SybaseStackAdapter {
+public class SQLServerUnitDbAdapter extends SybaseUnitDbAdapter {
- public SQLServerStackAdapter(DbAdapter adapter) {
+ public SQLServerUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SQLiteUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -20,9 +20,9 @@ package org.apache.cayenne.unit;
import org.apache.cayenne.dba.DbAdapter;
-public class SQLiteStackAdapter extends AccessStackAdapter {
+public class SQLiteUnitDbAdapter extends UnitDbAdapter {
- public SQLiteStackAdapter(DbAdapter adapter) {
+ public SQLiteUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -35,14 +35,14 @@ import org.apache.cayenne.map.Procedure;
/**
*/
-public class SybaseStackAdapter extends AccessStackAdapter {
+public class SybaseUnitDbAdapter extends UnitDbAdapter {
/**
* Constructor for SybaseDelegate.
*
* @param adapter
*/
- public SybaseStackAdapter(DbAdapter adapter) {
+ public SybaseUnitDbAdapter(DbAdapter adapter) {
super(adapter);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java Mon May 23 02:19:18 2011
@@ -48,13 +48,13 @@ import org.apache.commons.logging.LogFac
* things implemented in subclasses may become future candidates for inclusion in the
* corresponding adapter code.
*/
-public class AccessStackAdapter {
+public class UnitDbAdapter {
- private static Log logger = LogFactory.getLog(AccessStackAdapter.class);
+ private static Log logger = LogFactory.getLog(UnitDbAdapter.class);
protected DbAdapter adapter;
- public AccessStackAdapter(DbAdapter adapter) {
+ public UnitDbAdapter(DbAdapter adapter) {
if (adapter == null) {
throw new CayenneRuntimeException("Null adapter.");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java Mon May 23 02:19:18 2011
@@ -21,8 +21,8 @@ package org.apache.cayenne.unit.di.clien
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultScope;
-import org.apache.cayenne.unit.CayenneResources;
import org.apache.cayenne.unit.di.DICase;
+import org.apache.cayenne.unit.di.server.SchemaHelper;
import org.apache.cayenne.unit.di.server.ServerCaseModule;
public class ClientCase extends DICase {
@@ -38,8 +38,8 @@ public class ClientCase extends DICase {
injector = DIBootstrap.createInjector(
new ServerCaseModule(testScope),
new ClientCaseModule(testScope));
- // this triggers schema setup
- injector.getInstance(CayenneResources.class);
+
+ injector.getInstance(SchemaHelper.class).rebuildSchema();
}
@Override
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ConnectionProperties.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ConnectionProperties.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ConnectionProperties.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ConnectionProperties.java Mon May 23 02:19:18 2011
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.unit;
+package org.apache.cayenne.unit.di.server;
import java.io.BufferedWriter;
import java.io.File;
@@ -38,7 +38,7 @@ import org.apache.commons.collections.Ex
* in $HOME/.cayenne/connection.properties. As of now this is purely a utility class. Its
* features are not used in deployment.
*/
-public class ConnectionProperties {
+class ConnectionProperties {
public static final String EMBEDDED_DATASOURCE = "internal_embedded_datasource";
public static final String EMBEDDED_DATASOURCE_DBADAPTER = "org.apache.cayenne.dba.hsqldb.HSQLDBAdapter";
@@ -61,8 +61,8 @@ public class ConnectionProperties {
public static final String URL_KEY_MAVEN = "cayenneJdbcUrl";
public static final String DRIVER_KEY_MAVEN = "cayenneJdbcDriver";
- protected static ConnectionProperties sharedInstance;
- protected static Map<String, DataSourceInfo> connectionInfos = Collections
+ private static ConnectionProperties sharedInstance;
+ private static Map<String, DataSourceInfo> connectionInfos = Collections
.synchronizedMap(new HashMap<String, DataSourceInfo>());
static {
@@ -305,7 +305,7 @@ public class ConnectionProperties {
* Returns a list of connection names configured in the properties object.
*/
public List<String> extractNames(ExtendedProperties props) {
- Iterator it = props.getKeys();
+ Iterator<?> it = props.getKeys();
List<String> list = new ArrayList<String>();
while (it.hasNext()) {
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=1126296&r1=1126295&r2=1126296&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 02:19:18 2011
@@ -19,6 +19,7 @@
package org.apache.cayenne.unit.di.server;
+import java.io.InputStream;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -33,68 +34,111 @@ import java.util.ListIterator;
import javax.sql.DataSource;
+import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.DbGenerator;
-import org.apache.cayenne.access.UnitTestDomain;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.cache.MapQueryCache;
import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.di.Inject;
import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.MapLoader;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.testdo.testmap.StringET1ExtendedType;
-import org.apache.cayenne.unit.AccessStackAdapter;
-import org.apache.cayenne.unit.CayenneResources;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.xml.sax.InputSource;
/**
* Default implementation of the AccessStack that has a single DataNode per DataMap.
*/
-class SchemaHelper {
+public class SchemaHelper {
private static Log logger = LogFactory.getLog(SchemaHelper.class);
+ public static final String CONNECTION_NAME_KEY = "cayenneTestConnection";
+ public static final String DEFAULT_CONNECTION_KEY = "internal_embedded_datasource";
+
+ public static final String SKIP_SCHEMA_KEY = "cayenne.test.schema.skip";
+
+ private static String[] DATA_MAPS_REQUIREING_SCHEMA_SETUP = {
+ "testmap.map.xml", "people.map.xml", "locking.map.xml",
+ "relationships.map.xml", "multi-tier.map.xml", "generic.map.xml",
+ "map-db1.map.xml", "map-db2.map.xml", "embeddable.map.xml",
+ "qualified.map.xml", "quoted-identifiers.map.xml",
+ "inheritance-single-table1.map.xml", "inheritance-vertical.map.xml"
+ };
+
// hardcoded dependent entities that should be excluded
// if LOBs are not supported
private static final String[] EXTRA_EXCLUDED_FOR_NO_LOB = new String[] {
"CLOB_DETAIL"
};
- protected CayenneResources resources;
- protected UnitTestDomain domain;
private DataSource dataSource;
- private String adapterClassName;
+ private UnitDbAdapter unitDbAdapter;
- public SchemaHelper(DataSource dataSource, String adapterClassName,
- CayenneResources resources, DataMap[] maps) throws Exception {
+ private DataDomain domain;
- this.adapterClassName = adapterClassName;
+ public SchemaHelper(@Inject DataSource dataSource, @Inject UnitDbAdapter unitDbAdapter) {
this.dataSource = dataSource;
- this.resources = resources;
- this.domain = new UnitTestDomain("domain");
+ this.unitDbAdapter = unitDbAdapter;
+ }
+
+ /**
+ * Completely rebuilds test schema.
+ */
+ // TODO - this method changes the internal state of the object ... refactor
+ public void rebuildSchema() {
+
+ if ("true".equalsIgnoreCase(System.getProperty(SKIP_SCHEMA_KEY))) {
+ logger.info("skipping schema generation... ");
+ return;
+ }
+
+ // generate schema combining all DataMaps that require schema support.
+ // Schema generation is done like that instead of per DataMap on demand to avoid
+ // conflicts when dropping and generating PK objects.
+
+ DataMap[] maps = new DataMap[DATA_MAPS_REQUIREING_SCHEMA_SETUP.length];
+
+ for (int i = 0; i < maps.length; i++) {
+ InputStream stream = getClass().getClassLoader().getResourceAsStream(
+ DATA_MAPS_REQUIREING_SCHEMA_SETUP[i]);
+ InputSource in = new InputSource(stream);
+ in.setSystemId(DATA_MAPS_REQUIREING_SCHEMA_SETUP[i]);
+ maps[i] = new MapLoader().loadDataMap(in);
+ }
+
+ this.domain = new DataDomain("temp");
domain.setEventManager(new DefaultEventManager(2));
domain.setEntitySorter(new AshwoodEntitySorter());
domain.setQueryCache(new MapQueryCache(50));
- for (DataMap map : maps) {
- initNode(map);
- }
- }
+ try {
+ for (DataMap map : maps) {
+ initNode(map);
+ }
- public AccessStackAdapter getAdapter(DataNode node) {
- return resources.getAccessStackAdapter(node.getAdapter().getClass().getName());
+ dropSchema();
+ dropPKSupport();
+ createSchema();
+ createPKSupport();
+ }
+ catch (Exception e) {
+ throw new RuntimeException("Error rebuilding schema", e);
+ }
}
private void initNode(DataMap map) throws Exception {
- AccessStackAdapter adapter = resources.getAccessStackAdapter(adapterClassName);
-
DataNode node = new DataNode(map.getName());
- node.setAdapter(adapter.getAdapter());
+ node.setAdapter(unitDbAdapter.getAdapter());
node.setDataSource(dataSource);
// setup test extended types
@@ -102,7 +146,7 @@ class SchemaHelper {
// tweak mapping with a delegate
for (Procedure proc : map.getProcedures()) {
- getAdapter(node).tweakProcedure(proc);
+ unitDbAdapter.tweakProcedure(proc);
}
node.addDataMap(map);
@@ -112,7 +156,7 @@ class SchemaHelper {
}
/** Drops all test tables. */
- public void dropSchema() throws Exception {
+ private void dropSchema() throws Exception {
for (DataNode node : domain.getDataNodes()) {
dropSchema(node, node.getDataMaps().iterator().next());
}
@@ -121,13 +165,13 @@ class SchemaHelper {
/**
* Creates all test tables in the database.
*/
- public void createSchema() throws Exception {
+ private void createSchema() throws Exception {
for (DataNode node : domain.getDataNodes()) {
createSchema(node, node.getDataMaps().iterator().next());
}
}
- public void dropPKSupport() throws Exception {
+ private void dropPKSupport() throws Exception {
for (DataNode node : domain.getDataNodes()) {
dropPKSupport(node, node.getDataMaps().iterator().next());
}
@@ -138,7 +182,7 @@ class SchemaHelper {
* provided by DbAdapter to generate any necessary database objects and data for
* primary key support.
*/
- public void createPKSupport() throws Exception {
+ private void createPKSupport() throws Exception {
for (DataNode node : domain.getDataNodes()) {
createPKSupport(node, node.getDataMaps().iterator().next());
}
@@ -154,8 +198,8 @@ class SchemaHelper {
// filter various unsupported tests...
// LOBs
- boolean excludeLOB = !getAdapter(node).supportsLobs();
- boolean excludeBinPK = !getAdapter(node).supportsBinaryPK();
+ boolean excludeLOB = !unitDbAdapter.supportsLobs();
+ boolean excludeBinPK = !unitDbAdapter.supportsBinaryPK();
if (excludeLOB || excludeBinPK) {
List<DbEntity> filtered = new ArrayList<DbEntity>();
@@ -231,7 +275,7 @@ class SchemaHelper {
}
tables.close();
- getAdapter(node).willDropTables(conn, map, allTables);
+ unitDbAdapter.willDropTables(conn, map, allTables);
// drop all tables in the map
Statement stmt = conn.createStatement();
@@ -256,7 +300,7 @@ class SchemaHelper {
}
}
- getAdapter(node).droppedTables(conn, map);
+ unitDbAdapter.droppedTables(conn, map);
}
finally {
conn.close();
@@ -278,14 +322,14 @@ class SchemaHelper {
Connection conn = dataSource.getConnection();
try {
- getAdapter(node).willCreateTables(conn, map);
+ unitDbAdapter.willCreateTables(conn, map);
Statement stmt = conn.createStatement();
for (String query : tableCreateQueries(node, map)) {
logger.info(query);
stmt.execute(query);
}
- getAdapter(node).createdTables(conn, map);
+ unitDbAdapter.createdTables(conn, map);
}
finally {
conn.close();
@@ -310,7 +354,7 @@ class SchemaHelper {
// FK constraints
for (DbEntity ent : orderedEnts) {
- if (!getAdapter(node).supportsFKConstraints(ent)) {
+ if (!unitDbAdapter.supportsFKConstraints(ent)) {
continue;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java Mon May 23 02:19:18 2011
@@ -21,7 +21,6 @@ package org.apache.cayenne.unit.di.serve
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultScope;
-import org.apache.cayenne.unit.CayenneResources;
import org.apache.cayenne.unit.di.DICase;
public class ServerCase extends DICase {
@@ -44,9 +43,7 @@ public class ServerCase extends DICase {
static {
DefaultScope testScope = new DefaultScope();
injector = DIBootstrap.createInjector(new ServerCaseModule(testScope));
-
- // this triggers schema setup
- injector.getInstance(CayenneResources.class);
+ injector.getInstance(SchemaHelper.class).rebuildSchema();
}
@Override
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseBatchQueryBuilderFactoryProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseBatchQueryBuilderFactoryProvider.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseBatchQueryBuilderFactoryProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseBatchQueryBuilderFactoryProvider.java Mon May 23 02:19:18 2011
@@ -20,20 +20,13 @@ package org.apache.cayenne.unit.di.serve
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
-import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.access.jdbc.DefaultBatchQueryBuilderFactory;
import org.apache.cayenne.di.Provider;
public class ServerCaseBatchQueryBuilderFactoryProvider implements
Provider<BatchQueryBuilderFactory> {
- @Inject
- // injecting provider to make this provider independent from scoping of ServerRuntime
- protected Provider<ServerRuntime> serverRuntimeProvider;
-
public BatchQueryBuilderFactory get() throws ConfigurationException {
- Injector injector = serverRuntimeProvider.get().getInjector();
- return injector.getInstance(BatchQueryBuilderFactory.class);
+ return new DefaultBatchQueryBuilderFactory();
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java Mon May 23 02:19:18 2011
@@ -21,7 +21,6 @@ package org.apache.cayenne.unit.di.serve
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.di.Provider;
-import org.apache.cayenne.unit.ConnectionProperties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java?rev=1126296&r1=1126295&r2=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java Mon May 23 02:19:18 2011
@@ -49,20 +49,19 @@ import org.apache.cayenne.log.CommonsJdb
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.unit.AccessStackAdapter;
-import org.apache.cayenne.unit.CayenneResources;
-import org.apache.cayenne.unit.DB2StackAdapter;
-import org.apache.cayenne.unit.FrontBaseStackAdapter;
-import org.apache.cayenne.unit.H2StackAdapter;
-import org.apache.cayenne.unit.HSQLDBStackAdapter;
-import org.apache.cayenne.unit.IngresStackAdapter;
-import org.apache.cayenne.unit.MySQLStackAdapter;
-import org.apache.cayenne.unit.OpenBaseStackAdapter;
-import org.apache.cayenne.unit.OracleStackAdapter;
-import org.apache.cayenne.unit.PostgresStackAdapter;
-import org.apache.cayenne.unit.SQLServerStackAdapter;
-import org.apache.cayenne.unit.SQLiteStackAdapter;
-import org.apache.cayenne.unit.SybaseStackAdapter;
+import org.apache.cayenne.unit.DB2UnitDbAdapter;
+import org.apache.cayenne.unit.FrontBaseUnitDbAdapter;
+import org.apache.cayenne.unit.H2UnitDbAdapter;
+import org.apache.cayenne.unit.HSQLDBUnitDbAdapter;
+import org.apache.cayenne.unit.IngresUnitDbAdapter;
+import org.apache.cayenne.unit.MySQLUnitDbAdapter;
+import org.apache.cayenne.unit.OpenBaseUnitDbAdapter;
+import org.apache.cayenne.unit.OracleUnitDbAdapter;
+import org.apache.cayenne.unit.PostgresUnitDbAdapter;
+import org.apache.cayenne.unit.SQLServerUnitDbAdapter;
+import org.apache.cayenne.unit.SQLiteUnitDbAdapter;
+import org.apache.cayenne.unit.SybaseUnitDbAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestLifecycleManager;
import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
@@ -83,35 +82,35 @@ public class ServerCaseModule implements
// unit test injector. ServerRuntime injector contents are customized
// inside ServerRuntimeProvider.
- binder.bindMap(AccessStackAdapterProvider.TEST_ADAPTERS_MAP).put(
+ binder.bindMap(UnitDbAdapterProvider.TEST_ADAPTERS_MAP).put(
OracleAdapter.class.getName(),
- OracleStackAdapter.class.getName()).put(
+ OracleUnitDbAdapter.class.getName()).put(
Oracle8Adapter.class.getName(),
- OracleStackAdapter.class.getName()).put(
+ OracleUnitDbAdapter.class.getName()).put(
SybaseAdapter.class.getName(),
- SybaseStackAdapter.class.getName()).put(
+ SybaseUnitDbAdapter.class.getName()).put(
MySQLAdapter.class.getName(),
- MySQLStackAdapter.class.getName()).put(
+ MySQLUnitDbAdapter.class.getName()).put(
PostgresAdapter.class.getName(),
- PostgresStackAdapter.class.getName()).put(
+ PostgresUnitDbAdapter.class.getName()).put(
OpenBaseAdapter.class.getName(),
- OpenBaseStackAdapter.class.getName()).put(
+ OpenBaseUnitDbAdapter.class.getName()).put(
SQLServerAdapter.class.getName(),
- SQLServerStackAdapter.class.getName()).put(
+ SQLServerUnitDbAdapter.class.getName()).put(
DB2Adapter.class.getName(),
- DB2StackAdapter.class.getName()).put(
+ DB2UnitDbAdapter.class.getName()).put(
HSQLDBAdapter.class.getName(),
- HSQLDBStackAdapter.class.getName()).put(
+ HSQLDBUnitDbAdapter.class.getName()).put(
H2Adapter.class.getName(),
- H2StackAdapter.class.getName()).put(
+ H2UnitDbAdapter.class.getName()).put(
FrontBaseAdapter.class.getName(),
- FrontBaseStackAdapter.class.getName()).put(
+ FrontBaseUnitDbAdapter.class.getName()).put(
IngresAdapter.class.getName(),
- IngresStackAdapter.class.getName()).put(
+ IngresUnitDbAdapter.class.getName()).put(
SQLiteAdapter.class.getName(),
- SQLiteStackAdapter.class.getName());
+ SQLiteUnitDbAdapter.class.getName());
- binder.bind(CayenneResources.class).toProvider(CayenneResourcesProvider.class);
+ binder.bind(SchemaHelper.class).to(SchemaHelper.class);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
// singleton objects
@@ -124,9 +123,11 @@ public class ServerCaseModule implements
.bind(DataSource.class)
.toProvider(ServerCaseSharedDataSourceProvider.class);
binder.bind(DbAdapter.class).toProvider(ServerCaseDbAdapterProvider.class);
- binder
- .bind(AccessStackAdapter.class)
- .toProvider(AccessStackAdapterProvider.class);
+ binder.bind(UnitDbAdapter.class).toProvider(UnitDbAdapterProvider.class);
+
+ // this factory is a hack that allows to inject to DbAdapters loaded outside of
+ // server runtime... BatchQueryBuilderFactory is hardcoded and whatever is placed
+ // in the ServerModule is ignored
binder.bind(BatchQueryBuilderFactory.class).toProvider(
ServerCaseBatchQueryBuilderFactoryProvider.class);
binder.bind(DataChannelInterceptor.class).to(
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UnitDbAdapterProvider.java (from r1126295, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/AccessStackAdapterProvider.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UnitDbAdapterProvider.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UnitDbAdapterProvider.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/AccessStackAdapterProvider.java&r1=1126295&r2=1126296&rev=1126296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/AccessStackAdapterProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/UnitDbAdapterProvider.java Mon May 23 02:19:18 2011
@@ -27,10 +27,10 @@ import org.apache.cayenne.conn.DataSourc
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
-import org.apache.cayenne.unit.AccessStackAdapter;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.util.Util;
-public class AccessStackAdapterProvider implements Provider<AccessStackAdapter> {
+public class UnitDbAdapterProvider implements Provider<UnitDbAdapter> {
static final String TEST_ADAPTERS_MAP = "org.apache.cayenne.unit.di.server.CayenneResourcesAccessStackAdapterProvider.adapters";
@@ -38,7 +38,7 @@ public class AccessStackAdapterProvider
private DataSourceInfo dataSourceInfo;
private Map<String, String> adapterTypesMap;
- public AccessStackAdapterProvider(
+ public UnitDbAdapterProvider(
@Inject(TEST_ADAPTERS_MAP) Map<String, String> adapterTypesMap,
@Inject DataSourceInfo dataSourceInfo, @Inject DbAdapter adapter) {
this.dataSourceInfo = dataSourceInfo;
@@ -46,7 +46,7 @@ public class AccessStackAdapterProvider
this.adapter = adapter;
}
- public AccessStackAdapter get() throws ConfigurationException {
+ public UnitDbAdapter get() throws ConfigurationException {
String testAdapterType = adapterTypesMap
.get(dataSourceInfo.getAdapterClassName());
@@ -55,9 +55,9 @@ public class AccessStackAdapterProvider
+ dataSourceInfo.getAdapterClassName());
}
- Class<AccessStackAdapter> type;
+ Class<UnitDbAdapter> type;
try {
- type = (Class<AccessStackAdapter>) Util.getJavaClass(testAdapterType);
+ type = (Class<UnitDbAdapter>) Util.getJavaClass(testAdapterType);
}
catch (ClassNotFoundException e) {
throw new CayenneRuntimeException(
@@ -66,14 +66,14 @@ public class AccessStackAdapterProvider
testAdapterType);
}
- if (!AccessStackAdapter.class.isAssignableFrom(type)) {
+ if (!UnitDbAdapter.class.isAssignableFrom(type)) {
throw new CayenneRuntimeException(
"Class %s is not assignable to AccessStackAdapter",
testAdapterType);
}
try {
- Constructor<AccessStackAdapter> c = type.getConstructor(DbAdapter.class);
+ Constructor<UnitDbAdapter> c = type.getConstructor(DbAdapter.class);
return c.newInstance(adapter);
}
catch (Exception e) {