Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / commandline / tests / cmdlineparser.cpp

diff --git a/src/gromacs/commandline/tests/cmdlineparser.cpp b/src/gromacs/commandline/tests/cmdlineparser.cpp
index 87cf7bd8777ffdb19b77b8a171f23a429013758a..719e69d34f71917e67a1c1a2198387b44eee4e99 100644 (file)
--- a/src/gromacs/commandline/tests/cmdlineparser.cpp
+++ b/src/gromacs/commandline/tests/cmdlineparser.cpp
@@ -1,10 +1,10 @@
 /*
  * 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
@@ -42,11 +42,14 @@
  * \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"
 
@@ -91,7 +94,7 @@ 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());
 
@@ -107,7 +110,7 @@ TEST_F(CommandLineParserTest, HandlesNegativeNumbers)
     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());
 
@@ -123,7 +126,7 @@ TEST_F(CommandLineParserTest, HandlesDoubleDashOptionPrefix)
     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());
 
@@ -139,7 +142,7 @@ TEST_F(CommandLineParserTest, HandlesOptionsStartingWithNumbers)
     const char *const cmdline[] = {
         "test", "--12", "1", "-1p", "-12"
     };
-    CommandLine       args(CommandLine::create(cmdline));
+    CommandLine       args(cmdline);
     ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
     ASSERT_NO_THROW_GMX(options_.finish());
 
@@ -152,7 +155,7 @@ TEST_F(CommandLineParserTest, HandlesSkipUnknown)
     const char *const cmdline[] = {
         "test", "-opt1", "-flag", "-opt2", "value", "-mvi", "2", "-mvd", "2.7", "-opt3"
     };
-    CommandLine       args(CommandLine::create(cmdline));
+    CommandLine       args(cmdline);
     parser_.skipUnknown(true);
     ASSERT_NO_THROW_GMX(parser_.parse(&args.argc(), args.argv()));
     ASSERT_NO_THROW_GMX(options_.finish());
@@ -163,6 +166,7 @@ TEST_F(CommandLineParserTest, HandlesSkipUnknown)
     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());