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

Upgrades to JUnit5; fixes gh-1567

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-03-03 19:53:50 +01:00
parent a59bfb00cf
commit 3ce018bc51
129 changed files with 482 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/src/test/java/sample/SampleFeignApplicationTests.java
View File

@@ -19,35 +19,32 @@ package sample;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.assertj.core.api.BDDAssertions;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = SampleFeignApplication.class)
@TestPropertySource(properties = "sample.zipkin.enabled=false")
@ExtendWith(OutputCaptureExtension.class)
public class SampleFeignApplicationTests {
private static final Log log = LogFactory.getLog(SampleFeignApplicationTests.class);
@Rule
public OutputCaptureRule outputCapture = new OutputCaptureRule();
@Test
public void contextLoads() {
}
// https://github.com/spring-cloud/spring-cloud-sleuth/issues/1396
@Test
public void should_not_pass_dash_as_default_service_name() {
public void should_not_pass_dash_as_default_service_name(
CapturedOutput outputCapture) {
log.info("HELLO");
BDDAssertions.then(this.outputCapture.toString()).doesNotContain("INFO [-,,,]");
BDDAssertions.then(outputCapture.toString()).doesNotContain("INFO [-,,,]");
}
}