test: Add EXPECT_THAT_THROWS_MESSAGE, allowing arbitrary string matchers#6561
Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom Apr 12, 2019
Merged
Conversation
This was inspired by the same problem that PR#6448 is fixing, namely
an overly strict string match. Elisha wanted a more focused fix, so
I'm offering this for the next such case, enabling a test in
test/common/router/config_impl_test.cc such as:
EXPECT_THAT_THROWS_MESSAGE(
TestConfigImpl(parseRouteConfigurationFromV2Yaml(yaml), factory_context_, true),
EnvoyException,
AllOf(HasSubstr("Unable to parse"),
HasSubstr("virtual_hosts[0].routes[0].route.cors.enabled.value"),
HasSubstr("invalid value 0 for type TYPE_BOOL")));
Signed-off-by: James Synge <jamessynge@google.com>
Signed-off-by: James Synge <jamessynge@google.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This was inspired by the same problem that #6558 is fixing, namely
an overly strict string match. Elisha wanted a more focused fix, so
I'm offering this for the next such case, enabling a test in
test/common/router/config_impl_test.cc such as:
EXPECT_THAT_THROWS_MESSAGE(
TestConfigImpl(parseRouteConfigurationFromV2Yaml(yaml), factory_context_, true),
EnvoyException,
AllOf(HasSubstr("Unable to parse"),
HasSubstr("virtual_hosts[0].routes[0].route.cors.enabled.value"),
HasSubstr("invalid value 0 for type TYPE_BOOL")));
I've modified the existing EXPECT_THROWS.* macros to use this macro,
and added documentation of each of those macros.
Signed-off-by: James Synge jamessynge@google.com