Merge branch 'master' into master

aa31660d · Gennadiy Civil · GitHub · 11e1dd25 · 1d324d84 · aa31660d
Unverified Commit aa31660d authored Feb 26, 2018 by Gennadiy Civil Committed by GitHub Feb 26, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 86 additions and 95 deletions

googletest/docs/Primer.md googletest/docs/Primer.md +1 -1

googletest/test/gtest_unittest.cc googletest/test/gtest_unittest.cc +85 -94

No files found.
--- a/googletest/docs/Primer.md
+++ b/googletest/docs/Primer.md
@@ -239,7 +239,7 @@ To create a test:
  1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds.

 ```
-TEST(test_case_name, test_name) {
+TEST(testCaseName, testName) {
 ... test body ...
 }
 ```

--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc