SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making the branch 1.5.0 boot compatible

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java
View File

@@ -25,14 +25,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.sleuth.zipkin.ZipkinProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import integration.ZipkinTests.WaitUntilZipkinIsUpConfig;
import sample.SampleZipkinApplication;
@@ -40,11 +38,11 @@ import tools.AbstractIntegrationTest;
import zipkin.junit.ZipkinRule;
import zipkin.server.EnableZipkinServer;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = { WaitUntilZipkinIsUpConfig.class,
SampleZipkinApplication.class })
@WebIntegrationTest
@TestPropertySource(properties = {"sample.zipkin.enabled=true"})
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { WaitUntilZipkinIsUpConfig.class,
SampleZipkinApplication.class },
properties = {"sample.zipkin.enabled=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class ZipkinTests extends AbstractIntegrationTest {
@ClassRule public static final ZipkinRule zipkin = new ZipkinRule();

14
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/sample/SampleSleuthApplicationTests.java
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 = SampleZipkinApplication.class)
@WebAppConfiguration
@TestPropertySource(properties="sample.zipkin.enabled=false")
@RunWith(SpringRunner.class)
@SpringBootTest(classes = SampleZipkinApplication.class,
properties="sample.zipkin.enabled=false",
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class SampleSleuthApplicationTests {
@Test