From 447e8c9a6005a321faad7a59d8473e1b5d270035 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Wed, 1 Aug 2012 07:41:41 +0000
Subject: [PATCH] Refactoring

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@538 860be788-9bd5-4423-9f1e-828f051e677b
---
 test/mock_error.hpp | 81 ++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/test/mock_error.hpp b/test/mock_error.hpp
index 5afb7e8..a9b17b0 100644
--- a/test/mock_error.hpp
+++ b/test/mock_error.hpp
@@ -16,11 +16,45 @@
 
 namespace
 {
-    int error_count = 0;
-    int call_count = 0;
+    struct mock_error_data
+    {
+        void reset()
+        {
+            call_count = 0;
+            error_count = 0;
+            last_message.clear();
+            last_context.clear();
+        }
+        bool verify()
+        {
+            return error_count == 0;
+        }
 
-    std::string last_message;
-    std::string last_context;
+        void call()
+        {
+            last_context.clear();
+            last_message.clear();
+            ++call_count;
+        }
+        void fail( const std::string& message,
+            const std::string& context )
+        {
+            last_context = context;
+            last_message = message;
+            ++error_count;
+        }
+
+        int error_count;
+        int call_count;
+        std::string last_message;
+        std::string last_context;
+    };
+
+    inline mock_error_data& data()
+    {
+        static mock_error_data p;
+        return p;
+    }
 
     template< typename Result >
     struct mock_error
@@ -37,18 +71,14 @@ namespace
         static void call( const Context& /*context*/,
             const char* /*file*/, int /*line*/ )
         {
-            last_context.clear();
-            last_message.clear();
-            ++call_count;
+            data().call();
         }
 
         template< typename Context >
         static void fail( const std::string& message, const Context& context,
             const char* /*file*/ = "", int /*line*/ = 0 )
         {
-            last_context = boost::lexical_cast< std::string >( context );
-            last_message = message;
-            ++error_count;
+            data().fail( message, boost::lexical_cast< std::string >( context ) );
         }
     };
 
@@ -56,37 +86,26 @@ namespace
     {
         error_fixture()
         {
-            reset();
+            data().reset();
         }
         ~error_fixture()
         {
-            BOOST_CHECK( verify() );
-            BOOST_CHECK_EQUAL( 0, call_count );
-        }
-        void reset()
-        {
-            call_count = 0;
-            error_count = 0;
-            last_message.clear();
-            last_context.clear();
-        }
-        bool verify() const
-        {
-            return error_count == 0;
+            BOOST_CHECK( data().verify() );
+            BOOST_CHECK_EQUAL( 0, data().call_count );
         }
     };
 }
 
 #define CHECK_CALLS( calls ) \
-    BOOST_CHECK_EQUAL( calls, call_count ); \
-    call_count = 0;
+    BOOST_CHECK_EQUAL( calls, data().call_count ); \
+    data().call_count = 0;
 #define CHECK_ERROR( expr, error, calls, context ) \
-    BOOST_CHECK( verify() ); \
+    BOOST_CHECK( data().verify() ); \
     try { expr; } catch( ... ) {} \
-    BOOST_CHECK_EQUAL( 1, error_count ); \
-    BOOST_CHECK_EQUAL( error, last_message ); \
-    BOOST_CHECK_EQUAL( context, last_context ); \
+    BOOST_CHECK_EQUAL( 1, data().error_count ); \
+    BOOST_CHECK_EQUAL( error, data().last_message ); \
+    BOOST_CHECK_EQUAL( context, data().last_context ); \
     CHECK_CALLS( calls ); \
-    reset();
+    data().reset();
 
 #endif // MOCK_TEST_MOCK_ERROR_HPP_INCLUDED