From b8eacc9adf632529cbd1075ebb8e22195a4cf589 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 27 Oct 2021 23:33:30 +0200
Subject: [PATCH] #646 - reset manipulated time
---
.../selenium/LoginControllerTest.java | 35 +++++++++++--------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
index a0fe1141a..64e3ef4ef 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
@@ -88,20 +88,27 @@ class LoginControllerTest extends SeleniumTestBase
// DateTime.now() will return the time in UTC --> shortly before midnight
DateTimeUtils.setCurrentMillisFixed(new DateTime(2021, 10, 24, 23, 10, 0).getMillis());
- // system time zone is Berlin --> at least +1 hour --> after midnight
- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
-
- IntegrationTestHelper helper = new IntegrationTestHelper(driver, port);
- helper.start();
- helper.login(UserService.DEFAULT_PASSWORD);
- helper.hideBackupReminder();
- helper.hideWhatsNewDialog();
-
- WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5));
- wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("logo-home")));
-
- Cookie expectedCookie = new Cookie("currentDate", "25.10.21", "localhost", "/", null, false, false, "None");
- assertThat(driver.manage().getCookies()).contains(expectedCookie);
+ try
+ {
+ // system time zone is Berlin --> at least +1 hour --> after midnight
+ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+
+ IntegrationTestHelper helper = new IntegrationTestHelper(driver, port);
+ helper.start();
+ helper.login(UserService.DEFAULT_PASSWORD);
+ helper.hideBackupReminder();
+ helper.hideWhatsNewDialog();
+
+ WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5));
+ wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("logo-home")));
+
+ Cookie expectedCookie = new Cookie("currentDate", "25.10.21", "localhost", "/", null, false, false, "None");
+ assertThat(driver.manage().getCookies()).contains(expectedCookie);
+ }
+ finally
+ {
+ DateTimeUtils.setCurrentMillisSystem();
+ }
}
@Test
--
GitLab