Author: aadamchik
Date: Mon May 23 02:30:25 2011
New Revision: 1126301
URL: http://svn.apache.org/viewvc?rev=1126301&view=rev
Log:
unit test refactoring
refactoring
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
- copied, changed from r1126300,
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java
Removed:
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/client/ClientCase.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/ServerCaseModule.java
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=1126301&r1=1126300&r2=1126301&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:30:25 2011
@@ -22,7 +22,7 @@ import org.apache.cayenne.di.DIBootstrap
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultScope;
import org.apache.cayenne.unit.di.DICase;
-import org.apache.cayenne.unit.di.server.SchemaHelper;
+import org.apache.cayenne.unit.di.server.SchemaBuilder;
import org.apache.cayenne.unit.di.server.ServerCaseModule;
public class ClientCase extends DICase {
@@ -39,7 +39,7 @@ public class ClientCase extends DICase {
new ServerCaseModule(testScope),
new ClientCaseModule(testScope));
- injector.getInstance(SchemaHelper.class).rebuildSchema();
+ injector.getInstance(SchemaBuilder.class).rebuildSchema();
}
@Override
Copied:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
(from r1126300,
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/SchemaBuilder.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaHelper.java&r1=1126300&r2=1126301&rev=1126301&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/SchemaBuilder.java
Mon May 23 02:30:25 2011
@@ -57,9 +57,9 @@ import org.xml.sax.InputSource;
/**
* Default implementation of the AccessStack that has a single DataNode per
DataMap.
*/
-public class SchemaHelper {
+public class SchemaBuilder {
- private static Log logger = LogFactory.getLog(SchemaHelper.class);
+ private static Log logger = LogFactory.getLog(SchemaBuilder.class);
public static final String CONNECTION_NAME_KEY = "cayenneTestConnection";
public static final String DEFAULT_CONNECTION_KEY =
"internal_embedded_datasource";
@@ -86,7 +86,7 @@ public class SchemaHelper {
private DataDomain domain;
- public SchemaHelper(@Inject DataSource dataSource,
+ public SchemaBuilder(@Inject DataSource dataSource,
@Inject UnitDbAdapter unitDbAdapter, @Inject DbAdapter dbAdapter) {
this.dataSource = dataSource;
this.unitDbAdapter = unitDbAdapter;
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=1126301&r1=1126300&r2=1126301&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:30:25 2011
@@ -43,7 +43,7 @@ public class ServerCase extends DICase {
static {
DefaultScope testScope = new DefaultScope();
injector = DIBootstrap.createInjector(new ServerCaseModule(testScope));
- injector.getInstance(SchemaHelper.class).rebuildSchema();
+ injector.getInstance(SchemaBuilder.class).rebuildSchema();
}
@Override
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=1126301&r1=1126300&r2=1126301&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:30:25 2011
@@ -110,7 +110,7 @@ public class ServerCaseModule implements
SQLiteAdapter.class.getName(),
SQLiteUnitDbAdapter.class.getName());
- binder.bind(SchemaHelper.class).to(SchemaHelper.class);
+ binder.bind(SchemaBuilder.class).to(SchemaBuilder.class);
binder.bind(JdbcEventLogger.class).to(CommonsJdbcEventLogger.class);
// singleton objects
