Junit5 bump - ebean-test

ebean-test/pom.xml

@@ -124,9 +124,9 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
+      <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>1.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/test/java/io/ebean/test/DbJsonTest.java

@@ -2,7 +2,7 @@ package io.ebean.test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.ebean.DB;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.test.BSimpleWithGen;
 
 import java.util.List;

ebean-test/src/test/java/io/ebean/test/JsonAssertContainsTest.java

@@ -2,7 +2,7 @@ package io.ebean.test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Stream;
 

ebean-test/src/test/java/io/ebean/test/JsonTest.java

@@ -1,7 +1,7 @@
 package io.ebean.test;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.test.PlainBean;
 
 import java.util.List;

ebean-test/src/test/java/io/ebean/test/UserContextTest.java

@@ -1,8 +1,8 @@
 package io.ebean.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class UserContextTest {
 

ebean-test/src/test/java/io/ebean/test/config/platform/ConfigTest.java

@@ -2,8 +2,8 @@ package io.ebean.test.config.platform;
 
 import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
@@ -145,7 +145,7 @@ public class ConfigTest {
     assertThat(config.ignoreDockerShutdown("./src/test/resources/file-does-not-exist")).isFalse();
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void run_local_only_ignoreDockerShutdown() {
 

ebean-test/src/test/java/io/ebean/test/config/provider/ProviderAutoConfigTest.java

@@ -1,9 +1,9 @@
 package io.ebean.test.config.provider;
 
 import io.ebean.config.ServerConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ProviderAutoConfigTest {
 

ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java

@@ -3,9 +3,9 @@ package org.test;
 import io.ebean.DB;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -14,12 +14,12 @@ public class ForTestsBeforeAfterTest {
 
   private ForTests.RollbackAll rollbackAll;
 
-  @Before
+  @BeforeEach
   public void before() {
     rollbackAll = ForTests.createRollbackAll();
   }
 
-  @After
+  @AfterEach
   public void after() {
     rollbackAll.close();
     assertThat(getCount()).isEqualTo(0);

ebean-test/src/test/java/org/test/ForTestsTest.java

@@ -4,7 +4,7 @@ import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;