biod.pnpi.spb.ru / alexxy / gromacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Sort all includes in src/gromacs
[alexxy/gromacs.git] / src / gromacs / selection / tests / selectionoption.cpp
diff --git a/src/gromacs/selection/tests/selectionoption.cpp b/src/gromacs/selection/tests/selectionoption.cpp
index 6a2e782442f3e3a565c1a7f867038d5032de57f4..8f3397cf430bc0a8c24c4747eda61281009b75fc 100644 (file)
--- a/src/gromacs/selection/tests/selectionoption.cpp
+++ b/src/gromacs/selection/tests/selectionoption.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * 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.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -39,6 +39,10 @@
  * \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"
@@ -46,12 +50,14 @@
 #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
@@ -66,23 +72,29 @@ class SelectionOptionTestBase : public ::testing::Test
     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));
 }
 
 
@@ -97,16 +109,17 @@ TEST_F(SelectionOptionTest, ParsesSimpleSelection)
 {
     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());
 }
 
 
@@ -114,17 +127,74 @@ TEST_F(SelectionOptionTest, HandlesDynamicSelectionWhenStaticRequired)
 {
     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);
 }
 
 
@@ -132,17 +202,16 @@ TEST_F(SelectionOptionTest, HandlesTooManySelections)
 {
     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());
 }
 
 
@@ -150,17 +219,34 @@ TEST_F(SelectionOptionTest, HandlesTooFewSelections)
 {
     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());
 }
 
 
@@ -170,17 +256,16 @@ TEST_F(SelectionOptionTest, HandlesAdjuster)
     using gmx::SelectionOption;
     gmx::SelectionOptionInfo *info = options_.addOption(
                 SelectionOption("sel").storeVector(&sel).multiValue());
-    setManager();
 
     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));
 }
 
 
@@ -190,16 +275,15 @@ TEST_F(SelectionOptionTest, HandlesDynamicWhenStaticRequiredWithAdjuster)
     using gmx::SelectionOption;
     gmx::SelectionOptionInfo *info = options_.addOption(
                 SelectionOption("sel").store(&sel));
-    setManager();
 
     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);
 }
 
 
@@ -209,17 +293,16 @@ TEST_F(SelectionOptionTest, HandlesTooManySelectionsWithAdjuster)
     using gmx::SelectionOption;
     gmx::SelectionOptionInfo *info = options_.addOption(
                 SelectionOption("sel").storeVector(&sel).multiValue());
-    setManager();
 
     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);
 }
 
 
@@ -229,16 +312,15 @@ TEST_F(SelectionOptionTest, HandlesTooFewSelectionsWithAdjuster)
     using gmx::SelectionOption;
     gmx::SelectionOptionInfo *info = options_.addOption(
                 SelectionOption("sel").storeVector(&sel).multiValue());
-    setManager();
 
     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);
 }
 
 
@@ -246,15 +328,14 @@ TEST_F(SelectionOptionTest, HandlesDelayedRequiredSelection)
 {
     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());
 }
 
@@ -263,16 +344,15 @@ TEST_F(SelectionOptionTest, HandlesTooFewDelayedRequiredSelections)
 {
     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);
 }
 
 
@@ -280,16 +360,15 @@ TEST_F(SelectionOptionTest, HandlesDelayedOptionalSelection)
 {
     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());
 }
 
@@ -300,16 +379,15 @@ TEST_F(SelectionOptionTest, HandlesDelayedSelectionWithAdjuster)
     using gmx::SelectionOption;
     gmx::SelectionOptionInfo *info = options_.addOption(
                 SelectionOption("sel").storeVector(&sel).valueCount(3));
-    setManager();
 
     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"));
 }
 
 
@@ -334,22 +412,21 @@ TEST_F(SelectionFileOptionTest, HandlesSingleSelectionOptionFromFile)
     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());
@@ -364,27 +441,26 @@ TEST_F(SelectionFileOptionTest, HandlesTwoSeparateSelectionOptions)
     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());
+    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());
@@ -401,24 +477,23 @@ TEST_F(SelectionFileOptionTest, HandlesTwoSelectionOptionsFromSingleFile)
     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());
+    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());
@@ -433,24 +508,23 @@ TEST_F(SelectionFileOptionTest, HandlesRequiredOptionFromFile)
     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());
@@ -467,24 +541,23 @@ TEST_F(SelectionFileOptionTest, HandlesRequiredOptionFromFileWithOtherOptionSet)
     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());
@@ -500,20 +573,19 @@ TEST_F(SelectionFileOptionTest, HandlesTwoRequiredOptionsFromSingleFile)
     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());
+    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());
@@ -527,18 +599,17 @@ TEST_F(SelectionFileOptionTest, GivesErrorWithNoFile)
 {
     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());
 }
 
 
@@ -546,22 +617,21 @@ TEST_F(SelectionFileOptionTest, GivesErrorWithNonExistentFile)
 {
     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());
 }
 
 
@@ -569,20 +639,19 @@ TEST_F(SelectionFileOptionTest, GivesErrorWithMultipleFiles)
 {
     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
Local GROMACS mirror with custom stuff