diff options
| -rw-r--r-- | src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java | 14 |
1 files changed, 6 insertions, 8 deletions
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); } |