Skip to content
Permalink
Browse files
fix ci failure (#281)
* fix ci failure

* use LocalServerPort shortcut and re-trigger ci build
  • Loading branch information
kezhenxu94 authored and nzomkxia committed Jan 30, 2019
1 parent 0694692 commit e559efb87c2723071e1d6f687a288997ac37d591
Showing 1 changed file with 21 additions and 25 deletions.
@@ -21,42 +21,38 @@
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.TestingServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.RestTemplate;

import java.io.IOException;

@ActiveProfiles("test")
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@SpringBootTest(classes = DubboAdminApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ContextConfiguration(classes = DubboAdminApplication.class)
public abstract class AbstractSpringIntegrationTest {
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();

protected static TestingServer zkServer;
protected static CuratorFramework zkClient;

@Value("${local.server.port}")
protected int port;

@BeforeClass
public static void beforeClass() throws Exception {
zkServer = new TestingServer(2182, true);
zkClient = CuratorFrameworkFactory.newClient(zkServer.getConnectString(), new RetryOneTime(2000));
zkClient.start();
@Autowired
protected TestRestTemplate restTemplate;

protected static final TestingServer zkServer;
protected static final CuratorFramework zkClient;

static {
try {
zkServer = new TestingServer(2182, true);
zkClient = CuratorFrameworkFactory.newClient(zkServer.getConnectString(), new RetryOneTime(2000));
zkClient.start();
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
}

@AfterClass
public static void afterClass() throws IOException {
zkClient.close();
zkServer.stop();
}
@LocalServerPort
protected int port;

protected String url(final String path) {
return "http://localhost:" + port + path;

0 comments on commit e559efb

Please sign in to comment.