aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest_output_test_.cc
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-23 12:33:54 -0500
committerGennadiy Civil <misterg@google.com>2018-01-23 12:33:54 -0500
commit80defcec57cecc637e9fdfe0160e122f890eed54 (patch)
tree831c59280c0bcfa28afdf57fab14396e30cf8018 /googletest/test/gtest_output_test_.cc
parent58df5760569ffe17bcc492465f8cd57008840039 (diff)
downloadgoogletest-80defcec57cecc637e9fdfe0160e122f890eed54.tar.gz
googletest-80defcec57cecc637e9fdfe0160e122f890eed54.tar.bz2
googletest-80defcec57cecc637e9fdfe0160e122f890eed54.zip
Many code merge/upstream changes
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
-rw-r--r--googletest/test/gtest_output_test_.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc
index 04ca5e5e..9ae9dc60 100644
--- a/googletest/test/gtest_output_test_.cc
+++ b/googletest/test/gtest_output_test_.cc
@@ -168,6 +168,16 @@ void SubWithTrace(int n) {
SubWithoutTrace(n);
}
+TEST(SCOPED_TRACETest, AcceptedValues) {
+ SCOPED_TRACE("literal string");
+ SCOPED_TRACE(std::string("std::string"));
+ SCOPED_TRACE(1337); // streamable type
+ const char* null_value = NULL;
+ SCOPED_TRACE(null_value);
+
+ ADD_FAILURE() << "Just checking that all these values work fine.";
+}
+
// Tests that SCOPED_TRACE() obeys lexical scopes.
TEST(SCOPED_TRACETest, ObeysScopes) {
printf("(expected to fail)\n");