summaryrefslogtreecommitdiff
path: root/googletest/test/gtest_environment_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'googletest/test/gtest_environment_test.cc')
-rw-r--r--googletest/test/gtest_environment_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/test/gtest_environment_test.cc b/googletest/test/gtest_environment_test.cc
index bc9524d66373..064bfc50b918 100644
--- a/googletest/test/gtest_environment_test.cc
+++ b/googletest/test/gtest_environment_test.cc
@@ -53,7 +53,7 @@ class MyEnvironment : public testing::Environment {
// Depending on the value of failure_in_set_up_, SetUp() will
// generate a non-fatal failure, generate a fatal failure, or
// succeed.
- virtual void SetUp() {
+ void SetUp() override {
set_up_was_run_ = true;
switch (failure_in_set_up_) {
@@ -69,7 +69,7 @@ class MyEnvironment : public testing::Environment {
}
// Generates a non-fatal failure.
- virtual void TearDown() {
+ void TearDown() override {
tear_down_was_run_ = true;
ADD_FAILURE() << "Expected non-fatal failure in global tear-down.";
}
@@ -116,7 +116,7 @@ void Check(bool condition, const char* msg) {
}
}
-// Runs the tests. Return true iff successful.
+// Runs the tests. Return true if and only if successful.
//
// The 'failure' parameter specifies the type of failure that should
// be generated by the global set-up.