From 1182a5270994c72bfc9535b597ba00d2b2317748 Mon Sep 17 00:00:00 2001
From: David van der Spoel <spoel@xray.bmc.uu.se>
Date: Sun, 30 Dec 2018 17:25:50 +0100
Subject: [PATCH] Moved generic simulationdatabase code to testutils.

Change-Id: Ib10473efd727d9eb7e296a7d75cdb2a28ad31cce
---
 src/programs/mdrun/tests/CMakeLists.txt                        | 1 -
 src/programs/mdrun/tests/mimic.cpp                             | 2 +-
 src/programs/mdrun/tests/minimize.cpp                          | 2 +-
 src/programs/mdrun/tests/normalmodes.cpp                       | 2 +-
 src/programs/mdrun/tests/rerun.cpp                             | 2 +-
 src/testutils/CMakeLists.txt                                   | 1 +
 src/{programs/mdrun/tests => testutils}/simulationdatabase.cpp | 2 +-
 src/{programs/mdrun/tests => testutils}/simulationdatabase.h   | 9 ++++++---
 8 files changed, 12 insertions(+), 9 deletions(-)
 rename src/{programs/mdrun/tests => testutils}/simulationdatabase.cpp (99%)
 rename src/{programs/mdrun/tests => testutils}/simulationdatabase.h (95%)

diff --git a/src/programs/mdrun/tests/CMakeLists.txt b/src/programs/mdrun/tests/CMakeLists.txt
index e56de91568..9a187972dc 100644
--- a/src/programs/mdrun/tests/CMakeLists.txt
+++ b/src/programs/mdrun/tests/CMakeLists.txt
@@ -38,7 +38,6 @@ add_library(mdrun_test_objlib OBJECT
     energyreader.cpp
     energycomparison.cpp
     moduletest.cpp
-    simulationdatabase.cpp
     terminationhelper.cpp
     trajectorycomparison.cpp
     trajectoryreader.cpp
diff --git a/src/programs/mdrun/tests/mimic.cpp b/src/programs/mdrun/tests/mimic.cpp
index 90c0d57a08..98adef1b21 100644
--- a/src/programs/mdrun/tests/mimic.cpp
+++ b/src/programs/mdrun/tests/mimic.cpp
@@ -51,11 +51,11 @@
 
 #include "testutils/cmdlinetest.h"
 #include "testutils/refdata.h"
+#include "testutils/simulationdatabase.h"
 
 #include "energycomparison.h"
 #include "energyreader.h"
 #include "moduletest.h"
-#include "simulationdatabase.h"
 
 namespace gmx
 {
diff --git a/src/programs/mdrun/tests/minimize.cpp b/src/programs/mdrun/tests/minimize.cpp
index af14a7ddb4..1ac72c7ee8 100644
--- a/src/programs/mdrun/tests/minimize.cpp
+++ b/src/programs/mdrun/tests/minimize.cpp
@@ -61,12 +61,12 @@
 
 #include "testutils/mpitest.h"
 #include "testutils/refdata.h"
+#include "testutils/simulationdatabase.h"
 #include "testutils/testasserts.h"
 
 #include "energycomparison.h"
 #include "energyreader.h"
 #include "moduletest.h"
-#include "simulationdatabase.h"
 
 namespace gmx
 {
diff --git a/src/programs/mdrun/tests/normalmodes.cpp b/src/programs/mdrun/tests/normalmodes.cpp
index e8a343de08..a58da532d6 100644
--- a/src/programs/mdrun/tests/normalmodes.cpp
+++ b/src/programs/mdrun/tests/normalmodes.cpp
@@ -62,13 +62,13 @@
 
 #include "testutils/mpitest.h"
 #include "testutils/refdata.h"
+#include "testutils/simulationdatabase.h"
 #include "testutils/testasserts.h"
 #include "testutils/xvgtest.h"
 
 #include "energycomparison.h"
 #include "energyreader.h"
 #include "moduletest.h"
-#include "simulationdatabase.h"
 
 namespace gmx
 {
diff --git a/src/programs/mdrun/tests/rerun.cpp b/src/programs/mdrun/tests/rerun.cpp
index fe0743dce9..d384a151a6 100644
--- a/src/programs/mdrun/tests/rerun.cpp
+++ b/src/programs/mdrun/tests/rerun.cpp
@@ -61,13 +61,13 @@
 #include "gromacs/utility/stringutil.h"
 
 #include "testutils/mpitest.h"
+#include "testutils/simulationdatabase.h"
 #include "testutils/testasserts.h"
 
 #include "energycomparison.h"
 #include "energyreader.h"
 #include "mdruncomparison.h"
 #include "moduletest.h"
-#include "simulationdatabase.h"
 #include "trajectorycomparison.h"
 #include "trajectoryreader.h"
 
diff --git a/src/testutils/CMakeLists.txt b/src/testutils/CMakeLists.txt
index 73804b25db..5bcc6993b6 100644
--- a/src/testutils/CMakeLists.txt
+++ b/src/testutils/CMakeLists.txt
@@ -48,6 +48,7 @@ set(TESTUTILS_SOURCES
     mpitest.cpp
     refdata.cpp
     refdata-xml.cpp
+    simulationdatabase.cpp
     stdiohelper.cpp
     stringtest.cpp
     testasserts.cpp
diff --git a/src/programs/mdrun/tests/simulationdatabase.cpp b/src/testutils/simulationdatabase.cpp
similarity index 99%
rename from src/programs/mdrun/tests/simulationdatabase.cpp
rename to src/testutils/simulationdatabase.cpp
index e8eee637cb..78ad2f8e5d 100644
--- a/src/programs/mdrun/tests/simulationdatabase.cpp
+++ b/src/testutils/simulationdatabase.cpp
@@ -37,7 +37,7 @@
  * Implements declarations from in simulationdatabase.h
  *
  * \author Mark Abraham <mark.j.abraham@gmail.com>
- * \ingroup module_mdrun_integration_tests
+ * \ingroup module_testutils
  */
 #include "gmxpre.h"
 
diff --git a/src/programs/mdrun/tests/simulationdatabase.h b/src/testutils/simulationdatabase.h
similarity index 95%
rename from src/programs/mdrun/tests/simulationdatabase.h
rename to src/testutils/simulationdatabase.h
index a3d4d89083..8298093269 100644
--- a/src/programs/mdrun/tests/simulationdatabase.h
+++ b/src/testutils/simulationdatabase.h
@@ -32,13 +32,16 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-/*! \libinternal
+/*! \libinternal \file
  *
  * \brief Functionality for testing whether calls to mdrun produce the
  * same energy and force quantities when they should do so.
+ * \author Mark Abraham <mark.j.abraham@gmail.com>
+ * \inlibraryapi
+ * \ingroup module_testutils
  */
-#ifndef GMX_MDRUN_TESTS_SIMULATIONDATABASE_H
-#define GMX_MDRUN_TESTS_SIMULATIONDATABASE_H
+#ifndef GMX_TESTUTILS__SIMULATIONDATABASE_H
+#define GMX_TESTUTILS__SIMULATIONDATABASE_H
 
 #include <map>
 #include <string>
-- 
2.11.4.GIT