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

Fixed broken tests

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-14 14:06:57 +01:00
parent e6bf63307c
commit 8c7870d214
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java
View File

@@ -16,6 +16,9 @@
package org.springframework.cloud.sleuth.stream;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.Collection;
import java.util.Optional;
import java.util.concurrent.BlockingQueue;
@@ -29,8 +32,8 @@ import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleProperties;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -59,8 +62,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.BDDAssertions.then;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
/**
* @author Dave Syer
@@ -206,6 +207,13 @@ public class StreamSpanListenerTests {
return new NoOpSpanLogger();
}
@Bean
SimpleProperties simpleProperties() {
SimpleProperties simpleProperties = new SimpleProperties();
simpleProperties.setStep(Duration.of(60, ChronoUnit.SECONDS));
return simpleProperties;
}
@Bean
public Sampler defaultSampler() {
return new AlwaysSampler();