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

Fixes part of gh-1794 by fixing tests in TraceBaggageEntryConfigurationTests by eliminating nested tuples (#1805)

Browse Source
This commit is contained in:
Jonatan Ivanov
2020-12-13 23:47:39 -08:00
committed by GitHub
parent be35aaec21
commit d7c924e6a0
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/TraceBaggageEntryConfigurationTests.java
View File

@@ -37,7 +37,6 @@ import org.assertj.core.api.InstanceOfAssertFactories;
import org.assertj.core.api.ListAssert;
import org.assertj.core.api.ObjectAssert;
import org.assertj.core.groups.Tuple;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -75,22 +74,20 @@ public class TraceBaggageEntryConfigurationTests {
.asInstanceOf(InstanceOfAssertFactories.list(Tuple.class));
}
@Disabled("Brave broke its internal implementation and tests are bound to it - will skip for now")
@Test
public void shouldCreateRemoteFields() {
this.contextRunner.withPropertyValues("spring.sleuth.baggage.remote-fields=x-vcap-request-id,country-code")
.run((context) -> assertThatBaggageFieldNameToKeyNames(context).containsOnly(
tuple("x-vcap-request-id", new HashSet<>(Collections.singletonList("x-vcap-request-id")),
tuple("country-code", new HashSet<>(Collections.singletonList("country-code"))))));
.run(context -> assertThatBaggageFieldNameToKeyNames(context).containsExactlyInAnyOrder(
tuple("x-vcap-request-id", new HashSet<>(Collections.singletonList("x-vcap-request-id"))),
tuple("country-code", new HashSet<>(Collections.singletonList("country-code")))));
}
@Disabled("Brave broke its internal implementation and tests are bound to it - will skip for now")
@Test
public void shouldCreateRemoteFields_oldName() {
this.contextRunner.withPropertyValues("spring.sleuth.propagation-keys=x-vcap-request-id,country-code")
.run((context) -> assertThatBaggageFieldNameToKeyNames(context).containsOnly(
tuple("x-vcap-request-id", new HashSet<>(Collections.singletonList("x-vcap-request-id")),
tuple("country-code", new HashSet<>(Collections.singletonList("country-code"))))));
.run(context -> assertThatBaggageFieldNameToKeyNames(context).containsExactlyInAnyOrder(
tuple("x-vcap-request-id", new HashSet<>(Collections.singletonList("x-vcap-request-id"))),
tuple("country-code", new HashSet<>(Collections.singletonList("country-code")))));
}
@Test