Skip to content

Commit 33f8bfb

Browse files
feat: fix style (#81)
1 parent 2c6297f commit 33f8bfb

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

trpc-container/trpc-container-default/src/test/java/com/tencent/trpc/container/config/yaml/PluginConfigParserHelperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void checkRegistry(PluginConfig config) {
8686
List<Map<String, Object>> services = (List<Map<String, Object>>) config.getProperties()
8787
.get(ConfigConstants.SERVICE);
8888
Assert.assertEquals(services.get(0).get("namespace"), "java-sdk-test-service1");
89-
Assert.assertEquals(services.get(0).get("token"), "5e43887a00c4465085fb89eaa0e414b4");
89+
Assert.assertEquals(services.get(0).get("token"), "xxxx");
9090
Assert.assertEquals(services.get(0).get("instance_id"),
9191
"feda4ceffed0b7b08cf5ec665dcd320e50434549");
9292
Assert.assertEquals(services.get(0).get("name"), "trpc.TestApp.TestServer.Greeter");

trpc-container/trpc-container-default/src/test/java/com/tencent/trpc/container/config/yaml/YamlApplicationConfigParserTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void after() {
4747

4848
@Test
4949
public void parse() {
50+
ConfigManager.stopTest();
5051
ConfigManager applicationConfig =
5152
new YamlApplicationConfigParser().parseFromClassPath("trpc_java_parse_test.yaml");
5253
assert applicationConfig != null;
@@ -225,9 +226,9 @@ public void checkServerConfig(ConfigManager applicationConfig) {
225226
assertEquals(serviceConfig.getFilters().get(1), "filter2");
226227
assertEquals(serviceConfig.getWorkerPool(), "woker_pool_provider_test2");
227228
assertEquals(serviceConfig.getRegistries().get("polaris").get("token"),
228-
"5e43887a00c4465085fb89eaa0e414b4");
229+
"xxxx");
229230
assertEquals(serviceConfig.getRegistries().get("polaris2").get("token"),
230-
"5e43887a00c4465085fb89eaa0e414b3");
231+
"xxxx");
231232
ProviderConfig providerConfig = serviceConfig.getProviderConfigs().get(0);
232233
assertEquals(providerConfig.getRefClazz(), "com.tencent.trpc.container.demo.GreeterServiceImp");
233234
assertEquals(serviceConfig.getWorkerPool(), "woker_pool_provider_test2");
@@ -259,6 +260,7 @@ public void checkServerConfig(ConfigManager applicationConfig) {
259260

260261
@Test
261262
public void testServerIpParse() {
263+
ConfigManager.stopTest();
262264
ConfigManager applicationConfig = new YamlApplicationConfigParser()
263265
.parseFromClassPath("trpc_java_ip_parse_test.yaml");
264266
applicationConfig.setDefault();
@@ -271,13 +273,15 @@ public void testServerIpParse() {
271273

272274
@Test
273275
public void testParseMap() {
276+
ConfigManager.stopTest();
274277
String path = YamlParser.class.getClassLoader().getResource("trpc_java.yaml").getPath();
275278
Map<String, Object> map = new YamlApplicationConfigParser().parseMap(path);
276279
Assert.assertNotEquals(map.size(), 0);
277280
}
278281

279282
@Test
280283
public void testParseMap_confPath() {
284+
ConfigManager.stopTest();
281285
TRpcSystemProperties.setProperties(TRpcSystemProperties.CONFIG_PATH, "");
282286
Map<String, Object> map1 = new YamlApplicationConfigParser().parseMap("");
283287
Assert.assertNotNull(map1);
@@ -314,7 +318,7 @@ public void testParseImpls() {
314318

315319
@Test
316320
public void testEx() {
317-
321+
ConfigManager.stopTest();
318322
try {
319323
new YamlApplicationConfigParser().parseMap("abc");
320324
TRpcSystemProperties.setProperties(TRpcSystemProperties.CONFIG_PATH, "abc");

trpc-container/trpc-container-default/src/test/resources/listener_default.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ server:
6767
registrys:
6868
polaris2:
6969
namespace: java-sdk-test-service2
70-
token: 5e43887a00c4465085fb89eaa0e414b3
70+
token: xxxx
7171
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
7272
name: trpc.TestApp.TestServer.Greeter3
7373

@@ -173,7 +173,7 @@ plugins:
173173
register_self: true
174174
service:
175175
- namespace: java-sdk-test-service2
176-
token: 5e43887a00c4465085fb89eaa0e414b4
176+
token: xxxx
177177
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
178178
name: trpc.TestApp.TestServer.Greeter
179179
selector:

trpc-container/trpc-container-default/src/test/resources/trpc_java_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ plugins:
4141
register_self: false
4242
service:
4343
- namespace: java-sdk-test-service1
44-
token: 5e43887a00c4465085fb89eaa0e414b4
44+
token: xxxx
4545
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
4646
name: trpc.TestApp.TestServer.Greeter
4747

trpc-container/trpc-container-default/src/test/resources/trpc_java_parse_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ server:
6767
registrys:
6868
polaris2:
6969
namespace: java-sdk-test-service2
70-
token: 5e43887a00c4465085fb89eaa0e414b3
70+
token: xxxx
7171
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
7272
name: trpc.TestApp.TestServer.Greeter3
7373

@@ -173,7 +173,7 @@ plugins:
173173
register_self: true
174174
service:
175175
- namespace: java-sdk-test-service2
176-
token: 5e43887a00c4465085fb89eaa0e414b4
176+
token: xxxx
177177
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
178178
name: trpc.TestApp.TestServer.Greeter
179179
selector:

trpc-core/src/test/java/com/tencent/trpc/core/utils/IPUtilsTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414
import org.junit.Assert;
1515
import org.junit.Test;
1616

17-
import java.lang.reflect.InvocationTargetException;
18-
1917
public class IPUtilsTest {
2018

2119
@Test
2220
public void testTransfer() {
23-
String host = "9.12.53.243";
21+
String host = "19.12.53.243";
2422
int ipInt = IPUtils.ip2int(host);
2523
byte[] ipBytes = IPUtils.ip2bytes(host);
2624
String newIp = IPUtils.bytes2ip(ipBytes);

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/resources/application-bind-test1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ trpc:
3434
- instance_id: 0938d8c7303d976bafa761ff588fb41e2192740d #服务注册所需要的 id
3535
name: trpc.ep.ods_collector.test
3636
namespace: Development #环境类型,分正式production和非正式development两种类型
37-
token: d70b7d820f6144a2bb42e55cc6567f21 #服务注册所需要的 token
37+
token: xxxx #服务注册所需要的 token

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/resources/trpc_java_default-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ plugins:
151151
register_self: true
152152
service:
153153
- namespace: java-sdk-test-service1 #环境类型,分正式production和非正式development两种类型
154-
token: 5e43887a00c4465085fb89eaa0e414b4 #服务注册所需要的 token
154+
token: xxxx #服务注册所需要的 token
155155
instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549 #服务注册所需要的 id
156156
name: trpc.TestApp.TestServer.Greeter
157157
selector:

0 commit comments

Comments
 (0)