diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-08 17:10:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 17:10:16 -0500 |
| commit | c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2 (patch) | |
| tree | b808851ac3914f886d69fa746f29cb6e5481e892 | |
| parent | 3d27bdef53a5783a4150f74414d7636b7a5a3851 (diff) | |
| parent | 91ba05cc360a81a64cea53be1fe752944249d14c (diff) | |
| download | googletest-c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2.tar.gz googletest-c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2.tar.bz2 googletest-c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2.zip | |
Merge pull request #1390 from gennadiycivil/master
Small cleanups, merge
| -rw-r--r-- | googletest/samples/sample4_unittest.cc | 5 | ||||
| -rw-r--r-- | googletest/samples/sample5_unittest.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/googletest/samples/sample4_unittest.cc b/googletest/samples/sample4_unittest.cc index 948266e8..7bf9ea34 100644 --- a/googletest/samples/sample4_unittest.cc +++ b/googletest/samples/sample4_unittest.cc @@ -29,10 +29,12 @@ // // Author: wan@google.com (Zhanyong Wan) -#include "gtest/gtest.h" #include "sample4.h" +#include "gtest/gtest.h" + namespace { // Tests the Increment() method. + TEST(Counter, Increment) { Counter c; @@ -43,4 +45,5 @@ TEST(Counter, Increment) { EXPECT_EQ(1, c.Increment()); EXPECT_EQ(2, c.Increment()); } + } // namespace diff --git a/googletest/samples/sample5_unittest.cc b/googletest/samples/sample5_unittest.cc index 30999307..401a58a5 100644 --- a/googletest/samples/sample5_unittest.cc +++ b/googletest/samples/sample5_unittest.cc @@ -46,9 +46,9 @@ #include <limits.h> #include <time.h> -#include "sample3-inl.h" #include "gtest/gtest.h" #include "sample1.h" +#include "sample3-inl.h" namespace { // In this sample, we want to ensure that every test finishes within // ~5 seconds. If a test takes longer to run, we consider it a |