diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 21:43:25 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 21:43:25 +0000 |
| commit | 145a7ca423cf3a3249ca0329be37dc447f9ce855 (patch) | |
| tree | cdf1ca18db5e088b671cbdeda33635726d32a1ad /testing/gmock/test/gmock_output_test_.cc | |
| parent | 02ae88443795ca043b15083898e83ad2811b032b (diff) | |
| download | chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.zip chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.tar.gz chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.tar.bz2 | |
Update gmock and gtest.
(Hoping to pick up a clang-related bug fix.)
Review URL: http://codereview.chromium.org/521012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gmock/test/gmock_output_test_.cc')
| -rw-r--r-- | testing/gmock/test/gmock_output_test_.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/testing/gmock/test/gmock_output_test_.cc b/testing/gmock/test/gmock_output_test_.cc index 8244f10..24c9b38 100644 --- a/testing/gmock/test/gmock_output_test_.cc +++ b/testing/gmock/test/gmock_output_test_.cc @@ -49,9 +49,14 @@ using testing::Sequence; class MockFoo { public: + MockFoo() {} + MOCK_METHOD3(Bar, char(const std::string& s, int i, double x)); MOCK_METHOD2(Bar2, bool(int x, int y)); MOCK_METHOD2(Bar3, void(int x, int y)); + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo); }; class GMockOutputTest : public testing::Test { @@ -161,6 +166,10 @@ TEST_F(GMockOutputTest, UnsatisfiedPrerequisites) { foo_.Bar2(1, 0); } +TEST_F(GMockOutputTest, UnsatisfiedWith) { + EXPECT_CALL(foo_, Bar2(_, _)).With(Ge()); +} + TEST_F(GMockOutputTest, UnsatisfiedExpectation) { EXPECT_CALL(foo_, Bar(_, _, _)); EXPECT_CALL(foo_, Bar2(0, _)) |