From c8961588044dab6c9a1b43e64b745b7e9860bfed Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 28 Jun 2021 19:22:58 +0200 Subject: [PATCH] GH-1975 Fix test after SCF change Fix sleuth tests related to the change in SCF - https://github.com/spring-cloud/spring-cloud-function/commit/c86890806e856ef90f64f2b2e6142731eef74747 --- .../instrument/messaging/TraceFunctionAroundWrapperTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAroundWrapperTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAroundWrapperTests.java index fa94083a6..2197a8171 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAroundWrapperTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAroundWrapperTests.java @@ -50,11 +50,10 @@ public abstract class TraceFunctionAroundWrapperTests { assertThat(spanHandler.reportedSpans()).isEmpty(); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); FunctionInvocationWrapper function = catalog.lookup("greeter"); - function.setSkipOutputConversion(true); Message result = (Message) function.get(); - assertThat(result.getPayload()).isEqualTo("hello"); + assertThat(result.getPayload()).isEqualTo("hello".getBytes()); assertThat(spanHandler.reportedSpans().size()).isEqualTo(2); assertThat(((String) result.getHeaders().get("b3"))).contains(spanHandler.get(0).getTraceId()); spanHandler.assertAllSpansWereFinishedOrAbandoned(context.getBean(TestTracer.class).createdSpans()); @@ -70,7 +69,6 @@ public abstract class TraceFunctionAroundWrapperTests { assertThat(spanHandler.reportedSpans()).isEmpty(); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); FunctionInvocationWrapper function = catalog.lookup("uppercase"); - function.setSkipOutputConversion(true); Message result = (Message) function.apply(MessageBuilder.withPayload("hello").build());