summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-30 04:33:30 (GMT)
committerGitHub <noreply@github.com>2017-08-30 04:33:30 (GMT)
commit71e2858f32902ca736e2dc8d81b512a4dfa18b80 (patch)
tree49b70f98965727a2aabe03e552e4585160966a49 /googletest
parent298cd5e9c4230d35b7420f0ceec144c6e2cff57c (diff)
parent5bd8e832177f578a6393417665d08953d9552e67 (diff)
downloadgoogletest-71e2858f32902ca736e2dc8d81b512a4dfa18b80.zip
googletest-71e2858f32902ca736e2dc8d81b512a4dfa18b80.tar.gz
googletest-71e2858f32902ca736e2dc8d81b512a4dfa18b80.tar.bz2
Merge pull request #1226 from aninf-wo/hethi/fix-typo
fix typo in comment and string (SetUpTestCase)
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest_unittest.cc4
1 files changed, 2 insertions, 2 deletions
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() {