Sort all includes in src/gromacs

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

diff --git a/src/gromacs/options/tests/option.cpp b/src/gromacs/options/tests/option.cpp
index b3e2cfab2cce96a17a3e6d4f308b64506d7e1f59..70b513bdb79a3609c3ee92280d8d7a5d699184f9 100644 (file)
--- a/src/gromacs/options/tests/option.cpp
+++ b/src/gromacs/options/tests/option.cpp
@@ -1,32 +1,36 @@
 /*
+ * This file is part of the GROMACS molecular simulation package.
  *
- *                This source code is part of
+ * 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.
  *
- *                 G   R   O   M   A   C   S
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
  *
- *          GROningen MAchine for Chemical Simulations
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
- * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2009, The GROMACS development team,
- * check out http://www.gromacs.org for more information.
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  *
- * If you want to redistribute modifications, please consider that
- * scientific software is very special. Version control is crucial -
- * bugs must be traceable. We will be happy to consider code for
- * inclusion in the official distribution, but derived work must not
- * be called official GROMACS. Details are found in the README & COPYING
- * files - if they are missing, get the official version at www.gromacs.org.
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
  *
  * To help us fund GROMACS development, we humbly ask that you cite
- * the papers on the package - you can find them in the top README file.
- *
- * For more info, check our website at http://www.gromacs.org
+ * the research papers on the package. Check out http://www.gromacs.org.
  */
 /*! \internal \file
  * \brief
@@ -35,17 +39,21 @@
  * Most of the tests for the basic options are in optionsassigner.cpp.
  * This file only tests behavior that should fail in initialization.
  *
- * \author Teemu Murtola <teemu.murtola@cbr.su.se>
+ * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
-#include <vector>
+#include "gmxpre.h"
+
 #include <string>
+#include <vector>
 
 #include <gtest/gtest.h>
 
-#include "gromacs/fatalerror/exceptions.h"
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/options.h"
+#include "gromacs/utility/exceptions.h"
+
+#include "testutils/testasserts.h"
 
 namespace
 {
@@ -53,23 +61,23 @@ namespace
 TEST(OptionsTest, FailsOnNonsafeStorage)
 {
     gmx::Options options(NULL, NULL);
-    int value = -1;
+    int          value = -1;
     using gmx::IntegerOption;
-    ASSERT_THROW(options.addOption(IntegerOption("name").store(&value)
-                                       .multiValue()),
-                 gmx::APIError);
+    ASSERT_THROW_GMX(options.addOption(IntegerOption("name").store(&value)
+                                           .multiValue()),
+                     gmx::APIError);
 }
 
 TEST(OptionsTest, FailsOnIncorrectEnumDefaultValue)
 {
-    gmx::Options options(NULL, NULL);
+    gmx::Options                options(NULL, NULL);
     std::string                 value;
-    const char * const          allowed[] = { "none", "test", "value", NULL };
+    const char * const          allowed[] = { "none", "test", "value" };
     using gmx::StringOption;
-    ASSERT_THROW(options.addOption(StringOption("name").store(&value)
-                                       .enumValue(allowed)
-                                       .defaultValue("unknown")),
-                 gmx::APIError);
+    ASSERT_THROW_GMX(options.addOption(StringOption("name").store(&value)
+                                           .enumValue(allowed)
+                                           .defaultValue("unknown")),
+                     gmx::APIError);
 }
 
 } // namespace