|
1 | 1 | package org.lognet.springboot.grpc; |
2 | 2 |
|
| 3 | +import com.pszymczyk.consul.junit.ConsulResource; |
3 | 4 | import io.grpc.ManagedChannel; |
4 | 5 | import io.grpc.ManagedChannelBuilder; |
5 | 6 | import io.grpc.examples.GreeterGrpc; |
6 | 7 | import io.grpc.examples.GreeterOuterClass; |
| 8 | +import org.junit.AfterClass; |
| 9 | +import org.junit.ClassRule; |
7 | 10 | import org.junit.Test; |
8 | 11 | import org.junit.runner.RunWith; |
9 | 12 | import org.lognet.springboot.grpc.demo.DemoApp; |
|
13 | 16 | import org.springframework.cloud.client.discovery.DiscoveryClient; |
14 | 17 | import org.springframework.context.ConfigurableApplicationContext; |
15 | 18 | import org.springframework.test.context.junit4.SpringRunner; |
| 19 | +import org.springframework.util.SocketUtils; |
16 | 20 |
|
17 | 21 | import java.util.List; |
18 | 22 | import java.util.concurrent.ExecutionException; |
|
22 | 26 |
|
23 | 27 |
|
24 | 28 | @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"}) |
28 | 30 |
|
29 | 31 | 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 | + } |
41 | 43 |
|
42 | 44 |
|
43 | 45 |
|
44 | 46 |
|
45 | 47 | @Autowired |
46 | 48 | private DiscoveryClient discoveryClient; |
| 49 | + |
47 | 50 | @Autowired |
48 | 51 | ConfigurableApplicationContext applicationContext; |
49 | 52 |
|
|
0 commit comments