eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplifies gmock code using gtest's OS-indicating macros.

Browse Source
This commit is contained in:
zhanyong.wan
2009-09-24 21:17:24 +00:00
parent b0d1c08ff2
commit f7af24c7de
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/gmock-actions_test.cc
View File

@@ -70,9 +70,9 @@ using testing::ReturnNull;
using testing::ReturnRef;
using testing::SetArgumentPointee;
#ifndef _WIN32_WCE
#if !GTEST_OS_WINDOWS_MOBILE
using testing::SetErrnoAndReturn;
#endif // _WIN32_WCE
#endif
#if GMOCK_HAS_PROTOBUF_
using testing::internal::TestMessage;
@@ -911,7 +911,7 @@ TEST(AssignTest, CompatibleTypes) {
EXPECT_DOUBLE_EQ(5, x);
}
#ifndef _WIN32_WCE
#if !GTEST_OS_WINDOWS_MOBILE
class SetErrnoAndReturnTest : public testing::Test {
protected:
@@ -938,7 +938,7 @@ TEST_F(SetErrnoAndReturnTest, CompatibleTypes) {
EXPECT_EQ(EINVAL, errno);
}
#endif // _WIN32_WCE
#endif // !GTEST_OS_WINDOWS_MOBILE
// Tests ByRef().

14
test/gmock_link_test.h
View File

@@ -116,7 +116,7 @@
#include <gmock/gmock.h>
#ifndef _WIN32_WCE
#if !GTEST_OS_WINDOWS_MOBILE
#include <errno.h>
#endif
@@ -176,18 +176,18 @@ using testing::WithArg;
using testing::WithArgs;
using testing::WithoutArgs;
#ifndef _WIN32_WCE
#if !GTEST_OS_WINDOWS_MOBILE
using testing::SetErrnoAndReturn;
#endif // _WIN32_WCE
#endif
#if GTEST_HAS_EXCEPTIONS
using testing::Throw;
#endif // GTEST_HAS_EXCEPTIONS
#endif
#if GMOCK_HAS_REGEX
using testing::ContainsRegex;
using testing::MatchesRegex;
#endif // GMOCK_HAS_REGEX
#endif
class Interface {
public:
@@ -297,7 +297,7 @@ TEST(LinkTest, TestSetArrayArgument) {
mock.VoidFromString(&ch);
}
#ifndef _WIN32_WCE
#if !GTEST_OS_WINDOWS_MOBILE
// Tests the linkage of the SetErrnoAndReturn action.
TEST(LinkTest, TestSetErrnoAndReturn) {
@@ -309,7 +309,7 @@ TEST(LinkTest, TestSetErrnoAndReturn) {
errno = saved_errno;
}
#endif // _WIN32_WCE
#endif // !GTEST_OS_WINDOWS_MOBILE
// Tests the linkage of the Invoke(function) and Invoke(object, method) actions.
TEST(LinkTest, TestInvoke) {