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'
(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:
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:
#
# 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.
# 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
+ $<TARGET_OBJECTS:analysisdata-test-shared>)
/*
* 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.
#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;
/*
* 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.
#include "gromacs/analysisdata/arraydata.h"
-#include "testutils/datatest.h"
+#include "gromacs/analysisdata/tests/datatest.h"
#include "testutils/testasserts.h"
using gmx::test::AnalysisDataTestInput;
/*
* 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.
#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;
/*
* 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.
* Implements classes in datatest.h.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
#include "datatest.h"
#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
/*
* 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.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
* \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 <vector>
* between.
*
* \inlibraryapi
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
class AnalysisDataTestInputPointSet
{
* Represents a single frame in AnalysisDataTestInput structure.
*
* \inlibraryapi
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
class AnalysisDataTestInputFrame
{
* \see AnalysisDataTestFixture
*
* \inlibraryapi
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
class AnalysisDataTestInput
{
* \see AnalysisDataTestInput
*
* \inlibraryapi
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
class AnalysisDataTestFixture : public ::testing::Test
{
/*
* 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.
#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;
/*
* 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.
#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;
/*
* 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.
* Implements classes in mock_datamodule.h.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
#include "mock_datamodule.h"
#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"
/*! \internal \brief
* Private implementation class for gmx::test::MockAnalysisDataModule.
*
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
class MockAnalysisDataModule::Impl
{
/*! \internal \brief
* Checks a single AnalysisDataValue.
*
- * \ingroup module_testutils
+ * \ingroup module_analysisdata
*/
void checkReferenceDataPoint(TestReferenceChecker *checker,
const AnalysisDataValue &value)
/*
* 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.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
* \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 <boost/shared_ptr.hpp>
#include <gmock/gmock.h>
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.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
#
# 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.
gmx_add_unit_test(CommandLineUnitTests commandline-test
cmdlinehelpwriter.cpp
cmdlinemodulemanager.cpp
- cmdlineparser.cpp)
+ cmdlineparser.cpp
+ $<TARGET_OBJECTS:onlinehelp-test-shared>)
/*
* 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.
#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
#
# 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.
# 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
+ $<TARGET_OBJECTS:onlinehelp-test-shared>)
/*
* 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.
#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"
/*
* 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.
* Implements classes in mock_helptopic.h.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
- * \ingroup module_testutils
+ * \ingroup module_onlinehelp
*/
#include "mock_helptopic.h"
/*
* 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.
*
* \author Teemu Murtola <teemu.murtola@gmail.com>
* \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 <gmock/gmock.h>
#
# 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.
angle.cpp
distance.cpp
freevolume.cpp
- select.cpp)
+ select.cpp
+ $<TARGET_OBJECTS:analysisdata-test-shared>)
add_executable(test_selection test_selection.cpp)
target_link_libraries(test_selection libgromacs ${GMX_EXE_LINKER_FLAGS})
/*
* 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.
#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"
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.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+++ /dev/null
-<?xml version="1.0"?>
-
-<!--
-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.
--->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:import href="common-referencedata.xsl"/>
-
-<xsl:template match="AnalysisData">
- <xsl:variable name="has-datasetspec"
- select="DataFrame/DataValues/Int[@Name='DataSet']"/>
- <xsl:variable name="has-columnspec"
- select="DataFrame/DataValues/Int[@Name='FirstColumn']"/>
- <table border="1">
- <tr>
- <th>Frame</th>
- <th>X</th>
- <xsl:if test="$has-datasetspec">
- <th>Set</th>
- </xsl:if>
- <xsl:if test="$has-columnspec">
- <th>Columns</th>
- </xsl:if>
- <th>Values</th>
- </tr>
- <xsl:for-each select="DataFrame/DataValues">
- <tr>
- <td><xsl:value-of select="../@Name"/></td>
- <td><xsl:value-of select="../Real[@Name='X']"/></td>
- <xsl:if test="$has-datasetspec">
- <td><xsl:value-of select="Int[@Name='DataSet']"/></td>
- </xsl:if>
- <xsl:if test="$has-columnspec">
- <td>
- <xsl:choose>
- <xsl:when test="Int[@Name='FirstColumn']">
- <xsl:value-of select="Int[@Name='FirstColumn']"/>
- <xsl:text>-</xsl:text>
- <xsl:value-of select="Int[@Name='LastColumn']"/>
- </xsl:when>
- <xsl:otherwise>all</xsl:otherwise>
- </xsl:choose>
- </td>
- </xsl:if>
- <td><xsl:call-template name="SequenceAsCSV"/></td>
- </tr>
- </xsl:for-each>
- </table>
-</xsl:template>
-
-<xsl:template match="DataValue[Bool[@Name='Present']='false']">
- (
- <xsl:value-of select="Real[@Name='Value']"/>
- <xsl:if test="Real[@Name='Error']">
- ± <xsl:value-of select="Real[@Name='Error']"/>
- </xsl:if>
- )
-</xsl:template>
-<xsl:template match="DataValue">
- <xsl:value-of select="Real[@Name='Value']"/>
- <xsl:if test="Real[@Name='Error']">
- ± <xsl:value-of select="Real[@Name='Error']"/>
- </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
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
biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff