From 02112c80a9111bed79d2633d38438ac2172f61ba Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Mon, 21 May 2018 14:22:02 +0200
Subject: Refactor testAddValidEmployeeJoin to use helper methods [#25963]
---
.../einsatzverwaltung/dao/EmployeePersistenceTest.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
(limited to 'src/test/java')
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
index b16bab0..970c300 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
@@ -173,6 +173,7 @@ public class EmployeePersistenceTest extends JdbcTestCase {
String[] excludedColumns = new String[] {"E_VERSION", "V_ID"};
String table = "EMP_JOIN";
+ String expectedXmlDataFileName = "testAddValidEmployeeJoin_expected.xml";
String sqlJoinEmployeeVersion =
"SELECT e.id AS E_ID, v.name AS V_NAME, v.birthday AS V_BIRTHDAY, "
@@ -181,16 +182,13 @@ public class EmployeePersistenceTest extends JdbcTestCase {
+ "FROM Employee e "
+ "JOIN EmployeeVersion v ON e.version = v.id";
- ITable actualJoinData = getConnection().createQueryTable(table, sqlJoinEmployeeVersion);
-
- IDataSet expectedDataSet =
- new FlatXmlDataFileLoader().load("/testAddValidEmployeeJoin_expected.xml");
- ITable expectedJoinData = expectedDataSet.getTable(table);
-
ITable actualFilteredJoinData =
- DefaultColumnFilter.excludedColumnsTable(actualJoinData, excludedColumns);
+ Helper.getActualFilteredQueryTableData(
+ getConnection(), table, sqlJoinEmployeeVersion, excludedColumns);
+
ITable expectedFilteredJoinData =
- DefaultColumnFilter.excludedColumnsTable(expectedJoinData, excludedColumns);
+ Helper.getExpectedFilteredTableData(
+ table, excludedColumns, expectedXmlDataFileName);
Assertion.assertEquals(expectedFilteredJoinData, actualFilteredJoinData);
}
--
cgit v1.2.3-70-g09d2