diff options
| author | kosak <kosak@google.com> | 2015-04-28 23:06:58 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2015-04-28 23:06:58 +0000 |
| commit | 9b1a944ec48b7f84ad2f4466ed3babd232a20db5 (patch) | |
| tree | 4d5feac1fc51196dfa7ca4e9bb72ec1ee5cbd40e /test/gmock-matchers_test.cc | |
| parent | 6305ff5a922ddf3b428f08ad3b53d07d2c08d89a (diff) | |
| download | googletest-9b1a944ec48b7f84ad2f4466ed3babd232a20db5.tar.gz googletest-9b1a944ec48b7f84ad2f4466ed3babd232a20db5.tar.bz2 googletest-9b1a944ec48b7f84ad2f4466ed3babd232a20db5.zip | |
Fix EXPECT_THAT() to support literal strings as a second argument.
Diffstat (limited to 'test/gmock-matchers_test.cc')
| -rw-r--r-- | test/gmock-matchers_test.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index 494c85f4..ceb20022 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -762,6 +762,21 @@ TEST(SafeMatcherCastTest, ValueIsNotCopied) { EXPECT_TRUE(m.Matches(n)); } +TEST(ExpectThat, TakesLiterals) { + EXPECT_THAT(1, 1); + EXPECT_THAT(1.0, 1.0); + EXPECT_THAT(string(), ""); +} + +TEST(ExpectThat, TakesFunctions) { + struct Helper { + static void Func() {} + }; + void (*func)() = Helper::Func; + EXPECT_THAT(func, Helper::Func); + EXPECT_THAT(func, &Helper::Func); +} + // Tests that A<T>() matches any value of type T. TEST(ATest, MatchesAnyValue) { // Tests a matcher for a value type. |