Merge pull request #1485 from querydsl/i1483

Fix boolean defaults for AntMetaDataExporter
querydsl · Aug 21, 2015 · 100481e · 100481e
2 parents 8d61cc2 + 63d0a41
commit 100481e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
@@ -183,12 +183,12 @@ public class AntMetaDataExporter extends Task {
     /**
      * export tables
      */
-    private boolean exportTables;
+    private boolean exportTables = true;
 
     /**
      * export views
      */
-    private boolean exportViews;
+    private boolean exportViews = true;
 
     /**
      * export all
@@ -198,12 +198,12 @@ public class AntMetaDataExporter extends Task {
     /**
      * export primary keys
      */
-    private boolean exportPrimaryKeys;
+    private boolean exportPrimaryKeys = true;
 
     /**
      * export foreign keys
      */
-    private boolean exportForeignKeys;
+    private boolean exportForeignKeys = true;
 
     /**
      * override default column order (default: alphabetical)

diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java
@@ -55,6 +55,7 @@ public void Execute() {
         exporter.execute();
 
         assertTrue(new File("target/AntMetaDataExporterTest").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest/test/QTest.java").exists());
     }
 
     @Test
@@ -66,13 +67,15 @@ public void Execute_With_Beans() {
         exporter.setPackageName("test");
         exporter.setTargetFolder("target/AntMetaDataExporterTest2");
         exporter.setExportBeans(true);
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Q");
+        exporter.setNamePrefix("Q");
+        exporter.setNameSuffix("");
         exporter.setBeanPrefix("");
         exporter.setBeanSuffix("Bean");
         exporter.execute();
 
         assertTrue(new File("target/AntMetaDataExporterTest2").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest2/test/QTest.java").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest2/test/TestBean.java").exists());
     }
 
 
@@ -85,13 +88,15 @@ public void Execute_With_Import() {
         exporter.setPackageName("test");
         exporter.setTargetFolder("target/AntMetaDataExporterTest3");
         exporter.setExportBeans(true);
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Q");
+        exporter.setNamePrefix("Q");
+        exporter.setNameSuffix("");
         exporter.setBeanPrefix("");
         exporter.setBeanSuffix("Bean");
         exporter.setImports(new String[]{"com.pck1" , "com.pck2" , "com.Q1" , "com.Q2"});
         exporter.execute();
 
         assertTrue(new File("target/AntMetaDataExporterTest3").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest3/test/QTest.java").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest3/test/TestBean.java").exists());
     }
 }