From 71ba591868ed0f200f16c17a3d116cf6c32a559b Mon Sep 17 00:00:00 2001
From: Joao Esperancinha <joao.esperancinha@eonics.nl>
Date: Sun, 29 Mar 2020 18:16:45 +0200
Subject: [PATCH] [BAEL-2749] Select and Delete for OldSchool

---
 dbunit/pom.xml                                |  1 +
 .../baeldung/dbunit/OldSchoolDbUnitTest.java  | 39 +++++++++++--------
 .../items_exp_delete_no_produced.xml          |  8 ++++
 3 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 dbunit/src/test/resources/items_exp_delete_no_produced.xml

diff --git a/dbunit/pom.xml b/dbunit/pom.xml
index ab0befcf4c..7ca53cd3be 100644
--- a/dbunit/pom.xml
+++ b/dbunit/pom.xml
@@ -13,6 +13,7 @@
         <assertj-core.version>3.14.0</assertj-core.version>
         <dbunit.version>2.6.0</dbunit.version>
     </properties>
+
     <name>dbunit</name>
 
     <parent>
diff --git a/dbunit/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java b/dbunit/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
index 2a2f25971b..e64b49263a 100644
--- a/dbunit/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
+++ b/dbunit/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
@@ -5,7 +5,7 @@ import org.dbunit.IDatabaseTester;
 import org.dbunit.JdbcDatabaseTester;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.ITable;
-import org.dbunit.dataset.xml.FlatXmlDataSet;
+import org.dbunit.dataset.filter.DefaultColumnFilter;
 import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
 import org.dbunit.operation.DatabaseOperation;
 import org.junit.After;
@@ -18,8 +18,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.dbunit.Assertion.assertEquals;
 
 public class OldSchoolDbUnitTest {
     private static final String JDBC_DRIVER = org.h2.Driver.class.getName();
@@ -44,7 +43,7 @@ public class OldSchoolDbUnitTest {
 
     private static IDataSet initDataSet() throws Exception {
         final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("data.xml");
-        return new FlatXmlDataSet(is);
+        return new FlatXmlDataSetBuilder().build(is);
     }
 
     @Before
@@ -59,35 +58,43 @@ public class OldSchoolDbUnitTest {
 
     @Test
     public void testSelect() throws Exception {
-        // Arrange
         final Connection connection = tester.getConnection().getConnection();
 
-        // Act
         final ResultSet rs = connection.createStatement().executeQuery("select * from iTEMS where id = 1");
 
-        // Assert
-        assertTrue(rs.next());
-        assertEquals("Grey T-Shirt", rs.getString("title"));
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
     }
 
     @Test
     public void testDelete() throws Exception {
-        // Arrange
         final Connection connection = tester.getConnection().getConnection();
 
         final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("items_exp_delete.xml");
         ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
-        //expectedTable = DefaultColumnFilter.excludedColumnsTable(expectedTable, new String[]{"produced"});
 
-        // Act
         connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
 
-        // Assert
         final IDataSet databaseDataSet = tester.getConnection().createDataSet();
         ITable actualTable = databaseDataSet.getTable("items");
-        //actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[]{"produced"});
 
-        Assertion.assertEquals(expectedTable, actualTable);
+        assertEquals(expectedTable, actualTable);
+    }
+
+    @Test
+    public void testDeleteWithExcludedColumns() throws Exception {
+        final Connection connection = tester.getConnection().getConnection();
+
+        final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("items_exp_delete_no_produced.xml");
+        ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
+
+        connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
+
+        final IDataSet databaseDataSet = tester.getConnection().createDataSet();
+        ITable actualTable = databaseDataSet.getTable("items");
+        actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[]{"produced"});
+
+        assertEquals(expectedTable, actualTable);
     }
 
     @Test
@@ -107,7 +114,7 @@ public class OldSchoolDbUnitTest {
         ITable actualTable = databaseDataSet.getTable("items");
         //actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[]{"produced"});
 
-        assertThat(actualTable).isEqualTo(actualTable);
+        assertEquals(expectedTable, actualTable);
     }
 
 }
diff --git a/dbunit/src/test/resources/items_exp_delete_no_produced.xml b/dbunit/src/test/resources/items_exp_delete_no_produced.xml
new file mode 100644
index 0000000000..c9b182a1b2
--- /dev/null
+++ b/dbunit/src/test/resources/items_exp_delete_no_produced.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<dataset>
+	<ITEMS id='1' title='Grey T-Shirt' price='17.99'/>
+	<ITEMS id='3' title='Backpack' price='54.99'/>
+	<ITEMS id='4' title='Earrings' price='14.99'/>
+	<ITEMS id='5' title='Socks' price='9.99' />
+</dataset>