eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Gennadiy Civil
2017-08-30 14:11:38 -04:00
committed by GitHub
parent c3d1d33560 5d431c650f
commit bb1c4af487
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/docs/AdvancedGuide.md
View File

@@ -1623,8 +1623,8 @@ printf("We are in test %s of test case %s.\n",
```
`current_test_info()` returns a null pointer if no test is running. In
particular, you cannot find the test case name in `TestCaseSetUp()`,
`TestCaseTearDown()` (where you know the test case name implicitly), or
particular, you cannot find the test case name in `SetUpTestCase()`,
`TearDownTestCase()` (where you know the test case name implicitly), or
functions called from them.
_Availability:_ Linux, Windows, Mac.

4
googletest/test/gtest_unittest.cc
View File

@@ -3115,13 +3115,13 @@ TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) {
FAIL() << "Unexpected failure: Test in disabled test case should not be run.";
}
// Check that when all tests in a test case are disabled, SetupTestCase() and
// Check that when all tests in a test case are disabled, SetUpTestCase() and
// TearDownTestCase() are not called.
class DisabledTestsTest : public Test {
protected:
static void SetUpTestCase() {
FAIL() << "Unexpected failure: All tests disabled in test case. "
"SetupTestCase() should not be called.";
"SetUpTestCase() should not be called.";
}
static void TearDownTestCase() {