aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDominic Rogetzer <e1627756@student.tuwien.ac.at>2018-06-17 16:59:12 +0200
committerTharre <tharre3@gmail.com>2018-06-17 19:50:47 +0200
commit8207c1773aa144793cb42ae37104a836a4df6df4 (patch)
tree29df21a33934ad18da31213b513c52ce107f55be /src
parent490cc59a471e11393dd6188a0e8cbba96781a3d2 (diff)
downloadsepm-groupproject-8207c1773aa144793cb42ae37104a836a4df6df4.tar.gz
sepm-groupproject-8207c1773aa144793cb42ae37104a836a4df6df4.tar.xz
sepm-groupproject-8207c1773aa144793cb42ae37104a836a4df6df4.zip
Fix employee&vehicle-dao-tests to use correct alert headers [#25963]
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java8
-rw-r--r--src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java9
-rw-r--r--src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java9
3 files changed, 16 insertions, 10 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
index a4e85dd..694c804 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
@@ -4,11 +4,11 @@ import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.ButtonType;
-class Helper {
+public class Helper {
- private static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
- private static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
- private static final String ALERT_TITLE_SUCCESS = "Erfolg";
+ static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
+ static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
+ static final String ALERT_TITLE_SUCCESS = "Erfolg";
private Helper() {} // SonarLint insisted to create a private constructor to hide the public one
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
index ea09fb7..3273593 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
@@ -1,5 +1,8 @@
package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SUCCESS;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -47,7 +50,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Erfolgreich angelegt", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
}
@Test
@@ -62,7 +65,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Ungültige Eingabe", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
}
@Test
@@ -79,6 +82,6 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Speicherfehler", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
}
}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
index 9e6c470..f5f4b57 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
@@ -1,5 +1,8 @@
package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SUCCESS;
+import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -45,7 +48,7 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Speichern Erfolgreich", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
}
@Test
@@ -59,7 +62,7 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Ungültige Eingabe", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
}
@Test
@@ -73,6 +76,6 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
Assert.assertNotNull(alertDialog);
DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
- Assert.assertEquals("Fehler", dialogPane.getHeaderText());
+ Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
}
}