From bec0c8aafa5b65a82b522e5f60fafbc8f6279adc Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Fri, 20 May 2011 10:49:16 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@342 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/tests/turtle_test/constraints_test.cpp | 3 ---
 src/tests/turtle_test/error_test.cpp       | 3 ---
 src/tests/turtle_test/function_test.cpp    | 8 +++-----
 src/tests/turtle_test/integration_test.cpp | 8 +-------
 src/tests/turtle_test/invocation_test.cpp  | 3 ---
 src/tests/turtle_test/is_functor_test.cpp  | 9 +++------
 src/tests/turtle_test/log_test.cpp         | 5 +----
 src/tests/turtle_test/max_args_test.cpp    | 8 +-------
 src/tests/turtle_test/mock_error.hpp       | 2 +-
 src/tests/turtle_test/mock_test.cpp        | 8 +++-----
 src/tests/turtle_test/object_test.cpp      | 7 +------
 src/tests/turtle_test/sequence_test.cpp    | 8 ++------
 src/tests/turtle_test/type_name_test.cpp   | 3 ---
 13 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/src/tests/turtle_test/constraints_test.cpp b/src/tests/turtle_test/constraints_test.cpp
index 05af23f..cc550e1 100644
--- a/src/tests/turtle_test/constraints_test.cpp
+++ b/src/tests/turtle_test/constraints_test.cpp
@@ -8,10 +8,7 @@
 
 #include <turtle/constraints.hpp>
 #include <turtle/operators.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
 
 BOOST_AUTO_TEST_CASE( all_comparison_constraints_can_be_instanciated )
 {
diff --git a/src/tests/turtle_test/error_test.cpp b/src/tests/turtle_test/error_test.cpp
index 089e88d..b452de9 100644
--- a/src/tests/turtle_test/error_test.cpp
+++ b/src/tests/turtle_test/error_test.cpp
@@ -7,10 +7,7 @@
 //
 
 #include <turtle/error.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
 
 BOOST_AUTO_TEST_CASE( a_mock_exception_is_not_an_std_exception_to_not_mess_with_user_exceptions )
 {
diff --git a/src/tests/turtle_test/function_test.cpp b/src/tests/turtle_test/function_test.cpp
index afc8422..178adc5 100644
--- a/src/tests/turtle_test/function_test.cpp
+++ b/src/tests/turtle_test/function_test.cpp
@@ -6,15 +6,13 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "mock_error.hpp"
-
 #define BOOST_AUTO_TEST_MAIN
+#include "mock_error.hpp"
+#include <turtle/function.hpp>
 #include <boost/test/auto_unit_test.hpp>
 #define BOOST_LIB_NAME boost_unit_test_framework
 #include <boost/config/auto_link.hpp>
-
-#define MOCK_ERROR_POLICY mock_error
-#include <turtle/mock.hpp>
+#include <boost/function.hpp>
 #include <boost/bind.hpp>
 
 #define CHECK_CALLS( calls ) \
diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp
index 451d671..a98804c 100644
--- a/src/tests/turtle_test/integration_test.cpp
+++ b/src/tests/turtle_test/integration_test.cpp
@@ -7,14 +7,8 @@
 //
 
 #include "mock_error.hpp"
-
-#include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
-
-#define MOCK_ERROR_POLICY mock_error
 #include <turtle/mock.hpp>
-
+#include <boost/test/auto_unit_test.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/ref.hpp>
diff --git a/src/tests/turtle_test/invocation_test.cpp b/src/tests/turtle_test/invocation_test.cpp
index aa1edda..826f456 100644
--- a/src/tests/turtle_test/invocation_test.cpp
+++ b/src/tests/turtle_test/invocation_test.cpp
@@ -7,10 +7,7 @@
 //
 
 #include <turtle/invocation.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
 
 BOOST_AUTO_TEST_CASE( unlimited )
 {
diff --git a/src/tests/turtle_test/is_functor_test.cpp b/src/tests/turtle_test/is_functor_test.cpp
index aebf221..793042f 100644
--- a/src/tests/turtle_test/is_functor_test.cpp
+++ b/src/tests/turtle_test/is_functor_test.cpp
@@ -7,8 +7,7 @@
 //
 
 #include <turtle/is_functor.hpp>
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/test/auto_unit_test.hpp>
 #ifdef _MSC_VER
 #pragma warning( push, 0 )
 #endif
@@ -17,10 +16,8 @@
 #ifdef _MSC_VER
 #pragma warning( pop )
 #endif
-
-#include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
 
 namespace
 {
diff --git a/src/tests/turtle_test/log_test.cpp b/src/tests/turtle_test/log_test.cpp
index d9fc119..c829e42 100644
--- a/src/tests/turtle_test/log_test.cpp
+++ b/src/tests/turtle_test/log_test.cpp
@@ -7,6 +7,7 @@
 //
 
 #include <turtle/log.hpp>
+#include <boost/test/auto_unit_test.hpp>
 #include <boost/assign.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -17,10 +18,6 @@
 #include <map>
 #include <set>
 
-#include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
-
 namespace
 {
     template< typename T >
diff --git a/src/tests/turtle_test/max_args_test.cpp b/src/tests/turtle_test/max_args_test.cpp
index c65efa5..907d4d4 100644
--- a/src/tests/turtle_test/max_args_test.cpp
+++ b/src/tests/turtle_test/max_args_test.cpp
@@ -1,4 +1,3 @@
-
 //
 //  Copyright Mathieu Champlon 2008
 //
@@ -8,14 +7,9 @@
 //
 
 #include "mock_error.hpp"
-
-#define MOCK_ERROR_POLICY mock_error
 #include <turtle/mock.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
+#include <boost/preprocessor/repetition/enum.hpp>
 
 #define IDENTITY(z, n, d) d
 
diff --git a/src/tests/turtle_test/mock_error.hpp b/src/tests/turtle_test/mock_error.hpp
index c000987..5a4d521 100644
--- a/src/tests/turtle_test/mock_error.hpp
+++ b/src/tests/turtle_test/mock_error.hpp
@@ -9,7 +9,7 @@
 #ifndef MOCK_TEST_MOCK_ERROR_HPP_INCLUDED
 #define MOCK_TEST_MOCK_ERROR_HPP_INCLUDED
 
-#include <boost/type_traits/remove_reference.hpp>
+#define MOCK_ERROR_POLICY mock_error
 #include <boost/lexical_cast.hpp>
 #include <stdexcept>
 #include <string>
diff --git a/src/tests/turtle_test/mock_test.cpp b/src/tests/turtle_test/mock_test.cpp
index 3807d3b..d53503e 100644
--- a/src/tests/turtle_test/mock_test.cpp
+++ b/src/tests/turtle_test/mock_test.cpp
@@ -7,12 +7,10 @@
 //
 
 #include <turtle/mock.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/bind.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/bind.hpp>
 
 namespace
 {
diff --git a/src/tests/turtle_test/object_test.cpp b/src/tests/turtle_test/object_test.cpp
index a44a030..b584a17 100644
--- a/src/tests/turtle_test/object_test.cpp
+++ b/src/tests/turtle_test/object_test.cpp
@@ -7,14 +7,9 @@
 //
 
 #include "mock_error.hpp"
-
-#include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
-
-#define MOCK_ERROR_POLICY mock_error
 #include <turtle/object.hpp>
 #include <turtle/function.hpp>
+#include <boost/test/auto_unit_test.hpp>
 
 namespace
 {
diff --git a/src/tests/turtle_test/sequence_test.cpp b/src/tests/turtle_test/sequence_test.cpp
index ec1fc8d..f75fe69 100644
--- a/src/tests/turtle_test/sequence_test.cpp
+++ b/src/tests/turtle_test/sequence_test.cpp
@@ -7,13 +7,9 @@
 //
 
 #include "mock_error.hpp"
-
+#include <turtle/sequence.hpp>
+#include <turtle/function.hpp>
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
-
-#define MOCK_ERROR_POLICY mock_error
-#include <turtle/mock.hpp>
 
 BOOST_AUTO_TEST_CASE( registering_to_a_sequence_and_calling_out_of_order_throws )
 {
diff --git a/src/tests/turtle_test/type_name_test.cpp b/src/tests/turtle_test/type_name_test.cpp
index 2b2cc6f..2a35fcc 100644
--- a/src/tests/turtle_test/type_name_test.cpp
+++ b/src/tests/turtle_test/type_name_test.cpp
@@ -7,10 +7,7 @@
 //
 
 #include <turtle/type_name.hpp>
-
 #include <boost/test/auto_unit_test.hpp>
-#define BOOST_LIB_NAME boost_unit_test_framework
-#include <boost/config/auto_link.hpp>
 
 struct my_type_from_default_namespace {};