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

Improved tests

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-11-26 12:52:43 +01:00
parent f385740bfb
commit 700ae79c46
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/redis/TraceRedisAutoConfiguration.java
View File

@@ -20,6 +20,7 @@ import io.lettuce.core.tracing.Tracing;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -39,6 +40,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "spring.sleuth.redis.enabled", matchIfMissing = true)
@ConditionalOnBean(Tracer.class)
@ConditionalOnClass(Tracing.class)
@AutoConfigureBefore({ RedisAutoConfiguration.class })
@EnableConfigurationProperties(TraceRedisProperties.class)
public class TraceRedisAutoConfiguration {

6
tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/kafka/KafkaSenderTest.java
View File

@@ -51,9 +51,9 @@ public class KafkaSenderTest extends org.springframework.cloud.sleuth.instrument
ProducerRecord<String, String> producerRecord = new ProducerRecord<>(testTopic, "test", "test");
startKafkaConsumer();
Flux<SenderResult<Object>> senderResultFlux = this.kafkaSender
.send(Mono.just(SenderRecord.create(producerRecord, null)));
StepVerifier.create(senderResultFlux).expectNextCount(1).verifyComplete();
Flux<SenderResult<Object>> senderResultFlux = this.kafkaSender
.send(Mono.just(SenderRecord.create(producerRecord, null)));
StepVerifier.create(senderResultFlux).expectNextCount(1).verifyComplete();
Awaitility.await().untilAsserted(() -> {
ConsumerRecord<String, String> consumerRecord = consumerRecords.poll(1, TimeUnit.SECONDS);

4
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/BraveMessagingAutoConfiguration1664Tests.java
View File

@@ -22,8 +22,7 @@ import brave.kafka.clients.KafkaTracing;
import brave.sampler.Sampler;
import brave.test.TestSpanHandler;
import org.aspectj.lang.ProceedingJoinPoint;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +39,6 @@ import static org.assertj.core.api.BDDAssertions.then;
/**
* @author Roberto Tassi
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = BraveMessagingAutoConfiguration1664Tests.Config.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class BraveMessagingAutoConfiguration1664Tests {

2
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/StreamFunctionAdapterTests.java
View File

@@ -63,7 +63,7 @@ public class StreamFunctionAdapterTests {
Message<byte[]> message = this.outputDestination.receive(200L);
assertThat(message).isNotNull();
assertThat(message.getPayload()).isEqualTo("\"HELLO\"".getBytes());
assertThat(message.getPayload()).containsAnyOf("HELLO".getBytes());
String b3 = message.getHeaders().get("b3", String.class);
assertThat(b3).startsWith("4883117762eb9420");

2
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/StreamMessageOperatorsTests.java
View File

@@ -68,7 +68,7 @@ public class StreamMessageOperatorsTests {
Message<byte[]> message = this.outputDestination.receive(200L);
assertThat(message).isNotNull();
assertThat(message.getPayload()).isEqualTo("\"HELLO\"".getBytes());
assertThat(message.getPayload()).containsAnyOf("HELLO".getBytes());
String b3 = message.getHeaders().get("b3", String.class);
assertThat(b3).startsWith("4883117762eb9420");