Improve (Selection|FileName)OptionManager handling

[alexxy/gromacs.git] / src / gromacs / options / tests / filenameoption.cpp

diff --git a/src/gromacs/options/tests/filenameoption.cpp b/src/gromacs/options/tests/filenameoption.cpp
index 949928c182328cc2569493ef81f54fb5284fa822..be0acd969b8fa9084c440b52be7e5f2a59f24cf4 100644 (file)
--- a/src/gromacs/options/tests/filenameoption.cpp
+++ b/src/gromacs/options/tests/filenameoption.cpp
@@ -237,12 +237,12 @@ TEST(FileNameOptionTest, AddsMissingExtensionForRequiredFromDefaultNameOptionBas
     gmx::FileNameOptionManager manager;
     gmx::Options               options(NULL, NULL);
     std::string                value;
+    ASSERT_NO_THROW_GMX(options.addManager(&manager));
     ASSERT_NO_THROW_GMX(options.addOption(
                                 FileNameOption("f").store(&value).required()
                                     .filetype(gmx::eftTrajectory).inputFile()
                                     .defaultBasename("foo")));
     ASSERT_NO_THROW_GMX(manager.addDefaultFileNameOption(&options, "deffnm"));
-    ASSERT_NO_THROW_GMX(setManagerForFileNameOptions(&options, &manager));
     EXPECT_EQ("foo.xtc", value);
 
     gmx::OptionsAssigner assigner(&options);
@@ -266,12 +266,12 @@ TEST(FileNameOptionTest, AddsMissingExtensionForOptionalFromDefaultNameOptionBas
     gmx::FileNameOptionManager manager;
     gmx::Options               options(NULL, NULL);
     std::string                value;
+    ASSERT_NO_THROW_GMX(options.addManager(&manager));
     ASSERT_NO_THROW_GMX(options.addOption(
                                 FileNameOption("f").store(&value)
                                     .filetype(gmx::eftTrajectory).inputFile()
                                     .defaultBasename("foo")));
     ASSERT_NO_THROW_GMX(manager.addDefaultFileNameOption(&options, "deffnm"));
-    ASSERT_NO_THROW_GMX(setManagerForFileNameOptions(&options, &manager));
 
     gmx::OptionsAssigner assigner(&options);
     EXPECT_NO_THROW_GMX(assigner.start());