diff -r 8edcba00a103 -r d44f93f0677a sourcehook/test/testevents.h --- a/sourcehook/test/testevents.h Thu May 05 13:13:16 2005 +0000 +++ b/sourcehook/test/testevents.h Thu May 05 14:00:08 2005 +0000 @@ -14,6 +14,7 @@ #include #include #include +#include extern bool g_Verbose; @@ -31,6 +32,8 @@ { return (typeid(other) == typeid(this)) ? true : false; } + + virtual void Dump() = 0; }; typedef std::list StateList; @@ -38,6 +41,12 @@ #define ADD_STATE(name) g_States.push_back(new name) + void DumpStates(StateList *sl) + { + for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter) + (*iter)->Dump(); + } + bool StatesOk(StateList *sl, ...) { StateList requiredstates; @@ -54,6 +63,14 @@ if (requiredstates.size() != sl->size()) { + if (g_Verbose) + { + std::cout << std::endl << "FAIL: Should be:" << std::endl; + DumpStates(&requiredstates); + std::cout << std::endl << "FAIL: Is:" << std::endl; + DumpStates(sl); + } + for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter) delete *iter; for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter) @@ -86,7 +103,11 @@ //#define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; } else if (g_Verbose) { std::cout << "No error: " << myerr << std::endl; } #define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; } -#define MAKE_STATE(name) struct name : State {}; +#define MAKE_STATE(name) struct name : State { \ + virtual void Dump() { \ + std::cout << " " << #name << std::endl; } \ + }; + #define MAKE_STATE_1(name, p1_type) struct name : State { \ p1_type m_Param1; \ name(p1_type param1) : m_Param1(param1) {} \ @@ -96,6 +117,8 @@ return false; \ return other2->m_Param1 == m_Param1;\ } \ + virtual void Dump() { \ + std::cout << " " << #name << "; Param1=" << m_Param1 << std::endl; } \ } #define MAKE_STATE_2(name, p1_type, p2_type) struct name : State { \ @@ -108,6 +131,8 @@ return false; \ return other2->m_Param1 == m_Param1 && other2->m_Param2 == m_Param2;\ } \ + virtual void Dump() { \ + std::cout << " " << #name << "; Param1=" << m_Param1 << "; Param2=" << m_Param2 << std::endl; } \ } #endif