Making the branch 1.5.0 boot compatible

fixes #499
This commit is contained in:
Marcin Grzejszczak
2017-01-23 12:37:39 +01:00
parent a396a09603
commit e027d4cfb5
51 changed files with 298 additions and 338 deletions

View File

@@ -2,15 +2,13 @@ package sample;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = SampleWebsocketApplication.class)
@WebAppConfiguration
@TestPropertySource(properties="sample.zipkin.enabled=false")
@RunWith(SpringRunner.class)
@SpringBootTest(classes = SampleWebsocketApplication.class,
properties="sample.zipkin.enabled=false",
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class SampleWebsocketApplicationTests {
@Test