Bump tests to junit5

Author: rbygrave

pom.xml

@@ -28,9 +28,8 @@
 
     <dependency>
       <groupId>org.avaje.composite</groupId>
-      <artifactId>composite-testing</artifactId>
-      <version>2.1</version>
-      <type>pom</type>
+      <artifactId>junit</artifactId>
+      <version>5.0</version>
       <scope>test</scope>
     </dependency>
 

src/test/java/io/ebean/datasource/DataSourceConfigTest.java

@@ -1,16 +1,16 @@
 package io.ebean.datasource;
 
 import org.assertj.core.api.AssertionsForClassTypes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 
 public class DataSourceConfigTest {
@@ -110,11 +110,11 @@ public void defaults() {
     DataSourceConfig readOnly = new DataSourceConfig();
     readOnly.setDefaults(config);
 
-    AssertionsForClassTypes.assertThat(readOnly.getDriver()).isEqualTo(config.getDriver());
-    AssertionsForClassTypes.assertThat(readOnly.getUrl()).isEqualTo(config.getUrl());
-    AssertionsForClassTypes.assertThat(readOnly.getUsername()).isEqualTo(config.getUsername());
-    AssertionsForClassTypes.assertThat(readOnly.getPassword()).isEqualTo(config.getPassword());
-    AssertionsForClassTypes.assertThat(readOnly.getSchema()).isEqualTo(config.getSchema());
+    assertThat(readOnly.getDriver()).isEqualTo(config.getDriver());
+    assertThat(readOnly.getUrl()).isEqualTo(config.getUrl());
+    assertThat(readOnly.getUsername()).isEqualTo(config.getUsername());
+    assertThat(readOnly.getPassword()).isEqualTo(config.getPassword());
+    assertThat(readOnly.getSchema()).isEqualTo(config.getSchema());
     assertThat(readOnly.getCustomProperties()).containsKeys("useSSL");
   }
 
@@ -128,10 +128,10 @@ public void defaults_someOverride() {
     DataSourceConfig config = create();
     readOnly.setDefaults(config);
 
-    AssertionsForClassTypes.assertThat(readOnly.getPassword()).isEqualTo(config.getPassword());
-    AssertionsForClassTypes.assertThat(readOnly.getDriver()).isEqualTo(config.getDriver());
-    AssertionsForClassTypes.assertThat(readOnly.getUrl()).isEqualTo("jdbc:postgresql://127.0.0.2:5432/unit");
-    AssertionsForClassTypes.assertThat(readOnly.getUsername()).isEqualTo("foo2");
+    assertThat(readOnly.getPassword()).isEqualTo(config.getPassword());
+    assertThat(readOnly.getDriver()).isEqualTo(config.getDriver());
+    assertThat(readOnly.getUrl()).isEqualTo("jdbc:postgresql://127.0.0.2:5432/unit");
+    assertThat(readOnly.getUsername()).isEqualTo("foo2");
 
   }
 
@@ -154,10 +154,10 @@ public void loadSettings() throws IOException {
     props.load(getClass().getResourceAsStream("/example.properties"));
     config.loadSettings(props, "foo");
 
-    AssertionsForClassTypes.assertThat(config.getReadOnlyUrl()).isEqualTo("myReadOnlyUrl");
-    AssertionsForClassTypes.assertThat(config.getUrl()).isEqualTo("myUrl");
-    AssertionsForClassTypes.assertThat(config.getUsername()).isEqualTo("myusername");
-    AssertionsForClassTypes.assertThat(config.getPassword()).isEqualTo("mypassword");
-    AssertionsForClassTypes.assertThat(config.getSchema()).isEqualTo("myschema");
+    assertThat(config.getReadOnlyUrl()).isEqualTo("myReadOnlyUrl");
+    assertThat(config.getUrl()).isEqualTo("myUrl");
+    assertThat(config.getUsername()).isEqualTo("myusername");
+    assertThat(config.getPassword()).isEqualTo("mypassword");
+    assertThat(config.getSchema()).isEqualTo("myschema");
   }
 }

src/test/java/io/ebean/datasource/FactoryTest.java

@@ -1,6 +1,6 @@
 package io.ebean.datasource;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/test/java/io/ebean/datasource/PostgresInitTest.java

@@ -2,7 +2,7 @@
 
 import io.ebean.docker.commands.PostgresConfig;
 import io.ebean.docker.commands.PostgresContainer;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/test/java/io/ebean/datasource/core/DataSourcePoolFactoryTest.java

@@ -3,7 +3,7 @@
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourceFactory;
 import io.ebean.datasource.DataSourcePool;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/test/java/io/ebean/datasource/pool/BusyConnectionBufferTest.java

@@ -1,9 +1,8 @@
 package io.ebean.datasource.pool;
 
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BusyConnectionBufferTest {
 

src/test/java/io/ebean/datasource/pool/ConnectionPoolInterruptTest.java

@@ -1,12 +1,12 @@
 package io.ebean.datasource.pool;
 
 import io.ebean.datasource.DataSourceConfig;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ConnectionPoolInterruptTest {
 
@@ -29,7 +29,7 @@ private ConnectionPool createPool() {
     return new ConnectionPool("interrupt", config);
   }
 
-  @AfterClass
+  @AfterEach
   public void after() {
     pool.shutdown();
   }

src/test/java/io/ebean/datasource/pool/ConnectionPoolOfflineTest.java

@@ -1,16 +1,15 @@
 package io.ebean.datasource.pool;
 
 import io.ebean.datasource.DataSourceConfig;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.annotations.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ConnectionPoolOfflineTest {
 

src/test/java/io/ebean/datasource/pool/ConnectionPoolSpeedTest.java

@@ -1,10 +1,10 @@
 package io.ebean.datasource.pool;
 
 import io.ebean.datasource.DataSourceConfig;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -39,7 +39,7 @@ private ConnectionPool createPool() {
     return new ConnectionPool("testspeed", config);
   }
 
-  @AfterClass
+  @AfterEach
   public void after() {
     pool.shutdown();
   }

src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java

@@ -1,8 +1,8 @@
 package io.ebean.datasource.pool;
 
 import io.ebean.datasource.DataSourceConfig;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -31,7 +31,7 @@ private ConnectionPool createPool() {
     return new ConnectionPool("test", config);
   }
 
-  @AfterClass
+  @AfterEach
   public void after() {
     pool.shutdown();
   }