From fac6ecbee5fa03edc89a3e978c272b6a9a3afd20 Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 13:35:49 +0800 Subject: [PATCH 1/9] add PostInitPolarisSDKContextTest --- .../PostInitPolarisSDKContextTest.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java new file mode 100644 index 000000000..0a6d06c34 --- /dev/null +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -0,0 +1,51 @@ +package com.tencent.cloud.polaris.context; + +import com.tencent.cloud.common.metadata.StaticMetadataManager; +import com.tencent.polaris.api.plugin.common.ValueContext; +import com.tencent.polaris.api.plugin.route.LocationLevel; +import com.tencent.polaris.client.api.SDKContext; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.when; + + +/** + *@author : wh + *@date : 2022/7/6 11:41 + *@description: + */ +@RunWith(MockitoJUnitRunner.class) +public class PostInitPolarisSDKContextTest { + + @Mock + private SDKContext sdkContext; + @Mock + private StaticMetadataManager staticMetadataManager; + + private static final String region = "region"; + + private static final String zone = "zone"; + + private static final String campus = "campus"; + + @Test + public void PostInitPolarisSDKContextTest() { + ValueContext valueContext = new ValueContext(); + + when(sdkContext.getValueContext()).thenReturn(valueContext); + when(staticMetadataManager.getRegion()).thenReturn(region); + when(staticMetadataManager.getZone()).thenReturn(zone); + when(staticMetadataManager.getCampus()).thenReturn(campus); + + new PostInitPolarisSDKContext(sdkContext, staticMetadataManager); + assertThat(valueContext.getValue(LocationLevel.region.name()), is(region)); + assertThat(valueContext.getValue(LocationLevel.zone.name()), is(zone)); + assertThat(valueContext.getValue(LocationLevel.campus.name()), is(campus)); + } + +} From 3b4a516ddf9a354fdb14f30f7971e60c4b4f16df Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 13:45:14 +0800 Subject: [PATCH 2/9] delete blank lines --- .../cloud/polaris/context/PostInitPolarisSDKContextTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 0a6d06c34..dbc39c4c2 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -47,5 +47,4 @@ public class PostInitPolarisSDKContextTest { assertThat(valueContext.getValue(LocationLevel.zone.name()), is(zone)); assertThat(valueContext.getValue(LocationLevel.campus.name()), is(campus)); } - } From 967a4d9bd8608700cf748c80cd7e229fe304ff77 Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 13:47:02 +0800 Subject: [PATCH 3/9] update java doc --- .../cloud/polaris/context/PostInitPolarisSDKContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index dbc39c4c2..344598c64 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -17,7 +17,7 @@ import static org.mockito.Mockito.when; /** *@author : wh *@date : 2022/7/6 11:41 - *@description: + *@description: Test for {@link PostInitPolarisSDKContext}. */ @RunWith(MockitoJUnitRunner.class) public class PostInitPolarisSDKContextTest { From 487829b1a683a618504ea4a717bd8fe23254b5de Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 13:50:54 +0800 Subject: [PATCH 4/9] update java doc --- .../polaris/context/PostInitPolarisSDKContextTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 344598c64..13a0f6f77 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -15,9 +15,9 @@ import static org.mockito.Mockito.when; /** - *@author : wh - *@date : 2022/7/6 11:41 - *@description: Test for {@link PostInitPolarisSDKContext}. + * Test for {@link PostInitPolarisSDKContext}. + * + * @author wh */ @RunWith(MockitoJUnitRunner.class) public class PostInitPolarisSDKContextTest { From a095756f868e1209fdb934b2f7956de3ec943449 Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 17:28:58 +0800 Subject: [PATCH 5/9] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd1e5d177..fc379208b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,3 +10,4 @@ - [fix:fix ClassNotFoundException while not importing openfeign when using circuit-breaker module.](https://github.com/Tencent/spring-cloud-tencent/pull/270) - [fix:solve the chaos code problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/283) - [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/291) +- [test: add PostInitPolarisSDKContextTest](https://github.com/Tencent/spring-cloud-tencent/pull/399) From e2eaeb94a9da27bd5a70c05e95aa30f97b2265c1 Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 18:44:11 +0800 Subject: [PATCH 6/9] add test --- .../PostInitPolarisSDKContextTest.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 13a0f6f77..979ab1885 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -4,13 +4,12 @@ import com.tencent.cloud.common.metadata.StaticMetadataManager; import com.tencent.polaris.api.plugin.common.ValueContext; import com.tencent.polaris.api.plugin.route.LocationLevel; import com.tencent.polaris.client.api.SDKContext; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; @@ -20,31 +19,35 @@ import static org.mockito.Mockito.when; * @author wh */ @RunWith(MockitoJUnitRunner.class) -public class PostInitPolarisSDKContextTest { +public final class PostInitPolarisSDKContextTest { @Mock private SDKContext sdkContext; @Mock private StaticMetadataManager staticMetadataManager; - private static final String region = "region"; + private static final String REGION = "region"; - private static final String zone = "zone"; + private static final String ZONE = "zone"; - private static final String campus = "campus"; + private static final String CAMPUS = "campus"; @Test public void PostInitPolarisSDKContextTest() { ValueContext valueContext = new ValueContext(); when(sdkContext.getValueContext()).thenReturn(valueContext); - when(staticMetadataManager.getRegion()).thenReturn(region); - when(staticMetadataManager.getZone()).thenReturn(zone); - when(staticMetadataManager.getCampus()).thenReturn(campus); + when(staticMetadataManager.getRegion()).thenReturn(REGION); + when(staticMetadataManager.getZone()).thenReturn(ZONE); + when(staticMetadataManager.getCampus()).thenReturn(CAMPUS); new PostInitPolarisSDKContext(sdkContext, staticMetadataManager); - assertThat(valueContext.getValue(LocationLevel.region.name()), is(region)); - assertThat(valueContext.getValue(LocationLevel.zone.name()), is(zone)); - assertThat(valueContext.getValue(LocationLevel.campus.name()), is(campus)); + String regionName = valueContext.getValue(LocationLevel.region.name()); + String zoneName = valueContext.getValue(LocationLevel.zone.name()); + String campusName = valueContext.getValue(LocationLevel.campus.name()); + + Assertions.assertThat(regionName).isEqualTo(REGION); + Assertions.assertThat(zoneName).isEqualTo(ZONE); + Assertions.assertThat(campusName).isEqualTo(CAMPUS); } } From 1a687ff4a4efdcab5a18cbf4168dc5b08d07330e Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 19:27:59 +0800 Subject: [PATCH 7/9] add listener --- .../context/PostInitPolarisSDKContextTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 979ab1885..247e2e6ec 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -1,3 +1,20 @@ +/* + * 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.context; import com.tencent.cloud.common.metadata.StaticMetadataManager; From 8b2a12a69b98c1a7ebd30864b72b1589a4e1ca2c Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 19:29:18 +0800 Subject: [PATCH 8/9] add listener --- .../cloud/polaris/context/PostInitPolarisSDKContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 247e2e6ec..7d3a2b330 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -29,7 +29,6 @@ import org.mockito.junit.MockitoJUnitRunner; import static org.mockito.Mockito.when; - /** * Test for {@link PostInitPolarisSDKContext}. * @@ -68,3 +67,4 @@ public final class PostInitPolarisSDKContextTest { Assertions.assertThat(campusName).isEqualTo(CAMPUS); } } + From fbdce9a03f6e205a1bd9cad256eefd9a21461457 Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 6 Jul 2022 19:46:10 +0800 Subject: [PATCH 9/9] rename method --- .../cloud/polaris/context/PostInitPolarisSDKContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java index 7d3a2b330..52b42b23c 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PostInitPolarisSDKContextTest.java @@ -49,7 +49,7 @@ public final class PostInitPolarisSDKContextTest { private static final String CAMPUS = "campus"; @Test - public void PostInitPolarisSDKContextTest() { + public void testConstructor() { ValueContext valueContext = new ValueContext(); when(sdkContext.getValueContext()).thenReturn(valueContext);