Update test classes to match Failsafe conventions

MicroShed · May 6, 2020 · e3553fe · e3553fe
1 parent 8ac2eec
commit e3553fe
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 20 deletions.
diff --git a/core/src/main/java/org/microshed/testing/internal/InternalLogger.java b/core/src/main/java/org/microshed/testing/internal/InternalLogger.java
@@ -14,6 +14,11 @@ public class InternalLogger {
     private static boolean isLog4jEnabled() {
         if (!checkedEnabled) {
             checkedEnabled = true;
+            try {
+                Class.forName("org.slf4j.impl.StaticMDCBinder");
+            } catch (Throwable t) {
+                return loggingEnabled = false;
+            }
             ClassLoader tccl = Thread.currentThread().getContextClassLoader();
             loggingEnabled = tccl.getResource("log4j.properties") != null ||
                              tccl.getResource("log4j.xml") != null ||

diff --git a/...rg/example/app/BasicJAXRSServiceTest.java → .../org/example/app/BasicJAXRSServiceIT.java b/...rg/example/app/BasicJAXRSServiceTest.java → .../org/example/app/BasicJAXRSServiceIT.java
@@ -35,7 +35,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class BasicJAXRSServiceTest {
+public class BasicJAXRSServiceIT {
 
     @RESTClient
     public static PersonService personSvc;

diff --git a/...org/example/app/DependentServiceTest.java → ...a/org/example/app/DependentServiceIT.java b/...org/example/app/DependentServiceTest.java → ...a/org/example/app/DependentServiceIT.java
@@ -38,7 +38,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class DependentServiceTest {
+public class DependentServiceIT {
 
     @RESTClient
     public static PersonServiceWithPassthrough personSvc;

diff --git a/.../org/example/app/MongoAndLibertyTest.java → ...va/org/example/app/MongoAndLibertyIT.java b/.../org/example/app/MongoAndLibertyTest.java → ...va/org/example/app/MongoAndLibertyIT.java
@@ -30,7 +30,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class MongoAndLibertyTest {
+public class MongoAndLibertyIT {
 
     @RESTClient
     public static PersonServiceWithMongo personSvc;

diff --git a/...java/org/example/app/RestAssuredTest.java → ...t/java/org/example/app/RestAssuredIT.java b/...java/org/example/app/RestAssuredTest.java → ...t/java/org/example/app/RestAssuredIT.java
@@ -29,7 +29,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class RestAssuredTest {
+public class RestAssuredIT {
 
     @Test
     public void testCreatePerson() {

diff --git a/.../java/org/example/app/SecuredSvcTest.java → ...st/java/org/example/app/SecuredSvcIT.java b/.../java/org/example/app/SecuredSvcTest.java → ...st/java/org/example/app/SecuredSvcIT.java
@@ -32,7 +32,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class SecuredSvcTest {
+public class SecuredSvcIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java b/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java
@@ -36,7 +36,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class JaxrsJsonTest {
+public class JaxrsJsonIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/.../java/org/example/app/SecuredSvcTest.java → ...st/java/org/example/app/SecuredSvcIT.java b/.../java/org/example/app/SecuredSvcTest.java → ...st/java/org/example/app/SecuredSvcIT.java
@@ -32,7 +32,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class SecuredSvcTest {
+public class SecuredSvcIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/sample-apps/jdbc-app/src/test/java/org/example/app/AppContainerConfig.java b/sample-apps/jdbc-app/src/test/java/org/example/app/AppContainerConfig.java
@@ -28,8 +28,7 @@ public class AppContainerConfig implements SharedContainerConfiguration {
 	@Container
 	public static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>()
 					.withNetworkAliases("testpostgres")
-					.withDatabaseName("testdb")
-					.withReuse(true);
+					.withDatabaseName("testdb");
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/...st/java/org/example/app/DatabaseTest.java → ...test/java/org/example/app/DatabaseIT.java b/...st/java/org/example/app/DatabaseTest.java → ...test/java/org/example/app/DatabaseIT.java
@@ -30,7 +30,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class DatabaseTest {
+public class DatabaseIT {
 
     @RESTClient
     public static PersonServiceWithJDBC personSvc;

diff --git a/.../org/example/app/BasicLibertyAppTest.java → ...va/org/example/app/BasicLibertyAppIT.java b/.../org/example/app/BasicLibertyAppTest.java → ...va/org/example/app/BasicLibertyAppIT.java
@@ -35,7 +35,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class BasicLibertyAppTest {
+public class BasicLibertyAppIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/sample-apps/maven-app/pom.xml b/sample-apps/maven-app/pom.xml
@@ -63,21 +63,19 @@
 				</configuration>
 			</plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>2.22.0</version>
                 <executions>
                     <execution>
-                        <phase>integration-test</phase>
-                        <id>integration-test</id>
                         <goals>
                             <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>

diff --git a/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java b/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java
@@ -36,7 +36,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class JaxrsJsonTest {
+public class JaxrsJsonIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()

diff --git a/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java b/...t/java/org/example/app/JaxrsJsonTest.java → ...est/java/org/example/app/JaxrsJsonIT.java
@@ -36,7 +36,7 @@
 import org.testcontainers.junit.jupiter.Container;
 
 @MicroShedTest
-public class JaxrsJsonTest {
+public class JaxrsJsonIT {
 
     @Container
     public static ApplicationContainer app = new ApplicationContainer()