Skip to content

Commit

Permalink
[CCK] Update compatibility with messages:12.3.2
Browse files Browse the repository at this point in the history
Fixed in CI
  • Loading branch information
mpkorstanje committed Jul 30, 2020
1 parent 0bfbf34 commit 27e88fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -90,7 +91,9 @@ private static List<Matcher<?>> 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)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 27e88fd

Please sign in to comment.