From bbc192faf3d514e50ced1c56a1a673df4b7c9633 Mon Sep 17 00:00:00 2001 From: zongzhihui Date: Wed, 20 Dec 2023 14:02:11 +0800 Subject: [PATCH 1/2] add test --- .../hutool/extra/spring/SpringUtilTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java index b1eb3697e..a859bdc69 100644 --- a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java +++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.annotation.Resource; @@ -30,6 +31,8 @@ import java.util.Map; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = {SpringUtil.class, SpringUtilTest.Demo2.class}) +// @ActiveProfiles("dev") // SpringUtil.getActiveProfile()效果与下面方式一致 +@TestPropertySource(properties = {"spring.profiles.active=dev"}) //@Import(spring.org.dromara.hutool.extra.SpringUtil.class) public class SpringUtilTest { @@ -100,6 +103,17 @@ public class SpringUtilTest { Assertions.assertEquals("value2", mapBean.get("key2")); } + @Test + public void getActiveProfileTest() { + + String activeProfile = SpringUtil.getActiveProfile(); + String defaultProfile = SpringUtil.getProperty("spring.profiles.default"); + String activeProfile2 = SpringUtil.getProperty("spring.profiles.active"); + assert "dev".equals(activeProfile); + assert null == defaultProfile; + assert "dev".equals(activeProfile2); + } + @Data public static class Demo2{ private long id; From 707541d4a81994753c18e4d181d74981b3878933 Mon Sep 17 00:00:00 2001 From: zongzhihui Date: Wed, 20 Dec 2023 14:09:44 +0800 Subject: [PATCH 2/2] add test --- .../java/org/dromara/hutool/extra/spring/SpringUtilTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java index a859bdc69..c6b8370d2 100644 --- a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java +++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java @@ -105,7 +105,6 @@ public class SpringUtilTest { @Test public void getActiveProfileTest() { - String activeProfile = SpringUtil.getActiveProfile(); String defaultProfile = SpringUtil.getProperty("spring.profiles.default"); String activeProfile2 = SpringUtil.getProperty("spring.profiles.active");