summaryrefslogtreecommitdiffstats
path: root/googletest/samples/sample5_unittest.cc
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-16 15:13:12 (GMT)
committerGitHub <noreply@github.com>2018-08-16 15:13:12 (GMT)
commit21e518557ad7634bc4b1fd57effa7e49a1405bb5 (patch)
tree8484ccd28cc1bb4aa27c3b47b9a56cf9ee2ce66c /googletest/samples/sample5_unittest.cc
parent3e2cb75446e0f56f226f0fb259e032bb4d014002 (diff)
parent490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff)
downloadgoogletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.zip
googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.gz
googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.bz2
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googletest/samples/sample5_unittest.cc')
-rw-r--r--googletest/samples/sample5_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/googletest/samples/sample5_unittest.cc b/googletest/samples/sample5_unittest.cc
index 3099930..d8a8788 100644
--- a/googletest/samples/sample5_unittest.cc
+++ b/googletest/samples/sample5_unittest.cc
@@ -26,8 +26,7 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
+
// This sample teaches how to reuse a test fixture in multiple test
// cases by deriving sub-fixtures from it.
@@ -46,9 +45,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