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 2015/04/29 08:22:06 UTC
cayenne git commit: formatting, cleanup. no changes
Repository: cayenne
Updated Branches:
refs/heads/master 41cdad749 -> 3cfce77cb
formatting, cleanup. no changes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3cfce77c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3cfce77c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3cfce77c
Branch: refs/heads/master
Commit: 3cfce77cb40e345d4cf54557f5aa2aa9b693bdb5
Parents: 41cdad7
Author: aadamchik <aa...@apache.org>
Authored: Wed Apr 29 09:21:59 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Wed Apr 29 09:21:59 2015 +0300
----------------------------------------------------------------------
.../cayenne/gen/ClassGenerationActionTest.java | 419 ++++++++--------
.../cayenne/tools/AntDataPortDelegateTest.java | 1 +
.../cayenne/tools/DbImporterTaskTest.java | 10 +-
.../cayenne/tools/NamePatternMatcherTest.java | 106 ++--
.../tools/dbimport/DbImportActionTest.java | 479 +++++++++----------
.../DefaultReverseEngineeringLoaderTest.java | 419 ++++++++--------
6 files changed, 702 insertions(+), 732 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
index 8bdc454..714e2d3 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
@@ -40,214 +40,213 @@ import static org.junit.Assert.assertTrue;
public class ClassGenerationActionTest {
- protected ClassGenerationAction action;
- protected Collection<StringWriter> writers;
-
- @Before
- public void setUp() throws Exception {
- this.writers = new ArrayList<StringWriter>(3);
- this.action = new ClassGenerationAction() {
-
- @Override
- protected Writer openWriter(TemplateType templateType) throws Exception {
- StringWriter writer = new StringWriter();
- writers.add(writer);
- return writer;
- }
- };
- }
-
- @After
- public void tearDown() throws Exception {
- action = null;
- writers = null;
- }
-
- @Test
- public void testExecuteArtifactPairsImports() throws Exception {
-
- ObjEntity testEntity1 = new ObjEntity("TE1");
- testEntity1.setClassName("org.example.TestClass1");
-
- action.setMakePairs(true);
- action.setSuperPkg("org.example.auto");
-
- List<String> generated = execute(new EntityArtifact(testEntity1));
- assertNotNull(generated);
- assertEquals(2, generated.size());
-
- String superclass = generated.get(0);
- assertTrue(superclass, superclass.contains("package org.example.auto;"));
- assertTrue(superclass, superclass.contains("import org.apache.cayenne.CayenneDataObject;"));
-
- String subclass = generated.get(1);
- assertTrue(subclass, subclass.contains("package org.example;"));
- assertTrue(
- subclass,
- subclass.contains("import org.example.auto._TestClass1;"));
- }
-
- @Test
- public void testExecuteArtifactPairsMapRelationships() throws Exception {
-
- ObjEntity testEntity1 = new ObjEntity("TE1");
- testEntity1.setClassName("org.example.TestClass1");
-
- final ObjEntity testEntity2 = new ObjEntity("TE1");
- testEntity2.setClassName("org.example.TestClass2");
-
- ObjRelationship relationship = new ObjRelationship("xMap") {
-
- @Override
- public boolean isToMany() {
- return true;
- }
-
- @Override
- public ObjEntity getTargetEntity() {
- return testEntity2;
- }
- };
- relationship.setCollectionType("java.util.Map");
- testEntity1.addRelationship(relationship);
-
- action.setMakePairs(true);
-
- List<String> generated = execute(new EntityArtifact(testEntity1));
- assertNotNull(generated);
- assertEquals(2, generated.size());
-
- String superclass = generated.get(0);
- assertTrue(superclass, superclass.contains("import java.util.Map;"));
- }
-
- @Test
- public void testExecuteArtifactPairsAttribute() throws Exception {
-
- ObjEntity testEntity1 = new ObjEntity("TE1");
- testEntity1.setClassName("org.example.TestClass1");
-
- ObjAttribute attr = new ObjAttribute();
- attr.setName("ID");
- attr.setType("int");
-
- ObjAttribute attr1 = new ObjAttribute();
- attr1.setName("name");
- attr1.setType("char");
-
- testEntity1.addAttribute(attr);
- testEntity1.addAttribute(attr1);
-
- action.setMakePairs(true);
-
- List<String> generated = execute(new EntityArtifact(testEntity1));
- assertNotNull(generated);
- assertEquals(2, generated.size());
- String superclass = generated.get(0);
-
- assertTrue(superclass, superclass.contains("public void setID(int ID)"));
- assertTrue(superclass, superclass.contains("writeProperty(\"ID\", ID);"));
-
- assertTrue(superclass, superclass.contains("public int getID()"));
- assertTrue(superclass, superclass.contains("Object value = readProperty(\"ID\");"));
- assertTrue(superclass, superclass.contains("return (value != null) ? (Integer) value : 0;"));
-
- assertTrue(superclass, superclass.contains("public void setName(char name)"));
- assertTrue(superclass, superclass.contains("writeProperty(\"name\", name);"));
-
- assertTrue(superclass, superclass.contains("public char getName()"));
- assertTrue(superclass, superclass.contains("Object value = readProperty(\"name\");"));
- assertTrue(superclass, superclass.contains("return (value != null) ? (Character) value : 0;"));
-
- }
-
- @Test
- public void testExecuteDataMapQueryNames() throws Exception {
- runDataMapTest(false);
- }
-
- @Test
- public void testExecuteClientDataMapQueryNames() throws Exception {
- runDataMapTest(true);
- }
-
- private void runDataMapTest(boolean client) throws Exception {
- DataMap map = new DataMap();
- map.addQuery(new NamedQuery("TestQuery"));
- map.setName("testmap");
- List<String> generated;
- if (client) {
- map.setDefaultClientPackage("testpackage");
- generated = execute(new ClientDataMapArtifact(map,map.getQueries()));
- } else {
- map.setDefaultPackage("testpackage");
- generated = execute(new DataMapArtifact(map,map.getQueries()));
- }
- assertEquals(2,generated.size());
- assertTrue(generated.get(0).contains("public static final String TEST_QUERY_QUERYNAME = \"TestQuery\""));
- }
-
- @Test
- public void testCallbackMethodGeneration() throws Exception {
- assertCallbacks(false);
- }
-
- @Test
- public void testClientCallbackMethodGeneration() throws Exception {
- assertCallbacks(true);
- }
-
- private void assertCallbacks(boolean isClient) throws Exception
- {
- ObjEntity testEntity1 = new ObjEntity("TE1");
- testEntity1.setClassName("org.example.TestClass1");
- int i=0;
- for(CallbackDescriptor cb : testEntity1.getCallbackMap().getCallbacks()) {
- cb.addCallbackMethod("cb" + i++);
- }
-
- if (isClient) {
-
- action = new ClientClassGenerationAction() {
- @Override
- protected Writer openWriter(TemplateType templateType) throws Exception {
- StringWriter writer = new StringWriter();
- writers.add(writer);
- return writer;
- }
-
- };
-
- }
-
- action.setMakePairs(true);
-
- List<String> generated = execute(new EntityArtifact(testEntity1));
- assertNotNull(generated);
- assertEquals(2, generated.size());
-
- String superclass = generated.get(0);
-
- assertTrue(superclass, superclass.contains("public abstract class _TestClass1"));
-
- for(int j=0;j<i;j++) {
- assertTrue(superclass, superclass.contains("protected abstract void cb" + j + "();"));
- }
-
- String subclass = generated.get(1);
- for(int j=0;j<i;j++) {
- assertTrue(subclass, subclass.contains("protected void cb" + j + "() {"));
- }
- }
-
- protected List<String> execute(Artifact artifact) throws Exception {
-
- action.execute(artifact);
-
- List<String> strings = new ArrayList<String>(writers.size());
- for (StringWriter writer : writers) {
- strings.add(writer.toString());
- }
- return strings;
- }
+ protected ClassGenerationAction action;
+ protected Collection<StringWriter> writers;
+
+ @Before
+ public void setUp() throws Exception {
+ this.writers = new ArrayList<StringWriter>(3);
+ this.action = new ClassGenerationAction() {
+
+ @Override
+ protected Writer openWriter(TemplateType templateType) throws Exception {
+ StringWriter writer = new StringWriter();
+ writers.add(writer);
+ return writer;
+ }
+ };
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ action = null;
+ writers = null;
+ }
+
+ @Test
+ public void testExecuteArtifactPairsImports() throws Exception {
+
+ ObjEntity testEntity1 = new ObjEntity("TE1");
+ testEntity1.setClassName("org.example.TestClass1");
+
+ action.setMakePairs(true);
+ action.setSuperPkg("org.example.auto");
+
+ List<String> generated = execute(new EntityArtifact(testEntity1));
+ assertNotNull(generated);
+ assertEquals(2, generated.size());
+
+ String superclass = generated.get(0);
+ assertTrue(superclass, superclass.contains("package org.example.auto;"));
+ assertTrue(superclass, superclass.contains("import org.apache.cayenne.CayenneDataObject;"));
+
+ String subclass = generated.get(1);
+ assertTrue(subclass, subclass.contains("package org.example;"));
+ assertTrue(subclass, subclass.contains("import org.example.auto._TestClass1;"));
+ }
+
+ @Test
+ public void testExecuteArtifactPairsMapRelationships() throws Exception {
+
+ ObjEntity testEntity1 = new ObjEntity("TE1");
+ testEntity1.setClassName("org.example.TestClass1");
+
+ final ObjEntity testEntity2 = new ObjEntity("TE1");
+ testEntity2.setClassName("org.example.TestClass2");
+
+ ObjRelationship relationship = new ObjRelationship("xMap") {
+
+ private static final long serialVersionUID = 8042147877503405974L;
+
+ @Override
+ public boolean isToMany() {
+ return true;
+ }
+
+ @Override
+ public ObjEntity getTargetEntity() {
+ return testEntity2;
+ }
+ };
+ relationship.setCollectionType("java.util.Map");
+ testEntity1.addRelationship(relationship);
+
+ action.setMakePairs(true);
+
+ List<String> generated = execute(new EntityArtifact(testEntity1));
+ assertNotNull(generated);
+ assertEquals(2, generated.size());
+
+ String superclass = generated.get(0);
+ assertTrue(superclass, superclass.contains("import java.util.Map;"));
+ }
+
+ @Test
+ public void testExecuteArtifactPairsAttribute() throws Exception {
+
+ ObjEntity testEntity1 = new ObjEntity("TE1");
+ testEntity1.setClassName("org.example.TestClass1");
+
+ ObjAttribute attr = new ObjAttribute();
+ attr.setName("ID");
+ attr.setType("int");
+
+ ObjAttribute attr1 = new ObjAttribute();
+ attr1.setName("name");
+ attr1.setType("char");
+
+ testEntity1.addAttribute(attr);
+ testEntity1.addAttribute(attr1);
+
+ action.setMakePairs(true);
+
+ List<String> generated = execute(new EntityArtifact(testEntity1));
+ assertNotNull(generated);
+ assertEquals(2, generated.size());
+ String superclass = generated.get(0);
+
+ assertTrue(superclass, superclass.contains("public void setID(int ID)"));
+ assertTrue(superclass, superclass.contains("writeProperty(\"ID\", ID);"));
+
+ assertTrue(superclass, superclass.contains("public int getID()"));
+ assertTrue(superclass, superclass.contains("Object value = readProperty(\"ID\");"));
+ assertTrue(superclass, superclass.contains("return (value != null) ? (Integer) value : 0;"));
+
+ assertTrue(superclass, superclass.contains("public void setName(char name)"));
+ assertTrue(superclass, superclass.contains("writeProperty(\"name\", name);"));
+
+ assertTrue(superclass, superclass.contains("public char getName()"));
+ assertTrue(superclass, superclass.contains("Object value = readProperty(\"name\");"));
+ assertTrue(superclass, superclass.contains("return (value != null) ? (Character) value : 0;"));
+
+ }
+
+ @Test
+ public void testExecuteDataMapQueryNames() throws Exception {
+ runDataMapTest(false);
+ }
+
+ @Test
+ public void testExecuteClientDataMapQueryNames() throws Exception {
+ runDataMapTest(true);
+ }
+
+ private void runDataMapTest(boolean client) throws Exception {
+ DataMap map = new DataMap();
+ map.addQuery(new NamedQuery("TestQuery"));
+ map.setName("testmap");
+ List<String> generated;
+ if (client) {
+ map.setDefaultClientPackage("testpackage");
+ generated = execute(new ClientDataMapArtifact(map, map.getQueries()));
+ } else {
+ map.setDefaultPackage("testpackage");
+ generated = execute(new DataMapArtifact(map, map.getQueries()));
+ }
+ assertEquals(2, generated.size());
+ assertTrue(generated.get(0).contains("public static final String TEST_QUERY_QUERYNAME = \"TestQuery\""));
+ }
+
+ @Test
+ public void testCallbackMethodGeneration() throws Exception {
+ assertCallbacks(false);
+ }
+
+ @Test
+ public void testClientCallbackMethodGeneration() throws Exception {
+ assertCallbacks(true);
+ }
+
+ private void assertCallbacks(boolean isClient) throws Exception {
+ ObjEntity testEntity1 = new ObjEntity("TE1");
+ testEntity1.setClassName("org.example.TestClass1");
+ int i = 0;
+ for (CallbackDescriptor cb : testEntity1.getCallbackMap().getCallbacks()) {
+ cb.addCallbackMethod("cb" + i++);
+ }
+
+ if (isClient) {
+
+ action = new ClientClassGenerationAction() {
+ @Override
+ protected Writer openWriter(TemplateType templateType) throws Exception {
+ StringWriter writer = new StringWriter();
+ writers.add(writer);
+ return writer;
+ }
+
+ };
+
+ }
+
+ action.setMakePairs(true);
+
+ List<String> generated = execute(new EntityArtifact(testEntity1));
+ assertNotNull(generated);
+ assertEquals(2, generated.size());
+
+ String superclass = generated.get(0);
+
+ assertTrue(superclass, superclass.contains("public abstract class _TestClass1"));
+
+ for (int j = 0; j < i; j++) {
+ assertTrue(superclass, superclass.contains("protected abstract void cb" + j + "();"));
+ }
+
+ String subclass = generated.get(1);
+ for (int j = 0; j < i; j++) {
+ assertTrue(subclass, subclass.contains("protected void cb" + j + "() {"));
+ }
+ }
+
+ protected List<String> execute(Artifact artifact) throws Exception {
+
+ action.execute(artifact);
+
+ List<String> strings = new ArrayList<String>(writers.size());
+ for (StringWriter writer : writers) {
+ strings.add(writer.toString());
+ }
+ return strings;
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/tools/AntDataPortDelegateTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/AntDataPortDelegateTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/AntDataPortDelegateTest.java
index 8942547..584d4c8 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/AntDataPortDelegateTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/AntDataPortDelegateTest.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+@Deprecated
public class AntDataPortDelegateTest {
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
index e0268c5..ce44aa7 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
@@ -18,7 +18,12 @@
****************************************************************/
package org.apache.cayenne.tools;
-import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.*;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertCatalog;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertCatalogAndSchema;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertFlat;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertSchema;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertSkipRelationshipsLoading;
+import static org.apache.cayenne.tools.dbimport.config.DefaultReverseEngineeringLoaderTest.assertTableTypes;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -46,10 +51,8 @@ import org.apache.tools.ant.util.FileUtils;
import org.custommonkey.xmlunit.DetailedDiff;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.Difference;
-import org.custommonkey.xmlunit.DifferenceListener;
import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Test;
-import org.w3c.dom.Node;
import org.xml.sax.SAXException;
// TODO: we are only testing on Derby. We may need to dynamically switch between DBs
@@ -179,6 +182,7 @@ public class DbImporterTaskTest {
}
}
+ @SuppressWarnings("unchecked")
private void verifyResult(File map, File mapFileCopy) {
try {
FileReader control = new FileReader(map.getAbsolutePath() + "-result");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
index 14183dc..161f44e 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
@@ -19,80 +19,56 @@
package org.apache.cayenne.tools;
-import org.apache.cayenne.access.loader.NamePatternMatcher;
-import org.apache.tools.ant.Task;
-import org.junit.Test;
-
+import static org.apache.cayenne.access.loader.NamePatternMatcher.replaceWildcardInStringWithString;
import static org.junit.Assert.assertEquals;
-import static org.apache.cayenne.access.loader.NamePatternMatcher.replaceWildcardInStringWithString;
+import org.apache.cayenne.access.loader.NamePatternMatcher;
+import org.junit.Test;
public class NamePatternMatcherTest {
- /**
- * Test pattern expansion.
- */
- @Test
- public void testReplaceWildcardInStringWithString() throws Exception {
- assertEquals(null, replaceWildcardInStringWithString("*", null, "Entity"));
- assertEquals("*.java", replaceWildcardInStringWithString(null, "*.java", "Entity"));
- assertEquals("Entity.java", replaceWildcardInStringWithString("*", "*.java", "Entity"));
- assertEquals("java.Entity", replaceWildcardInStringWithString("*", "java.*", "Entity"));
- assertEquals("Entity.Entity", replaceWildcardInStringWithString("*", "*.*", "Entity"));
- assertEquals("EntityEntity", replaceWildcardInStringWithString("*", "**", "Entity"));
- assertEquals("EditEntityReport.vm", replaceWildcardInStringWithString("*", "Edit*Report.vm", "Entity"));
- assertEquals("Entity", replaceWildcardInStringWithString("*", "*", "Entity"));
- }
-
- /**
- * Test tokenizing
- */
- @Test
- public void testTokenizer() {
- Task parentTask = new Task() {
-
- @Override
- public void log(String msg, int msgLevel) {
- System.out.println(String.valueOf(msgLevel) + ": " + msg);
- }
- };
-
- String includePattern = "billing_*,user?";
- String excludePattern = null;
- NamePatternMatcher namePatternMatcher = NamePatternMatcher.build(
- new AntLogger(parentTask), includePattern, excludePattern);
+ /**
+ * Test pattern expansion.
+ */
+ @Test
+ public void testReplaceWildcardInStringWithString() throws Exception {
+ assertEquals(null, replaceWildcardInStringWithString("*", null, "Entity"));
+ assertEquals("*.java", replaceWildcardInStringWithString(null, "*.java", "Entity"));
+ assertEquals("Entity.java", replaceWildcardInStringWithString("*", "*.java", "Entity"));
+ assertEquals("java.Entity", replaceWildcardInStringWithString("*", "java.*", "Entity"));
+ assertEquals("Entity.Entity", replaceWildcardInStringWithString("*", "*.*", "Entity"));
+ assertEquals("EntityEntity", replaceWildcardInStringWithString("*", "**", "Entity"));
+ assertEquals("EditEntityReport.vm", replaceWildcardInStringWithString("*", "Edit*Report.vm", "Entity"));
+ assertEquals("Entity", replaceWildcardInStringWithString("*", "*", "Entity"));
+ }
- String[] nullFilters = namePatternMatcher.tokenizePattern(null);
- assertEquals(0, nullFilters.length);
+ /**
+ * Test tokenizing
+ */
+ @Test
+ public void testTokenizer() {
- String[] filters = namePatternMatcher.tokenizePattern("billing_*,user?");
- assertEquals(2, filters.length);
- assertEquals("^billing_.*$", filters[0]);
- assertEquals("^user.?$", filters[1]);
- }
+ String[] nullFilters = NamePatternMatcher.tokenizePattern(null);
+ assertEquals(0, nullFilters.length);
- /**
- * Test tokenizing
- */
- @Test
- public void testTokenizerEntities() {
- Task parentTask = new Task() {
+ String[] filters = NamePatternMatcher.tokenizePattern("billing_*,user?");
+ assertEquals(2, filters.length);
+ assertEquals("^billing_.*$", filters[0]);
+ assertEquals("^user.?$", filters[1]);
+ }
- @Override
- public void log(String msg, int msgLevel) {
- System.out.println(String.valueOf(msgLevel) + ": " + msg);
- }
- };
+ /**
+ * Test tokenizing
+ */
+ @Test
+ public void testTokenizerEntities() {
- String includePattern = "Organization,SecGroup,SecIndividual";
- String excludePattern = null;
- NamePatternMatcher namePatternMatcher = NamePatternMatcher.build(
- new AntLogger(parentTask), includePattern, excludePattern);
+ String includePattern = "Organization,SecGroup,SecIndividual";
- String[] filters = namePatternMatcher.tokenizePattern(includePattern);
- assertEquals(3, filters.length);
- assertEquals("^Organization$", filters[0]);
- assertEquals("^SecGroup$", filters[1]);
- assertEquals("^SecIndividual$", filters[2]);
- }
+ String[] filters = NamePatternMatcher.tokenizePattern(includePattern);
+ assertEquals(3, filters.length);
+ assertEquals("^Organization$", filters[0]);
+ assertEquals("^SecGroup$", filters[1]);
+ assertEquals("^SecIndividual$", filters[2]);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java
index a303a6d..b49c873 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java
@@ -42,7 +42,6 @@ import java.io.File;
import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -74,200 +73,191 @@ import org.apache.cayenne.project.Project;
import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.tools.configuration.ToolsModule;
import org.apache.cayenne.util.Util;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.junit.Test;
import org.xml.sax.InputSource;
public class DbImportActionTest {
- public static final File FILE_STUB = new File("") {
- @Override
- public boolean exists() {
- return true;
- }
-
- @Override
- public boolean canRead() {
- return true;
- }
- };
-
- @Test
- public void testNewDataMapImport() throws Exception {
-
- DbLoader dbLoader = new DbLoader(null, null, null) {
- @Override
- public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
- new DataMapBuilder(dataMap).withDbEntities(2).build();
- }
-
- @Override
- public String[] getDefaultTableTypes() {
- return null;
- }
- };
-
- DbImportConfiguration params = mock(DbImportConfiguration.class);
- when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class)))
- .thenReturn(dbLoader);
-
- when(params.createDataMap()).thenReturn(new DataMap("testImport"));
- when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
- when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
-
- final DataMap DATA_MAP = new DataMap();
- when(params.initializeDataMap(any(DataMap.class))).thenReturn(DATA_MAP);
-
- final boolean[] haveWeTriedToSave = {false};
- DbImportAction action = buildDbImportAction(new FileProjectSaver() {
- @Override
- public void save(Project project) {
- haveWeTriedToSave[0] = true;
-
- // Validation phase
- assertEquals(DATA_MAP, project.getRootNode());
- }
- }, null);
-
- action.execute(params);
-
- assertTrue("We should try to save.", haveWeTriedToSave[0]);
- }
-
- @Test
- public void testImportWithFieldChanged() throws Exception {
- DbLoader dbLoader = new DbLoader(null, null, null) {
- @Override
- public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
- new DataMapBuilder(dataMap).with(
- dbEntity("ARTGROUP").attributes(
- dbAttr("GROUP_ID").typeInt().primaryKey(),
- dbAttr("NAME").typeVarchar(100).mandatory(),
- dbAttr("NAME_01").typeVarchar(100).mandatory(),
- dbAttr("PARENT_GROUP_ID").typeInt()
- )).with(
- objEntity("org.apache.cayenne.testdo.testmap", "ArtGroup", "ARTGROUP").attributes(
- objAttr("name").type(String.class).dbPath("NAME")
- ));
- }
-
- @Override
- public String[] getDefaultTableTypes() {
- return null;
- }
- };
-
- DbImportConfiguration params = mock(DbImportConfiguration.class);
- when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class)))
- .thenReturn(dbLoader);
-
- when(params.createDataMap()).thenReturn(new DataMap("testImport"));
- when(params.getDataMapFile()).thenReturn(FILE_STUB);
- when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
- when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
-
- final boolean[] haveWeTriedToSave = {false};
- DbImportAction action = buildDbImportAction(new FileProjectSaver() {
- @Override
- public void save(Project project) {
- haveWeTriedToSave[0] = true;
-
- // Validation phase
- DataMap rootNode = (DataMap) project.getRootNode();
- assertEquals(1, rootNode.getObjEntities().size());
- assertEquals(1, rootNode.getDbEntityMap().size());
-
- DbEntity entity = rootNode.getDbEntity("ARTGROUP");
- assertNotNull(entity);
- assertEquals(4, entity.getAttributes().size());
- assertNotNull(entity.getAttribute("NAME_01"));
- }
- }, new MapLoader() {
-
- @Override
- public synchronized DataMap loadDataMap(InputSource src) throws CayenneRuntimeException {
- return new DataMapBuilder().with(
- dbEntity("ARTGROUP").attributes(
- dbAttr("GROUP_ID").typeInt().primaryKey(),
- dbAttr("NAME").typeVarchar(100).mandatory(),
- dbAttr("PARENT_GROUP_ID").typeInt()
- )).with(
- objEntity("org.apache.cayenne.testdo.testmap", "ArtGroup", "ARTGROUP").attributes(
- objAttr("name").type(String.class).dbPath("NAME")
- )).build();
- }
- });
-
- action.execute(params);
-
- assertTrue("We should try to save.", haveWeTriedToSave[0]);
- }
-
- @Test
- public void testImportWithoutChanges() throws Exception {
- DbLoader dbLoader = new DbLoader(null, null, null) {
- @Override
- public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
- new DataMapBuilder(dataMap).with(
- dbEntity("ARTGROUP").attributes(
- dbAttr("NAME").typeVarchar(100).mandatory()
- ));
- }
-
- @Override
- public String[] getDefaultTableTypes() {
- return null;
- }
- };
-
- DbImportConfiguration params = mock(DbImportConfiguration.class);
- when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class)))
- .thenReturn(dbLoader);
-
- when(params.createDataMap()).thenReturn(new DataMap("testImport"));
- when(params.getDataMapFile()).thenReturn(FILE_STUB);
- when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
- when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
-
- Log log = mock(Log.class);
- when(log.isDebugEnabled()).thenReturn(false);
- when(log.isInfoEnabled()).thenReturn(false);
-
- FileProjectSaver projectSaver = mock(FileProjectSaver.class);
- doNothing().when(projectSaver).save(any(Project.class));
-
- MapLoader mapLoader = mock(MapLoader.class);
- stub(mapLoader.loadDataMap(any(InputSource.class))).toReturn(new DataMapBuilder().with(
- dbEntity("ARTGROUP").attributes(
- dbAttr("NAME").typeVarchar(100).mandatory()
- )).build());
-
- DbImportAction action = buildDbImportAction(log, projectSaver, mapLoader);
-
- action.execute(params);
-
- verify(projectSaver, never()).save(any(Project.class));
- verify(mapLoader, times(1)).loadDataMap(any(InputSource.class));
- }
-
- @Test
- public void testImportWithDbError() throws Exception {
- DbLoader dbLoader = mock(DbLoader.class);
- when(dbLoader.getDefaultTableTypes()).thenReturn(null);
- doThrow(new SQLException()).when(dbLoader).load(any(DataMap.class), any(DbLoaderConfiguration.class));
-
- DbImportConfiguration params = mock(DbImportConfiguration.class);
- when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class)))
- .thenReturn(dbLoader);
-
- FileProjectSaver projectSaver = mock(FileProjectSaver.class);
- doNothing().when(projectSaver).save(any(Project.class));
-
- MapLoader mapLoader = mock(MapLoader.class);
- when(mapLoader.loadDataMap(any(InputSource.class))).thenReturn(null);
-
- DbImportAction action = buildDbImportAction(projectSaver, mapLoader);
+ public static final File FILE_STUB = new File("") {
+
+ private static final long serialVersionUID = -7513956717393115824L;
+
+ @Override
+ public boolean exists() {
+ return true;
+ }
+
+ @Override
+ public boolean canRead() {
+ return true;
+ }
+ };
+
+ @Test
+ public void testNewDataMapImport() throws Exception {
+
+ DbLoader dbLoader = new DbLoader(null, null, null) {
+ @Override
+ public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
+ new DataMapBuilder(dataMap).withDbEntities(2).build();
+ }
+
+ @Override
+ public String[] getDefaultTableTypes() {
+ return null;
+ }
+ };
+
+ DbImportConfiguration params = mock(DbImportConfiguration.class);
+ when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class))).thenReturn(
+ dbLoader);
+
+ when(params.createDataMap()).thenReturn(new DataMap("testImport"));
+ when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
+ when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
+
+ final DataMap DATA_MAP = new DataMap();
+ when(params.initializeDataMap(any(DataMap.class))).thenReturn(DATA_MAP);
+
+ final boolean[] haveWeTriedToSave = { false };
+ DbImportAction action = buildDbImportAction(new FileProjectSaver() {
+ @Override
+ public void save(Project project) {
+ haveWeTriedToSave[0] = true;
+
+ // Validation phase
+ assertEquals(DATA_MAP, project.getRootNode());
+ }
+ }, null);
+
+ action.execute(params);
+
+ assertTrue("We should try to save.", haveWeTriedToSave[0]);
+ }
+
+ @Test
+ public void testImportWithFieldChanged() throws Exception {
+ DbLoader dbLoader = new DbLoader(null, null, null) {
+ @Override
+ public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
+ new DataMapBuilder(dataMap).with(
+ dbEntity("ARTGROUP").attributes(dbAttr("GROUP_ID").typeInt().primaryKey(),
+ dbAttr("NAME").typeVarchar(100).mandatory(),
+ dbAttr("NAME_01").typeVarchar(100).mandatory(), dbAttr("PARENT_GROUP_ID").typeInt()))
+ .with(objEntity("org.apache.cayenne.testdo.testmap", "ArtGroup", "ARTGROUP").attributes(
+ objAttr("name").type(String.class).dbPath("NAME")));
+ }
+
+ @Override
+ public String[] getDefaultTableTypes() {
+ return null;
+ }
+ };
+
+ DbImportConfiguration params = mock(DbImportConfiguration.class);
+ when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class))).thenReturn(
+ dbLoader);
+
+ when(params.createDataMap()).thenReturn(new DataMap("testImport"));
+ when(params.getDataMapFile()).thenReturn(FILE_STUB);
+ when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
+ when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
+
+ final boolean[] haveWeTriedToSave = { false };
+ DbImportAction action = buildDbImportAction(new FileProjectSaver() {
+ @Override
+ public void save(Project project) {
+ haveWeTriedToSave[0] = true;
+
+ // Validation phase
+ DataMap rootNode = (DataMap) project.getRootNode();
+ assertEquals(1, rootNode.getObjEntities().size());
+ assertEquals(1, rootNode.getDbEntityMap().size());
+
+ DbEntity entity = rootNode.getDbEntity("ARTGROUP");
+ assertNotNull(entity);
+ assertEquals(4, entity.getAttributes().size());
+ assertNotNull(entity.getAttribute("NAME_01"));
+ }
+ }, new MapLoader() {
+
+ @Override
+ public synchronized DataMap loadDataMap(InputSource src) throws CayenneRuntimeException {
+ return new DataMapBuilder()
+ .with(dbEntity("ARTGROUP").attributes(dbAttr("GROUP_ID").typeInt().primaryKey(),
+ dbAttr("NAME").typeVarchar(100).mandatory(), dbAttr("PARENT_GROUP_ID").typeInt()))
+ .with(objEntity("org.apache.cayenne.testdo.testmap", "ArtGroup", "ARTGROUP").attributes(
+ objAttr("name").type(String.class).dbPath("NAME"))).build();
+ }
+ });
+
+ action.execute(params);
+
+ assertTrue("We should try to save.", haveWeTriedToSave[0]);
+ }
+
+ @Test
+ public void testImportWithoutChanges() throws Exception {
+ DbLoader dbLoader = new DbLoader(null, null, null) {
+ @Override
+ public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
+ new DataMapBuilder(dataMap).with(dbEntity("ARTGROUP").attributes(
+ dbAttr("NAME").typeVarchar(100).mandatory()));
+ }
+
+ @Override
+ public String[] getDefaultTableTypes() {
+ return null;
+ }
+ };
+
+ DbImportConfiguration params = mock(DbImportConfiguration.class);
+ when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class))).thenReturn(
+ dbLoader);
+
+ when(params.createDataMap()).thenReturn(new DataMap("testImport"));
+ when(params.getDataMapFile()).thenReturn(FILE_STUB);
+ when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate());
+ when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration());
+
+ Log log = mock(Log.class);
+ when(log.isDebugEnabled()).thenReturn(false);
+ when(log.isInfoEnabled()).thenReturn(false);
+
+ FileProjectSaver projectSaver = mock(FileProjectSaver.class);
+ doNothing().when(projectSaver).save(any(Project.class));
+
+ MapLoader mapLoader = mock(MapLoader.class);
+ stub(mapLoader.loadDataMap(any(InputSource.class))).toReturn(
+ new DataMapBuilder().with(dbEntity("ARTGROUP").attributes(dbAttr("NAME").typeVarchar(100).mandatory()))
+ .build());
+
+ DbImportAction action = buildDbImportAction(log, projectSaver, mapLoader);
+
+ action.execute(params);
+
+ verify(projectSaver, never()).save(any(Project.class));
+ verify(mapLoader, times(1)).loadDataMap(any(InputSource.class));
+ }
+
+ @Test
+ public void testImportWithDbError() throws Exception {
+ DbLoader dbLoader = mock(DbLoader.class);
+ when(dbLoader.getDefaultTableTypes()).thenReturn(null);
+ doThrow(new SQLException()).when(dbLoader).load(any(DataMap.class), any(DbLoaderConfiguration.class));
+
+ DbImportConfiguration params = mock(DbImportConfiguration.class);
+ when(params.createLoader(any(DbAdapter.class), any(Connection.class), any(DbLoaderDelegate.class))).thenReturn(
+ dbLoader);
+
+ FileProjectSaver projectSaver = mock(FileProjectSaver.class);
+ doNothing().when(projectSaver).save(any(Project.class));
+
+ MapLoader mapLoader = mock(MapLoader.class);
+ when(mapLoader.loadDataMap(any(InputSource.class))).thenReturn(null);
+
+ DbImportAction action = buildDbImportAction(projectSaver, mapLoader);
try {
action.execute(params);
@@ -276,76 +266,77 @@ public class DbImportActionTest {
// expected
}
- verify(projectSaver, never()).save(any(Project.class));
- verify(mapLoader, never()).loadDataMap(any(InputSource.class));
- }
+ verify(projectSaver, never()).save(any(Project.class));
+ verify(mapLoader, never()).loadDataMap(any(InputSource.class));
+ }
- private DbImportAction buildDbImportAction(FileProjectSaver projectSaver, MapLoader mapLoader) throws Exception {
- Log log = mock(Log.class);
- when(log.isDebugEnabled()).thenReturn(true);
- when(log.isInfoEnabled()).thenReturn(true);
+ private DbImportAction buildDbImportAction(FileProjectSaver projectSaver, MapLoader mapLoader) throws Exception {
+ Log log = mock(Log.class);
+ when(log.isDebugEnabled()).thenReturn(true);
+ when(log.isInfoEnabled()).thenReturn(true);
- return buildDbImportAction(log, projectSaver, mapLoader);
- }
+ return buildDbImportAction(log, projectSaver, mapLoader);
+ }
- private DbImportAction buildDbImportAction(Log log, FileProjectSaver projectSaver, MapLoader mapLoader) throws Exception {
- DbAdapter dbAdapter = mock(DbAdapter.class);
- when(dbAdapter.mergerFactory()).thenReturn(new MergerFactory());
+ private DbImportAction buildDbImportAction(Log log, FileProjectSaver projectSaver, MapLoader mapLoader)
+ throws Exception {
+ DbAdapter dbAdapter = mock(DbAdapter.class);
+ when(dbAdapter.mergerFactory()).thenReturn(new MergerFactory());
- DbAdapterFactory adapterFactory = mock(DbAdapterFactory.class);
- when(adapterFactory.createAdapter(any(DataNodeDescriptor.class), any(DataSource.class))).thenReturn(dbAdapter);
+ DbAdapterFactory adapterFactory = mock(DbAdapterFactory.class);
+ when(adapterFactory.createAdapter(any(DataNodeDescriptor.class), any(DataSource.class))).thenReturn(dbAdapter);
- DataSourceFactory dataSourceFactory = mock(DataSourceFactory.class);
- DataSource mock = mock(DataSource.class);
- when(dataSourceFactory.getDataSource(any(DataNodeDescriptor.class))).thenReturn(mock);
+ DataSourceFactory dataSourceFactory = mock(DataSourceFactory.class);
+ DataSource mock = mock(DataSource.class);
+ when(dataSourceFactory.getDataSource(any(DataNodeDescriptor.class))).thenReturn(mock);
- return new DbImportAction(log, projectSaver, dataSourceFactory, adapterFactory, mapLoader);
- }
+ return new DbImportAction(log, projectSaver, dataSourceFactory, adapterFactory, mapLoader);
+ }
- @Test
- public void testSaveLoaded() throws Exception {
- Log log = mock(Log.class);
- Injector i = DIBootstrap.createInjector(new ToolsModule(log), new DbImportModule());
+ @Test
+ public void testSaveLoaded() throws Exception {
+ Log log = mock(Log.class);
+ Injector i = DIBootstrap.createInjector(new ToolsModule(log), new DbImportModule());
- DbImportAction action = i.getInstance(DbImportAction.class);
+ DbImportAction action = i.getInstance(DbImportAction.class);
- String packagePath = getClass().getPackage().getName().replace('.', '/');
- URL packageUrl = getClass().getClassLoader().getResource(packagePath);
- assertNotNull(packageUrl);
- URL outUrl = new URL(packageUrl, "dbimport/testSaveLoaded1.map.xml");
+ String packagePath = getClass().getPackage().getName().replace('.', '/');
+ URL packageUrl = getClass().getClassLoader().getResource(packagePath);
+ assertNotNull(packageUrl);
+ URL outUrl = new URL(packageUrl, "dbimport/testSaveLoaded1.map.xml");
- File out = new File(outUrl.toURI());
- out.delete();
- assertFalse(out.isFile());
+ File out = new File(outUrl.toURI());
+ out.delete();
+ assertFalse(out.isFile());
- DataMap map = new DataMap("testSaveLoaded1");
- map.setConfigurationSource(new URLResource(outUrl));
+ DataMap map = new DataMap("testSaveLoaded1");
+ map.setConfigurationSource(new URLResource(outUrl));
- action.saveLoaded(map);
+ action.saveLoaded(map);
- assertTrue(out.isFile());
+ assertTrue(out.isFile());
- String contents = Util.stringFromFile(out);
- assertTrue("Has no project version saved", contents.contains("project-version=\""));
- }
+ String contents = Util.stringFromFile(out);
+ assertTrue("Has no project version saved", contents.contains("project-version=\""));
+ }
- @Test
- public void testMergeTokensSorting() {
- LinkedList<MergerToken> tokens = new LinkedList<MergerToken>();
- tokens.add(new AddColumnToDb(null, null));
- tokens.add(new AddRelationshipToDb(null, null));
- tokens.add(new CreateTableToDb(null));
- tokens.add(new CreateTableToModel(null));
+ @Test
+ public void testMergeTokensSorting() {
+ LinkedList<MergerToken> tokens = new LinkedList<MergerToken>();
+ tokens.add(new AddColumnToDb(null, null));
+ tokens.add(new AddRelationshipToDb(null, null));
+ tokens.add(new CreateTableToDb(null));
+ tokens.add(new CreateTableToModel(null));
- assertEquals(asList("AddColumnToDb", "CreateTableToDb", "CreateTableToModel", "AddRelationshipToDb"),
- toClasses(DbImportAction.sort(tokens)));
- }
+ assertEquals(asList("AddColumnToDb", "CreateTableToDb", "CreateTableToModel", "AddRelationshipToDb"),
+ toClasses(DbImportAction.sort(tokens)));
+ }
- private List<String> toClasses(List<MergerToken> sort) {
- LinkedList<String> res = new LinkedList<String>();
- for (MergerToken mergerToken : sort) {
- res.add(mergerToken.getClass().getSimpleName());
- }
- return res;
- }
+ private List<String> toClasses(List<MergerToken> sort) {
+ LinkedList<String> res = new LinkedList<String>();
+ for (MergerToken mergerToken : sort) {
+ res.add(mergerToken.getClass().getSimpleName());
+ }
+ return res;
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3cfce77c/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
index 83af6df..52c21bd 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
@@ -19,223 +19,222 @@
package org.apache.cayenne.tools.dbimport.config;
-import org.apache.cayenne.resource.URLResource;
-import org.apache.cayenne.tools.ExcludeTable;
-import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import java.io.File;
import java.net.MalformedURLException;
import java.util.Iterator;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.cayenne.resource.URLResource;
+import org.apache.cayenne.tools.ExcludeTable;
+import org.junit.Test;
public class DefaultReverseEngineeringLoaderTest {
- @Test
- public void testLoadCatalog() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-catalog.xml"));
-
- assertCatalog(engineering);
- }
-
- public static void assertCatalog(ReverseEngineering engineering) {
- Iterator<Catalog> catalogs = engineering.getCatalogs().iterator();
- assertEquals("catalog-name-01", catalogs.next().getName());
- assertEquals("catalog-name-02", catalogs.next().getName());
-
- assertCatalog(catalogs);
- }
-
- public static void assertCatalog(Iterator<Catalog> catalogs) {
- Catalog catalog = catalogs.next();
- assertEquals("catalog-name-03", catalog.getName());
-
- Iterator<IncludeTable> includeTables = catalog.getIncludeTables().iterator();
- assertEquals("includeTable-01", includeTables.next().getPattern());
- assertEquals("includeTable-02", includeTables.next().getPattern());
-
- IncludeTable includeTable = includeTables.next();
- assertEquals("includeTable-03", includeTable.getPattern());
- assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
- assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
-
- Iterator<ExcludeTable> excludeTables = catalog.getExcludeTables().iterator();
- assertEquals("excludeTable-01", excludeTables.next().getPattern());
- assertEquals("excludeTable-02", excludeTables.next().getPattern());
- assertEquals("excludeTable-03", excludeTables.next().getPattern());
-
- Iterator<ExcludeColumn> excludeColumns = catalog.getExcludeColumns().iterator();
- assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
- Iterator<IncludeColumn> includeColumns = catalog.getIncludeColumns().iterator();
- assertEquals("includeColumn-01", includeColumns.next().getPattern());
- assertEquals("includeColumn-02", includeColumns.next().getPattern());
- assertEquals("includeColumn-03", includeColumns.next().getPattern());
-
- Iterator<ExcludeProcedure> excludeProcedures = catalog.getExcludeProcedures().iterator();
- assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
- Iterator<IncludeProcedure> includeProcedures = catalog.getIncludeProcedures().iterator();
- assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
- }
-
- @Test
- public void testLoadSchema() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-schema.xml"));
-
- assertSchema(engineering);
- }
-
- public static void assertSchema(ReverseEngineering engineering) {
- Iterator<Schema> schemas = engineering.getSchemas().iterator();
- assertEquals("schema-name-01", schemas.next().getName());
- assertEquals("schema-name-02", schemas.next().getName());
-
- Schema schema = schemas.next();
- assertEquals("schema-name-03", schema.getName());
-
- assertSchemaContent(schema);
- }
-
- public static void assertSchemaContent(Schema schema) {
- Iterator<IncludeTable> includeTables = schema.getIncludeTables().iterator();
- assertEquals("includeTable-01", includeTables.next().getPattern());
- assertEquals("includeTable-02", includeTables.next().getPattern());
-
- IncludeTable includeTable = includeTables.next();
- assertEquals("includeTable-03", includeTable.getPattern());
- assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
- assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
-
- Iterator<ExcludeTable> excludeTables = schema.getExcludeTables().iterator();
- assertEquals("excludeTable-01", excludeTables.next().getPattern());
- assertEquals("excludeTable-02", excludeTables.next().getPattern());
- assertEquals("excludeTable-03", excludeTables.next().getPattern());
-
- Iterator<ExcludeColumn> excludeColumns = schema.getExcludeColumns().iterator();
- assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
- Iterator<IncludeColumn> includeColumns = schema.getIncludeColumns().iterator();
- assertEquals("includeColumn-01", includeColumns.next().getPattern());
- assertEquals("includeColumn-02", includeColumns.next().getPattern());
- assertEquals("includeColumn-03", includeColumns.next().getPattern());
-
- Iterator<ExcludeProcedure> excludeProcedures = schema.getExcludeProcedures().iterator();
- assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
- Iterator<IncludeProcedure> includeProcedures = schema.getIncludeProcedures().iterator();
- assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
- }
-
- @Test
- public void testLoadCatalogAndSchema() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-catalog-and-schema.xml"));
-
- assertCatalogAndSchema(engineering);
- }
-
- public static void assertCatalogAndSchema(ReverseEngineering engineering) {
- Catalog catalog = engineering.getCatalogs().iterator().next();
- assertEquals("catalog-name", catalog.getName());
-
- Schema schema = catalog.getSchemas().iterator().next();
- assertEquals("schema-name", schema.getName());
-
- assertSchemaContent(schema);
- }
-
- @Test
- public void testLoadFlat() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-flat.xml"));
-
- assertFlat(engineering);
- }
-
- public static void assertFlat(ReverseEngineering engineering) {
- Iterator<IncludeTable> includeTables = engineering.getIncludeTables().iterator();
- assertEquals("includeTable-01", includeTables.next().getPattern());
- assertEquals("includeTable-02", includeTables.next().getPattern());
-
- IncludeTable includeTable = includeTables.next();
- assertEquals("includeTable-03", includeTable.getPattern());
- assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
- assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
-
- Iterator<ExcludeTable> excludeTables = engineering.getExcludeTables().iterator();
- assertEquals("excludeTable-01", excludeTables.next().getPattern());
- assertEquals("excludeTable-02", excludeTables.next().getPattern());
- assertEquals("excludeTable-03", excludeTables.next().getPattern());
-
- Iterator<ExcludeColumn> excludeColumns = engineering.getExcludeColumns().iterator();
- assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
- assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
- Iterator<IncludeColumn> includeColumns = engineering.getIncludeColumns().iterator();
- assertEquals("includeColumn-01", includeColumns.next().getPattern());
- assertEquals("includeColumn-02", includeColumns.next().getPattern());
- assertEquals("includeColumn-03", includeColumns.next().getPattern());
-
- Iterator<ExcludeProcedure> excludeProcedures = engineering.getExcludeProcedures().iterator();
- assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
- assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
- Iterator<IncludeProcedure> includeProcedures = engineering.getIncludeProcedures().iterator();
- assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
- assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
- }
-
- @Test
- public void testSkipRelationships() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-skipRelationshipsLoading.xml"));
-
- assertSkipRelationshipsLoading(engineering);
- }
-
- public static void assertSkipRelationshipsLoading(ReverseEngineering engineering) {
- assertTrue(engineering.getSkipRelationshipsLoading());
- }
-
- @Test
- public void testSkipPrimaryKeyLoading() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-skipPrimaryKeyLoading.xml"));
-
- assertSkipPrimaryKeyLoading(engineering);
- }
-
- public static void assertSkipPrimaryKeyLoading(ReverseEngineering engineering) {
- assertTrue(engineering.getSkipPrimaryKeyLoading());
- }
-
- @Test
- public void testTableTypes() throws Exception {
- ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
- .load(getResource("reverseEngineering-tableTypes.xml"));
-
- assertTableTypes(engineering);
- }
-
- public static void assertTableTypes(ReverseEngineering engineering) {
- assertArrayEquals(engineering.getTableTypes(), new String[]{"type1", "type2", "type3"});
- }
-
- protected URLResource getResource(String file) throws MalformedURLException {
+ @Test
+ public void testLoadCatalog() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-catalog.xml"));
+
+ assertCatalog(engineering);
+ }
+
+ public static void assertCatalog(ReverseEngineering engineering) {
+ Iterator<Catalog> catalogs = engineering.getCatalogs().iterator();
+ assertEquals("catalog-name-01", catalogs.next().getName());
+ assertEquals("catalog-name-02", catalogs.next().getName());
+
+ assertCatalog(catalogs);
+ }
+
+ public static void assertCatalog(Iterator<Catalog> catalogs) {
+ Catalog catalog = catalogs.next();
+ assertEquals("catalog-name-03", catalog.getName());
+
+ Iterator<IncludeTable> includeTables = catalog.getIncludeTables().iterator();
+ assertEquals("includeTable-01", includeTables.next().getPattern());
+ assertEquals("includeTable-02", includeTables.next().getPattern());
+
+ IncludeTable includeTable = includeTables.next();
+ assertEquals("includeTable-03", includeTable.getPattern());
+ assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
+ assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
+
+ Iterator<ExcludeTable> excludeTables = catalog.getExcludeTables().iterator();
+ assertEquals("excludeTable-01", excludeTables.next().getPattern());
+ assertEquals("excludeTable-02", excludeTables.next().getPattern());
+ assertEquals("excludeTable-03", excludeTables.next().getPattern());
+
+ Iterator<ExcludeColumn> excludeColumns = catalog.getExcludeColumns().iterator();
+ assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
+ Iterator<IncludeColumn> includeColumns = catalog.getIncludeColumns().iterator();
+ assertEquals("includeColumn-01", includeColumns.next().getPattern());
+ assertEquals("includeColumn-02", includeColumns.next().getPattern());
+ assertEquals("includeColumn-03", includeColumns.next().getPattern());
+
+ Iterator<ExcludeProcedure> excludeProcedures = catalog.getExcludeProcedures().iterator();
+ assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
+ Iterator<IncludeProcedure> includeProcedures = catalog.getIncludeProcedures().iterator();
+ assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
+ }
+
+ @Test
+ public void testLoadSchema() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-schema.xml"));
+
+ assertSchema(engineering);
+ }
+
+ public static void assertSchema(ReverseEngineering engineering) {
+ Iterator<Schema> schemas = engineering.getSchemas().iterator();
+ assertEquals("schema-name-01", schemas.next().getName());
+ assertEquals("schema-name-02", schemas.next().getName());
+
+ Schema schema = schemas.next();
+ assertEquals("schema-name-03", schema.getName());
+
+ assertSchemaContent(schema);
+ }
+
+ public static void assertSchemaContent(Schema schema) {
+ Iterator<IncludeTable> includeTables = schema.getIncludeTables().iterator();
+ assertEquals("includeTable-01", includeTables.next().getPattern());
+ assertEquals("includeTable-02", includeTables.next().getPattern());
+
+ IncludeTable includeTable = includeTables.next();
+ assertEquals("includeTable-03", includeTable.getPattern());
+ assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
+ assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
+
+ Iterator<ExcludeTable> excludeTables = schema.getExcludeTables().iterator();
+ assertEquals("excludeTable-01", excludeTables.next().getPattern());
+ assertEquals("excludeTable-02", excludeTables.next().getPattern());
+ assertEquals("excludeTable-03", excludeTables.next().getPattern());
+
+ Iterator<ExcludeColumn> excludeColumns = schema.getExcludeColumns().iterator();
+ assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
+ Iterator<IncludeColumn> includeColumns = schema.getIncludeColumns().iterator();
+ assertEquals("includeColumn-01", includeColumns.next().getPattern());
+ assertEquals("includeColumn-02", includeColumns.next().getPattern());
+ assertEquals("includeColumn-03", includeColumns.next().getPattern());
+
+ Iterator<ExcludeProcedure> excludeProcedures = schema.getExcludeProcedures().iterator();
+ assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
+ Iterator<IncludeProcedure> includeProcedures = schema.getIncludeProcedures().iterator();
+ assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
+ }
+
+ @Test
+ public void testLoadCatalogAndSchema() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-catalog-and-schema.xml"));
+
+ assertCatalogAndSchema(engineering);
+ }
+
+ public static void assertCatalogAndSchema(ReverseEngineering engineering) {
+ Catalog catalog = engineering.getCatalogs().iterator().next();
+ assertEquals("catalog-name", catalog.getName());
+
+ Schema schema = catalog.getSchemas().iterator().next();
+ assertEquals("schema-name", schema.getName());
+
+ assertSchemaContent(schema);
+ }
+
+ @Test
+ public void testLoadFlat() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-flat.xml"));
+
+ assertFlat(engineering);
+ }
+
+ public static void assertFlat(ReverseEngineering engineering) {
+ Iterator<IncludeTable> includeTables = engineering.getIncludeTables().iterator();
+ assertEquals("includeTable-01", includeTables.next().getPattern());
+ assertEquals("includeTable-02", includeTables.next().getPattern());
+
+ IncludeTable includeTable = includeTables.next();
+ assertEquals("includeTable-03", includeTable.getPattern());
+ assertEquals("includeColumn-01", includeTable.getIncludeColumns().iterator().next().getPattern());
+ assertEquals("excludeColumn-01", includeTable.getExcludeColumns().iterator().next().getPattern());
+
+ Iterator<ExcludeTable> excludeTables = engineering.getExcludeTables().iterator();
+ assertEquals("excludeTable-01", excludeTables.next().getPattern());
+ assertEquals("excludeTable-02", excludeTables.next().getPattern());
+ assertEquals("excludeTable-03", excludeTables.next().getPattern());
+
+ Iterator<ExcludeColumn> excludeColumns = engineering.getExcludeColumns().iterator();
+ assertEquals("excludeColumn-01", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-02", excludeColumns.next().getPattern());
+ assertEquals("excludeColumn-03", excludeColumns.next().getPattern());
+ Iterator<IncludeColumn> includeColumns = engineering.getIncludeColumns().iterator();
+ assertEquals("includeColumn-01", includeColumns.next().getPattern());
+ assertEquals("includeColumn-02", includeColumns.next().getPattern());
+ assertEquals("includeColumn-03", includeColumns.next().getPattern());
+
+ Iterator<ExcludeProcedure> excludeProcedures = engineering.getExcludeProcedures().iterator();
+ assertEquals("excludeProcedure-01", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-02", excludeProcedures.next().getPattern());
+ assertEquals("excludeProcedure-03", excludeProcedures.next().getPattern());
+ Iterator<IncludeProcedure> includeProcedures = engineering.getIncludeProcedures().iterator();
+ assertEquals("includeProcedure-01", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-02", includeProcedures.next().getPattern());
+ assertEquals("includeProcedure-03", includeProcedures.next().getPattern());
+ }
+
+ @Test
+ public void testSkipRelationships() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-skipRelationshipsLoading.xml"));
+
+ assertSkipRelationshipsLoading(engineering);
+ }
+
+ public static void assertSkipRelationshipsLoading(ReverseEngineering engineering) {
+ assertTrue(engineering.getSkipRelationshipsLoading());
+ }
+
+ @Test
+ public void testSkipPrimaryKeyLoading() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-skipPrimaryKeyLoading.xml"));
+
+ assertSkipPrimaryKeyLoading(engineering);
+ }
+
+ public static void assertSkipPrimaryKeyLoading(ReverseEngineering engineering) {
+ assertTrue(engineering.getSkipPrimaryKeyLoading());
+ }
+
+ @Test
+ public void testTableTypes() throws Exception {
+ ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
+ .load(getResource("reverseEngineering-tableTypes.xml"));
+
+ assertTableTypes(engineering);
+ }
+
+ public static void assertTableTypes(ReverseEngineering engineering) {
+ assertArrayEquals(engineering.getTableTypes(), new String[] { "type1", "type2", "type3" });
+ }
+
+ protected URLResource getResource(String file) throws MalformedURLException {
return new URLResource(getClass().getResource(file));
}