/*
* This file is part of the GROMACS molecular simulation package.
*
- * Copyright (c) 2010,2011,2012,2013, 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
* \author Teemu Murtola <teemu.murtola@gmail.com>
* \ingroup module_commandline
*/
+#include "gmxpre.h"
+
+#include "gromacs/commandline/cmdlineparser.h"
+
#include <vector>
#include <gtest/gtest.h>
-#include "gromacs/commandline/cmdlineparser.h"
#include "gromacs/options/basicoptions.h"
#include "gromacs/options/options.h"
bool flag_;
std::vector<int> ivalues_;
std::vector<double> dvalues_;
+ int ivalue1p_;
+ int ivalue12_;
};
CommandLineParserTest::CommandLineParserTest()
: options_(NULL, NULL), parser_(&options_),
- flag_(false)
+ flag_(false), ivalue1p_(0), ivalue12_(0)
{
using gmx::BooleanOption;
using gmx::IntegerOption;
options_.addOption(BooleanOption("flag").store(&flag_));
options_.addOption(IntegerOption("mvi").storeVector(&ivalues_).multiValue());
options_.addOption(DoubleOption("mvd").storeVector(&dvalues_).allowMultiple());
+ options_.addOption(IntegerOption("1p").store(&ivalue1p_));
+ options_.addOption(IntegerOption("12").store(&ivalue12_));
}
TEST_F(CommandLineParserTest, HandlesSingleValues)
const char *const cmdline[] = {
"test", "-flag", "yes", "-mvi", "2", "-mvd", "2.7"
};
- CommandLine args(CommandLine::create(cmdline));
+ CommandLine args(cmdline);
ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
ASSERT_NO_THROW_GMX(options_.finish());
const char *const cmdline[] = {
"test", "-mvi", "1", "-2", "-mvd", "-2.7"
};
- CommandLine args(CommandLine::create(cmdline));
+ CommandLine args(cmdline);
+ ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
+ ASSERT_NO_THROW_GMX(options_.finish());
+
+ ASSERT_EQ(2U, ivalues_.size());
+ EXPECT_EQ(1, ivalues_[0]);
+ EXPECT_EQ(-2, ivalues_[1]);
+ ASSERT_EQ(1U, dvalues_.size());
+ EXPECT_DOUBLE_EQ(-2.7, dvalues_[0]);
+}
+
+TEST_F(CommandLineParserTest, HandlesDoubleDashOptionPrefix)
+{
+ const char *const cmdline[] = {
+ "test", "--mvi", "1", "-2", "--mvd", "-2.7"
+ };
+ CommandLine args(cmdline);
ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
ASSERT_NO_THROW_GMX(options_.finish());
EXPECT_DOUBLE_EQ(-2.7, dvalues_[0]);
}
+TEST_F(CommandLineParserTest, HandlesOptionsStartingWithNumbers)
+{
+ const char *const cmdline[] = {
+ "test", "--12", "1", "-1p", "-12"
+ };
+ CommandLine args(cmdline);
+ ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
+ ASSERT_NO_THROW_GMX(options_.finish());
+
+ EXPECT_EQ(1, ivalue12_);
+ EXPECT_EQ(-12, ivalue1p_);
+}
+
+TEST_F(CommandLineParserTest, HandlesSkipUnknown)
+{
+ const char *const cmdline[] = {
+ "test", "-opt1", "-flag", "-opt2", "value", "-mvi", "2", "-mvd", "2.7", "-opt3"
+ };
+ CommandLine args(cmdline);
+ parser_.skipUnknown(true);
+ ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
+ ASSERT_NO_THROW_GMX(options_.finish());
+
+ ASSERT_EQ(5, args.argc());
+ EXPECT_STREQ("test", args.arg(0));
+ EXPECT_STREQ("-opt1", args.arg(1));
+ EXPECT_STREQ("-opt2", args.arg(2));
+ EXPECT_STREQ("value", args.arg(3));
+ EXPECT_STREQ("-opt3", args.arg(4));
+ EXPECT_TRUE(args.arg(5) == NULL);
+
+ EXPECT_TRUE(flag_);
+ ASSERT_EQ(1U, ivalues_.size());
+ EXPECT_EQ(2, ivalues_[0]);
+ ASSERT_EQ(1U, dvalues_.size());
+ EXPECT_DOUBLE_EQ(2.7, dvalues_[0]);
+}
+
} // namespace