/*
+ * This file is part of the GROMACS molecular simulation package.
*
- * This source code is part of
+ * Copyright (c) 2010,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.
*
- * G R O M A C S
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
*
- * GROningen MAchine for Chemical Simulations
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
- * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2009, The GROMACS development team,
- * check out http://www.gromacs.org for more information.
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * If you want to redistribute modifications, please consider that
- * scientific software is very special. Version control is crucial -
- * bugs must be traceable. We will be happy to consider code for
- * inclusion in the official distribution, but derived work must not
- * be called official GROMACS. Details are found in the README & COPYING
- * files - if they are missing, get the official version at www.gromacs.org.
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
*
* To help us fund GROMACS development, we humbly ask that you cite
- * the papers on the package - you can find them in the top README file.
- *
- * For more info, check our website at http://www.gromacs.org
+ * the research papers on the package. Check out http://www.gromacs.org.
*/
/*! \internal \file
* \brief
* Tests handling of selection options.
*
- * \author Teemu Murtola <teemu.murtola@cbr.su.se>
+ * \author Teemu Murtola <teemu.murtola@gmail.com>
* \ingroup module_selection
*/
+#include "gmxpre.h"
+
+#include "gromacs/selection/selectionoption.h"
+
#include <gtest/gtest.h>
#include "gromacs/options/options.h"
#include "gromacs/selection/selection.h"
#include "gromacs/selection/selectioncollection.h"
#include "gromacs/selection/selectionfileoption.h"
-#include "gromacs/selection/selectionoption.h"
#include "gromacs/selection/selectionoptionmanager.h"
#include "gromacs/utility/exceptions.h"
+#include "testutils/testasserts.h"
#include "testutils/testfilemanager.h"
+#include "toputils.h"
+
using gmx::test::TestFileManager;
namespace
public:
SelectionOptionTestBase();
- void setManager();
+ void loadTopology(const char *filename);
gmx::SelectionCollection sc_;
gmx::SelectionOptionManager manager_;
gmx::Options options_;
+
+ private:
+ gmx::test::TopologyManager topManager_;
};
SelectionOptionTestBase::SelectionOptionTestBase()
: manager_(&sc_), options_(NULL, NULL)
{
+ options_.addManager(&manager_);
sc_.setReferencePosType("atom");
sc_.setOutputPosType("atom");
}
-void SelectionOptionTestBase::setManager()
+void SelectionOptionTestBase::loadTopology(const char *filename)
{
- setManagerForSelectionOptions(&options_, &manager_);
+ topManager_.loadTopology(filename);
+
+ ASSERT_NO_THROW_GMX(sc_.setTopology(topManager_.topology(), -1));
}
{
gmx::Selection sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(SelectionOption("sel").store(&sel)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(SelectionOption("sel").store(&sel)));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+
+ ASSERT_TRUE(sel.isValid());
}
{
gmx::Selection sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").store(&sel).onlyStatic()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(&sel).onlyStatic()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_THROW(assigner.appendValue("resname RA RB and x < 5"), gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_THROW_GMX(assigner.appendValue("resname RA RB and x < 5"), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+}
+
+
+TEST_F(SelectionOptionTest, HandlesNonAtomicSelectionWhenAtomsRequired)
+{
+ gmx::Selection sel;
+ using gmx::SelectionOption;
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(&sel).onlyAtoms()));
+
+ gmx::OptionsAssigner assigner(&options_);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("res_cog of resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+
+ ASSERT_NO_FATAL_FAILURE(loadTopology("simple.gro"));
+ EXPECT_THROW_GMX(sc_.compile(), gmx::InvalidInputError);
+}
+
+
+TEST_F(SelectionOptionTest, ChecksEmptySelections)
+{
+ gmx::Selection sel;
+ using gmx::SelectionOption;
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(&sel)));
+
+ gmx::OptionsAssigner assigner(&options_);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("none"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+
+ EXPECT_THROW_GMX(sc_.compile(), gmx::InvalidInputError);
+}
+
+
+TEST_F(SelectionOptionTest, ChecksEmptyDelayedSelections)
+{
+ gmx::Selection sel;
+ using gmx::SelectionOption;
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(&sel)));
+
+ gmx::OptionsAssigner assigner(&options_);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ ASSERT_NO_THROW_GMX(manager_.parseRequestedFromString("none"));
+
+ EXPECT_THROW_GMX(sc_.compile(), gmx::InvalidInputError);
}
{
gmx::Selection sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(SelectionOption("sel").store(&sel)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(SelectionOption("sel").store(&sel)));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_THROW(assigner.appendValue("resname RB RC"), gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_THROW_GMX(assigner.appendValue("resname RB RC"), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
}
{
gmx::Selection sel[2];
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").store(sel).valueCount(2)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(sel).valueCount(2)));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_THROW(assigner.finishOption(), gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_THROW_GMX(assigner.finishOption(), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+}
+
+
+TEST_F(SelectionOptionTest, HandlesDefaultSelectionText)
+{
+ gmx::Selection sel;
+ using gmx::SelectionOption;
+ options_.addOption(SelectionOption("sel").store(&sel)
+ .defaultSelectionText("all"));
+
+ EXPECT_NO_THROW_GMX(options_.finish());
+
+ ASSERT_TRUE(sel.isValid());
+
+ EXPECT_NO_THROW_GMX(sc_.setTopology(NULL, 10));
+ EXPECT_NO_THROW_GMX(sc_.compile());
+
+ EXPECT_STREQ("all", sel.selectionText());
}
TEST_F(SelectionOptionTest, HandlesAdjuster)
{
- gmx::SelectionList sel;
+ gmx::SelectionList sel;
using gmx::SelectionOption;
gmx::SelectionOptionInfo *info = options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue());
- setManager();
+ SelectionOption("sel").storeVector(&sel).multiValue());
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_NO_THROW(assigner.appendValue("resname RB RC"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_NO_THROW(info->setValueCount(2));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RB RC"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_NO_THROW_GMX(info->setValueCount(2));
}
TEST_F(SelectionOptionTest, HandlesDynamicWhenStaticRequiredWithAdjuster)
{
- gmx::Selection sel;
+ gmx::Selection sel;
using gmx::SelectionOption;
gmx::SelectionOptionInfo *info = options_.addOption(
- SelectionOption("sel").store(&sel));
- setManager();
+ SelectionOption("sel").store(&sel));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("x < 5"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_THROW(info->setOnlyStatic(true), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("x < 5"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_THROW_GMX(info->setOnlyStatic(true), gmx::InvalidInputError);
}
TEST_F(SelectionOptionTest, HandlesTooManySelectionsWithAdjuster)
{
- gmx::SelectionList sel;
+ gmx::SelectionList sel;
using gmx::SelectionOption;
gmx::SelectionOptionInfo *info = options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue());
- setManager();
+ SelectionOption("sel").storeVector(&sel).multiValue());
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_NO_THROW(assigner.appendValue("resname RB RC"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_THROW(info->setValueCount(1), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RB RC"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_THROW_GMX(info->setValueCount(1), gmx::InvalidInputError);
}
TEST_F(SelectionOptionTest, HandlesTooFewSelectionsWithAdjuster)
{
- gmx::SelectionList sel;
+ gmx::SelectionList sel;
using gmx::SelectionOption;
gmx::SelectionOptionInfo *info = options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue());
- setManager();
+ SelectionOption("sel").storeVector(&sel).multiValue());
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.appendValue("resname RA RB"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_THROW(info->setValueCount(2), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_THROW_GMX(info->setValueCount(2), gmx::InvalidInputError);
}
{
gmx::Selection sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").store(&sel).required()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(&sel).required()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- ASSERT_NO_THROW(manager_.parseRequestedFromString("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ ASSERT_NO_THROW_GMX(manager_.parseRequestedFromString("resname RA RB"));
ASSERT_STREQ("resname RA RB", sel.selectionText());
}
{
gmx::Selection sel[2];
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").store(sel).required()
- .valueCount(2)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").store(sel).required()
+ .valueCount(2)));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_THROW(manager_.parseRequestedFromString("resname RA RB"), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.start());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_THROW_GMX(manager_.parseRequestedFromString("resname RA RB"), gmx::InvalidInputError);
}
{
gmx::Selection sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(SelectionOption("sel").store(&sel)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(SelectionOption("sel").store(&sel)));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- ASSERT_NO_THROW(manager_.parseRequestedFromString("resname RA RB"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ ASSERT_NO_THROW_GMX(manager_.parseRequestedFromString("resname RA RB"));
ASSERT_STREQ("resname RA RB", sel.selectionText());
}
TEST_F(SelectionOptionTest, HandlesDelayedSelectionWithAdjuster)
{
- gmx::SelectionList sel;
+ gmx::SelectionList sel;
using gmx::SelectionOption;
gmx::SelectionOptionInfo *info = options_.addOption(
- SelectionOption("sel").storeVector(&sel).valueCount(3));
- setManager();
+ SelectionOption("sel").storeVector(&sel).valueCount(3));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_NO_THROW(info->setValueCount(2));
- EXPECT_NO_THROW(manager_.parseRequestedFromString("resname RA RB; resname RB RC"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_NO_THROW_GMX(info->setValueCount(2));
+ EXPECT_NO_THROW_GMX(manager_.parseRequestedFromString("resname RA RB; resname RB RC"));
}
gmx::SelectionList sel;
gmx::SelectionList reqsel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue()));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("reqsel").storeVector(&reqsel)
- .multiValue().required()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").storeVector(&sel).multiValue()));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("reqsel").storeVector(&reqsel)
+ .multiValue().required()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
// These should match the contents of selfile.dat
ASSERT_EQ(2U, sel.size());
gmx::SelectionList sel1;
gmx::SelectionList sel2;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel1").storeVector(&sel1).multiValue()));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel2").storeVector(&sel2).multiValue()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel1").storeVector(&sel1).multiValue()));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel2").storeVector(&sel2).multiValue()));
gmx::OptionsAssigner assigner(&options_);
- std::string value(TestFileManager::getInputFilePath("selfile.dat"));
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel1"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(value));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sel2"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(value));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ std::string value(TestFileManager::getInputFilePath("selfile.dat"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel1"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(value));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel2"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(value));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
// These should match the contents of selfile.dat
ASSERT_EQ(2U, sel1.size());
gmx::SelectionList sel1;
gmx::SelectionList sel2;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel1").storeVector(&sel1)));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel2").storeVector(&sel2)));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel1").storeVector(&sel1)));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel2").storeVector(&sel2)));
gmx::OptionsAssigner assigner(&options_);
- std::string value(TestFileManager::getInputFilePath("selfile.dat"));
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel1"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sel2"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(value));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ std::string value(TestFileManager::getInputFilePath("selfile.dat"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel1"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel2"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(value));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
// These should match the contents of selfile.dat
ASSERT_EQ(1U, sel1.size());
gmx::SelectionList sel;
gmx::SelectionList optsel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").storeVector(&sel)
- .multiValue().required()));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("optsel").storeVector(&optsel)
- .multiValue()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").storeVector(&sel)
+ .multiValue().required()));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("optsel").storeVector(&optsel)
+ .multiValue()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.startOption("optsel"));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
- EXPECT_NO_THROW(manager_.parseRequestedFromString("resname RC RD"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.startOption("optsel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
+ EXPECT_NO_THROW_GMX(manager_.parseRequestedFromString("resname RC RD"));
// These should match the contents of selfile.dat
ASSERT_EQ(2U, sel.size());
gmx::SelectionList sel1;
gmx::SelectionList sel2;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel1").storeVector(&sel1)
- .multiValue().required()));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel2").storeVector(&sel2)
- .multiValue().required()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel1").storeVector(&sel1)
+ .multiValue().required()));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel2").storeVector(&sel2)
+ .multiValue().required()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- EXPECT_NO_THROW(assigner.startOption("sel1"));
- EXPECT_NO_THROW(assigner.appendValue("resname RC RD"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ EXPECT_NO_THROW_GMX(assigner.startOption("sel1"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue("resname RC RD"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
// These should match the contents of selfile.dat
ASSERT_EQ(2U, sel2.size());
gmx::SelectionList sel1;
gmx::SelectionList sel2;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel1").storeVector(&sel1).required()));
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel2").storeVector(&sel2).required()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel1").storeVector(&sel1).required()));
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel2").storeVector(&sel2).required()));
gmx::OptionsAssigner assigner(&options_);
- std::string value(TestFileManager::getInputFilePath("selfile.dat"));
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(value));
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ std::string value(TestFileManager::getInputFilePath("selfile.dat"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(value));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
// These should match the contents of selfile.dat
ASSERT_EQ(1U, sel1.size());
{
gmx::SelectionList sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").storeVector(&sel).multiValue()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_THROW(assigner.finishOption(), gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_THROW_GMX(assigner.finishOption(), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
}
{
gmx::SelectionList sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").storeVector(&sel).multiValue()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
// TODO: Should this be changed to an InvalidInputError?
- EXPECT_THROW(assigner.appendValue("nonexistentfile"), gmx::FileIOError);
- EXPECT_THROW(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")),
- gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_THROW_GMX(assigner.appendValue("nonexistentfile"), gmx::FileIOError);
+ EXPECT_THROW_GMX(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")),
+ gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
}
{
gmx::SelectionList sel;
using gmx::SelectionOption;
- ASSERT_NO_THROW(options_.addOption(
- SelectionOption("sel").storeVector(&sel).multiValue()));
- setManager();
+ ASSERT_NO_THROW_GMX(options_.addOption(
+ SelectionOption("sel").storeVector(&sel).multiValue()));
gmx::OptionsAssigner assigner(&options_);
- EXPECT_NO_THROW(assigner.start());
- ASSERT_NO_THROW(assigner.startOption("sel"));
- EXPECT_NO_THROW(assigner.finishOption());
- ASSERT_NO_THROW(assigner.startOption("sf"));
- EXPECT_NO_THROW(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
- EXPECT_THROW(assigner.appendValue("nonexistentfile"), gmx::InvalidInputError);
- EXPECT_NO_THROW(assigner.finishOption());
- EXPECT_NO_THROW(assigner.finish());
- EXPECT_NO_THROW(options_.finish());
+ EXPECT_NO_THROW_GMX(assigner.start());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sel"));
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ ASSERT_NO_THROW_GMX(assigner.startOption("sf"));
+ EXPECT_NO_THROW_GMX(assigner.appendValue(TestFileManager::getInputFilePath("selfile.dat")));
+ EXPECT_THROW_GMX(assigner.appendValue("nonexistentfile"), gmx::InvalidInputError);
+ EXPECT_NO_THROW_GMX(assigner.finishOption());
+ EXPECT_NO_THROW_GMX(assigner.finish());
+ EXPECT_NO_THROW_GMX(options_.finish());
}
} // namespace
biod.pnpi.spb.ru / alexxy / gromacs.git / blobdiff