More flexible API for xvg testing
authorTeemu Murtola <teemu.murtola@gmail.com>
Sat, 8 Aug 2015 03:31:33 +0000 (06:31 +0300)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 2 Oct 2015 15:28:43 +0000 (17:28 +0200)
commite07405642b46a88c00d65c6c28047dbe61437df0
treea1225564c30370b3308083dc20a743860fdad642
parent59f15762b4899f399ed64b21b7141f25edf82363
More flexible API for xvg testing

Make checking xvg files with CommandLineTestHelper::setOutputFile()
explicit.  Also unify setOutputFileNoTest() to just have a single
method.  Add a parameter to the method for the caller to provide a
matcher to use for the file contents, and implement three matchers for
exact, xvg, and no matching.

Unify the reference data XML structure for all types of output files,
and make the xslt files aware of this structure.

Rename checkStringBlock() to checkTextBlock() for consistency.

Change-Id: I17d1ca2f5b4f7bad4b41c418c3ecd0d04f962abc
48 files changed:
src/gromacs/analysisdata/tests/refdata/common-referencedata.xsl
src/gromacs/gmxpreprocess/tests/insert-molecules.cpp
src/gromacs/gmxpreprocess/tests/refdata/InsertMoleculesTest_InsertsMoleculesIntoEmptyBox.xml
src/gromacs/gmxpreprocess/tests/refdata/InsertMoleculesTest_InsertsMoleculesIntoEnlargedBox.xml
src/gromacs/gmxpreprocess/tests/refdata/InsertMoleculesTest_InsertsMoleculesIntoExistingConfiguration.xml
src/gromacs/gmxpreprocess/tests/refdata/InsertMoleculesTest_InsertsMoleculesIntoFixedPositions.xml
src/gromacs/gmxpreprocess/tests/solvate.cpp
src/gromacs/selection/tests/refdata/common-referencedata.xsl
src/gromacs/trajectoryanalysis/tests/pairdist.cpp
src/gromacs/trajectoryanalysis/tests/rdf.cpp
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesAllDistances.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesAllDistancesWithCutoff.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesGroupedMaxDistanceWithCutoff.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesGroupedMinDistanceWithCutoff.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesMaxDistance.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesMaxDistanceWithCutoff.xml
src/gromacs/trajectoryanalysis/tests/refdata/PairDistanceModuleTest_ComputesMinDistanceWithCutoff.xml
src/gromacs/trajectoryanalysis/tests/refdata/RdfModuleTest_BasicTest.xml
src/gromacs/trajectoryanalysis/tests/refdata/RdfModuleTest_CalculatesSurf.xml
src/gromacs/trajectoryanalysis/tests/refdata/RdfModuleTest_CalculatesXY.xml
src/gromacs/trajectoryanalysis/tests/refdata/SasaModuleTest_BasicTest.xml
src/gromacs/trajectoryanalysis/tests/refdata/SasaModuleTest_HandlesDynamicCalculationGroup.xml
src/gromacs/trajectoryanalysis/tests/refdata/SasaModuleTest_HandlesDynamicOutputGroup.xml
src/gromacs/trajectoryanalysis/tests/refdata/SasaModuleTest_WritesConnollySurfaceWithSolute.xml
src/gromacs/trajectoryanalysis/tests/refdata/SelectModuleTest_BasicTest.xml
src/gromacs/trajectoryanalysis/tests/refdata/SelectModuleTest_HandlesMaxPDBOutput.xml
src/gromacs/trajectoryanalysis/tests/refdata/SelectModuleTest_HandlesPDBOutputWithNonPDBInput.xml
src/gromacs/trajectoryanalysis/tests/refdata/SelectModuleTest_HandlesPDBOutputWithPDBInput.xml
src/gromacs/trajectoryanalysis/tests/refdata/SelectModuleTest_HandlesSelectedPDBOutput.xml
src/gromacs/trajectoryanalysis/tests/refdata/common-referencedata.xsl
src/gromacs/trajectoryanalysis/tests/refdata/referencedata.xsl
src/gromacs/trajectoryanalysis/tests/sasa.cpp
src/gromacs/trajectoryanalysis/tests/select.cpp
src/gromacs/utility/textreader.cpp
src/gromacs/utility/textreader.h
src/testutils/CMakeLists.txt
src/testutils/cmdlinetest.cpp
src/testutils/cmdlinetest.h
src/testutils/common-referencedata.xsl
src/testutils/refdata.cpp
src/testutils/refdata.h
src/testutils/stringtest.cpp
src/testutils/tests/refdata_tests.cpp
src/testutils/tests/xvgtest_tests.cpp
src/testutils/textblockmatchers.cpp [new file with mode: 0644]
src/testutils/textblockmatchers.h [new file with mode: 0644]
src/testutils/xvgtest.cpp
src/testutils/xvgtest.h