Remove the boost 1.33 code in the unit tests.

changelog

@@ -31,6 +31,7 @@ Version 1.7.3+svn:
      to story text instead
    * Fixed 100% CPU usage on storyscreens with no text (e.g. map screens)
    * Fix ODR issues in gui2
+   * Remove the boost 1.33 code in the unit tests
  * Animations
    * Movement have the number of steps done in value and the number of step left in value_second, this allows take-off and landing animations
 

src/tests/gui/test_drop_target.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "tests/utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <boost/bind.hpp>
 

src/tests/gui/test_gui2.cpp

@@ -15,7 +15,7 @@
 // In this domain since it compares a shared string from this domain.
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "tests/utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include "config_cache.hpp"
 #include "filesystem.hpp"

src/tests/gui/test_save_dialog.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "tests/utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <boost/test/unit_test_suite.hpp>
 

src/tests/main.cpp

@@ -14,23 +14,13 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include <boost/version.hpp>
 
 #define BOOST_TEST_MODULE wesnoth unit tests master suite
-#if BOOST_VERSION < 103400
-#include <boost/test/auto_unit_test.hpp>
-#else
 #include <boost/test/unit_test.hpp>
-#endif
 #include <boost/test/unit_test_monitor.hpp>
 #include <boost/test/detail/unit_test_parameters.hpp>
 #include <boost/test/results_reporter.hpp>
 
-#if BOOST_VERSION < 103400
-#include <boost/test/unit_test_log.hpp>
-#include <boost/scoped_ptr.hpp>
-#endif
-
 #include "SDL.h"
 
 #include "filesystem.hpp"
@@ -91,29 +81,6 @@ struct wesnoth_global_fixture {
 	}
 };
 
-#if BOOST_VERSION < 103400
-#include <boost/test/auto_unit_test.hpp>
-
-#define BOOST_GLOBAL_FIXTURE(name)\
-boost::scoped_ptr<name> global_fix;\
-boost::unit_test::test_suite*\
-init_unit_test_suite( int argc, char* argv[] ) { \
-    boost::unit_test::auto_unit_test_suite_t* master_test_suite = boost::unit_test::auto_unit_test_suite();\
-\
-    boost::unit_test::const_string new_name = boost::unit_test::const_string( BOOST_STRINGIZE(BOOST_TEST_MODULE) );\
-\
-    if( !new_name.is_empty() )\
-        boost::unit_test::assign_op( master_test_suite->p_name.value, new_name, 0 );\
-\
-    master_test_suite->argc = argc;\
-    master_test_suite->argv = argv;\
-\
-	global_fix.reset(new name());\
-    return master_test_suite;\
-}
-
-#endif
-
 BOOST_GLOBAL_FIXTURE(wesnoth_global_fixture)
 
 /*

src/tests/test_config_cache.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 

src/tests/test_formula_ai.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 
 

src/tests/test_lexical_cast.cpp

@@ -16,7 +16,7 @@
 
 #include "lexical_cast.hpp"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/copy.hpp>

src/tests/test_network_worker.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 
 #include "utils/auto_parameterized.hpp"

src/tests/test_policy.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include "copy_policy.hpp"
 

src/tests/test_team.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 
 BOOST_AUTO_TEST_SUITE( teams )

src/tests/test_util.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include "util.hpp"
 

src/tests/test_version.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-test"
 
-#include "utils/test_support.hpp"
+#include <boost/test/unit_test.hpp>
 #include "version.hpp"
 
 BOOST_AUTO_TEST_SUITE( version )

src/tests/utils/test_support.hpp

@@ -1,30 +0,0 @@
-/* $Id$ */
-/*
-   Copyright (C) 2008 - 2009 by Pauli Nieminen <paniemin@cc.hut.fi>
-   Part of thie Battle for Wesnoth Project http://www.wesnoth.org/
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2
-   or at your option any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY.
-
-   See the COPYING file for more details.
-*/
-
-#ifndef TESTS_UTILS_TEST_SUPPORT_HPP_INCLUDED
-#define TESTS_UTILS_TEST_SUPPORT_HPP_INCLUDED
-
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < 103400
-// 1.33 doesn't provide namespace for test suite so fix that
-#include <boost/test/auto_unit_test.hpp>
-#include "tests/utils/boost_unit_test_suite_1_34_0.hpp"
-#else // BOOST_VERSION >= 103400
-#include <boost/test/unit_test.hpp>
-
-
-#endif
-
-#endif