gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into hethi/unused-import

Browse Source
This commit is contained in:
Herbert Thielen
2017-08-30 10:44:26 +02:00
committed by GitHub
parent b567aadd1b 71e2858f32
commit d6562b5a57
11 changed files with 141 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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() {