From ec704c88ffecb85e480dfe2724bd8d74c20e1b6c Mon Sep 17 00:00:00 2001
From: DerekYRC <15521077528@163.com>
Date: Mon, 7 Nov 2022 20:53:23 +0800
Subject: [PATCH] add junit tests for spring-cloud-tencent-gateway-plugin

---
 .../gateway/SCGPluginsAutoConfiguration.java  | 50 ++++++++-----------
 .../SCGPluginsAutoConfigurationTest.java      |  5 +-
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/main/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfiguration.java b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/main/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfiguration.java
index cbba11e51..16ca5303b 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/main/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfiguration.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/main/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfiguration.java
@@ -44,39 +44,33 @@ import org.springframework.context.annotation.Configuration;
 public class SCGPluginsAutoConfiguration {
 
 	@Configuration
-	@ConditionalOnProperty(value = "spring.cloud.tencent.plugin.scg.staining.enabled", matchIfMissing = true)
-	public static class StainingPluginConfiguration {
+	@ConditionalOnProperty("spring.cloud.tencent.plugin.scg.staining.rule-staining.enabled")
+	@ConditionalOnPolarisConfigEnabled
+	public static class RuleStainingPluginConfiguration {
 
-		@Configuration
-		@ConditionalOnProperty(value = "spring.cloud.tencent.plugin.scg.staining.rule-staining.enabled", matchIfMissing = true)
-		@ConditionalOnPolarisConfigEnabled
-		public static class RuleStainingPluginConfiguration {
-
-			@Bean
-			public RuleStainingProperties ruleStainingProperties() {
-				return new RuleStainingProperties();
-			}
+		@Bean
+		public RuleStainingProperties ruleStainingProperties() {
+			return new RuleStainingProperties();
+		}
 
-			@Bean
-			public StainingRuleManager stainingRuleManager(RuleStainingProperties stainingProperties, ConfigFileService configFileService) {
-				return new StainingRuleManager(stainingProperties, configFileService);
-			}
+		@Bean
+		public StainingRuleManager stainingRuleManager(RuleStainingProperties stainingProperties, ConfigFileService configFileService) {
+			return new StainingRuleManager(stainingProperties, configFileService);
+		}
 
-			@Bean
-			public TrafficStainingGatewayFilter trafficStainingGatewayFilter(List<TrafficStainer> trafficStainer) {
-				return new TrafficStainingGatewayFilter(trafficStainer);
-			}
+		@Bean
+		public TrafficStainingGatewayFilter trafficStainingGatewayFilter(List<TrafficStainer> trafficStainer) {
+			return new TrafficStainingGatewayFilter(trafficStainer);
+		}
 
-			@Bean
-			public RuleStainingExecutor ruleStainingExecutor() {
-				return new RuleStainingExecutor();
-			}
+		@Bean
+		public RuleStainingExecutor ruleStainingExecutor() {
+			return new RuleStainingExecutor();
+		}
 
-			@Bean
-			public RuleTrafficStainer ruleTrafficStainer(StainingRuleManager stainingRuleManager,
-					RuleStainingExecutor ruleStainingExecutor) {
-				return new RuleTrafficStainer(stainingRuleManager, ruleStainingExecutor);
-			}
+		@Bean
+		public RuleTrafficStainer ruleTrafficStainer(StainingRuleManager stainingRuleManager, RuleStainingExecutor ruleStainingExecutor) {
+			return new RuleTrafficStainer(stainingRuleManager, ruleStainingExecutor);
 		}
 	}
 }
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfigurationTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfigurationTest.java
index ba243f72d..21314544d 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfigurationTest.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/SCGPluginsAutoConfigurationTest.java
@@ -40,12 +40,13 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
 
 /**
- * Test for {@link SCGPluginsAutoConfigurationTest}.
+ * Test for {@link SCGPluginsAutoConfiguration}.
  * @author derek.yi 2022-11-03
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = DEFINED_PORT, classes = SCGPluginsAutoConfigurationTest.TestApplication.class,
-		properties = {"server.port=8081", "spring.config.location = classpath:application-test.yml"})
+		properties = {"server.port=8081", "spring.config.location = classpath:application-test.yml",
+				"spring.cloud.tencent.plugin.scg.staining.rule-staining.enabled = true"})
 public class SCGPluginsAutoConfigurationTest {
 
 	@Autowired