Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / trajectoryanalysis / tests / select.cpp

diff --git a/src/gromacs/trajectoryanalysis/tests/select.cpp b/src/gromacs/trajectoryanalysis/tests/select.cpp
index 8adc76abcedd2d4a7b122f35ddf968223f316275..05a24a4707aed057f5583427175a7a749f72b97d 100644 (file)
--- a/src/gromacs/trajectoryanalysis/tests/select.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/select.cpp
@@ -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
@@ -47,10 +47,12 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
-#include <gtest/gtest.h>
+#include "gmxpre.h"
 
 #include "gromacs/trajectoryanalysis/modules/select.h"
 
+#include <gtest/gtest.h>
+
 #include "testutils/cmdlinetest.h"
 
 #include "moduletest.h"
@@ -65,7 +67,7 @@ using gmx::test::CommandLine;
  */
 
 //! Test fixture for the select analysis module.
-typedef gmx::test::TrajectoryAnalysisModuleTestFixture<gmx::analysismodules::Select>
+typedef gmx::test::TrajectoryAnalysisModuleTestFixture<gmx::analysismodules::SelectInfo>
     SelectModuleTest;
 
 TEST_F(SelectModuleTest, BasicTest)
@@ -79,7 +81,7 @@ TEST_F(SelectModuleTest, BasicTest)
     setOutputFile("-oi", "index.dat");
     setOutputFile("-on", "index.ndx");
     excludeDataset("cfrac");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, HandlesPDBOutputWithNonPDBInput)
@@ -92,7 +94,7 @@ TEST_F(SelectModuleTest, HandlesPDBOutputWithNonPDBInput)
     setTrajectory("simple.gro");
     includeDataset("occupancy");
     setOutputFile("-ofpdb", "occupancy.pdb");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, HandlesPDBOutputWithPDBInput)
@@ -105,7 +107,7 @@ TEST_F(SelectModuleTest, HandlesPDBOutputWithPDBInput)
     setTrajectory("simple.gro");
     includeDataset("occupancy");
     setOutputFile("-ofpdb", "occupancy.pdb");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, HandlesMaxPDBOutput)
@@ -119,7 +121,7 @@ TEST_F(SelectModuleTest, HandlesMaxPDBOutput)
     setTrajectory("simple.gro");
     includeDataset("occupancy");
     setOutputFile("-ofpdb", "occupancy.pdb");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, HandlesSelectedPDBOutput)
@@ -133,7 +135,7 @@ TEST_F(SelectModuleTest, HandlesSelectedPDBOutput)
     setTrajectory("simple.gro");
     includeDataset("occupancy");
     setOutputFile("-ofpdb", "occupancy.pdb");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, NormalizesSizes)
@@ -145,7 +147,7 @@ TEST_F(SelectModuleTest, NormalizesSizes)
     };
     setTopology("simple.gro");
     includeDataset("size");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, WritesResidueNumbers)
@@ -156,7 +158,7 @@ TEST_F(SelectModuleTest, WritesResidueNumbers)
     };
     setTopology("simple.gro");
     includeDataset("index");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(SelectModuleTest, WritesResidueIndices)
@@ -168,7 +170,7 @@ TEST_F(SelectModuleTest, WritesResidueIndices)
     };
     setTopology("simple.gro");
     includeDataset("index");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 } // namespace