sourcehook/test/testevents.h
changeset 60 d44f93f0677a
parent 58 71016f952503
child 61 f9b4e9ded36d
     1.1 --- a/sourcehook/test/testevents.h	Thu May 05 13:13:16 2005 +0000
     1.2 +++ b/sourcehook/test/testevents.h	Thu May 05 14:00:08 2005 +0000
     1.3 @@ -14,6 +14,7 @@
     1.4  #include <typeinfo>
     1.5  #include <stdarg.h>
     1.6  #include <iostream>
     1.7 +#include <string>
     1.8  
     1.9  extern bool g_Verbose;
    1.10  
    1.11 @@ -31,6 +32,8 @@
    1.12  		{
    1.13  			return (typeid(other) == typeid(this)) ? true : false;
    1.14  		}
    1.15 +
    1.16 +		virtual void Dump() = 0;
    1.17  	};
    1.18  
    1.19  	typedef std::list<State*> StateList;
    1.20 @@ -38,6 +41,12 @@
    1.21  	#define ADD_STATE(name) g_States.push_back(new name)
    1.22  
    1.23  
    1.24 +	void DumpStates(StateList *sl)
    1.25 +	{
    1.26 +		for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
    1.27 +			(*iter)->Dump();
    1.28 +	}
    1.29 +
    1.30  	bool StatesOk(StateList *sl, ...)
    1.31  	{
    1.32  		StateList requiredstates;
    1.33 @@ -54,6 +63,14 @@
    1.34  
    1.35  		if (requiredstates.size() != sl->size())
    1.36  		{
    1.37 +			if (g_Verbose)
    1.38 +			{
    1.39 +				std::cout << std::endl << "FAIL: Should be:" << std::endl;
    1.40 +				DumpStates(&requiredstates);
    1.41 +				std::cout << std::endl << "FAIL: Is:" << std::endl;
    1.42 +				DumpStates(sl);
    1.43 +			}
    1.44 +
    1.45  			for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
    1.46  				delete *iter;
    1.47  			for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
    1.48 @@ -86,7 +103,11 @@
    1.49  //#define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; } else if (g_Verbose) { std::cout << "No error: " << myerr << std::endl; }
    1.50  #define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; }
    1.51  
    1.52 -#define MAKE_STATE(name) struct name : State {};
    1.53 +#define MAKE_STATE(name) struct name : State { \
    1.54 +		virtual void Dump() { \
    1.55 +			std::cout << "  " << #name << std::endl; } \
    1.56 +	};
    1.57 +
    1.58  #define MAKE_STATE_1(name, p1_type) struct name : State { \
    1.59  		p1_type m_Param1; \
    1.60  		name(p1_type param1) : m_Param1(param1) {} \
    1.61 @@ -96,6 +117,8 @@
    1.62  				return false; \
    1.63  			return other2->m_Param1 == m_Param1;\
    1.64  		} \
    1.65 +		virtual void Dump() { \
    1.66 +			std::cout << "  " << #name << "; Param1=" << m_Param1 << std::endl; } \
    1.67  	}
    1.68  
    1.69  #define MAKE_STATE_2(name, p1_type, p2_type) struct name : State { \
    1.70 @@ -108,6 +131,8 @@
    1.71  				return false; \
    1.72  			return other2->m_Param1 == m_Param1 && other2->m_Param2 == m_Param2;\
    1.73  		} \
    1.74 +		virtual void Dump() { \
    1.75 +			std::cout << "  " << #name << "; Param1=" << m_Param1 << "; Param2=" << m_Param2 << std::endl; } \
    1.76  	}
    1.77  #endif
    1.78