From 1ef3301d2546ec4ec3c821e76a60404b8ec77c5e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 21 Sep 2016 12:09:44 +0200 Subject: [PATCH] Fixed the hanging test --- .../sample/SampleApplicationTests.java | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java index 186dfabb..de05f383 100644 --- a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java +++ b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java @@ -16,34 +16,19 @@ package org.springframework.cloud.zookeeper.sample; -import java.io.IOException; - import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.boot.test.WebIntegrationTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleZookeeperApplication.class) -@WebIntegrationTest(randomPort = true) public class SampleApplicationTests { - static TestingServer testingServer; + @Test public void contextLoads() throws Exception { + TestingServer server = new TestingServer(2181); - @BeforeClass - public static void before() throws Exception { - testingServer = new TestingServer(2181); - } + ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleZookeeperApplication.class).run("--server.port=0"); - @AfterClass - public static void clean() throws IOException { - testingServer.close(); - } - - @Test public void contextLoads() { + context.close(); + server.close(); } }