diff --git a/pom.xml b/pom.xml index d66e0fbd1627d759ac7fe5254917a8faa2a3be81..f5819c6b0a6cf2abbd8501bd27816da867ee33e2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.2.12.RELEASE</version> + <version>2.6.4</version> <relativePath/> <!-- lookup parent from repository --> </parent> diff --git a/src/test/java/de/thd/pms/dao/BootServiceTest.java b/src/test/java/de/thd/pms/dao/BootServiceTest.java index 7a24edaa7c97d49117debe82ac45dcd5c08d994a..beb6051cb3a3c53628ce43ccd460e0db04f76889 100644 --- a/src/test/java/de/thd/pms/dao/BootServiceTest.java +++ b/src/test/java/de/thd/pms/dao/BootServiceTest.java @@ -2,14 +2,14 @@ package de.thd.pms.dao; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import de.thd.pms.model.Boot; import de.thd.pms.service.BootService; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; @ContextConfiguration("/test-application-context.xml") public class BootServiceTest extends AbstractDataAccessTest { @@ -52,7 +52,7 @@ public class BootServiceTest extends AbstractDataAccessTest { deleteFromTables(tables); bootService.create("Deggendorf", 4, "Vierer"); int rows = countRowsInTable(tabellennameBoot); - assertEquals("Die DB muss eine Zeile enthalten", 1, rows); + assertEquals(1, rows, "Die DB muss eine Zeile enthalten"); // delete all rows from db table deleteFromTables(tables); } diff --git a/src/test/java/de/thd/pms/dao/FahrtServiceTest.java b/src/test/java/de/thd/pms/dao/FahrtServiceTest.java index 3ff947b075129e80b75db175f15a62dffe4a59e2..59ea4d9f34267295b697af5bc24f14e2750fc74f 100644 --- a/src/test/java/de/thd/pms/dao/FahrtServiceTest.java +++ b/src/test/java/de/thd/pms/dao/FahrtServiceTest.java @@ -4,9 +4,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.test.context.ContextConfiguration; @@ -21,7 +22,7 @@ import de.thd.pms.service.DaoException; import de.thd.pms.service.FahrtService; import de.thd.pms.service.PersonService; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; @ContextConfiguration("/test-application-context.xml") public class FahrtServiceTest extends AbstractDataAccessTest { @@ -45,7 +46,7 @@ public class FahrtServiceTest extends AbstractDataAccessTest { this.bootService = bootService; } - @Before + @BeforeEach public void before() { try { // create two persons @@ -68,7 +69,7 @@ public class FahrtServiceTest extends AbstractDataAccessTest { } } - @After + @AfterEach public void after() { try { deleteFromTables(tables); diff --git a/src/test/java/de/thd/pms/dao/PersonServiceTest.java b/src/test/java/de/thd/pms/dao/PersonServiceTest.java index caab6c8abb0e604f180f0e958d2e3c52c861e078..5a3dbc3db63583a4d05b603217d5e31f25b206ea 100644 --- a/src/test/java/de/thd/pms/dao/PersonServiceTest.java +++ b/src/test/java/de/thd/pms/dao/PersonServiceTest.java @@ -1,13 +1,13 @@ package de.thd.pms.dao; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import de.thd.pms.model.Person; import de.thd.pms.service.PersonService; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; @ContextConfiguration("/test-application-context.xml") public class PersonServiceTest extends AbstractDataAccessTest { diff --git a/src/test/java/de/thd/pms/fahrtenbuch/FahrtenbuchApplicationTests.java b/src/test/java/de/thd/pms/fahrtenbuch/FahrtenbuchApplicationTests.java index 882ea2212739628376a5ccf550ac837de8420993..5b05c0c96a9375275bb45d24dc22ac02346ffd60 100644 --- a/src/test/java/de/thd/pms/fahrtenbuch/FahrtenbuchApplicationTests.java +++ b/src/test/java/de/thd/pms/fahrtenbuch/FahrtenbuchApplicationTests.java @@ -1,11 +1,11 @@ package de.thd.pms.fahrtenbuch; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest public class FahrtenbuchApplicationTests {