summaryrefslogtreecommitdiffstats
path: root/googletest/docs/advanced.md
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-02-21 18:14:17 (GMT)
committerGennadiy Civil <misterg@google.com>2019-02-21 18:14:17 (GMT)
commit7203f37f57e4fef0d77670098aabc186309eb874 (patch)
treea606db7efea99c378dbc8aac23042fdbf0699a02 /googletest/docs/advanced.md
parent1411d27a944dc1997162c61dbcc0881cd56efdb1 (diff)
parentfcf59ca7bf6346ec08ed8591973517cdadc8e342 (diff)
downloadgoogletest-7203f37f57e4fef0d77670098aabc186309eb874.zip
googletest-7203f37f57e4fef0d77670098aabc186309eb874.tar.gz
googletest-7203f37f57e4fef0d77670098aabc186309eb874.tar.bz2
Merge pull request #2137 from ngie-eign:clang-ignore-sign-conversion
PiperOrigin-RevId: 235012245
Diffstat (limited to 'googletest/docs/advanced.md')
-rw-r--r--googletest/docs/advanced.md11
1 files changed, 5 insertions, 6 deletions
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index dbe6694..ea9b80f 100644
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -1198,7 +1198,7 @@ also supports per-test-suite set-up/tear-down. To use it:
1. Outside your test fixture class (typically just below it), define those
member variables, optionally giving them initial values.
1. In the same test fixture class, define a `static void SetUpTestSuite()`
- function (remember not to spell it as **`SetUpTestSuite`** with a small `u`!)
+ function (remember not to spell it as **`SetupTestSuite`** with a small `u`!)
to set up the shared resources and a `static void TearDownTestSuite()`
function to tear them down.
@@ -2430,7 +2430,7 @@ could generate this report:
"failures": 1,
"errors": 0,
"time": "0.035s",
- "timestamp": "2011-10-31T18:52:42Z"
+ "timestamp": "2011-10-31T18:52:42Z",
"name": "AllTests",
"testsuites": [
{
@@ -2447,11 +2447,11 @@ could generate this report:
"classname": "",
"failures": [
{
- "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2",
+ "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2",
"type": ""
},
{
- "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0",
+ "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0",
"type": ""
}
]
@@ -2463,7 +2463,7 @@ could generate this report:
"classname": ""
}
]
- }
+ },
{
"name": "LogicTest",
"tests": 1,
@@ -2517,4 +2517,3 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
running the tests.
**Availability**: Linux, Windows, Mac.
-