Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / selection / tests / indexutil.cpp

diff --git a/src/gromacs/selection/tests/indexutil.cpp b/src/gromacs/selection/tests/indexutil.cpp
index 12998ba02b89830869bb03dd17016d75854d3f44..5efd13423eae867ad77bb32c1708d92d2010c96a 100644 (file)
--- a/src/gromacs/selection/tests/indexutil.cpp
+++ b/src/gromacs/selection/tests/indexutil.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
@@ -42,12 +42,14 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
-#include <gtest/gtest.h>
-
-#include "gromacs/legacyheaders/typedefs.h"
+#include "gmxpre.h"
 
 #include "gromacs/selection/indexutil.h"
 
+#include <gtest/gtest.h>
+
+#include "gromacs/topology/block.h"
+
 #include "testutils/refdata.h"
 
 #include "toputils.h"
@@ -418,12 +420,11 @@ void IndexMapTest::testUpdate(int atomCount, const int atoms[], bool bMaskOnly,
 void IndexMapTest::checkMapping(int atomCount, const int atoms[],
                                 const char *name)
 {
-    ASSERT_EQ(map_.nr, map_.mapb.nr);
     gmx::test::TestReferenceChecker compound(
             checker_.checkCompound("IndexMapping", name));
     compound.checkSequenceArray(atomCount, atoms, "Input");
-    compound.checkInteger(map_.nr, "Count");
-    for (int i = 0; i < map_.nr; ++i)
+    compound.checkInteger(map_.mapb.nr, "Count");
+    for (int i = 0; i < map_.mapb.nr; ++i)
     {
         gmx::test::TestReferenceChecker blockCompound(
                 compound.checkCompound("Block", NULL));