updated dependency and deleted deprecated test imports

Author: ddamke

pom.xml

@@ -51,6 +51,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
+      <version>2.7.4</version>
     </dependency>
 
     <dependency>
@@ -61,6 +62,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
+      <version>2.7.4</version>
       <scope>test</scope>
     </dependency>
 
@@ -93,6 +95,12 @@
       <version>3.4.2</version>
       <type>maven-plugin</type>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

src/test/java/de/doubleslash/keeptime/common/DateFormatterTest.java

@@ -16,15 +16,15 @@
 
 package de.doubleslash.keeptime.common;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.LocalDateTime;
 
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore
+@Disabled
 public class DateFormatterTest {
 
    @Test

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -16,13 +16,13 @@
 
 package de.doubleslash.keeptime.controller;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -31,8 +31,9 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -48,15 +49,15 @@
 
 public class ControllerTest {
 
-   private Controller testee;
+   private static Controller testee;
 
-   private Model model;
-   private DateProvider mockedDateProvider;
+   private  Model model;
+   private  DateProvider mockedDateProvider;
 
    private WorkRepository mockedWorkRepository;
 
-   @Before
-   public void beforeTest() {
+   @BeforeEach
+   void beforeTest() {
       mockedWorkRepository = Mockito.mock(WorkRepository.class);
       model = new Model(Mockito.mock(ProjectRepository.class), mockedWorkRepository,
             Mockito.mock(SettingsRepository.class));

src/test/java/de/doubleslash/keeptime/view/ProjectReportTest.java

@@ -16,12 +16,14 @@
 
 package de.doubleslash.keeptime.view;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.invoke.MethodHandles;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +36,8 @@ public class ProjectReportTest {
 
    private ProjectReport uut;
 
-   @Before
-   public void setUp() throws Exception {
+   @BeforeEach
+   void setUp() {
       this.uut = new ProjectReport(3);
    }
 

src/test/java/de/doubleslash/keeptime/view/ProjectsListViewControllerTest.java

@@ -16,12 +16,12 @@
 
 package de.doubleslash.keeptime.view;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
 
 import de.doubleslash.keeptime.model.Project;
+import org.junit.jupiter.api.Test;
 
 public class ProjectsListViewControllerTest {