Skip to content

GitLab

Unverified Commit e9b05a4d authored by tisi1988's avatar tisi1988 Committed by GitHub
Browse files

Merge branch 'master' into master

parents 25e1436b 28b71e44
Hide whitespace changes
Inline Side-by-side
Showing with 444 additions and 133 deletions
googletest/test/gtest_output_test_golden_lin.txt → googletest/test/googletest-output-test-golden-lin.txt
View file @ e9b05a4d
The non-test part of the code is expected to have 2 failures. The non-test part of the code is expected to have 2 failures.
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Value of: false Value of: false
Actual: false Actual: false
Expected: true Expected: true
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
2 2
3 3
...@@ -38,7 +38,7 @@ BarEnvironment::SetUp() called. ...@@ -38,7 +38,7 @@ BarEnvironment::SetUp() called.
[ OK ] PassingTest.PassingTest2 [ OK ] PassingTest.PassingTest2
[----------] 2 tests from NonfatalFailureTest [----------] 2 tests from NonfatalFailureTest
[ RUN ] NonfatalFailureTest.EscapesStringOperands [ RUN ] NonfatalFailureTest.EscapesStringOperands
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
kGoldenString kGoldenString
Which is: "\"Line" Which is: "\"Line"
...@@ -46,7 +46,7 @@ Expected equality of these values: ...@@ -46,7 +46,7 @@ Expected equality of these values:
Which is: "actual \"string\"" Which is: "actual \"string\""
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
golden golden
Which is: "\"Line" Which is: "\"Line"
...@@ -56,7 +56,7 @@ Stack trace: (omitted) ...@@ -56,7 +56,7 @@ Stack trace: (omitted)
[ FAILED ] NonfatalFailureTest.EscapesStringOperands [ FAILED ] NonfatalFailureTest.EscapesStringOperands
[ RUN ] NonfatalFailureTest.DiffForLongStrings [ RUN ] NonfatalFailureTest.DiffForLongStrings
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
golden_str golden_str
Which is: "\"Line\0 1\"\nLine 2" Which is: "\"Line\0 1\"\nLine 2"
...@@ -72,7 +72,7 @@ Stack trace: (omitted) ...@@ -72,7 +72,7 @@ Stack trace: (omitted)
[----------] 3 tests from FatalFailureTest [----------] 3 tests from FatalFailureTest
[ RUN ] FatalFailureTest.FatalFailureInSubroutine [ RUN ] FatalFailureTest.FatalFailureInSubroutine
(expecting a failure that x should be 1) (expecting a failure that x should be 1)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
x x
...@@ -82,7 +82,7 @@ Stack trace: (omitted) ...@@ -82,7 +82,7 @@ Stack trace: (omitted)
[ FAILED ] FatalFailureTest.FatalFailureInSubroutine [ FAILED ] FatalFailureTest.FatalFailureInSubroutine
[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine [ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
(expecting a failure that x should be 1) (expecting a failure that x should be 1)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
x x
...@@ -92,7 +92,7 @@ Stack trace: (omitted) ...@@ -92,7 +92,7 @@ Stack trace: (omitted)
[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
(expecting a failure on false) (expecting a failure on false)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Value of: false Value of: false
Actual: false Actual: false
Expected: true Expected: true
...@@ -104,45 +104,45 @@ Stack trace: (omitted) ...@@ -104,45 +104,45 @@ Stack trace: (omitted)
(expecting 2 failures on (3) >= (a[i])) (expecting 2 failures on (3) >= (a[i]))
i == 0 i == 0
i == 1 i == 1
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected: (3) >= (a[i]), actual: 3 vs 9 Expected: (3) >= (a[i]), actual: 3 vs 9
Stack trace: (omitted) Stack trace: (omitted)
i == 2 i == 2
i == 3 i == 3
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected: (3) >= (a[i]), actual: 3 vs 6 Expected: (3) >= (a[i]), actual: 3 vs 6
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions [ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
[----------] 7 tests from SCOPED_TRACETest [----------] 7 tests from SCOPED_TRACETest
[ RUN ] SCOPED_TRACETest.AcceptedValues [ RUN ] SCOPED_TRACETest.AcceptedValues
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Just checking that all these values work fine. Just checking that all these values work fine.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: (null) googletest-output-test_.cc:#: (null)
gtest_output_test_.cc:#: 1337 googletest-output-test_.cc:#: 1337
gtest_output_test_.cc:#: std::string googletest-output-test_.cc:#: std::string
gtest_output_test_.cc:#: literal string googletest-output-test_.cc:#: literal string
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.AcceptedValues [ FAILED ] SCOPED_TRACETest.AcceptedValues
[ RUN ] SCOPED_TRACETest.ObeysScopes [ RUN ] SCOPED_TRACETest.ObeysScopes
(expected to fail) (expected to fail)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and shouldn't have a trace. This failure is expected, and shouldn't have a trace.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and should have a trace. This failure is expected, and should have a trace.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: Expected trace googletest-output-test_.cc:#: Expected trace
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and shouldn't have a trace. This failure is expected, and shouldn't have a trace.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -150,131 +150,131 @@ Stack trace: (omitted) ...@@ -150,131 +150,131 @@ Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.ObeysScopes [ FAILED ] SCOPED_TRACETest.ObeysScopes
[ RUN ] SCOPED_TRACETest.WorksInLoop [ RUN ] SCOPED_TRACETest.WorksInLoop
(expected to fail) (expected to fail)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
2 2
n n
Which is: 1 Which is: 1
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: i = 1 googletest-output-test_.cc:#: i = 1
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
n n
Which is: 2 Which is: 2
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: i = 2 googletest-output-test_.cc:#: i = 2
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.WorksInLoop [ FAILED ] SCOPED_TRACETest.WorksInLoop
[ RUN ] SCOPED_TRACETest.WorksInSubroutine [ RUN ] SCOPED_TRACETest.WorksInSubroutine
(expected to fail) (expected to fail)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
2 2
n n
Which is: 1 Which is: 1
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: n = 1 googletest-output-test_.cc:#: n = 1
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
n n
Which is: 2 Which is: 2
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: n = 2 googletest-output-test_.cc:#: n = 2
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.WorksInSubroutine [ FAILED ] SCOPED_TRACETest.WorksInSubroutine
[ RUN ] SCOPED_TRACETest.CanBeNested [ RUN ] SCOPED_TRACETest.CanBeNested
(expected to fail) (expected to fail)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
n n
Which is: 2 Which is: 2
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: n = 2 googletest-output-test_.cc:#: n = 2
gtest_output_test_.cc:#: googletest-output-test_.cc:#:
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.CanBeNested [ FAILED ] SCOPED_TRACETest.CanBeNested
[ RUN ] SCOPED_TRACETest.CanBeRepeated [ RUN ] SCOPED_TRACETest.CanBeRepeated
(expected to fail) (expected to fail)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and should contain trace point A. This failure is expected, and should contain trace point A.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: A googletest-output-test_.cc:#: A
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and should contain trace point A and B. This failure is expected, and should contain trace point A and B.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: B googletest-output-test_.cc:#: B
gtest_output_test_.cc:#: A googletest-output-test_.cc:#: A
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and should contain trace point A, B, and C. This failure is expected, and should contain trace point A, B, and C.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: C googletest-output-test_.cc:#: C
gtest_output_test_.cc:#: B googletest-output-test_.cc:#: B
gtest_output_test_.cc:#: A googletest-output-test_.cc:#: A
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
This failure is expected, and should contain trace point A, B, and D. This failure is expected, and should contain trace point A, B, and D.
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: D googletest-output-test_.cc:#: D
gtest_output_test_.cc:#: B googletest-output-test_.cc:#: B
gtest_output_test_.cc:#: A googletest-output-test_.cc:#: A
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.CanBeRepeated [ FAILED ] SCOPED_TRACETest.CanBeRepeated
[ RUN ] SCOPED_TRACETest.WorksConcurrently [ RUN ] SCOPED_TRACETest.WorksConcurrently
(expecting 6 failures) (expecting 6 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #1 (in thread B, only trace B alive). Expected failure #1 (in thread B, only trace B alive).
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: Trace B googletest-output-test_.cc:#: Trace B
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #2 (in thread A, trace A & B both alive). Expected failure #2 (in thread A, trace A & B both alive).
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: Trace A googletest-output-test_.cc:#: Trace A
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #3 (in thread B, trace A & B both alive). Expected failure #3 (in thread B, trace A & B both alive).
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: Trace B googletest-output-test_.cc:#: Trace B
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #4 (in thread B, only trace A alive). Expected failure #4 (in thread B, only trace A alive).
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #5 (in thread A, only trace A alive). Expected failure #5 (in thread A, only trace A alive).
Google Test trace: Google Test trace:
gtest_output_test_.cc:#: Trace A googletest-output-test_.cc:#: Trace A
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #6 (in thread A, no trace alive). Expected failure #6 (in thread A, no trace alive).
Stack trace: (omitted) Stack trace: (omitted)
...@@ -282,7 +282,7 @@ Stack trace: (omitted) ...@@ -282,7 +282,7 @@ Stack trace: (omitted)
[ FAILED ] SCOPED_TRACETest.WorksConcurrently [ FAILED ] SCOPED_TRACETest.WorksConcurrently
[----------] 1 test from ScopedTraceTest [----------] 1 test from ScopedTraceTest
[ RUN ] ScopedTraceTest.WithExplicitFileAndLine [ RUN ] ScopedTraceTest.WithExplicitFileAndLine
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Check that the trace is attached to a particular location. Check that the trace is attached to a particular location.
Google Test trace: Google Test trace:
...@@ -293,27 +293,27 @@ Stack trace: (omitted) ...@@ -293,27 +293,27 @@ Stack trace: (omitted)
[----------] 1 test from NonFatalFailureInFixtureConstructorTest [----------] 1 test from NonFatalFailureInFixtureConstructorTest
[ RUN ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor [ RUN ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
(expecting 5 failures) (expecting 5 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #1, in the test fixture c'tor. Expected failure #1, in the test fixture c'tor.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #2, in SetUp(). Expected failure #2, in SetUp().
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #3, in the test body. Expected failure #3, in the test body.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #4, in TearDown. Expected failure #4, in TearDown.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #5, in the test fixture d'tor. Expected failure #5, in the test fixture d'tor.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -322,12 +322,12 @@ Stack trace: (omitted) ...@@ -322,12 +322,12 @@ Stack trace: (omitted)
[----------] 1 test from FatalFailureInFixtureConstructorTest [----------] 1 test from FatalFailureInFixtureConstructorTest
[ RUN ] FatalFailureInFixtureConstructorTest.FailureInConstructor [ RUN ] FatalFailureInFixtureConstructorTest.FailureInConstructor
(expecting 2 failures) (expecting 2 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #1, in the test fixture c'tor. Expected failure #1, in the test fixture c'tor.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #2, in the test fixture d'tor. Expected failure #2, in the test fixture d'tor.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -336,22 +336,22 @@ Stack trace: (omitted) ...@@ -336,22 +336,22 @@ Stack trace: (omitted)
[----------] 1 test from NonFatalFailureInSetUpTest [----------] 1 test from NonFatalFailureInSetUpTest
[ RUN ] NonFatalFailureInSetUpTest.FailureInSetUp [ RUN ] NonFatalFailureInSetUpTest.FailureInSetUp
(expecting 4 failures) (expecting 4 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #1, in SetUp(). Expected failure #1, in SetUp().
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #2, in the test function. Expected failure #2, in the test function.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #3, in TearDown(). Expected failure #3, in TearDown().
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #4, in the test fixture d'tor. Expected failure #4, in the test fixture d'tor.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -360,17 +360,17 @@ Stack trace: (omitted) ...@@ -360,17 +360,17 @@ Stack trace: (omitted)
[----------] 1 test from FatalFailureInSetUpTest [----------] 1 test from FatalFailureInSetUpTest
[ RUN ] FatalFailureInSetUpTest.FailureInSetUp [ RUN ] FatalFailureInSetUpTest.FailureInSetUp
(expecting 3 failures) (expecting 3 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #1, in SetUp(). Expected failure #1, in SetUp().
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #2, in TearDown(). Expected failure #2, in TearDown().
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected failure #3, in the test fixture d'tor. Expected failure #3, in the test fixture d'tor.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -483,13 +483,13 @@ Stack trace: (omitted) ...@@ -483,13 +483,13 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: 2 failures Actual: 2 failures
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure 1. Expected non-fatal failure 1.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure 2. Expected non-fatal failure 2.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -503,7 +503,7 @@ Stack trace: (omitted) ...@@ -503,7 +503,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -548,13 +548,13 @@ Stack trace: (omitted) ...@@ -548,13 +548,13 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: 2 failures Actual: 2 failures
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -568,7 +568,7 @@ Stack trace: (omitted) ...@@ -568,7 +568,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -597,7 +597,7 @@ Stack trace: (omitted) ...@@ -597,7 +597,7 @@ Stack trace: (omitted)
[ RUN ] TypedTest/0.Success [ RUN ] TypedTest/0.Success
[ OK ] TypedTest/0.Success [ OK ] TypedTest/0.Success
[ RUN ] TypedTest/0.Failure [ RUN ] TypedTest/0.Failure
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
TypeParam() TypeParam()
...@@ -610,7 +610,7 @@ Stack trace: (omitted) ...@@ -610,7 +610,7 @@ Stack trace: (omitted)
[ RUN ] Unsigned/TypedTestP/0.Success [ RUN ] Unsigned/TypedTestP/0.Success
[ OK ] Unsigned/TypedTestP/0.Success [ OK ] Unsigned/TypedTestP/0.Success
[ RUN ] Unsigned/TypedTestP/0.Failure [ RUN ] Unsigned/TypedTestP/0.Failure
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1U 1U
Which is: 1 Which is: 1
...@@ -624,7 +624,7 @@ Stack trace: (omitted) ...@@ -624,7 +624,7 @@ Stack trace: (omitted)
[ RUN ] Unsigned/TypedTestP/1.Success [ RUN ] Unsigned/TypedTestP/1.Success
[ OK ] Unsigned/TypedTestP/1.Success [ OK ] Unsigned/TypedTestP/1.Success
[ RUN ] Unsigned/TypedTestP/1.Failure [ RUN ] Unsigned/TypedTestP/1.Failure
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1U 1U
Which is: 1 Which is: 1
...@@ -640,7 +640,7 @@ Stack trace: (omitted) ...@@ -640,7 +640,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Success: googletest-output-test_.cc:#: Success:
Succeeded Succeeded
Stack trace: (omitted) Stack trace: (omitted)
...@@ -651,7 +651,7 @@ Stack trace: (omitted) ...@@ -651,7 +651,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -663,7 +663,7 @@ Stack trace: (omitted) ...@@ -663,7 +663,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure containing "Some other fatal failure expected." Expected: 1 fatal failure containing "Some other fatal failure expected."
Actual: Actual:
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -677,7 +677,7 @@ Stack trace: (omitted) ...@@ -677,7 +677,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Success: googletest-output-test_.cc:#: Success:
Succeeded Succeeded
Stack trace: (omitted) Stack trace: (omitted)
...@@ -688,7 +688,7 @@ Stack trace: (omitted) ...@@ -688,7 +688,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -700,7 +700,7 @@ Stack trace: (omitted) ...@@ -700,7 +700,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure containing "Some other non-fatal failure." Expected: 1 non-fatal failure containing "Some other non-fatal failure."
Actual: Actual:
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -714,7 +714,7 @@ Stack trace: (omitted) ...@@ -714,7 +714,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Success: googletest-output-test_.cc:#: Success:
Succeeded Succeeded
Stack trace: (omitted) Stack trace: (omitted)
...@@ -725,7 +725,7 @@ Stack trace: (omitted) ...@@ -725,7 +725,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure Expected: 1 fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -737,7 +737,7 @@ Stack trace: (omitted) ...@@ -737,7 +737,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 fatal failure containing "Some other fatal failure expected." Expected: 1 fatal failure containing "Some other fatal failure expected."
Actual: Actual:
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -751,7 +751,7 @@ Stack trace: (omitted) ...@@ -751,7 +751,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Success: googletest-output-test_.cc:#: Success:
Succeeded Succeeded
Stack trace: (omitted) Stack trace: (omitted)
...@@ -762,7 +762,7 @@ Stack trace: (omitted) ...@@ -762,7 +762,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure Expected: 1 non-fatal failure
Actual: Actual:
gtest_output_test_.cc:#: Fatal failure: googletest-output-test_.cc:#: Fatal failure:
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -774,7 +774,7 @@ Stack trace: (omitted) ...@@ -774,7 +774,7 @@ Stack trace: (omitted)
gtest.cc:#: Failure gtest.cc:#: Failure
Expected: 1 non-fatal failure containing "Some other non-fatal failure." Expected: 1 non-fatal failure containing "Some other non-fatal failure."
Actual: Actual:
gtest_output_test_.cc:#: Non-fatal failure: googletest-output-test_.cc:#: Non-fatal failure:
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -786,7 +786,7 @@ Stack trace: (omitted) ...@@ -786,7 +786,7 @@ Stack trace: (omitted)
[----------] 2 tests from ExpectFailureWithThreadsTest [----------] 2 tests from ExpectFailureWithThreadsTest
[ RUN ] ExpectFailureWithThreadsTest.ExpectFatalFailure [ RUN ] ExpectFailureWithThreadsTest.ExpectFatalFailure
(expecting 2 failures) (expecting 2 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -799,7 +799,7 @@ Stack trace: (omitted) ...@@ -799,7 +799,7 @@ Stack trace: (omitted)
[ FAILED ] ExpectFailureWithThreadsTest.ExpectFatalFailure [ FAILED ] ExpectFailureWithThreadsTest.ExpectFatalFailure
[ RUN ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure [ RUN ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure
(expecting 2 failures) (expecting 2 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -813,12 +813,12 @@ Stack trace: (omitted) ...@@ -813,12 +813,12 @@ Stack trace: (omitted)
[----------] 1 test from ScopedFakeTestPartResultReporterTest [----------] 1 test from ScopedFakeTestPartResultReporterTest
[ RUN ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread [ RUN ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
(expecting 2 failures) (expecting 2 failures)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -826,7 +826,7 @@ Stack trace: (omitted) ...@@ -826,7 +826,7 @@ Stack trace: (omitted)
[ FAILED ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread [ FAILED ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
[----------] 1 test from PrintingFailingParams/FailingParamTest [----------] 1 test from PrintingFailingParams/FailingParamTest
[ RUN ] PrintingFailingParams/FailingParamTest.Fails/0 [ RUN ] PrintingFailingParams/FailingParamTest.Fails/0
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
GetParam() GetParam()
...@@ -838,7 +838,7 @@ Stack trace: (omitted) ...@@ -838,7 +838,7 @@ Stack trace: (omitted)
[ RUN ] PrintingStrings/ParamTest.Success/a [ RUN ] PrintingStrings/ParamTest.Success/a
[ OK ] PrintingStrings/ParamTest.Success/a [ OK ] PrintingStrings/ParamTest.Success/a
[ RUN ] PrintingStrings/ParamTest.Failure/a [ RUN ] PrintingStrings/ParamTest.Failure/a
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
"b" "b"
GetParam() GetParam()
...@@ -849,13 +849,13 @@ Stack trace: (omitted) ...@@ -849,13 +849,13 @@ Stack trace: (omitted)
[ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
[----------] Global test environment tear-down [----------] Global test environment tear-down
BarEnvironment::TearDown() called. BarEnvironment::TearDown() called.
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected non-fatal failure. Expected non-fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
FooEnvironment::TearDown() called. FooEnvironment::TearDown() called.
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Expected fatal failure. Expected fatal failure.
Stack trace: (omitted) Stack trace: (omitted)
...@@ -919,7 +919,7 @@ Stack trace: (omitted) ...@@ -919,7 +919,7 @@ Stack trace: (omitted)
[----------] 3 tests from FatalFailureTest [----------] 3 tests from FatalFailureTest
[ RUN ] FatalFailureTest.FatalFailureInSubroutine [ RUN ] FatalFailureTest.FatalFailureInSubroutine
(expecting a failure that x should be 1) (expecting a failure that x should be 1)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
x x
...@@ -929,7 +929,7 @@ Stack trace: (omitted) ...@@ -929,7 +929,7 @@ Stack trace: (omitted)
[ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms) [ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms)
[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine [ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
(expecting a failure that x should be 1) (expecting a failure that x should be 1)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1 1
x x
...@@ -939,7 +939,7 @@ Stack trace: (omitted) ...@@ -939,7 +939,7 @@ Stack trace: (omitted)
[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms) [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
(expecting a failure on false) (expecting a failure on false)
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Value of: false Value of: false
Actual: false Actual: false
Expected: true Expected: true
...@@ -953,13 +953,13 @@ Stack trace: (omitted) ...@@ -953,13 +953,13 @@ Stack trace: (omitted)
(expecting 2 failures on (3) >= (a[i])) (expecting 2 failures on (3) >= (a[i]))
i == 0 i == 0
i == 1 i == 1
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected: (3) >= (a[i]), actual: 3 vs 9 Expected: (3) >= (a[i]), actual: 3 vs 9
Stack trace: (omitted) Stack trace: (omitted)
i == 2 i == 2
i == 3 i == 3
gtest_output_test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected: (3) >= (a[i]), actual: 3 vs 6 Expected: (3) >= (a[i]), actual: 3 vs 6
Stack trace: (omitted) Stack trace: (omitted)
......
googletest/test/gtest_output_test.py → googletest/test/googletest-output-test.py
View file @ e9b05a4d
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
SYNOPSIS SYNOPSIS
gtest_output_test.py --build_dir=BUILD/DIR --gengolden googletest_output_test.py --build_dir=BUILD/DIR --gengolden
# where BUILD/DIR contains the built gtest_output_test_ file. # where BUILD/DIR contains the built googletest-output-test_ file.
gtest_output_test.py --gengolden googletest_output_test.py --gengolden
gtest_output_test.py googletest_output_test.py
""" """
__author__ = 'wan@google.com (Zhanyong Wan)' __author__ = 'wan@google.com (Zhanyong Wan)'
...@@ -59,9 +59,9 @@ IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' ...@@ -59,9 +59,9 @@ IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
IS_WINDOWS = os.name == 'nt' IS_WINDOWS = os.name == 'nt'
# TODO(vladl@google.com): remove the _lin suffix. # TODO(vladl@google.com): remove the _lin suffix.
GOLDEN_NAME = 'gtest_output_test_golden_lin.txt' GOLDEN_NAME = 'googletest-output-test-golden-lin.txt'
PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_') PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('googletest-output-test_')
# At least one command we exercise must not have the # At least one command we exercise must not have the
# 'internal_skip_environment_and_ad_hoc_tests' argument. # 'internal_skip_environment_and_ad_hoc_tests' argument.
...@@ -104,7 +104,7 @@ def RemoveLocations(test_output): ...@@ -104,7 +104,7 @@ def RemoveLocations(test_output):
'FILE_NAME:#: '. 'FILE_NAME:#: '.
""" """
return re.sub(r'.*[/\\]((gtest_output_test_|gtest).cc)(\:\d+|\(\d+\))\: ', return re.sub(r'.*[/\\]((googletest-output-test_|gtest).cc)(\:\d+|\(\d+\))\: ',
r'\1:#: ', test_output) r'\1:#: ', test_output)
...@@ -195,7 +195,7 @@ def RemoveMatchingTests(test_output, pattern): ...@@ -195,7 +195,7 @@ def RemoveMatchingTests(test_output, pattern):
def NormalizeOutput(output): def NormalizeOutput(output):
"""Normalizes output (the output of gtest_output_test_.exe).""" """Normalizes output (the output of googletest-output-test_.exe)."""
output = ToUnixLineEnding(output) output = ToUnixLineEnding(output)
output = RemoveLocations(output) output = RemoveLocations(output)
...@@ -316,11 +316,11 @@ class GTestOutputTest(gtest_test_utils.TestCase): ...@@ -316,11 +316,11 @@ class GTestOutputTest(gtest_test_utils.TestCase):
if os.getenv('DEBUG_GTEST_OUTPUT_TEST'): if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
open(os.path.join( open(os.path.join(
gtest_test_utils.GetSourceDir(), gtest_test_utils.GetSourceDir(),
'_gtest_output_test_normalized_actual.txt'), 'wb').write( '_googletest-output-test_normalized_actual.txt'), 'wb').write(
normalized_actual) normalized_actual)
open(os.path.join( open(os.path.join(
gtest_test_utils.GetSourceDir(), gtest_test_utils.GetSourceDir(),
'_gtest_output_test_normalized_golden.txt'), 'wb').write( '_googletest-output-test_normalized_golden.txt'), 'wb').write(
normalized_golden) normalized_golden)
self.assertEqual(normalized_golden, normalized_actual) self.assertEqual(normalized_golden, normalized_actual)
......
googletest/test/gtest_output_test_.cc → googletest/test/googletest-output-test_.cc
View file @ e9b05a4d
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
// //
// The purpose of this file is to generate Google Test output under // The purpose of this file is to generate Google Test output under
// various conditions. The output will then be verified by // various conditions. The output will then be verified by
// gtest_output_test.py to ensure that Google Test generates the // googletest-output-test.py to ensure that Google Test generates the
// desired messages. Therefore, most tests in this file are MEANT TO // desired messages. Therefore, most tests in this file are MEANT TO
// FAIL. // FAIL.
// //
......
googletest/test/googletest-param-test-invalid-name1-test.py 0 → 100644
View file @ e9b05a4d
#!/usr/bin/env python
#
# Copyright 2015 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""Verifies that Google Test warns the user when not initialized properly."""
__author__ = 'jmadill@google.com (Jamie Madill)'
import os
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
if IS_LINUX:
import gtest_test_utils
else:
import gtest_test_utils
binary_name = 'googletest-param-test-invalid-name1-test_'
COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
def Assert(condition):
if not condition:
raise AssertionError
def TestExitCodeAndOutput(command):
"""Runs the given command and verifies its exit code and output."""
err = ('Parameterized test name \'"InvalidWithQuotes"\' is invalid')
p = gtest_test_utils.Subprocess(command)
Assert(p.terminated_by_signal)
# Verify the output message contains appropriate output
Assert(err in p.output)
class GTestParamTestInvalidName1Test(gtest_test_utils.TestCase):
def testExitCodeAndOutput(self):
TestExitCodeAndOutput(COMMAND)
if __name__ == '__main__':
gtest_test_utils.Main()
googletest/test/googletest-param-test-invalid-name1-test_.cc 0 → 100644
View file @ e9b05a4d
// Copyright 2015, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// Author: jmadill@google.com (Jamie Madill)
#include "gtest/gtest.h"
namespace {
class DummyTest : public ::testing::TestWithParam<const char *> {};
TEST_P(DummyTest, Dummy) {
}
INSTANTIATE_TEST_CASE_P(InvalidTestName,
DummyTest,
::testing::Values("InvalidWithQuotes"),
::testing::PrintToStringParamName());
} // namespace
int main(int argc, char *argv[]) {
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
googletest/test/googletest-param-test-invalid-name2-test.py 0 → 100644
View file @ e9b05a4d
#!/usr/bin/env python
#
# Copyright 2015 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""Verifies that Google Test warns the user when not initialized properly."""
__author__ = 'jmadill@google.com (Jamie Madill)'
import os
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
if IS_LINUX:
import gtest_test_utils
else:
import gtest_test_utils
binary_name = 'googletest-param-test-invalid-name2-test_'
COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
def Assert(condition):
if not condition:
raise AssertionError
def TestExitCodeAndOutput(command):
"""Runs the given command and verifies its exit code and output."""
err = ('Duplicate parameterized test name \'a\'')
p = gtest_test_utils.Subprocess(command)
Assert(p.terminated_by_signal)
# Check for appropriate output
Assert(err in p.output)
class GTestParamTestInvalidName2Test(gtest_test_utils.TestCase):
def testExitCodeAndOutput(self):
TestExitCodeAndOutput(COMMAND)
if __name__ == '__main__':
gtest_test_utils.Main()
googletest/test/googletest-param-test-invalid-name2-test_.cc 0 → 100644
View file @ e9b05a4d
// Copyright 2015, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// Author: jmadill@google.com (Jamie Madill)
#include "gtest/gtest.h"
namespace {
class DummyTest : public ::testing::TestWithParam<const char *> {};
std::string StringParamTestSuffix(
const testing::TestParamInfo<const char*>& info) {
return std::string(info.param);
}
TEST_P(DummyTest, Dummy) {
}
INSTANTIATE_TEST_CASE_P(DuplicateTestNames,
DummyTest,
::testing::Values("a", "b", "a", "c"),
StringParamTestSuffix);
} // namespace
int main(int argc, char *argv[]) {
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
googletest/test/gtest-param-test_test.cc → googletest/test/googletest-param-test-test.cc
View file @ e9b05a4d
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
# include <vector> # include <vector>
# include "src/gtest-internal-inl.h" // for UnitTestOptions # include "src/gtest-internal-inl.h" // for UnitTestOptions
# include "test/gtest-param-test_test.h" # include "test/googletest-param-test-test.h"
using ::std::vector; using ::std::vector;
using ::std::sort; using ::std::sort;
......
googletest/test/gtest-param-test2_test.cc → googletest/test/googletest-param-test2-test.cc
View file @ e9b05a4d
...@@ -33,18 +33,18 @@ ...@@ -33,18 +33,18 @@
// Google Test work. // Google Test work.
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gtest-param-test_test.h" #include "googletest-param-test-test.h"
using ::testing::Values; using ::testing::Values;
using ::testing::internal::ParamGenerator; using ::testing::internal::ParamGenerator;
// Tests that generators defined in a different translation unit // Tests that generators defined in a different translation unit
// are functional. The test using extern_gen is defined // are functional. The test using extern_gen is defined
// in gtest-param-test_test.cc. // in googletest-param-test-test.cc.
ParamGenerator<int> extern_gen = Values(33); ParamGenerator<int> extern_gen = Values(33);
// Tests that a parameterized test case can be defined in one translation unit // Tests that a parameterized test case can be defined in one translation unit
// and instantiated in another. The test is defined in gtest-param-test_test.cc // and instantiated in another. The test is defined in googletest-param-test-test.cc
// and ExternalInstantiationTest fixture class is defined in // and ExternalInstantiationTest fixture class is defined in
// gtest-param-test_test.h. // gtest-param-test_test.h.
INSTANTIATE_TEST_CASE_P(MultiplesOf33, INSTANTIATE_TEST_CASE_P(MultiplesOf33,
...@@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(MultiplesOf33, ...@@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(MultiplesOf33,
// Tests that a parameterized test case can be instantiated // Tests that a parameterized test case can be instantiated
// in multiple translation units. Another instantiation is defined // in multiple translation units. Another instantiation is defined
// in gtest-param-test_test.cc and InstantiationInMultipleTranslaionUnitsTest // in googletest-param-test-test.cc and InstantiationInMultipleTranslaionUnitsTest
// fixture is defined in gtest-param-test_test.h // fixture is defined in gtest-param-test_test.h
INSTANTIATE_TEST_CASE_P(Sequence2, INSTANTIATE_TEST_CASE_P(Sequence2,
InstantiationInMultipleTranslaionUnitsTest, InstantiationInMultipleTranslaionUnitsTest,
......
googletest/test/gtest-port_test.cc → googletest/test/googletest-port-test.cc
View file @ e9b05a4d
...@@ -346,11 +346,11 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { ...@@ -346,11 +346,11 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
const bool a_false_condition = false; const bool a_false_condition = false;
const char regex[] = const char regex[] =
#ifdef _MSC_VER #ifdef _MSC_VER
"gtest-port_test\\.cc\\(\\d+\\):" "googletest-port-test\\.cc\\(\\d+\\):"
#elif GTEST_USES_POSIX_RE #elif GTEST_USES_POSIX_RE
"gtest-port_test\\.cc:[0-9]+" "googletest-port-test\\.cc:[0-9]+"
#else #else
"gtest-port_test\\.cc:\\d+" "googletest-port-test\\.cc:\\d+"
#endif // _MSC_VER #endif // _MSC_VER
".*a_false_condition.*Extra info.*"; ".*a_false_condition.*Extra info.*";
......
googletest/test/gtest-printers_test.cc → googletest/test/googletest-printers-test.cc
View file @ e9b05a4d
...@@ -572,7 +572,7 @@ struct Foo { ...@@ -572,7 +572,7 @@ struct Foo {
TEST(PrintPointerTest, MemberVariablePointer) { TEST(PrintPointerTest, MemberVariablePointer) {
EXPECT_TRUE(HasPrefix(Print(&Foo::value), EXPECT_TRUE(HasPrefix(Print(&Foo::value),
Print(sizeof(&Foo::value)) + "-byte object ")); Print(sizeof(&Foo::value)) + "-byte object "));
int (Foo::*p) = NULL; // NOLINT int Foo::*p = NULL; // NOLINT
EXPECT_TRUE(HasPrefix(Print(p), EXPECT_TRUE(HasPrefix(Print(p),
Print(sizeof(p)) + "-byte object ")); Print(sizeof(p)) + "-byte object "));
} }
...@@ -1250,7 +1250,7 @@ TEST(PrintReferenceTest, HandlesMemberFunctionPointer) { ...@@ -1250,7 +1250,7 @@ TEST(PrintReferenceTest, HandlesMemberFunctionPointer) {
// Tests that the universal printer prints a member variable pointer // Tests that the universal printer prints a member variable pointer
// passed by reference. // passed by reference.
TEST(PrintReferenceTest, HandlesMemberVariablePointer) { TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
int (Foo::*p) = &Foo::value; // NOLINT int Foo::*p = &Foo::value; // NOLINT
EXPECT_TRUE(HasPrefix( EXPECT_TRUE(HasPrefix(
PrintByRef(p), PrintByRef(p),
"@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object ")); "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object "));
......
googletest/test/gtest_shuffle_test.py → googletest/test/googletest-shuffle-test.py
View file @ e9b05a4d
...@@ -35,8 +35,8 @@ __author__ = 'wan@google.com (Zhanyong Wan)' ...@@ -35,8 +35,8 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
import os import os
import gtest_test_utils import gtest_test_utils
# Command to run the gtest_shuffle_test_ program. # Command to run the googletest-shuffle-test_ program.
COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_') COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-shuffle-test_')
# The environment variables for test sharding. # The environment variables for test sharding.
TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
...@@ -89,7 +89,7 @@ def GetTestsForAllIterations(extra_env, args): ...@@ -89,7 +89,7 @@ def GetTestsForAllIterations(extra_env, args):
Args: Args:
extra_env: a map from environment variables to their values extra_env: a map from environment variables to their values
args: command line flags to pass to gtest_shuffle_test_ args: command line flags to pass to googletest-shuffle-test_
Returns: Returns:
A list where the i-th element is the list of tests run in the i-th A list where the i-th element is the list of tests run in the i-th
......
googletest/test/googletest-test2_test.cc 0 → 100644
View file @ e9b05a4d
// Copyright 2008, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// Author: vladl@google.com (Vlad Losev)
//
// Tests for Google Test itself. This verifies that the basic constructs of
// Google Test work.
#include "gtest/gtest.h"
#include "googletest-param-test-test.h"
using ::testing::Values;
using ::testing::internal::ParamGenerator;
// Tests that generators defined in a different translation unit
// are functional. The test using extern_gen_2 is defined
// in googletest-param-test-test.cc.
ParamGenerator<int> extern_gen_2 = Values(33);
// Tests that a parameterized test case can be defined in one translation unit
// and instantiated in another. The test is defined in googletest-param-test-test.cc
// and ExternalInstantiationTest fixture class is defined in
// gtest-param-test_test.h.
INSTANTIATE_TEST_CASE_P(MultiplesOf33,
ExternalInstantiationTest,
Values(33, 66));
// Tests that a parameterized test case can be instantiated
// in multiple translation units. Another instantiation is defined
// in googletest-param-test-test.cc and InstantiationInMultipleTranslaionUnitsTest
// fixture is defined in gtest-param-test_test.h
INSTANTIATE_TEST_CASE_P(Sequence2,
InstantiationInMultipleTranslaionUnitsTest,
Values(42*3, 42*4, 42*5));
googletest/test/gtest_throw_on_failure_test.py → googletest/test/googletest-throw-on-failure-test.py
View file @ e9b05a4d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"""Tests Google Test's throw-on-failure mode with exceptions disabled. """Tests Google Test's throw-on-failure mode with exceptions disabled.
This script invokes gtest_throw_on_failure_test_ (a program written with This script invokes googletest-throw-on-failure-test_ (a program written with
Google Test) with different environments and command line flags. Google Test) with different environments and command line flags.
""" """
...@@ -46,10 +46,10 @@ import gtest_test_utils ...@@ -46,10 +46,10 @@ import gtest_test_utils
# The command line flag for enabling/disabling the throw-on-failure mode. # The command line flag for enabling/disabling the throw-on-failure mode.
THROW_ON_FAILURE = 'gtest_throw_on_failure' THROW_ON_FAILURE = 'gtest_throw_on_failure'
# Path to the gtest_throw_on_failure_test_ program, compiled with # Path to the googletest-throw-on-failure-test_ program, compiled with
# exceptions disabled. # exceptions disabled.
EXE_PATH = gtest_test_utils.GetTestExecutablePath( EXE_PATH = gtest_test_utils.GetTestExecutablePath(
'gtest_throw_on_failure_test_') 'googletest-throw-on-failure-test_')
# Utilities. # Utilities.
...@@ -76,12 +76,12 @@ def Run(command): ...@@ -76,12 +76,12 @@ def Run(command):
# The tests. TODO(wan@google.com): refactor the class to share common # The tests. TODO(wan@google.com): refactor the class to share common
# logic with code in gtest_break_on_failure_unittest.py. # logic with code in googletest-break-on-failure-unittest.py.
class ThrowOnFailureTest(gtest_test_utils.TestCase): class ThrowOnFailureTest(gtest_test_utils.TestCase):
"""Tests the throw-on-failure mode.""" """Tests the throw-on-failure mode."""
def RunAndVerify(self, env_var_value, flag_value, should_fail): def RunAndVerify(self, env_var_value, flag_value, should_fail):
"""Runs gtest_throw_on_failure_test_ and verifies that it does """Runs googletest-throw-on-failure-test_ and verifies that it does
(or does not) exit with a non-zero code. (or does not) exit with a non-zero code.
Args: Args:
......
googletest/test/gtest_throw_on_failure_test_.cc → googletest/test/googletest-throw-on-failure-test_.cc
View file @ e9b05a4d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
// Tests Google Test's throw-on-failure mode with exceptions disabled. // Tests Google Test's throw-on-failure mode with exceptions disabled.
// //
// This program must be compiled with exceptions disabled. It will be // This program must be compiled with exceptions disabled. It will be
// invoked by gtest_throw_on_failure_test.py, and is expected to exit // invoked by googletest-throw-on-failure-test.py, and is expected to exit
// with non-zero in the throw-on-failure mode or 0 otherwise. // with non-zero in the throw-on-failure mode or 0 otherwise.
#include "gtest/gtest.h" #include "gtest/gtest.h"
......
googletest/test/gtest_uninitialized_test.py → googletest/test/googletest-uninitialized-test.py
View file @ e9b05a4d
...@@ -35,7 +35,7 @@ __author__ = 'wan@google.com (Zhanyong Wan)' ...@@ -35,7 +35,7 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
import gtest_test_utils import gtest_test_utils
COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-uninitialized-test_')
def Assert(condition): def Assert(condition):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment