diff -r e8a3f2617a3e -r f9e21a2ac558 sourcehook/test/main.cpp --- a/sourcehook/test/main.cpp Sun Oct 07 03:12:19 2007 +0000 +++ b/sourcehook/test/main.cpp Sun Oct 07 22:10:07 2007 +0000 @@ -25,7 +25,7 @@ TestProto m_Func; std::string m_Name; - static SourceHook::List ms_Tests; + static SourceHook::CVector ms_Tests; public: Test(TestProto func, const char *name) : m_Func(func), m_Name(name) { @@ -50,7 +50,7 @@ static void DoTests() { int passed=0, failed=0; - for (SourceHook::List::iterator iter = ms_Tests.begin(); iter != ms_Tests.end(); ++iter) + for (SourceHook::CVector::iterator iter = ms_Tests.begin(); iter != ms_Tests.end(); ++iter) { if ((**iter)()) ++passed; @@ -62,7 +62,7 @@ } }; -SourceHook::List Test::ms_Tests; +SourceHook::CVector Test::ms_Tests; #define DO_TEST(x) \ bool Test##x(std::string &error); \ @@ -73,7 +73,7 @@ DO_TEST(VafmtAndOverload); DO_TEST(ThisPtrOffs); DO_TEST(PlugSys); -DO_TEST(Bail); +//DO_TEST(Bail); DO_TEST(Reentr); DO_TEST(Manual); DO_TEST(Recall); @@ -98,35 +98,30 @@ SourceHook::ISourceHook *Test_Factory() { - return new SourceHook::CSourceHookImpl(); + return new SourceHook::Impl::CSourceHookImpl(); } void Test_Delete(SourceHook::ISourceHook *shptr) { - delete static_cast(shptr); + delete static_cast(shptr); } void Test_CompleteShutdown(SourceHook::ISourceHook *shptr) { - static_cast(shptr)->CompleteShutdown(); -} - -bool Test_IsPluginInUse(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug) -{ - return static_cast(shptr)->IsPluginInUse(plug); + static_cast(shptr)->CompleteShutdown(); } void Test_UnloadPlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug) { - static_cast(shptr)->UnloadPlugin(plug); + static_cast(shptr)->UnloadPlugin(plug); } void Test_PausePlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug) { - static_cast(shptr)->PausePlugin(plug); + static_cast(shptr)->PausePlugin(plug); } void Test_UnpausePlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug) { - static_cast(shptr)->UnpausePlugin(plug); + static_cast(shptr)->UnpausePlugin(plug); }