1.1 --- a/sourcehook/test/main.cpp Sun Oct 07 03:12:19 2007 +0000
1.2 +++ b/sourcehook/test/main.cpp Sun Oct 07 22:10:07 2007 +0000
1.3 @@ -25,7 +25,7 @@
1.4 TestProto m_Func;
1.5 std::string m_Name;
1.6
1.7 - static SourceHook::List<Test *> ms_Tests;
1.8 + static SourceHook::CVector<Test *> ms_Tests;
1.9 public:
1.10 Test(TestProto func, const char *name) : m_Func(func), m_Name(name)
1.11 {
1.12 @@ -50,7 +50,7 @@
1.13 static void DoTests()
1.14 {
1.15 int passed=0, failed=0;
1.16 - for (SourceHook::List<Test*>::iterator iter = ms_Tests.begin(); iter != ms_Tests.end(); ++iter)
1.17 + for (SourceHook::CVector<Test*>::iterator iter = ms_Tests.begin(); iter != ms_Tests.end(); ++iter)
1.18 {
1.19 if ((**iter)())
1.20 ++passed;
1.21 @@ -62,7 +62,7 @@
1.22 }
1.23 };
1.24
1.25 -SourceHook::List<Test *> Test::ms_Tests;
1.26 +SourceHook::CVector<Test *> Test::ms_Tests;
1.27
1.28 #define DO_TEST(x) \
1.29 bool Test##x(std::string &error); \
1.30 @@ -73,7 +73,7 @@
1.31 DO_TEST(VafmtAndOverload);
1.32 DO_TEST(ThisPtrOffs);
1.33 DO_TEST(PlugSys);
1.34 -DO_TEST(Bail);
1.35 +//DO_TEST(Bail);
1.36 DO_TEST(Reentr);
1.37 DO_TEST(Manual);
1.38 DO_TEST(Recall);
1.39 @@ -98,35 +98,30 @@
1.40
1.41 SourceHook::ISourceHook *Test_Factory()
1.42 {
1.43 - return new SourceHook::CSourceHookImpl();
1.44 + return new SourceHook::Impl::CSourceHookImpl();
1.45 }
1.46
1.47 void Test_Delete(SourceHook::ISourceHook *shptr)
1.48 {
1.49 - delete static_cast<SourceHook::CSourceHookImpl *>(shptr);
1.50 + delete static_cast<SourceHook::Impl::CSourceHookImpl *>(shptr);
1.51 }
1.52
1.53 void Test_CompleteShutdown(SourceHook::ISourceHook *shptr)
1.54 {
1.55 - static_cast<SourceHook::CSourceHookImpl *>(shptr)->CompleteShutdown();
1.56 -}
1.57 -
1.58 -bool Test_IsPluginInUse(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
1.59 -{
1.60 - return static_cast<SourceHook::CSourceHookImpl *>(shptr)->IsPluginInUse(plug);
1.61 + static_cast<SourceHook::Impl::CSourceHookImpl *>(shptr)->CompleteShutdown();
1.62 }
1.63
1.64 void Test_UnloadPlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
1.65 {
1.66 - static_cast<SourceHook::CSourceHookImpl *>(shptr)->UnloadPlugin(plug);
1.67 + static_cast<SourceHook::Impl::CSourceHookImpl *>(shptr)->UnloadPlugin(plug);
1.68 }
1.69
1.70 void Test_PausePlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
1.71 {
1.72 - static_cast<SourceHook::CSourceHookImpl *>(shptr)->PausePlugin(plug);
1.73 + static_cast<SourceHook::Impl::CSourceHookImpl *>(shptr)->PausePlugin(plug);
1.74 }
1.75
1.76 void Test_UnpausePlugin(SourceHook::ISourceHook *shptr, SourceHook::Plugin plug)
1.77 {
1.78 - static_cast<SourceHook::CSourceHookImpl *>(shptr)->UnpausePlugin(plug);
1.79 + static_cast<SourceHook::Impl::CSourceHookImpl *>(shptr)->UnpausePlugin(plug);
1.80 }