Adjust EmployeePersistenceTest to use new JdbcTestCase [#25949]

1 files changed, 11 insertions, 7 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 6bfd898..b16bab0 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
@@ -2,7 +2,9 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
 import java.io.InputStream;
 import java.time.LocalDate;
@@ -13,9 +15,10 @@ import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.ITable;
 import org.dbunit.dataset.filter.DefaultColumnFilter;
 import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.operation.DatabaseOperation;
 import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Test;
 
 public class EmployeePersistenceTest extends JdbcTestCase {
 
@@ -34,16 +37,13 @@ public class EmployeePersistenceTest extends JdbcTestCase {
         return new FlatXmlDataSetBuilder().build(res);
     }
 
-    protected DatabaseOperation getSetUpOperation() throws Exception {
-        return DatabaseOperation.CLEAN_INSERT;
-    }
-
-    protected DatabaseOperation getTearDownOperation() throws Exception {
+    @After
+    public void tearDownOperation() throws Exception {
         // needed in order to completely reset DB, including resetting auto_increment sequences
         jdbcConnectionManager.getConnection().prepareStatement("DROP ALL OBJECTS").execute();
-        return DatabaseOperation.DELETE_ALL;
     }
 
+    @Test
     public void testListEmployees() throws PersistenceException {
         Set<Employee> employees = employeePersistence.list();
 
@@ -84,6 +84,7 @@ public class EmployeePersistenceTest extends JdbcTestCase {
         Assert.assertEquals(3, employees.size());
     }
 
+    @Test
     public void testEmployeeListNoElement() throws PersistenceException {
         Set<Employee> employees = employeePersistence.list();
 
@@ -109,6 +110,7 @@ public class EmployeePersistenceTest extends JdbcTestCase {
                     .isPilot(false)
                     .build();
 
+    @Test
     public void testAddValidEmployee_EmployeeVersion() throws Exception {
 
         employeePersistence.add(validEmployee);
@@ -136,6 +138,7 @@ public class EmployeePersistenceTest extends JdbcTestCase {
         Assertion.assertEquals(expectedFilteredTable, actualFilteredTable);
     }
 
+    @Test
     public void testAddValidEmployee_Employee() throws Exception {
 
         employeePersistence.add(validEmployee);
@@ -163,6 +166,7 @@ public class EmployeePersistenceTest extends JdbcTestCase {
         Assertion.assertEquals(expectedFilteredEmpTable, actualFilteredEmpTable);
     }
 
+    @Test
     public void testAddValidEmployee_Join() throws Exception {
 
         employeePersistence.add(validEmployee);