Generalize gmock-matchers_test to handle is_gtest_matcher-style matchers, too.

PiperOrigin-RevId: 444586594
Change-Id: I0de9b40b3773e3047a492f050266967ea935ae3e

1 files changed, 6 insertions, 2 deletions

diff --git a/googlemock/test/gmock-matchers-arithmetic_test.cc b/googlemock/test/gmock-matchers-arithmetic_test.cc
index ef53baa..a4c1def 100644
--- a/googlemock/test/gmock-matchers-arithmetic_test.cc
+++ b/googlemock/test/gmock-matchers-arithmetic_test.cc
@@ -429,6 +429,8 @@ void AllOfMatches(int num, const Matcher<int>& m) {
   EXPECT_TRUE(m.Matches(num + 1));
 }
 
+INSTANTIATE_GTEST_MATCHER_TEST_P(AllOfTest);
+
 // Tests that AllOf(m1, ..., mn) matches any value that matches all of
 // the given matchers.
 TEST(AllOfTest, MatchesWhenAllMatch) {
@@ -552,7 +554,7 @@ TEST(AllOfTest, AllOfMatcherSafelyCastsMonomorphicMatchers) {
   Matcher<int&> m5 = AllOf(greater_than_5, less_than_10, less_than_10);
 }
 
-TEST(AllOfTest, ExplainsResult) {
+TEST_P(AllOfTestP, ExplainsResult) {
   Matcher<int> m;
 
   // Successful match.  Both matchers need to explain.  The second
@@ -616,6 +618,8 @@ static void AnyOfStringMatches(int num, const Matcher<std::string>& m) {
   EXPECT_FALSE(m.Matches(std::to_string(num + 1)));
 }
 
+INSTANTIATE_GTEST_MATCHER_TEST_P(AnyOfTest);
+
 // Tests that AnyOf(m1, ..., mn) matches any value that matches at
 // least one of the given matchers.
 TEST(AnyOfTest, MatchesWhenAnyMatches) {
@@ -766,7 +770,7 @@ TEST(AnyOfTest, AnyOfMatcherSafelyCastsMonomorphicMatchers) {
   Matcher<int&> m5 = AnyOf(greater_than_5, less_than_10, less_than_10);
 }
 
-TEST(AnyOfTest, ExplainsResult) {
+TEST_P(AnyOfTestP, ExplainsResult) {
   Matcher<int> m;
 
   // Failed match.  Both matchers need to explain.  The second