Sort all includes in src/gromacs

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

diff --git a/src/gromacs/trajectoryanalysis/tests/distance.cpp b/src/gromacs/trajectoryanalysis/tests/distance.cpp
index 2ddd62919121b02ed230fb4ac658212d616dec77..5a63636346d0f6b1af0f47651165f3c62b894658 100644 (file)
--- a/src/gromacs/trajectoryanalysis/tests/distance.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/distance.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, 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) 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
@@ -39,10 +39,12 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
-#include <gtest/gtest.h>
+#include "gmxpre.h"
 
 #include "gromacs/trajectoryanalysis/modules/distance.h"
 
+#include <gtest/gtest.h>
+
 #include "testutils/cmdlinetest.h"
 
 #include "moduletest.h"
@@ -57,7 +59,7 @@ using gmx::test::CommandLine;
  */
 
 //! Test fixture for the angle analysis module.
-typedef gmx::test::TrajectoryAnalysisModuleTestFixture<gmx::analysismodules::Distance>
+typedef gmx::test::TrajectoryAnalysisModuleTestFixture<gmx::analysismodules::DistanceInfo>
     DistanceModuleTest;
 
 TEST_F(DistanceModuleTest, ComputesDistances)
@@ -68,7 +70,7 @@ TEST_F(DistanceModuleTest, ComputesDistances)
         "-len", "2", "-binw", "0.5"
     };
     setTopology("simple.gro");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(DistanceModuleTest, ComputesMultipleDistances)
@@ -80,7 +82,7 @@ TEST_F(DistanceModuleTest, ComputesMultipleDistances)
         "-len", "2", "-binw", "0.5"
     };
     setTopology("simple.gro");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 TEST_F(DistanceModuleTest, HandlesDynamicSelections)
@@ -91,7 +93,7 @@ TEST_F(DistanceModuleTest, HandlesDynamicSelections)
         "-len", "2", "-binw", "0.5"
     };
     setTopology("simple.gro");
-    runTest(CommandLine::create(cmdline));
+    runTest(CommandLine(cmdline));
 }
 
 } // namespace