summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/gtest.h
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-09 19:48:06 (GMT)
committerGennadiy Civil <misterg@google.com>2018-01-09 19:48:06 (GMT)
commit9fce984a677020f2f3ab60f66f02b9edd363bb61 (patch)
treefa8db54ac138619c4d936fe5223a5962c677991f /googletest/include/gtest/gtest.h
parent23015249236e60b94b5010330ef687de43d2e923 (diff)
downloadgoogletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.zip
googletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.tar.gz
googletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.tar.bz2
wip, cleanups/merge
Diffstat (limited to 'googletest/include/gtest/gtest.h')
-rw-r--r--googletest/include/gtest/gtest.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 2ad5a0c..3261c91 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -359,7 +359,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
// this for you.
//
// The only time you derive from Test is when defining a test fixture
-// to be used a TEST_F. For example:
+// to be used in a TEST_F. For example:
//
// class FooTest : public testing::Test {
// protected:
@@ -699,7 +699,7 @@ class GTEST_API_ TestInfo {
// Returns true iff this test will appear in the XML report.
bool is_reportable() const {
- // For now, the XML report includes all tests matching the filter.
+ // The XML report includes all tests matching the filter.
// In the future, we may trim tests that are excluded because of
// sharding.
return matches_filter_;
@@ -1782,7 +1782,6 @@ template <typename T>
class TestWithParam : public Test, public WithParamInterface<T> {
};
-
// Macros for indicating success/failure in test code.
// ADD_FAILURE unconditionally adds a failure to the current test.