From 9c2164ece6f36beab081e375204d7915277bdb1a Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 22 Feb 2018 11:42:02 +0100 Subject: [PATCH] #341 - Reduced log output for build execution. Make sure test that previously used @SpringBootApplication now use @SpringBootTest to properly initialize Boot's default logging configuration. Added explicit logback.xml to make sure tests running without Boot don't use debug logging by default. --- .../UserRepositoryCustomizationTests.java | 4 ++-- jpa/example/src/test/resources/logback.xml | 14 ++++++++++++++ .../redis/commands/GeoOperationsTests.java | 4 ++-- .../redis/commands/KeyOperationsTests.java | 4 ++-- .../src/main/resources/application.properties | 2 +- .../test/java/example/users/ApplicationTests.java | 4 ++-- 6 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 jpa/example/src/test/resources/logback.xml diff --git a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java index fc97952c..ae77f47e 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java +++ b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional; */ @RunWith(SpringRunner.class) @Transactional -@SpringBootApplication +@SpringBootTest public class UserRepositoryCustomizationTests { @Autowired UserRepository repository; diff --git a/jpa/example/src/test/resources/logback.xml b/jpa/example/src/test/resources/logback.xml new file mode 100644 index 00000000..06e36318 --- /dev/null +++ b/jpa/example/src/test/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d %5p %40.40c:%4L - %m%n + + + + + + + + \ No newline at end of file diff --git a/redis/example/src/test/java/example/springdata/redis/commands/GeoOperationsTests.java b/redis/example/src/test/java/example/springdata/redis/commands/GeoOperationsTests.java index 4ed4b952..a719239c 100644 --- a/redis/example/src/test/java/example/springdata/redis/commands/GeoOperationsTests.java +++ b/redis/example/src/test/java/example/springdata/redis/commands/GeoOperationsTests.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResults; @@ -43,7 +43,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @author Mark Paluch */ @RunWith(SpringRunner.class) -@SpringBootApplication +@SpringBootTest public class GeoOperationsTests { // we only want to run this tests when redis is up an running diff --git a/redis/example/src/test/java/example/springdata/redis/commands/KeyOperationsTests.java b/redis/example/src/test/java/example/springdata/redis/commands/KeyOperationsTests.java index 415c93d5..ed215734 100644 --- a/redis/example/src/test/java/example/springdata/redis/commands/KeyOperationsTests.java +++ b/redis/example/src/test/java/example/springdata/redis/commands/KeyOperationsTests.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.Cursor; @@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @author Christoph Strobl */ @RunWith(SpringRunner.class) -@SpringBootApplication +@SpringBootTest public class KeyOperationsTests { // we only want to run this tests when redis is up an running diff --git a/web/projection/src/main/resources/application.properties b/web/projection/src/main/resources/application.properties index bae39292..f68eeda7 100644 --- a/web/projection/src/main/resources/application.properties +++ b/web/projection/src/main/resources/application.properties @@ -1 +1 @@ -logging.level.org.springframework.web=DEBUG +logging.level.org.springframework.web.client=DEBUG diff --git a/web/querydsl/src/test/java/example/users/ApplicationTests.java b/web/querydsl/src/test/java/example/users/ApplicationTests.java index 85c8c652..5bfc5164 100644 --- a/web/querydsl/src/test/java/example/users/ApplicationTests.java +++ b/web/querydsl/src/test/java/example/users/ApplicationTests.java @@ -17,14 +17,14 @@ package example.users; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; /** * @author Oliver Gierke */ @RunWith(SpringRunner.class) -@SpringBootApplication +@SpringBootTest public class ApplicationTests { @Test