Sort includes outside src/gromacs

[alexxy/gromacs.git] / src / testutils / stringtest.h

diff --git a/src/testutils/stringtest.h b/src/testutils/stringtest.h
index a300ac22b5e4332f8380ade4b8c7961dda14fa43..502f207bf6b32620f68d8ba2ce1ba641f89dd75b 100644 (file)
--- a/src/testutils/stringtest.h
+++ b/src/testutils/stringtest.h
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -48,7 +48,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 
-#include "refdata.h"
+#include "testutils/refdata.h"
 
 namespace gmx
 {
@@ -69,9 +69,6 @@ namespace test
 class StringTestBase : public ::testing::Test
 {
     public:
-        //! Static fixture setup to parse command-line options.
-        static void SetUpTestCase();
-
         StringTestBase();
         ~StringTestBase();
 
@@ -102,8 +99,6 @@ class StringTestBase : public ::testing::Test
         void checkFileContents(const std::string &filename, const char *id);
 
     private:
-        static bool                             s_bWriteToStdOut;
-
         TestReferenceData                       data_;
         boost::scoped_ptr<TestReferenceChecker> checker_;
 };