From ea501c3e00aabac929d7c78e697daee8e01a01d8 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Thu, 5 May 2011 16:35:03 +0000
Subject: [PATCH] Refactored tests

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@307 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/build.xml                            | 6 ++++++
 src/tests/turtle_test/integration_test.cpp | 2 --
 src/tests/turtle_test/max_args_test.cpp    | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index b46eb39..9ec0253 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -15,6 +15,12 @@
     <build-test name="turtle" depends="boost" mode="all">
       <compilerarg value="-Wno-uninitialized" location="mid" if="is-cygwin"/>
     </build-test>
+    <build-test name="turtle_max_args" input="turtle_test" depends="boost" mode="all">
+      <compilerarg value="-Wno-uninitialized" location="mid" if="is-cygwin"/>
+      <defineset>
+        <define name="MOCK_MAX_ARGS" value="20"/>
+      </defineset>
+    </build-test>
   </target>
 
   <target name="analyse" description="run errors analyser">
diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp
index cf2abfa..d078ee2 100644
--- a/src/tests/turtle_test/integration_test.cpp
+++ b/src/tests/turtle_test/integration_test.cpp
@@ -25,8 +25,6 @@ namespace
     struct my_custom_mock
     {
         MOCK_METHOD_EXT( my_method, 0, void(), my_method )
-        BOOST_STATIC_ASSERT( MOCK_MAX_ARGS == 9 );
-        MOCK_METHOD_EXT( my_method_with_max_number_of_args, MOCK_MAX_ARGS, void( int, int, int, int, int, int, int, int, int ), my_method_with_max_number_of_args )
     };
 }
 
diff --git a/src/tests/turtle_test/max_args_test.cpp b/src/tests/turtle_test/max_args_test.cpp
index 5db0914..1642446 100644
--- a/src/tests/turtle_test/max_args_test.cpp
+++ b/src/tests/turtle_test/max_args_test.cpp
@@ -9,7 +9,6 @@
 
 #include "silent_error.hpp"
 
-#define MOCK_MAX_ARGS 20
 #define MOCK_ERROR_POLICY silent_error
 #include <turtle/mock.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>