svn commit: r1407637 - in /cayenne/main/trunk/framework/cayenne-tools/src: main/java/org/apache/cayenne/tools/dbimport/ test/java/org/apache/cayenne/tools/dbimport/

[aa...@apache.org]

Author: aadamchik
Date: Fri Nov  9 21:10:41 2012
New Revision: 1407637

URL: http://svn.apache.org/viewvc?rev=1407637&view=rev
Log:
CAY-1758 cdbimport improvements

unit tests, and also fixing DbImportModule

Added:
    cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java
      - copied, changed from r1407635, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
Modified:
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java

Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java?rev=1407637&r1=1407636&r2=1407637&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java Fri Nov  9 21:10:41 2012
@@ -30,6 +30,7 @@ import org.apache.cayenne.configuration.
 import org.apache.cayenne.configuration.server.DbAdapterFactory;
 import org.apache.cayenne.conn.DriverDataSource;
 import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.map.ObjEntity;
@@ -50,7 +51,7 @@ public class DbImportAction {
     private DbAdapterFactory adapterFactory;
     private Log logger;
 
-    public DbImportAction(Log logger, DbAdapterFactory adapterFactory) {
+    public DbImportAction(@Inject Log logger, @Inject DbAdapterFactory adapterFactory) {
         this.logger = logger;
         this.adapterFactory = adapterFactory;
     }

Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java?rev=1407637&r1=1407636&r2=1407637&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java Fri Nov  9 21:10:41 2012
@@ -31,7 +31,6 @@ import org.apache.cayenne.tools.configur
 public class DbImportModule implements Module {
 
     public void configure(Binder binder) {
-
-        binder.bind(DbImportAction.class);
+        binder.bind(DbImportAction.class).to(DbImportAction.class);
     }
 }

Copied: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java (from r1407635, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java&r1=1407635&r2=1407637&rev=1407637&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java Fri Nov  9 21:10:41 2012
@@ -18,20 +18,20 @@
  ****************************************************************/
 package org.apache.cayenne.tools.dbimport;
 
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
+import static org.mockito.Mockito.mock;
+import junit.framework.TestCase;
+
+import org.apache.cayenne.di.DIBootstrap;
+import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.tools.configuration.ToolsModule;
+import org.apache.commons.logging.Log;
 
-/**
- * A DI module that bootstraps {@link DbImportAction}. Should be used in
- * conjunction with {@link ToolsModule}.
- * 
- * @since 3.2
- */
-public class DbImportModule implements Module {
+public class DbImportModuleTest extends TestCase {
 
-    public void configure(Binder binder) {
+    public void testModuleContents() {
 
-        binder.bind(DbImportAction.class);
+        Log log = mock(Log.class);
+        Injector i = DIBootstrap.createInjector(new ToolsModule(log), new DbImportModule());
+        assertTrue(i.getInstance(DbImportAction.class) instanceof DbImportAction);
     }
 }