From 27e88fd6e59a9db6091f312a61945b01869046d6 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Thu, 30 Jul 2020 19:28:56 +0200 Subject: [PATCH] [CCK] Update compatibility with messages:12.3.2 Fixed in CI --- .../cucumber/compatibility/matchers/AComparableMessage.java | 5 ++++- .../io/cucumber/core/runtime/CucumberExecutionContext.java | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compatibility/src/test/java/io/cucumber/compatibility/matchers/AComparableMessage.java b/compatibility/src/test/java/io/cucumber/compatibility/matchers/AComparableMessage.java index 31be647ffe..b133b6f4fb 100644 --- a/compatibility/src/test/java/io/cucumber/compatibility/matchers/AComparableMessage.java +++ b/compatibility/src/test/java/io/cucumber/compatibility/matchers/AComparableMessage.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.stream.Collectors; +import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.isA; import static org.hamcrest.CoreMatchers.not; @@ -90,7 +91,9 @@ private static List> extractExpectedFields(GeneratedMessageV3 expecte expected.add(hasEntry(is(fieldName), isA(expectedValue.getClass()))); break; case "ci": - expected.add(not(hasKey(is(fieldName)))); + // exception: Absent when running locally, present in ci + expected.add( + anyOf(not(hasKey(is(fieldName))), hasEntry(is(fieldName), isA(expectedValue.getClass())))); break; default: expected.add(hasEntry(is(fieldName), aComparableValue(expectedValue, depth))); diff --git a/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java b/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java index 5974c3e85a..846e41115a 100644 --- a/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java +++ b/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java @@ -33,9 +33,6 @@ public final class CucumberExecutionContext { private static final String VERSION = ResourceBundle.getBundle("io.cucumber.core.version") .getString("cucumber-jvm.version"); - private static final String MESSAGE_PROTOCOL_VERSION = ResourceBundle.getBundle("io.cucumber.core.version") - .getString("messages.version"); - private static final Logger log = LoggerFactory.getLogger(CucumberExecutionContext.class); private final EventBus bus;