Disbles two tests that crash on Symbian.
This commit is contained in:
parent
4bd79e4f25
commit
93244dc369
|
@ -173,16 +173,21 @@ TEST(NiceMockTest, NonDefaultConstructor10) {
|
||||||
nice_bar.That(5, true);
|
nice_bar.That(5, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !GTEST_OS_SYMBIAN
|
||||||
// Tests that NiceMock<Mock> compiles where Mock is a user-defined
|
// Tests that NiceMock<Mock> compiles where Mock is a user-defined
|
||||||
// class (as opposed to ::testing::Mock). We had to workaround an
|
// class (as opposed to ::testing::Mock). We had to workaround an
|
||||||
// MSVC 8.0 bug that caused the symbol Mock used in the definition of
|
// MSVC 8.0 bug that caused the symbol Mock used in the definition of
|
||||||
// NiceMock to be looked up in the wrong context, and this test
|
// NiceMock to be looked up in the wrong context, and this test
|
||||||
// ensures that our fix works.
|
// ensures that our fix works.
|
||||||
|
//
|
||||||
|
// We have to skip this test on Symbian, as it causes the program to
|
||||||
|
// crash there, for reasons unclear to us yet.
|
||||||
TEST(NiceMockTest, AcceptsClassNamedMock) {
|
TEST(NiceMockTest, AcceptsClassNamedMock) {
|
||||||
NiceMock< ::Mock> nice;
|
NiceMock< ::Mock> nice;
|
||||||
EXPECT_CALL(nice, DoThis());
|
EXPECT_CALL(nice, DoThis());
|
||||||
nice.DoThis();
|
nice.DoThis();
|
||||||
}
|
}
|
||||||
|
#endif // !GTEST_OS_SYMBIAN
|
||||||
|
|
||||||
// Tests that a strict mock allows expected calls.
|
// Tests that a strict mock allows expected calls.
|
||||||
TEST(StrictMockTest, AllowsExpectedCall) {
|
TEST(StrictMockTest, AllowsExpectedCall) {
|
||||||
|
@ -242,16 +247,21 @@ TEST(StrictMockTest, NonDefaultConstructor10) {
|
||||||
"Uninteresting mock function call");
|
"Uninteresting mock function call");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !GTEST_OS_SYMBIAN
|
||||||
// Tests that StrictMock<Mock> compiles where Mock is a user-defined
|
// Tests that StrictMock<Mock> compiles where Mock is a user-defined
|
||||||
// class (as opposed to ::testing::Mock). We had to workaround an
|
// class (as opposed to ::testing::Mock). We had to workaround an
|
||||||
// MSVC 8.0 bug that caused the symbol Mock used in the definition of
|
// MSVC 8.0 bug that caused the symbol Mock used in the definition of
|
||||||
// StrictMock to be looked up in the wrong context, and this test
|
// StrictMock to be looked up in the wrong context, and this test
|
||||||
// ensures that our fix works.
|
// ensures that our fix works.
|
||||||
|
//
|
||||||
|
// We have to skip this test on Symbian, as it causes the program to
|
||||||
|
// crash there, for reasons unclear to us yet.
|
||||||
TEST(StrictMockTest, AcceptsClassNamedMock) {
|
TEST(StrictMockTest, AcceptsClassNamedMock) {
|
||||||
StrictMock< ::Mock> nice;
|
StrictMock< ::Mock> strict;
|
||||||
EXPECT_CALL(nice, DoThis());
|
EXPECT_CALL(strict, DoThis());
|
||||||
nice.DoThis();
|
strict.DoThis();
|
||||||
}
|
}
|
||||||
|
#endif // !GTEST_OS_SYMBIAN
|
||||||
|
|
||||||
} // namespace gmock_nice_strict_test
|
} // namespace gmock_nice_strict_test
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
Loading…
Reference in New Issue
Block a user