cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [3/4] cayenne git commit: CAY-2114 cdbimport: object layer settings are not respected
Date Fri, 30 Sep 2016 19:18:39 GMT
CAY-2114 cdbimport: object layer settings are not respected

* propagating top-level ObjectNameGenerator down to all tokens


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5a031305
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5a031305
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5a031305

Branch: refs/heads/master
Commit: 5a031305ce0ddfca21b96e031bb710ef4fa4b824
Parents: 49a6ca3
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Fri Sep 30 21:32:57 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Fri Sep 30 21:52:10 2016 +0300

----------------------------------------------------------------------
 .../apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a031305/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java
b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java
index 45f6478..f5d5bbc 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.dbsync.merge.factory.DefaultMergerTokenFactory;
 import org.apache.cayenne.dbsync.reverse.db.DbLoader;
 import org.apache.cayenne.dbsync.reverse.db.DbLoaderConfiguration;
 import org.apache.cayenne.dbsync.reverse.db.DbLoaderDelegate;
+import org.apache.cayenne.dbsync.reverse.naming.DefaultObjectNameGenerator;
 import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.map.DataMap;
@@ -155,6 +156,7 @@ public class DefaultDbImportActionTest {
 		when(params.getDataMapFile()).thenReturn(FILE_STUB);
 		when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
 		when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
+		when(params.getNameGenerator()).thenReturn(new DefaultObjectNameGenerator());
 
         final boolean[] haveWeTriedToSave = {false};
         DefaultDbImportAction action = buildDbImportAction(new FileProjectSaver() {


Mime
View raw message