Merge pull request #202 from SkyeBeFreeman/main

test:add junit test to polaris-circuitbreaker.

CHANGELOG.md

@@ -10,3 +10,4 @@
 - [Feature:Support near by router.](https://github.com/Tencent/spring-cloud-tencent/pull/196)
 - [Feature: Load application.yml and application-${profile}.yml from polaris server.](https://github.com/Tencent/spring-cloud-tencent/pull/199)
 - [feat:add rate limit of unirate.](https://github.com/Tencent/spring-cloud-tencent/pull/197)
+- [test:add junit test to polaris-circuitbreaker.](https://github.com/Tencent/spring-cloud-tencent/pull/202)

spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml

@@ -107,5 +107,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-inline</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java

@@ -35,8 +35,7 @@
  *
  * @author Haotian Zhang
  */
-public class PolarisFeignBeanPostProcessor
-		implements BeanPostProcessor, BeanFactoryAware {
+public class PolarisFeignBeanPostProcessor implements BeanPostProcessor, BeanFactoryAware {
 
 	private final ConsumerAPI consumerAPI;
 
@@ -47,8 +46,7 @@ public PolarisFeignBeanPostProcessor(ConsumerAPI consumerAPI) {
 	}
 
 	@Override
-	public Object postProcessBeforeInitialization(Object bean, String beanName)
-			throws BeansException {
+	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return wrapper(bean);
 	}
 

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java

@@ -27,11 +27,9 @@
  *
  * @author Haotian Zhang
  */
-public class PolarisFeignBlockingLoadBalancerClient
-		extends FeignBlockingLoadBalancerClient {
+public class PolarisFeignBlockingLoadBalancerClient extends FeignBlockingLoadBalancerClient {
 
-	public PolarisFeignBlockingLoadBalancerClient(Client delegate,
-			BlockingLoadBalancerClient loadBalancerClient) {
+	public PolarisFeignBlockingLoadBalancerClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient) {
 		super(delegate, loadBalancerClient);
 	}
 

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClient.java

@@ -64,11 +64,13 @@ public Response execute(Request request, Options options) throws IOException {
 			if (response.status() >= 500) {
 				resultRequest.setRetStatus(RetStatus.RetFail);
 			}
+			LOG.debug("Will report result of {}. Request=[{}]. Response=[{}].",
+					resultRequest.getRetStatus().name(), request, response);
 			return response;
 		}
 		catch (IOException origin) {
 			resultRequest.setRetStatus(RetStatus.RetFail);
-
+			LOG.debug("Will report result of {}. Request=[{}].", resultRequest.getRetStatus().name(), request, origin);
 			throw origin;
 		}
 		finally {

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java

@@ -0,0 +1,44 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker;
+
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link PolarisCircuitBreakerBootstrapConfiguration}.
+ *
+ * @author Haotian Zhang
+ */
+public class PolarisCircuitBreakerBootstrapConfigurationTest {
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(
+					AutoConfigurations.of(PolarisCircuitBreakerBootstrapConfiguration.class))
+			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
+
+	@Test
+	public void testDefaultInitialization() {
+		this.contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(PolarisCircuitBreakerBootstrapConfiguration.CircuitBreakerConfigModifier.class);
+		});
+	}
+}

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java

@@ -0,0 +1,52 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker;
+
+import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignBeanPostProcessor;
+import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration;
+import com.tencent.polaris.api.core.ConsumerAPI;
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link PolarisFeignClientAutoConfiguration}.
+ *
+ * @author Haotian Zhang
+ */
+public class PolarisFeignClientAutoConfigurationTest {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(
+					AutoConfigurations.of(
+							PolarisContextAutoConfiguration.class,
+							PolarisFeignClientAutoConfiguration.class))
+			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
+
+	@Test
+	public void testDefaultInitialization() {
+		this.contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(ConsumerAPI.class);
+			assertThat(context).hasSingleBean(PolarisFeignBeanPostProcessor.class);
+		});
+	}
+
+}

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessorTest.java

@@ -0,0 +1,97 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.feign;
+
+import com.tencent.polaris.api.core.ConsumerAPI;
+import feign.Client;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
+import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Test for {@link PolarisFeignBeanPostProcessor}.
+ *
+ * @author Haotian Zhang
+ */
+public class PolarisFeignBeanPostProcessorTest {
+
+	private PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor;
+
+	@Before
+	public void setUp() {
+		ConsumerAPI consumerAPI = mock(ConsumerAPI.class);
+
+		polarisFeignBeanPostProcessor = new PolarisFeignBeanPostProcessor(consumerAPI);
+	}
+
+	@Test
+	public void testPostProcessBeforeInitialization() {
+		BeanFactory beanFactory = mock(BeanFactory.class);
+		doAnswer(invocation -> {
+			Class<?> clazz = invocation.getArgument(0);
+			if (clazz.equals(BlockingLoadBalancerClient.class)) {
+				return mock(BlockingLoadBalancerClient.class);
+			}
+			if (clazz.equals(CachingSpringLoadBalancerFactory.class)) {
+				return mock(CachingSpringLoadBalancerFactory.class);
+			}
+			if (clazz.equals(SpringClientFactory.class)) {
+				return mock(SpringClientFactory.class);
+			}
+			return null;
+		}).when(beanFactory).getBean(any(Class.class));
+		polarisFeignBeanPostProcessor.setBeanFactory(beanFactory);
+
+		// isNeedWrap(bean) == false
+		Object bean1 = new Object();
+		Object bean = polarisFeignBeanPostProcessor.postProcessBeforeInitialization(bean1, "bean1");
+		assertThat(bean).isNotInstanceOfAny(
+				PolarisFeignClient.class,
+				PolarisLoadBalancerFeignClient.class,
+				PolarisFeignBlockingLoadBalancerClient.class);
+
+		// bean instanceOf Client.class
+		Client bean2 = mock(Client.class);
+		bean = polarisFeignBeanPostProcessor.postProcessBeforeInitialization(bean2, "bean2");
+		assertThat(bean).isInstanceOf(PolarisFeignClient.class);
+
+		// bean instanceOf LoadBalancerFeignClient.class
+		LoadBalancerFeignClient bean3 = mock(LoadBalancerFeignClient.class);
+		doReturn(mock(Client.class)).when(bean3).getDelegate();
+		bean = polarisFeignBeanPostProcessor.postProcessBeforeInitialization(bean3, "bean3");
+		assertThat(bean).isInstanceOf(PolarisLoadBalancerFeignClient.class);
+
+		// bean instanceOf FeignBlockingLoadBalancerClient.class
+		FeignBlockingLoadBalancerClient bean4 = mock(FeignBlockingLoadBalancerClient.class);
+		doReturn(mock(Client.class)).when(bean4).getDelegate();
+		bean = polarisFeignBeanPostProcessor.postProcessBeforeInitialization(bean4, "bean4");
+		assertThat(bean).isInstanceOf(PolarisFeignBlockingLoadBalancerClient.class);
+	}
+}

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClientTest.java

@@ -0,0 +1,39 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.feign;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+/**
+ * Test for {@link PolarisFeignBlockingLoadBalancerClient}.
+ *
+ * @author Haotian Zhang
+ */
+public class PolarisFeignBlockingLoadBalancerClientTest {
+
+	@Test
+	public void testConstructor() {
+		try {
+			new PolarisFeignBlockingLoadBalancerClient(null, null);
+		}
+		catch (Exception e) {
+			Assertions.fail("Exception encountered.", e);
+		}
+	}
+}