Merge pull request #2722 from dropwizard/issue-2721

Allow to disable logging bootstrap in DAOTest
dropwizard · Apr 6, 2019 · ce53e69 · ce53e69
2 parents ad96950 + cc0a7cf
commit ce53e69
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/dropwizard-testing/src/main/java/io/dropwizard/testing/common/DAOTest.java b/dropwizard-testing/src/main/java/io/dropwizard/testing/common/DAOTest.java
@@ -17,10 +17,6 @@
 import java.util.function.Consumer;
 
 public class DAOTest {
-    static {
-        BootstrapLogging.bootstrap();
-    }
-
     @SuppressWarnings("unchecked")
     public static abstract class Builder<B extends Builder<B>> {
         private String url = "jdbc:h2:mem:" + UUID.randomUUID();
@@ -30,6 +26,7 @@ public static abstract class Builder<B extends Builder<B>> {
         private String hbm2ddlAuto = "create";
         private boolean showSql = false;
         private boolean useSqlComments = false;
+        private boolean bootstrapLogging = true;
         private Set<Class<?>> entityClasses = new LinkedHashSet<>();
         private Map<String, String> properties = new HashMap<>();
         private Consumer<Configuration> configurationCustomizer = c -> {
@@ -65,6 +62,11 @@ public B useSqlComments(boolean useSqlComments) {
             return (B) this;
         }
 
+        public B bootstrapLogging(boolean value){
+            bootstrapLogging = value;
+            return (B) this;
+        }
+
         public B addEntityClass(Class<?> entityClass) {
             this.entityClasses.add(entityClass);
             return (B) this;
@@ -81,6 +83,10 @@ public B customizeConfiguration(Consumer<Configuration> configurationCustomizer)
         }
 
         protected DAOTest buildDAOTest() {
+            if (bootstrapLogging) {
+                BootstrapLogging.bootstrap();
+            }
+
             final Configuration config = new Configuration();
             config.setProperty(AvailableSettings.URL, url);
             config.setProperty(AvailableSettings.USER, username);

diff --git a/...ourceTestRuleWithoutLoggingBootstrap.java → ...eTestRuleWithoutLoggingBootstrapTest.java b/...ourceTestRuleWithoutLoggingBootstrap.java → ...eTestRuleWithoutLoggingBootstrapTest.java
@@ -6,7 +6,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ResourceTestRuleWithoutLoggingBootstrap {
+public class ResourceTestRuleWithoutLoggingBootstrapTest {
     @SuppressWarnings("deprecation")
     @Rule
     public final ResourceTestRule resourceTestRule = ResourceTestRule.builder()

diff --git a/...ing/src/test/java/io/dropwizard/testing/junit/DAOTestRuleWithoutLoggingBootstrapTest.java b/...ing/src/test/java/io/dropwizard/testing/junit/DAOTestRuleWithoutLoggingBootstrapTest.java
@@ -0,0 +1,24 @@
+package io.dropwizard.testing.junit;
+
+import io.dropwizard.testing.app.TestEntity;
+import org.hibernate.SessionFactory;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DAOTestRuleWithoutLoggingBootstrapTest {
+    @SuppressWarnings("deprecation")
+    @Rule
+    public final DAOTestRule daoTestRule = DAOTestRule.newBuilder()
+            .addEntityClass(TestEntity.class)
+            .bootstrapLogging(false)
+            .build();
+
+    @Test
+    public void ruleCreatedSessionFactory() {
+        final SessionFactory sessionFactory = daoTestRule.getSessionFactory();
+
+        assertThat(sessionFactory).isNotNull();
+    }
+}