diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-18 17:42:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 17:42:34 -0500 |
| commit | 1489dc8daad3a9eaff89789752c1cadc5f2ece72 (patch) | |
| tree | 38e051e8e4fd2a7b82b95d01b1b63cfc3e2f0251 /googletest/test/gtest_output_test_.cc | |
| parent | ea8f6f0e6959c74b1c9ac1f30cbfdc94715d606b (diff) | |
| parent | 051053054df6d2dbedd5f572ae288f2f82a289b7 (diff) | |
| download | googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.tar.gz googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.tar.bz2 googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.zip | |
Merge branch 'master' into support_xboxone
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
| -rw-r--r-- | googletest/test/gtest_output_test_.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc index 6aaba977..04ca5e5e 100644 --- a/googletest/test/gtest_output_test_.cc +++ b/googletest/test/gtest_output_test_.cc @@ -315,6 +315,13 @@ TEST(SCOPED_TRACETest, WorksConcurrently) { } #endif // GTEST_IS_THREADSAFE +// Tests basic functionality of the ScopedTrace utility (most of its features +// are already tested in SCOPED_TRACETest). +TEST(ScopedTraceTest, WithExplicitFileAndLine) { + testing::ScopedTrace trace("explicit_file.cc", 123, "expected trace message"); + ADD_FAILURE() << "Check that the trace is attached to a particular location."; +} + TEST(DisabledTestsWarningTest, DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) { // This test body is intentionally empty. Its sole purpose is for |