3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-20 10:53:47 +00:00
Code Projects Wiki

Fixes the definition of GTEST_HAS_EXCEPTIONS, allowing exception assertions to be used with gcc.

Browse Source
This commit is contained in:
zhanyong.wan 2009-02-08 04:53:35 +00:00
parent 3750499433
commit 886cafd4a3
3 changed files with 76 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/gtest/internal/gtest-port.h
View File

@ -207,28 +207,31 @@
#endif // GTEST_OS_LINUX #endif // GTEST_OS_LINUX
// Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0
// otherwise.
#ifdef _MSC_VER // Compiled by MSVC?
// Assumes that exceptions are enabled by default.
#ifndef _HAS_EXCEPTIONS // MSVC uses this macro to enable exceptions.
#define _HAS_EXCEPTIONS 1
#endif // _HAS_EXCEPTIONS
#define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
#else // The compiler is not MSVC.
// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled. For
// other compilers, we assume exceptions are disabled to be
// conservative.
#define GTEST_HAS_EXCEPTIONS (defined(__GNUC__) && __EXCEPTIONS)
#endif // _MSC_VER
// Determines whether ::std::string and ::string are available. // Determines whether ::std::string and ::string are available.
#ifndef GTEST_HAS_STD_STRING #ifndef GTEST_HAS_STD_STRING
// The user didn't tell us whether ::std::string is available, so we // The user didn't tell us whether ::std::string is available, so we
// need to figure it out. // need to figure it out. The only environment that we know
// ::std::string is not available is MSVC 7.1 or lower with exceptions
#ifdef GTEST_OS_WINDOWS // disabled.
// Assumes that exceptions are enabled by default. #define GTEST_HAS_STD_STRING \
#ifndef _HAS_EXCEPTIONS (!(defined(_MSC_VER) && (_MSC_VER < 1400) && !GTEST_HAS_EXCEPTIONS))
#define _HAS_EXCEPTIONS 1
#endif // _HAS_EXCEPTIONS
// GTEST_HAS_EXCEPTIONS is non-zero iff exceptions are enabled. It is
// always defined, while _HAS_EXCEPTIONS is defined only on Windows.
#define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
// On Windows, we can use ::std::string if the compiler version is VS
// 2005 or above, or if exceptions are enabled.
#define GTEST_HAS_STD_STRING ((_MSC_VER >= 1400) || GTEST_HAS_EXCEPTIONS)
#else // We are on Linux or Mac OS.
#define GTEST_HAS_EXCEPTIONS 0
#define GTEST_HAS_STD_STRING 1
#endif // GTEST_OS_WINDOWS
#endif // GTEST_HAS_STD_STRING #endif // GTEST_HAS_STD_STRING
#ifndef GTEST_HAS_GLOBAL_STRING #ifndef GTEST_HAS_GLOBAL_STRING

26
test/gtest_output_test_golden_lin.txt
View File

@ -7,7 +7,7 @@ Expected: true
gtest_output_test_.cc:#: Failure gtest_output_test_.cc:#: Failure
Value of: 3 Value of: 3
Expected: 2 Expected: 2
[==========] Running 52 tests from 22 test cases. [==========] Running 54 tests from 22 test cases.
[----------] Global test environment set-up. [----------] Global test environment set-up.
FooEnvironment::SetUp() called. FooEnvironment::SetUp() called.
BarEnvironment::SetUp() called. BarEnvironment::SetUp() called.
@ -270,7 +270,7 @@ test DefinedUsingTEST is defined using TEST. You probably
want to change the TEST to TEST_F or move it to another test want to change the TEST to TEST_F or move it to another test
case. case.
[ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail [ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
[----------] 7 tests from ExpectNonfatalFailureTest [----------] 8 tests from ExpectNonfatalFailureTest
[ RUN ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables [ RUN ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
[ OK ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables [ OK ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
[ RUN ] ExpectNonfatalFailureTest.CanReferenceLocalVariables [ RUN ] ExpectNonfatalFailureTest.CanReferenceLocalVariables
@ -313,7 +313,13 @@ gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: 0 failures Actual: 0 failures
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
[----------] 7 tests from ExpectFatalFailureTest [ RUN ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
(expecting a failure)
gtest.cc:#: Failure
Expected: 1 non-fatal failure
Actual: 0 failures
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
[----------] 8 tests from ExpectFatalFailureTest
[ RUN ] ExpectFatalFailureTest.CanReferenceGlobalVariables [ RUN ] ExpectFatalFailureTest.CanReferenceGlobalVariables
[ OK ] ExpectFatalFailureTest.CanReferenceGlobalVariables [ OK ] ExpectFatalFailureTest.CanReferenceGlobalVariables
[ RUN ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables [ RUN ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables
@ -356,6 +362,12 @@ gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: 0 failures Actual: 0 failures
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns
[ RUN ] ExpectFatalFailureTest.FailsWhenStatementThrows
(expecting a failure)
gtest.cc:#: Failure
Expected: 1 fatal failure
Actual: 0 failures
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows
[----------] 2 tests from TypedTest/0, where TypeParam = int [----------] 2 tests from TypedTest/0, where TypeParam = int
[ RUN ] TypedTest/0.Success [ RUN ] TypedTest/0.Success
[ OK ] TypedTest/0.Success [ OK ] TypedTest/0.Success
@ -496,9 +508,9 @@ FooEnvironment::TearDown() called.
gtest_output_test_.cc:#: Failure gtest_output_test_.cc:#: Failure
Failed Failed
Expected fatal failure. Expected fatal failure.
[==========] 52 tests from 22 test cases ran. [==========] 54 tests from 22 test cases ran.
[ PASSED ] 19 tests. [ PASSED ] 19 tests.
[ FAILED ] 33 tests, listed below: [ FAILED ] 35 tests, listed below:
[ FAILED ] FatalFailureTest.FatalFailureInSubroutine [ FAILED ] FatalFailureTest.FatalFailureInSubroutine
[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine [ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
@ -521,10 +533,12 @@ Expected fatal failure.
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures [ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure [ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure [ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
[ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures [ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure [ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows
[ FAILED ] TypedTest/0.Failure, where TypeParam = int [ FAILED ] TypedTest/0.Failure, where TypeParam = int
[ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
@ -533,7 +547,7 @@ Expected fatal failure.
[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads [ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
[ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads [ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
33 FAILED TESTS 35 FAILED TESTS
 YOU HAVE 1 DISABLED TEST  YOU HAVE 1 DISABLED TEST
Note: Google Test filter = FatalFailureTest.*:LoggingTest.* Note: Google Test filter = FatalFailureTest.*:LoggingTest.*

58
test/gtest_unittest.cc
View File

@ -2869,31 +2869,37 @@ TEST(AssertionTest, ASSERT_GT) {
#if GTEST_HAS_EXCEPTIONS #if GTEST_HAS_EXCEPTIONS
void ThrowNothing() {}
// Tests ASSERT_THROW. // Tests ASSERT_THROW.
TEST(AssertionTest, ASSERT_THROW) { TEST(AssertionTest, ASSERT_THROW) {
ASSERT_THROW(ThrowAnInteger(), int); ASSERT_THROW(ThrowAnInteger(), int);
EXPECT_FATAL_FAILURE(ASSERT_THROW(ThrowAnInteger(), bool), EXPECT_FATAL_FAILURE(
"Expected: ThrowAnInteger() throws an exception of type"\ ASSERT_THROW(ThrowAnInteger(), bool),
" bool.\n Actual: it throws a different type."); "Expected: ThrowAnInteger() throws an exception of type bool.\n"
EXPECT_FATAL_FAILURE(ASSERT_THROW(1, bool), " Actual: it throws a different type.");
"Expected: 1 throws an exception of type bool.\n"\ EXPECT_FATAL_FAILURE(
ASSERT_THROW(ThrowNothing(), bool),
"Expected: ThrowNothing() throws an exception of type bool.\n"
" Actual: it throws nothing."); " Actual: it throws nothing.");
} }
// Tests ASSERT_NO_THROW. // Tests ASSERT_NO_THROW.
TEST(AssertionTest, ASSERT_NO_THROW) { TEST(AssertionTest, ASSERT_NO_THROW) {
ASSERT_NO_THROW(1); ASSERT_NO_THROW(ThrowNothing());
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()), EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an exception."\ "Expected: ThrowAnInteger() doesn't throw an exception."
"\n Actual: it throws."); "\n Actual: it throws.");
} }
// Tests ASSERT_ANY_THROW. // Tests ASSERT_ANY_THROW.
TEST(AssertionTest, ASSERT_ANY_THROW) { TEST(AssertionTest, ASSERT_ANY_THROW) {
ASSERT_ANY_THROW(ThrowAnInteger()); ASSERT_ANY_THROW(ThrowAnInteger());
EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(1), EXPECT_FATAL_FAILURE(
"Expected: 1 throws an exception.\n Actual: it "\ ASSERT_ANY_THROW(ThrowNothing()),
"doesn't."); "Expected: ThrowNothing() throws an exception.\n"
" Actual: it doesn't.");
} }
#endif // GTEST_HAS_EXCEPTIONS #endif // GTEST_HAS_EXCEPTIONS
@ -3149,7 +3155,7 @@ TEST(ExpectThrowTest, DoesNotGenerateUnreachableCodeWarning) {
TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) { TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) {
if (false) if (false)
EXPECT_THROW(1, bool); EXPECT_THROW(ThrowNothing(), bool);
if (true) if (true)
EXPECT_THROW(ThrowAnInteger(), int); EXPECT_THROW(ThrowAnInteger(), int);
@ -3160,12 +3166,12 @@ TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) {
EXPECT_NO_THROW(ThrowAnInteger()); EXPECT_NO_THROW(ThrowAnInteger());
if (true) if (true)
EXPECT_NO_THROW(1); EXPECT_NO_THROW(ThrowNothing());
else else
; ;
if (false) if (false)
EXPECT_ANY_THROW(1); EXPECT_ANY_THROW(ThrowNothing());
if (true) if (true)
EXPECT_ANY_THROW(ThrowAnInteger()); EXPECT_ANY_THROW(ThrowAnInteger());
@ -3424,27 +3430,29 @@ TEST(ExpectTest, EXPECT_GT) {
TEST(ExpectTest, EXPECT_THROW) { TEST(ExpectTest, EXPECT_THROW) {
EXPECT_THROW(ThrowAnInteger(), int); EXPECT_THROW(ThrowAnInteger(), int);
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool), EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
"Expected: ThrowAnInteger() throws an exception of "\ "Expected: ThrowAnInteger() throws an exception of "
"type bool.\n Actual: it throws a different type."); "type bool.\n Actual: it throws a different type.");
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(1, bool), EXPECT_NONFATAL_FAILURE(
"Expected: 1 throws an exception of type bool.\n"\ EXPECT_THROW(ThrowNothing(), bool),
"Expected: ThrowNothing() throws an exception of type bool.\n"
" Actual: it throws nothing."); " Actual: it throws nothing.");
} }
// Tests EXPECT_NO_THROW. // Tests EXPECT_NO_THROW.
TEST(ExpectTest, EXPECT_NO_THROW) { TEST(ExpectTest, EXPECT_NO_THROW) {
EXPECT_NO_THROW(1); EXPECT_NO_THROW(ThrowNothing());
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()), EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an "\ "Expected: ThrowAnInteger() doesn't throw an "
"exception.\n Actual: it throws."); "exception.\n Actual: it throws.");
} }
// Tests EXPECT_ANY_THROW. // Tests EXPECT_ANY_THROW.
TEST(ExpectTest, EXPECT_ANY_THROW) { TEST(ExpectTest, EXPECT_ANY_THROW) {
EXPECT_ANY_THROW(ThrowAnInteger()); EXPECT_ANY_THROW(ThrowAnInteger());
EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(1), EXPECT_NONFATAL_FAILURE(
"Expected: 1 throws an exception.\n Actual: it "\ EXPECT_ANY_THROW(ThrowNothing()),
"doesn't."); "Expected: ThrowNothing() throws an exception.\n"
" Actual: it doesn't.");
} }
#endif // GTEST_HAS_EXCEPTIONS #endif // GTEST_HAS_EXCEPTIONS
@ -5056,8 +5064,8 @@ TEST(StreamingAssertionsTest, Throw) {
} }
TEST(StreamingAssertionsTest, NoThrow) { TEST(StreamingAssertionsTest, NoThrow) {
EXPECT_NO_THROW(1) << "unexpected failure"; EXPECT_NO_THROW(ThrowNothing()) << "unexpected failure";
ASSERT_NO_THROW(1) << "unexpected failure"; ASSERT_NO_THROW(ThrowNothing()) << "unexpected failure";
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()) << EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()) <<
"expected failure", "expected failure"); "expected failure", "expected failure");
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) << EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) <<
@ -5067,9 +5075,9 @@ TEST(StreamingAssertionsTest, NoThrow) {
TEST(StreamingAssertionsTest, AnyThrow) { TEST(StreamingAssertionsTest, AnyThrow) {
EXPECT_ANY_THROW(ThrowAnInteger()) << "unexpected failure"; EXPECT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
ASSERT_ANY_THROW(ThrowAnInteger()) << "unexpected failure"; ASSERT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(1) << EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing()) <<
"expected failure", "expected failure"); "expected failure", "expected failure");
EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(1) << EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()) <<
"expected failure", "expected failure"); "expected failure", "expected failure");
} }