diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-30 18:11:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 18:11:38 (GMT) |
| commit | bb1c4af48702b934e1a768150f6283ec8c916fb9 (patch) | |
| tree | a22d6a494f7ab69401ef4b5ec138cdec1b682e36 /googletest | |
| parent | c3d1d33560462c923f06adb8e9c2f77ffbafa46c (diff) | |
| parent | 5d431c650f9c4d0aefdcca72d4b950ea8f0214ac (diff) | |
| download | googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.zip googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.gz googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.bz2 | |
Merge branch 'master' into masterrefs/pull/1234/head
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/docs/AdvancedGuide.md | 4 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googletest/docs/AdvancedGuide.md b/googletest/docs/AdvancedGuide.md index a454bf4..1076496 100644 --- a/googletest/docs/AdvancedGuide.md +++ b/googletest/docs/AdvancedGuide.md @@ -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. diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 1d3c7c7..0ae8e03 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -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() { |