From e59dbf9e5631b7458289e089eb06729d42f23295 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Mon, 21 Feb 2011 00:40:52 +0000
Subject: [PATCH] More work on error logging tests

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@248 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/build.xml                               | 25 ++++++++++++++++++-
 .../mismatch_type_in_returns_action.cpp       |  8 +++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index cebbe64..e2b5318 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -18,7 +18,30 @@
   </target>
 
   <target name="analyser" description="run errors analyser">
-    <build-test name="errors" depends="boost"/>
+    <quiet>
+      <delete file="${reports.dir}/errors-${platform}.log"/>
+      <touch file="${reports.dir}/errors-${platform}.log"/>
+    </quiet>
+    <for param="file">
+      <fileset dir="${tests.dir}/errors_test" includes="*.cpp"/>
+      <sequential>
+        <ant target="-analyser">
+          <property name="analyser-file" value="@{file}"/>
+        </ant>
+      </sequential>
+    </for>
+  </target>
+
+  <target name="-analyser">
+    <record name="${reports.dir}/errors-${platform}.log" action="start" append="true"/>
+    <trycatch>
+      <try>
+        <build-test name="errors" excludes="**" depends="boost">
+          <fileset file="${analyser-file}"/>
+        </build-test>
+      </try>
+    </trycatch>
+    <record name="${reports.dir}/errors-${platform}.log" action="stop"/>
   </target>
 
   <target name="bench" description="build compilation benchmark">
diff --git a/src/tests/errors_test/mismatch_type_in_returns_action.cpp b/src/tests/errors_test/mismatch_type_in_returns_action.cpp
index 36fc444..6c5b292 100644
--- a/src/tests/errors_test/mismatch_type_in_returns_action.cpp
+++ b/src/tests/errors_test/mismatch_type_in_returns_action.cpp
@@ -10,13 +10,13 @@
 
 namespace
 {
-    MOCK_CLASS( cl )
+    MOCK_CLASS( mocked )
     {
-        MOCK_METHOD_EXT( m, 0, int(), m ) // add another test with void() and another with std::string()
+        MOCK_METHOD_EXT( method, 0, int(), method ) // add another test with void() and another with std::string()
     };
     void test_case()
     {
-        cl c;
-        MOCK_EXPECT( c, m ).returns( "42" );
+        mocked m;
+        MOCK_EXPECT( m, method ).returns( "42" );
     }
 }