Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect event id comparison #1640

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ private static boolean compareEvents(ValidationEvent expected, ValidationEvent a
}

private boolean isModelDeprecationEvent(ValidationEvent event) {
return event.getId().equals(Validator.MODEL_DEPRECATION)
return event.containsId(Validator.MODEL_DEPRECATION)
// Trait vendors should be free to deprecate a trait without breaking consumers.
|| event.getId().equals("DeprecatedTrait")
|| event.getId().equals("DeprecatedShape");
|| event.containsId("DeprecatedTrait")
|| event.containsId("DeprecatedShape");
}

private static String inferErrorFileLocation(String modelLocation) {
Expand Down