From: Teemu Murtola Date: Mon, 6 Jan 2014 18:37:23 +0000 (+0200) Subject: Reorganize shared unit test code X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=9c666a9b1cf75cd928b83c7b5d3c98a32e0fdf7b;p=alexxy%2Fgromacs.git Reorganize shared unit test code Move mocks and test fixtures to the modules that they are mocking: - datatest.*, mock_datamodule.* to analysisdata/tests/ - mock_helptopic.* to onlinehelp/tests/ This is now easier with object libraries, and clarifies the dependencies in the test code. src/testutils/ is now really about utilities, and not about some specific-purpose test code. Change-Id: Ib0cbe6382813315df65fa65f7fe0233b9b5e2d4e --- diff --git a/admin/includedeps.py b/admin/includedeps.py index 48734404d3..f3cc0e022d 100755 --- a/admin/includedeps.py +++ b/admin/includedeps.py @@ -572,7 +572,7 @@ class IncludeFileChecker(object): intramodule = \ (checkfile.module.get_top_level_module() == \ otherfile.module.get_top_level_module()) - if otherfile.type not in ('publicheader', 'libheader'): + if otherfile.type not in ('publicheader', 'libheader', 'test'): if not intramodule and not _is_legacy_module(otherfile.module): reporter.error(checkfile.path, 'included file "{0}" is missing API definition' @@ -622,7 +622,7 @@ class GraphBuilder(object): (fromfile.module.get_top_level_module() == \ tofile.module.get_top_level_module()) is_legacy = _is_legacy_module(tofile.module) - if tofile.type not in ('publicheader', 'libheader', 'header'): + if tofile.type not in ('publicheader', 'libheader', 'header', 'test'): if intramodule: link_type = 'intramodule' elif is_legacy: @@ -631,6 +631,8 @@ class GraphBuilder(object): link_type = 'undocumented' elif fromfile.type == 'test': link_type = 'test' + elif tofile.type == 'test': + link_type = 'undocumented' elif fromfile.type in ('source', 'header', 'implheader') and \ not fromfile.is_installed(): if intramodule: diff --git a/src/gromacs/analysisdata/tests/CMakeLists.txt b/src/gromacs/analysisdata/tests/CMakeLists.txt index 4dd11ef08f..7bde033ed6 100644 --- a/src/gromacs/analysisdata/tests/CMakeLists.txt +++ b/src/gromacs/analysisdata/tests/CMakeLists.txt @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2011,2012,2013, by the GROMACS development team, led by +# Copyright (c) 2011,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. @@ -32,9 +32,14 @@ # To help us fund GROMACS development, we humbly ask that you cite # the research papers on the package. Check out http://www.gromacs.org. +add_library(analysisdata-test-shared OBJECT + datatest.cpp + mock_datamodule.cpp) + gmx_add_unit_test(AnalysisDataUnitTests analysisdata-test analysisdata.cpp arraydata.cpp average.cpp histogram.cpp - lifetime.cpp) + lifetime.cpp + $) diff --git a/src/gromacs/analysisdata/tests/analysisdata.cpp b/src/gromacs/analysisdata/tests/analysisdata.cpp index 6239b4e213..a957085010 100644 --- a/src/gromacs/analysisdata/tests/analysisdata.cpp +++ b/src/gromacs/analysisdata/tests/analysisdata.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2011,2012,2013, by the GROMACS development team, led by + * Copyright (c) 2011,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. @@ -52,8 +52,8 @@ #include "gromacs/analysisdata/paralleloptions.h" #include "gromacs/utility/exceptions.h" -#include "testutils/datatest.h" -#include "testutils/mock_datamodule.h" +#include "gromacs/analysisdata/tests/datatest.h" +#include "gromacs/analysisdata/tests/mock_datamodule.h" #include "testutils/testasserts.h" using gmx::test::AnalysisDataTestInput; diff --git a/src/gromacs/analysisdata/tests/arraydata.cpp b/src/gromacs/analysisdata/tests/arraydata.cpp index 9305633f2d..74601b265d 100644 --- a/src/gromacs/analysisdata/tests/arraydata.cpp +++ b/src/gromacs/analysisdata/tests/arraydata.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -48,7 +48,7 @@ #include "gromacs/analysisdata/arraydata.h" -#include "testutils/datatest.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/testasserts.h" using gmx::test::AnalysisDataTestInput; diff --git a/src/gromacs/analysisdata/tests/average.cpp b/src/gromacs/analysisdata/tests/average.cpp index 49aa2c00cc..f0b540da91 100644 --- a/src/gromacs/analysisdata/tests/average.cpp +++ b/src/gromacs/analysisdata/tests/average.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -51,7 +51,7 @@ #include "gromacs/analysisdata/analysisdata.h" #include "gromacs/analysisdata/modules/average.h" -#include "testutils/datatest.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/testasserts.h" using gmx::test::AnalysisDataTestInput; diff --git a/src/testutils/datatest.cpp b/src/gromacs/analysisdata/tests/datatest.cpp similarity index 98% rename from src/testutils/datatest.cpp rename to src/gromacs/analysisdata/tests/datatest.cpp index a78a44f194..743b4f8f3b 100644 --- a/src/testutils/datatest.cpp +++ b/src/gromacs/analysisdata/tests/datatest.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2011,2012,2013, by the GROMACS development team, led by + * Copyright (c) 2011,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. @@ -37,7 +37,7 @@ * Implements classes in datatest.h. * * \author Teemu Murtola - * \ingroup module_testutils + * \ingroup module_analysisdata */ #include "datatest.h" @@ -49,7 +49,7 @@ #include "gromacs/utility/gmxassert.h" #include "gromacs/utility/stringutil.h" -#include "testutils/mock_datamodule.h" +#include "gromacs/analysisdata/tests/mock_datamodule.h" #include "testutils/refdata.h" namespace gmx diff --git a/src/testutils/datatest.h b/src/gromacs/analysisdata/tests/datatest.h similarity index 98% rename from src/testutils/datatest.h rename to src/gromacs/analysisdata/tests/datatest.h index bb7c076540..579c6211d4 100644 --- a/src/testutils/datatest.h +++ b/src/gromacs/analysisdata/tests/datatest.h @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2011,2012,2013, by the GROMACS development team, led by + * Copyright (c) 2011,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. @@ -38,10 +38,10 @@ * * \author Teemu Murtola * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ -#ifndef GMX_TESTUTILS_DATATEST_H -#define GMX_TESTUTILS_DATATEST_H +#ifndef GMX_ANALYSISDATA_TESTS_DATATEST_H +#define GMX_ANALYSISDATA_TESTS_DATATEST_H #include @@ -73,7 +73,7 @@ namespace test * between. * * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ class AnalysisDataTestInputPointSet { @@ -145,7 +145,7 @@ class AnalysisDataTestInputPointSet * Represents a single frame in AnalysisDataTestInput structure. * * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ class AnalysisDataTestInputFrame { @@ -202,7 +202,7 @@ class AnalysisDataTestInputFrame * \see AnalysisDataTestFixture * * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ class AnalysisDataTestInput { @@ -285,7 +285,7 @@ class AnalysisDataTestInput * \see AnalysisDataTestInput * * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ class AnalysisDataTestFixture : public ::testing::Test { diff --git a/src/gromacs/analysisdata/tests/histogram.cpp b/src/gromacs/analysisdata/tests/histogram.cpp index d296399780..f68a8b0213 100644 --- a/src/gromacs/analysisdata/tests/histogram.cpp +++ b/src/gromacs/analysisdata/tests/histogram.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -51,7 +51,7 @@ #include "gromacs/analysisdata/analysisdata.h" #include "gromacs/analysisdata/modules/histogram.h" -#include "testutils/datatest.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/testasserts.h" using gmx::test::AnalysisDataTestInput; diff --git a/src/gromacs/analysisdata/tests/lifetime.cpp b/src/gromacs/analysisdata/tests/lifetime.cpp index ae8eadfb80..16a9e886a9 100644 --- a/src/gromacs/analysisdata/tests/lifetime.cpp +++ b/src/gromacs/analysisdata/tests/lifetime.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2013, by the GROMACS development team, led by + * 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. @@ -50,7 +50,7 @@ #include "gromacs/analysisdata/analysisdata.h" #include "gromacs/analysisdata/modules/lifetime.h" -#include "testutils/datatest.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/testasserts.h" using gmx::test::AnalysisDataTestInput; diff --git a/src/testutils/mock_datamodule.cpp b/src/gromacs/analysisdata/tests/mock_datamodule.cpp similarity index 99% rename from src/testutils/mock_datamodule.cpp rename to src/gromacs/analysisdata/tests/mock_datamodule.cpp index 48bbc0640d..ce4887ede0 100644 --- a/src/testutils/mock_datamodule.cpp +++ b/src/gromacs/analysisdata/tests/mock_datamodule.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2011,2012,2013, by the GROMACS development team, led by + * Copyright (c) 2011,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. @@ -37,7 +37,7 @@ * Implements classes in mock_datamodule.h. * * \author Teemu Murtola - * \ingroup module_testutils + * \ingroup module_analysisdata */ #include "mock_datamodule.h" @@ -49,7 +49,7 @@ #include "gromacs/utility/gmxassert.h" #include "gromacs/utility/stringutil.h" -#include "testutils/datatest.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/refdata.h" #include "testutils/testasserts.h" @@ -65,7 +65,7 @@ namespace test /*! \internal \brief * Private implementation class for gmx::test::MockAnalysisDataModule. * - * \ingroup module_testutils + * \ingroup module_analysisdata */ class MockAnalysisDataModule::Impl { @@ -129,7 +129,7 @@ namespace /*! \internal \brief * Checks a single AnalysisDataValue. * - * \ingroup module_testutils + * \ingroup module_analysisdata */ void checkReferenceDataPoint(TestReferenceChecker *checker, const AnalysisDataValue &value) diff --git a/src/testutils/mock_datamodule.h b/src/gromacs/analysisdata/tests/mock_datamodule.h similarity index 94% rename from src/testutils/mock_datamodule.h rename to src/gromacs/analysisdata/tests/mock_datamodule.h index df632f251d..bbc18bded7 100644 --- a/src/testutils/mock_datamodule.h +++ b/src/gromacs/analysisdata/tests/mock_datamodule.h @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2011,2012,2013, by the GROMACS development team, led by + * Copyright (c) 2011,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. @@ -40,10 +40,10 @@ * * \author Teemu Murtola * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_analysisdata */ -#ifndef GMX_TESTUTILS_MOCK_DATAMODULE_H -#define GMX_TESTUTILS_MOCK_DATAMODULE_H +#ifndef GMX_ANALYSISDATA_TESTS_MOCK_DATAMODULE_H +#define GMX_ANALYSISDATA_TESTS_MOCK_DATAMODULE_H #include #include diff --git a/src/gromacs/analysisdata/tests/refdata/analysisdata-referencedata.xsl b/src/gromacs/analysisdata/tests/refdata/analysisdata-referencedata.xsl index 9223385238..03ed3db01e 100644 --- a/src/gromacs/analysisdata/tests/refdata/analysisdata-referencedata.xsl +++ b/src/gromacs/analysisdata/tests/refdata/analysisdata-referencedata.xsl @@ -4,8 +4,8 @@ This file is currently duplicated to each directory containing reference data XML files. This is to make it compatible with more browsers. To keep these files in sync, please only modify the version in - src/testutils/ -and use the copy_xsl.sh script to copy it to relevant locations. + src/gromacs/analysisdata/tests/refdata/ +and use the src/testutils/copy_xsl.sh script to copy it to relevant locations. --> diff --git a/src/gromacs/commandline/tests/CMakeLists.txt b/src/gromacs/commandline/tests/CMakeLists.txt index e7e963bfb7..58b0021fe7 100644 --- a/src/gromacs/commandline/tests/CMakeLists.txt +++ b/src/gromacs/commandline/tests/CMakeLists.txt @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2012, by the GROMACS development team, led by +# Copyright (c) 2012,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. @@ -35,4 +35,5 @@ gmx_add_unit_test(CommandLineUnitTests commandline-test cmdlinehelpwriter.cpp cmdlinemodulemanager.cpp - cmdlineparser.cpp) + cmdlineparser.cpp + $) diff --git a/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp b/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp index 2fdd7fa2ad..07b946215b 100644 --- a/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp +++ b/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -53,8 +53,8 @@ #include "gromacs/commandline/cmdlinemodulemanager.h" #include "gromacs/utility/programinfo.h" +#include "gromacs/onlinehelp/tests/mock_helptopic.h" #include "testutils/cmdlinetest.h" -#include "testutils/mock_helptopic.h" #include "testutils/testasserts.h" namespace diff --git a/src/gromacs/onlinehelp/tests/CMakeLists.txt b/src/gromacs/onlinehelp/tests/CMakeLists.txt index 83f923bffc..05427ea08e 100644 --- a/src/gromacs/onlinehelp/tests/CMakeLists.txt +++ b/src/gromacs/onlinehelp/tests/CMakeLists.txt @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2012, by the GROMACS development team, led by +# Copyright (c) 2012,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. @@ -32,6 +32,10 @@ # To help us fund GROMACS development, we humbly ask that you cite # the research papers on the package. Check out http://www.gromacs.org. +add_library(onlinehelp-test-shared OBJECT + mock_helptopic.cpp) + gmx_add_unit_test(OnlineHelpUnitTests onlinehelp-test helpformat.cpp - helpmanager.cpp) + helpmanager.cpp + $) diff --git a/src/gromacs/onlinehelp/tests/helpmanager.cpp b/src/gromacs/onlinehelp/tests/helpmanager.cpp index 14baefd832..b3ce50e09f 100644 --- a/src/gromacs/onlinehelp/tests/helpmanager.cpp +++ b/src/gromacs/onlinehelp/tests/helpmanager.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -51,7 +51,7 @@ #include "gromacs/utility/exceptions.h" #include "gromacs/utility/file.h" -#include "testutils/mock_helptopic.h" +#include "gromacs/onlinehelp/tests/mock_helptopic.h" #include "testutils/stringtest.h" #include "testutils/testasserts.h" #include "testutils/testfilemanager.h" diff --git a/src/testutils/mock_helptopic.cpp b/src/gromacs/onlinehelp/tests/mock_helptopic.cpp similarity index 96% rename from src/testutils/mock_helptopic.cpp rename to src/gromacs/onlinehelp/tests/mock_helptopic.cpp index 826e6a4b34..f982a7ac16 100644 --- a/src/testutils/mock_helptopic.cpp +++ b/src/gromacs/onlinehelp/tests/mock_helptopic.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012, by the GROMACS development team, led by + * Copyright (c) 2012,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. @@ -37,7 +37,7 @@ * Implements classes in mock_helptopic.h. * * \author Teemu Murtola - * \ingroup module_testutils + * \ingroup module_onlinehelp */ #include "mock_helptopic.h" diff --git a/src/testutils/mock_helptopic.h b/src/gromacs/onlinehelp/tests/mock_helptopic.h similarity index 93% rename from src/testutils/mock_helptopic.h rename to src/gromacs/onlinehelp/tests/mock_helptopic.h index 471e0e5e90..f0b0b61d7b 100644 --- a/src/testutils/mock_helptopic.h +++ b/src/gromacs/onlinehelp/tests/mock_helptopic.h @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012, by the GROMACS development team, led by + * Copyright (c) 2012,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. @@ -38,10 +38,10 @@ * * \author Teemu Murtola * \inlibraryapi - * \ingroup module_testutils + * \ingroup module_onlinehelp */ -#ifndef GMX_TESTUTILS_MOCK_HELPTOPIC_H -#define GMX_TESTUTILS_MOCK_HELPTOPIC_H +#ifndef GMX_ONLINEHELP_TESTS_MOCK_HELPTOPIC_H +#define GMX_ONLINEHELP_TESTS_MOCK_HELPTOPIC_H #include diff --git a/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt b/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt index 4bdd6b71bf..913645d7ca 100644 --- a/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt +++ b/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2010,2012,2013, by the GROMACS development team, led by +# Copyright (c) 2010,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. @@ -37,7 +37,8 @@ gmx_add_unit_test(TrajectoryAnalysisUnitTests trajectoryanalysis-test angle.cpp distance.cpp freevolume.cpp - select.cpp) + select.cpp + $) add_executable(test_selection test_selection.cpp) target_link_libraries(test_selection libgromacs ${GMX_EXE_LINKER_FLAGS}) diff --git a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp index 5d2a241206..38f071e738 100644 --- a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp +++ b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * 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. @@ -49,8 +49,8 @@ #include "gromacs/trajectoryanalysis/cmdlinerunner.h" #include "gromacs/utility/file.h" +#include "gromacs/analysisdata/tests/datatest.h" #include "testutils/cmdlinetest.h" -#include "testutils/datatest.h" #include "testutils/refdata.h" #include "testutils/testasserts.h" #include "testutils/testfilemanager.h" diff --git a/src/gromacs/trajectoryanalysis/tests/refdata/analysisdata-referencedata.xsl b/src/gromacs/trajectoryanalysis/tests/refdata/analysisdata-referencedata.xsl index 9223385238..03ed3db01e 100644 --- a/src/gromacs/trajectoryanalysis/tests/refdata/analysisdata-referencedata.xsl +++ b/src/gromacs/trajectoryanalysis/tests/refdata/analysisdata-referencedata.xsl @@ -4,8 +4,8 @@ This file is currently duplicated to each directory containing reference data XML files. This is to make it compatible with more browsers. To keep these files in sync, please only modify the version in - src/testutils/ -and use the copy_xsl.sh script to copy it to relevant locations. + src/gromacs/analysisdata/tests/refdata/ +and use the src/testutils/copy_xsl.sh script to copy it to relevant locations. --> diff --git a/src/testutils/analysisdata-referencedata.xsl b/src/testutils/analysisdata-referencedata.xsl deleted file mode 100644 index 9223385238..0000000000 --- a/src/testutils/analysisdata-referencedata.xsl +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FrameXSetColumnsValues
- - - - - - - - all - -
- - - - ( - - - ± - - ) - - - - - ± - - - - diff --git a/src/testutils/copy_xsl.sh b/src/testutils/copy_xsl.sh index 6f8b510b47..7d1e7cef32 100755 --- a/src/testutils/copy_xsl.sh +++ b/src/testutils/copy_xsl.sh @@ -10,7 +10,7 @@ for destdir in analysisdata selection trajectoryanalysis ; do src/gromacs/$destdir/tests/refdata/ done -for destdir in analysisdata trajectoryanalysis ; do - cp -f src/testutils/analysisdata-referencedata.xsl \ +for destdir in trajectoryanalysis ; do + cp -f src/gromacs/analysisdata/tests/refdata/analysisdata-referencedata.xsl \ src/gromacs/$destdir/tests/refdata/ done