From d7c924e6a05f0770904cc9c9478984e1084cd8a8 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Sun, 13 Dec 2020 23:47:39 -0800 Subject: [PATCH] Fixes part of gh-1794 by fixing tests in TraceBaggageEntryConfigurationTests by eliminating nested tuples (#1805) --- .../TraceBaggageEntryConfigurationTests.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/TraceBaggageEntryConfigurationTests.java b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/TraceBaggageEntryConfigurationTests.java index 7443e598d..3a400c16f 100644 --- a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/TraceBaggageEntryConfigurationTests.java +++ b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/TraceBaggageEntryConfigurationTests.java @@ -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