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

Allows EXPECT_FATAL_FAILURE() and friends to accept a string object as the second argument.

Browse Source
This commit is contained in:
zhanyong.wan 2010-09-27 17:42:52 +00:00
parent 345d9ebf30
commit b5d3a17805
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gtest/gtest-spi.h
View File

@ -98,12 +98,12 @@ class GTEST_API_ SingleFailureChecker {
// The constructor remembers the arguments. // The constructor remembers the arguments.
SingleFailureChecker(const TestPartResultArray* results, SingleFailureChecker(const TestPartResultArray* results,
TestPartResult::Type type, TestPartResult::Type type,
const char* substr); const string& substr);
~SingleFailureChecker(); ~SingleFailureChecker();
private: private:
const TestPartResultArray* const results_; const TestPartResultArray* const results_;
const TestPartResult::Type type_; const TestPartResult::Type type_;
const String substr_; const string substr_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
}; };

8
src/gtest.cc
View File

@ -607,7 +607,7 @@ AssertionResult HasOneFailure(const char* /* results_expr */,
const char* /* substr_expr */, const char* /* substr_expr */,
const TestPartResultArray& results, const TestPartResultArray& results,
TestPartResult::Type type, TestPartResult::Type type,
const char* substr) { const string& substr) {
const String expected(type == TestPartResult::kFatalFailure ? const String expected(type == TestPartResult::kFatalFailure ?
"1 fatal failure" : "1 fatal failure" :
"1 non-fatal failure"); "1 non-fatal failure");
@ -629,7 +629,7 @@ AssertionResult HasOneFailure(const char* /* results_expr */,
return AssertionFailure(msg); return AssertionFailure(msg);
} }
if (strstr(r.message(), substr) == NULL) { if (strstr(r.message(), substr.c_str()) == NULL) {
msg << "Expected: " << expected << " containing \"" msg << "Expected: " << expected << " containing \""
<< substr << "\"\n" << substr << "\"\n"
<< " Actual:\n" << " Actual:\n"
@ -646,7 +646,7 @@ AssertionResult HasOneFailure(const char* /* results_expr */,
SingleFailureChecker:: SingleFailureChecker( SingleFailureChecker:: SingleFailureChecker(
const TestPartResultArray* results, const TestPartResultArray* results,
TestPartResult::Type type, TestPartResult::Type type,
const char* substr) const string& substr)
: results_(results), : results_(results),
type_(type), type_(type),
substr_(substr) {} substr_(substr) {}
@ -656,7 +656,7 @@ SingleFailureChecker:: SingleFailureChecker(
// type and contains the given substring. If that's not the case, a // type and contains the given substring. If that's not the case, a
// non-fatal failure will be generated. // non-fatal failure will be generated.
SingleFailureChecker::~SingleFailureChecker() { SingleFailureChecker::~SingleFailureChecker() {
EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_.c_str()); EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
} }
DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter( DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(

23
test/gtest_unittest.cc
View File

@ -1335,6 +1335,17 @@ TEST_F(ExpectFatalFailureTest, CatchesFatalFaliure) {
EXPECT_FATAL_FAILURE(AddFatalFailure(), "Expected fatal failure."); EXPECT_FATAL_FAILURE(AddFatalFailure(), "Expected fatal failure.");
} }
#if GTEST_HAS_GLOBAL_STRING
TEST_F(ExpectFatalFailureTest, AcceptsStringObject) {
EXPECT_FATAL_FAILURE(AddFatalFailure(), ::string("Expected fatal failure."));
}
#endif
TEST_F(ExpectFatalFailureTest, AcceptsStdStringObject) {
EXPECT_FATAL_FAILURE(AddFatalFailure(),
::std::string("Expected fatal failure."));
}
TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) { TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) {
// We have another test below to verify that the macro catches fatal // We have another test below to verify that the macro catches fatal
// failures generated on another thread. // failures generated on another thread.
@ -1412,6 +1423,18 @@ TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailure) {
"Expected non-fatal failure."); "Expected non-fatal failure.");
} }
#if GTEST_HAS_GLOBAL_STRING
TEST_F(ExpectNonfatalFailureTest, AcceptsStringObject) {
EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
::string("Expected non-fatal failure."));
}
#endif
TEST_F(ExpectNonfatalFailureTest, AcceptsStdStringObject) {
EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
::std::string("Expected non-fatal failure."));
}
TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) { TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) {
// We have another test below to verify that the macro catches // We have another test below to verify that the macro catches
// non-fatal failures generated on another thread. // non-fatal failures generated on another thread.