refs #41

rmpestano · Sep 4, 2016 · 941d73c · 941d73c
1 parent faa4f47
commit 941d73c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/core/src/main/java/com/github/dbunit/rules/configuration/GlobaConfig.java b/core/src/main/java/com/github/dbunit/rules/configuration/GlobaConfig.java
@@ -6,7 +6,7 @@
 
 /**
  * Created by pestano on 03/09/16.
- *
+ * <p/>
  * pojo which represents dbunit.yml, used for global which can be overrided via @DataSet annotation
  * at class or method level and with @DBUnit at class or method level
  */
@@ -29,13 +29,6 @@ public static GlobaConfig instance() {
         if (instance == null) {
             createInstance();
         }
-        if(instance.getDbUnitConfig().getProperties().containsKey("escapePattern")){
-            if (instance.getDbUnitConfig().getProperties().get("escapePattern").equals("")){
-                //avoid Caused by: org.dbunit.DatabaseUnitRuntimeException: Empty string is an invalid escape pattern!
-                // because @DBUnit annotation and dbunit.yml global config have escapePattern defaults to ""
-                instance.getDbUnitConfig().getProperties().remove("escapePattern");
-            }
-        }
         return instance;
     }
 
@@ -45,14 +38,25 @@ public static GlobaConfig newInstance() {
     }
 
     private static void createInstance() {
+        instance = new GlobaConfig();
+        DBUnitConfig dbUnitConfig;
         //try to instance user provided dbunit.yml
         InputStream customConfiguration = Thread.currentThread().getContextClassLoader().getResourceAsStream("dbunit.yml");
-        if(customConfiguration != null){
-           instance = new Yaml().loadAs(customConfiguration, GlobaConfig.class);
-        } else{
-           //default config
-           instance = new Yaml().loadAs(GlobaConfig.class.getResourceAsStream("/default/dbunit.yml"), GlobaConfig.class);
+        if (customConfiguration != null) {
+            dbUnitConfig = new Yaml().loadAs(customConfiguration, DBUnitConfig.class);
+        } else {
+            //default config
+            dbUnitConfig = new Yaml().loadAs(GlobaConfig.class.getResourceAsStream("/default/dbunit.yml"), DBUnitConfig.class);
+        }
+
+        if (dbUnitConfig.getProperties().containsKey("escapePattern")) {
+            if (dbUnitConfig.getProperties().get("escapePattern").equals("")) {
+                //avoid Caused by: org.dbunit.DatabaseUnitRuntimeException: Empty string is an invalid escape pattern!
+                // because @DBUnit annotation and dbunit.yml global config have escapePattern defaults to ""
+                dbUnitConfig.getProperties().remove("escapePattern");
+            }
         }
+        instance.setDbUnitConfig(dbUnitConfig);
 
     }
 

diff --git a/core/src/main/resources/default/dbunit.yml b/core/src/main/resources/default/dbunit.yml
@@ -1,10 +1,9 @@
-dbUnitConfig:
-  cacheConnection: false
-  cacheTables: false
-  properties:
-    batchedStatements:  false
-    qualifiedTableNames: false
-    batchSize: 100
-    fetchSize: 100
-    allowEmptyFields: false
-    escapePattern: ""
+cacheConnection: false
+cacheTables: false
+properties:
+  batchedStatements:  false
+  qualifiedTableNames: false
+  batchSize: 100
+  fetchSize: 100
+  allowEmptyFields: false
+  escapePattern: ""
diff --git a/core/src/test/resources/config/sample-dbunit.yml b/core/src/test/resources/config/sample-dbunit.yml
@@ -1,10 +1,9 @@
-dbUnitConfig:
-  cacheConnection: true
-  cacheTables: true
-  properties:
-    batchedStatements:  true
-    qualifiedTableNames: true
-    batchSize: 200
-    fetchSize: 200
-    allowEmptyFields: true
-    escapePattern: "[?]"
+cacheConnection: true
+cacheTables: true
+properties:
+  batchedStatements:  true
+  qualifiedTableNames: true
+  batchSize: 200
+  fetchSize: 200
+  allowEmptyFields: true
+  escapePattern: "[?]"