biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Options::setDescription() elsewhere
[alexxy/gromacs.git]
/
src
/
gromacs
/
commandline
/
tests
/
cmdlinehelpmodule.cpp
diff --git
a/src/gromacs/commandline/tests/cmdlinehelpmodule.cpp
b/src/gromacs/commandline/tests/cmdlinehelpmodule.cpp
index 5fada52c35de53dd3fec1d0fd73e1095e89bb9fe..ba62e55e0393cc399472320a3b5e68b214008497 100644
(file)
--- a/
src/gromacs/commandline/tests/cmdlinehelpmodule.cpp
+++ b/
src/gromacs/commandline/tests/cmdlinehelpmodule.cpp
@@
-107,13
+107,14
@@
TEST_F(CommandLineHelpModuleTest, PrintsHelpOnTopic)
*
* \ingroup module_commandline
*/
*
* \ingroup module_commandline
*/
-void initOptionsBasic(gmx::Options *options)
+void initOptionsBasic(gmx::Options *options,
+ gmx::ICommandLineOptionsModuleSettings *settings)
{
const char *const desc[] = {
"Sample description",
"for testing [THISMODULE]."
};
{
const char *const desc[] = {
"Sample description",
"for testing [THISMODULE]."
};
-
options->setDescription
(desc);
+
settings->setHelpText
(desc);
options->addOption(gmx::IntegerOption("int"));
}
options->addOption(gmx::IntegerOption("int"));
}
@@
-143,8
+144,8
@@
TEST_F(CommandLineHelpModuleTest, ExportsHelp)
MockHelpTopic &topic2 = addHelpTopic("topic2", "Another topic");
using ::testing::_;
using ::testing::Invoke;
MockHelpTopic &topic2 = addHelpTopic("topic2", "Another topic");
using ::testing::_;
using ::testing::Invoke;
- EXPECT_CALL(mod1, initOptions(_)).WillOnce(Invoke(&initOptionsBasic));
- EXPECT_CALL(mod2, initOptions(_));
+ EXPECT_CALL(mod1, initOptions(_
, _
)).WillOnce(Invoke(&initOptionsBasic));
+ EXPECT_CALL(mod2, initOptions(_
, _
));
EXPECT_CALL(topic1, writeHelp(_));
EXPECT_CALL(sub1, writeHelp(_));
EXPECT_CALL(sub2, writeHelp(_));
EXPECT_CALL(topic1, writeHelp(_));
EXPECT_CALL(sub1, writeHelp(_));
EXPECT_CALL(sub2, writeHelp(_));