fixes #32

rmpestano · Aug 21, 2016 · 25987c8 · 25987c8
1 parent 89335e7
commit 25987c8
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 15 deletions.
diff --git a/core/src/main/java/com/github/dbunit/rules/api/dataset/JSONDataSet.java b/core/src/main/java/com/github/dbunit/rules/api/dataset/JSONDataSet.java
@@ -151,12 +151,14 @@ private ITableMetaData getMetaData(String tableName,
 		private void fillRow(DefaultTable table, Map<String, Object> row,
 				int rowIndex) {
 			try {
-				table.addRow();
-				// set the column values for the current row
-				for (Map.Entry<String, Object> column : row.entrySet()) {
-					table.setValue(rowIndex, column.getKey(), column.getValue());
-
+				if(!row.entrySet().isEmpty()){
+					table.addRow();
+					// set the column values for the current row
+					for (Map.Entry<String, Object> column : row.entrySet()) {
+						table.setValue(rowIndex, column.getKey(), column.getValue());
+					}
 				}
+
 			} catch (Exception e) {
 				throw new RuntimeException(e.getMessage(), e);
 			}

diff --git a/core/src/main/java/com/github/dbunit/rules/api/dataset/YamlDataSet.java b/core/src/main/java/com/github/dbunit/rules/api/dataset/YamlDataSet.java
@@ -21,11 +21,14 @@ public class YamlDataSet implements IDataSet {
   public YamlDataSet(InputStream source) {
     @SuppressWarnings("unchecked")
     Map<String, List<Map<String, Object>>> data = (Map<String, List<Map<String, Object>>>) new Yaml().load(source);
-    for (Map.Entry<String, List<Map<String, Object>>> ent : data.entrySet()) {
-      String tableName = ent.getKey();
-      List<Map<String, Object>> rows = ent.getValue();
-      createTable(tableName.toUpperCase(), rows);
+    if(data != null){
+      for (Map.Entry<String, List<Map<String, Object>>> ent : data.entrySet()) {
+        String tableName = ent.getKey();
+        List<Map<String, Object>> rows = ent.getValue();
+        createTable(tableName.toUpperCase(), rows);
+      }
     }
+
   }
 
   class MyTable implements ITable {
@@ -47,6 +50,8 @@ ITableMetaData createMeta(String name, List<String> columnNames) {
         columns = new Column[columnNames.size()];
         for (int i = 0; i < columnNames.size(); i++)
           columns[i] = new Column(columnNames.get(i), DataType.UNKNOWN);
+      } else{
+        columns = new Column[0];
       }
       return new DefaultTableMetaData(name, columns);
     }
@@ -80,9 +85,11 @@ Map<String, Object> convertMap(Map<String, Object> values) {
   }
 
   MyTable createTable(String name, List<Map<String, Object>> rows) {
-    MyTable table = new MyTable(name, rows.size() > 0 ? new ArrayList<String>(rows.get(0).keySet()) : null);
-    for (Map<String, Object> values : rows)
-      table.addRow(values);
+    MyTable table = new MyTable(name, (rows != null && rows.size() > 0) ? new ArrayList<String>(rows.get(0).keySet()) : null);
+    if(rows != null){
+      for (Map<String, Object> values : rows)
+        table.addRow(values);
+    }
     tables.put(name.toUpperCase(), table);
     return table;
   }

diff --git a/core/src/main/java/com/github/dbunit/rules/dataset/DataSetExecutorImpl.java b/core/src/main/java/com/github/dbunit/rules/dataset/DataSetExecutorImpl.java
@@ -436,7 +436,6 @@ public void compareCurrentDataSetWith(DataSetModel expectedDataSetModel, String[
                 initDatabaseConnection();
             }
             current = databaseConnection.createDataSet();
-            current.getTable("user");
             expected = loadDataSet(expectedDataSetModel.getName());
         } catch (Exception e) {
             throw new RuntimeException("Could not create dataset to compare.", e);
@@ -448,14 +447,14 @@ public void compareCurrentDataSetWith(DataSetModel expectedDataSetModel, String[
             throw new RuntimeException("Could extract dataset table names.", e);
         }
 
-        for (String tableName : tableNames) {
+        for (String tableName : expected.getTableNames()) {
             ITable expectedTable = null;
             ITable actualTable = null;
             try {
                 expectedTable = expected.getTable(tableName);
                 actualTable = current.getTable(tableName);
             } catch (DataSetException e) {
-                throw new RuntimeException("Could extract dataset table.", e);
+                throw new RuntimeException("DataSet comparison failed due to following exception: ", e);
             }
             ITable filteredActualTable = DefaultColumnFilter.includedColumnsTable(actualTable, expectedTable.getTableMetaData().getColumns());
             DataSetAssertion.assertEqualsIgnoreCols(expectedTable, filteredActualTable, excludeCols);

diff --git a/core/src/test/java/com/github/dbunit/rules/ExpectedDataSetIt.java b/core/src/test/java/com/github/dbunit/rules/ExpectedDataSetIt.java
@@ -106,4 +106,44 @@ public void shouldMatchExpectedDataSetAfterSeedingDataBase() {
         tx().commit();
     }
     // end::expectedWithSeeding[]
+
+    @Test
+    @DataSet(value = "yml/user.yml", disableConstraints = true)
+    @ExpectedDataSet(value = "yml/empty.yml")
+    public void shouldMatchEmptyYmlDataSet() {
+        tx().begin();
+        em().remove(em().find(User.class,1L));
+        em().remove(em().find(User.class,2L));
+        tx().commit();
+    }
+
+    @Test
+    @DataSet(value = "yml/user.yml", disableConstraints = true, transactional = true)
+    @ExpectedDataSet(value = "yml/empty.yml")
+    public void shouldMatchEmptyYmlDataSetWithTransaction() {
+        em().remove(em().find(User.class,1L));
+        em().remove(em().find(User.class,2L));
+    }
+
+
+    @Test
+    @DataSet(value = "json/user.json", disableConstraints = true)
+    @ExpectedDataSet(value = "json/empty.json")
+    public void shouldMatchEmptyJsonDataSet() {
+        tx().begin();
+        em().remove(em().find(User.class,1L));
+        em().remove(em().find(User.class,2L));
+        tx().commit();
+        em().createQuery("select u from User u").getResultList();
+    }
+
+    @Test
+    @DataSet(value = "xml/user.xml", disableConstraints = true)
+    @ExpectedDataSet(value = "xml/empty.xml")
+    public void shouldMatchEmptyXmlDataSet() {
+        tx().begin();
+        em().remove(em().find(User.class,1L));
+        em().remove(em().find(User.class,2L));
+        tx().commit();
+    }
 }
diff --git a/core/src/test/resources/datasets/json/empty.json b/core/src/test/resources/datasets/json/empty.json
@@ -0,0 +1,14 @@
+{
+  "USER": [
+    {
+    }
+  ],
+  "TWEET": [
+    {
+    }
+  ],
+  "FOLLOWER": [
+    {
+    }
+  ]
+}
diff --git a/core/src/test/resources/datasets/json/user.json b/core/src/test/resources/datasets/json/user.json
@@ -0,0 +1,12 @@
+{
+  "USER": [
+    {
+      "id": 1,
+      "name": "@realpestano"
+    },
+    {
+      "id": 2,
+      "name": "@dbunit"
+    }
+  ]
+}
diff --git a/core/src/test/resources/datasets/xml/empty.xml b/core/src/test/resources/datasets/xml/empty.xml
@@ -0,0 +1,5 @@
+<dataset>
+    <USER  />
+    <FOLLOWER  />
+    <TWEET  />
+</dataset>
diff --git a/core/src/test/resources/datasets/xml/user.xml b/core/src/test/resources/datasets/xml/user.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <USER id="1" name="@realpestano" />
+    <USER id="2" name="@dbunit" />
+</dataset>
diff --git a/core/src/test/resources/datasets/yml/empty.yml b/core/src/test/resources/datasets/yml/empty.yml
@@ -0,0 +1,5 @@
+user:
+
+follower:
+
+tweet: