Skip to content

Commit f80179a

Browse files
author
Alexander Furer
committed
test with embedded consul
1 parent 31d3dda commit f80179a

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConsulRegistrationTest.java

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package org.lognet.springboot.grpc;
22

3+
import com.pszymczyk.consul.junit.ConsulResource;
34
import io.grpc.ManagedChannel;
45
import io.grpc.ManagedChannelBuilder;
56
import io.grpc.examples.GreeterGrpc;
67
import io.grpc.examples.GreeterOuterClass;
8+
import org.junit.AfterClass;
9+
import org.junit.ClassRule;
710
import org.junit.Test;
811
import org.junit.runner.RunWith;
912
import org.lognet.springboot.grpc.demo.DemoApp;
@@ -13,6 +16,7 @@
1316
import org.springframework.cloud.client.discovery.DiscoveryClient;
1417
import org.springframework.context.ConfigurableApplicationContext;
1518
import org.springframework.test.context.junit4.SpringRunner;
19+
import org.springframework.util.SocketUtils;
1620

1721
import java.util.List;
1822
import java.util.concurrent.ExecutionException;
@@ -22,28 +26,27 @@
2226

2327

2428
@RunWith(SpringRunner.class)
25-
@SpringBootTest(classes = DemoApp.class, properties = {"spring.cloud.config.enabled:false"}
26-
,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
27-
)
29+
@SpringBootTest(classes = DemoApp.class, properties = {"spring.cloud.config.enabled:false"})
2830

2931
public class ConsulRegistrationTest {
30-
// @ClassRule
31-
// public static final ConsulResource consul(){
32-
// int port = SocketUtils.findAvailableTcpPort();
33-
// ConsulResource consulResource = new ConsulResource(port);
34-
// System.setProperty("spring.cloud.consul.port",String.valueOf(port));
35-
// return consulResource;
36-
// }
37-
// @AfterClass
38-
// public static void clear(){
39-
// System.clearProperty("spring.cloud.consul.port");
40-
// }
32+
@ClassRule
33+
public static final ConsulResource consul(){
34+
int port = SocketUtils.findAvailableTcpPort();
35+
ConsulResource consulResource = new ConsulResource(port);
36+
System.setProperty("spring.cloud.consul.port",String.valueOf(port));
37+
return consulResource;
38+
}
39+
@AfterClass
40+
public static void clear(){
41+
System.clearProperty("spring.cloud.consul.port");
42+
}
4143

4244

4345

4446

4547
@Autowired
4648
private DiscoveryClient discoveryClient;
49+
4750
@Autowired
4851
ConfigurableApplicationContext applicationContext;
4952

0 commit comments

Comments
 (0)