Merge pull request #193 from aguibert/stdout-logging

Update test classes to match Failsafe conventions

Author: aguibert

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 ||

…g/example/app/BasicJAXRSServiceTest.java …org/example/app/BasicJAXRSServiceIT.javasample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceIT.java sample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceTest.java renamed to sample-apps/everything-app/src/test/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;

…rg/example/app/DependentServiceTest.java …/org/example/app/DependentServiceIT.javasample-apps/everything-app/src/test/java/org/example/app/DependentServiceTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/DependentServiceIT.java sample-apps/everything-app/src/test/java/org/example/app/DependentServiceTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/DependentServiceIT.java

@@ -38,7 +38,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class DependentServiceTest {
+public class DependentServiceIT {
 
     @RESTClient
     public static PersonServiceWithPassthrough personSvc;

…org/example/app/MongoAndLibertyTest.java …a/org/example/app/MongoAndLibertyIT.javasample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyIT.java sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyIT.java

@@ -30,7 +30,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class MongoAndLibertyTest {
+public class MongoAndLibertyIT {
 
     @RESTClient
     public static PersonServiceWithMongo personSvc;

…ava/org/example/app/RestAssuredTest.java …/java/org/example/app/RestAssuredIT.javasample-apps/everything-app/src/test/java/org/example/app/RestAssuredTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java sample-apps/everything-app/src/test/java/org/example/app/RestAssuredTest.java renamed to sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java

@@ -29,7 +29,7 @@
 
 @MicroShedTest
 @SharedContainerConfig(AppContainerConfig.class)
-public class RestAssuredTest {
+public class RestAssuredIT {
 
     @Test
     public void testCreatePerson() {

…java/org/example/app/SecuredSvcTest.java …t/java/org/example/app/SecuredSvcIT.javasample-apps/jaxrs-basicauth/src/test/java/org/example/app/SecuredSvcTest.java renamed to sample-apps/jaxrs-basicauth/src/test/java/org/example/app/SecuredSvcIT.java sample-apps/jaxrs-basicauth/src/test/java/org/example/app/SecuredSvcTest.java renamed to sample-apps/jaxrs-basicauth/src/test/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()

…/java/org/example/app/JaxrsJsonTest.java …st/java/org/example/app/JaxrsJsonIT.javasample-apps/wildfly-app/src/test/java/org/example/app/JaxrsJsonTest.java renamed to sample-apps/jaxrs-json/src/test/java/org/example/app/JaxrsJsonIT.java sample-apps/wildfly-app/src/test/java/org/example/app/JaxrsJsonTest.java renamed to sample-apps/jaxrs-json/src/test/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()

…java/org/example/app/SecuredSvcTest.java …t/java/org/example/app/SecuredSvcIT.javasample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcTest.java renamed to sample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcIT.java sample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcTest.java renamed to sample-apps/jaxrs-mpjwt/src/test/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()

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()

…t/java/org/example/app/DatabaseTest.java …est/java/org/example/app/DatabaseIT.javasample-apps/jdbc-app/src/test/java/org/example/app/DatabaseTest.java renamed to sample-apps/jdbc-app/src/test/java/org/example/app/DatabaseIT.java sample-apps/jdbc-app/src/test/java/org/example/app/DatabaseTest.java renamed to sample-apps/jdbc-app/src/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;