Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ci failure #281

Merged
merged 2 commits into from Jan 30, 2019
Merged

fix ci failure #281

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3089a21
fix ci failure
kezhenxu94 Jan 29, 2019
26a4699
use LocalServerPort shortcut and re-trigger ci build
kezhenxu94 Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 21 additions & 25 deletions dubbo-admin-backend/src/test/java/org/apache/dubbo/admin/AbstractSpringIntegrationTest.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down