From d14aaed74b2a8a1222d60d8fa3afcfc93a21c321 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Thu, 14 Jan 2010 05:36:32 +0000 Subject: Enables regex matchers on all platforms. --- test/gmock-matchers_test.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'test/gmock-matchers_test.cc') diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index e10b7275..555cc228 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -126,11 +126,9 @@ using testing::internal::linked_ptr; using testing::internal::scoped_ptr; using testing::internal::string; -#ifdef GMOCK_HAS_REGEX using testing::ContainsRegex; using testing::MatchesRegex; using testing::internal::RE; -#endif // GMOCK_HAS_REGEX // For testing ExplainMatchResultTo(). class GreaterThanMatcher : public MatcherInterface { @@ -1249,8 +1247,6 @@ TEST(EndsWithTest, CanDescribeSelf) { EXPECT_EQ("ends with \"Hi\"", Describe(m)); } -#ifdef GMOCK_HAS_REGEX - // Tests MatchesRegex(). TEST(MatchesRegexTest, MatchesStringMatchingGivenRegex) { @@ -1269,8 +1265,8 @@ TEST(MatchesRegexTest, CanDescribeSelf) { Matcher m1 = MatchesRegex(string("Hi.*")); EXPECT_EQ("matches regular expression \"Hi.*\"", Describe(m1)); - Matcher m2 = MatchesRegex(new RE("[a-z].*")); - EXPECT_EQ("matches regular expression \"[a-z].*\"", Describe(m2)); + Matcher m2 = MatchesRegex(new RE("a.*")); + EXPECT_EQ("matches regular expression \"a.*\"", Describe(m2)); } // Tests ContainsRegex(). @@ -1291,10 +1287,9 @@ TEST(ContainsRegexTest, CanDescribeSelf) { Matcher m1 = ContainsRegex("Hi.*"); EXPECT_EQ("contains regular expression \"Hi.*\"", Describe(m1)); - Matcher m2 = ContainsRegex(new RE("[a-z].*")); - EXPECT_EQ("contains regular expression \"[a-z].*\"", Describe(m2)); + Matcher m2 = ContainsRegex(new RE("a.*")); + EXPECT_EQ("contains regular expression \"a.*\"", Describe(m2)); } -#endif // GMOCK_HAS_REGEX // Tests for wide strings. #if GTEST_HAS_STD_WSTRING -- cgit v1.2.3