测试日志打印改成info级别

fartherp · Jan 19, 2020 · 026c55e · 026c55e
1 parent d7091e3
commit 026c55e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/...hub/fartherp/spring/boot/shiro/autoconfigure/NoWebShiroRedissonAutoConfigurationTest.java b/...hub/fartherp/spring/boot/shiro/autoconfigure/NoWebShiroRedissonAutoConfigurationTest.java
@@ -43,14 +43,11 @@ public class NoWebShiroRedissonAutoConfigurationTest extends ShiroRedissonAutoCo
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(RedissonAutoConfiguration.class, ShiroRedissonAutoConfiguration.class))
 		.withUserConfiguration(TestConfiguration.class)
-		.withPropertyValues("spring.redis.redisson.config:classpath:redisson.yaml",
-			"logging.level.org.springframework=info", "logging.level.org.redisson=info");
+		.withPropertyValues("spring.redis.redisson.config:classpath:redisson.yaml");
 
 	@Test
 	public void testDefaultCacheManager() {
-		this.contextRunner.run((context) -> {
-			assertThat(context.getBean(RedisCacheManager.class)).isNotNull();
-		});
+		this.contextRunner.run((context) -> assertThat(context.getBean(RedisCacheManager.class)).isNotNull());
 	}
 
 	@Test
@@ -68,9 +65,7 @@ public void testOverrideCacheManager() {
 
 	@Test
 	public void testDefaultSessionDAO() {
-		this.contextRunner.run((context) -> {
-			assertThat(context.getBean(SessionDAO.class)).isNotNull();
-		});
+		this.contextRunner.run((context) -> assertThat(context.getBean(SessionDAO.class)).isNotNull());
 	}
 
 	@Test

diff --git a/...m/github/fartherp/spring/boot/shiro/autoconfigure/ShiroRedissonAutoConfigurationTest.java b/...m/github/fartherp/spring/boot/shiro/autoconfigure/ShiroRedissonAutoConfigurationTest.java
@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.TestPropertySource;
 
 /**
  * Created by IntelliJ IDEA.
@@ -36,6 +37,7 @@
 public abstract class ShiroRedissonAutoConfigurationTest {
 
 	@Configuration
+	@TestPropertySource(properties = {"logging.level.org.springframework=info", "logging.level.org.redisson=info"})
 	protected static class TestConfiguration {
 		@Bean
 		public HashedCredentialsMatcher hashedCredentialsMatcher() {

diff --git a/...ithub/fartherp/spring/boot/shiro/autoconfigure/WebShiroRedissonAutoConfigurationTest.java b/...ithub/fartherp/spring/boot/shiro/autoconfigure/WebShiroRedissonAutoConfigurationTest.java
@@ -50,14 +50,11 @@ public class WebShiroRedissonAutoConfigurationTest extends ShiroRedissonAutoConf
 	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(RedissonAutoConfiguration.class, ShiroRedissonAutoConfiguration.class))
 		.withUserConfiguration(TestConfiguration.class, Config.class)
-		.withPropertyValues("spring.redis.redisson.config:classpath:redisson.yaml",
-			"logging.level.org.springframework=info", "logging.level.org.redisson=info");
+		.withPropertyValues("spring.redis.redisson.config:classpath:redisson.yaml");
 
 	@Test
 	public void testDefaultCacheManager() {
-		this.contextRunner.run((context) -> {
-			assertThat(context.getBean(RedisCacheManager.class)).isNotNull();
-		});
+		this.contextRunner.run((context) -> assertThat(context.getBean(RedisCacheManager.class)).isNotNull());
 	}
 
 	@Test
@@ -75,9 +72,7 @@ public void testOverrideCacheManager() {
 
 	@Test
 	public void testDefaultSessionDAO() {
-		this.contextRunner.run((context) -> {
-			assertThat(context.getBean(SessionDAO.class)).isNotNull();
-		});
+		this.contextRunner.run((context) -> assertThat(context.getBean(SessionDAO.class)).isNotNull());
 	}
 
 	@Test