1.1 --- a/sourcehook/test/test4.cpp Thu Dec 22 21:00:54 2005 +0000
1.2 +++ b/sourcehook/test/test4.cpp Fri Dec 23 11:58:11 2005 +0000
1.3 @@ -1,5 +1,5 @@
1.4 #include <string>
1.5 -#include "sourcehook_impl.h"
1.6 +#include "sourcehook_test.h"
1.7 #include "testevents.h"
1.8
1.9 // TEST4
1.10 @@ -60,8 +60,7 @@
1.11
1.12 bool TestPlugSys(std::string &error)
1.13 {
1.14 - SourceHook::CSourceHookImpl g_SHImpl;
1.15 - g_SHPtr = &g_SHImpl;
1.16 + GET_SHPTR(g_SHPtr);
1.17 g_PLID = 1;
1.18
1.19 Test inst;
1.20 @@ -86,7 +85,7 @@
1.21 new State_Func3_Called,
1.22 NULL), "Part 1.1");
1.23
1.24 - g_SHImpl.CompleteShutdown();
1.25 + Test_CompleteShutdown(g_SHPtr);
1.26
1.27 pInst->Func1();
1.28 pInst->Func2();
1.29 @@ -139,10 +138,10 @@
1.30 new State_Func3_Called,
1.31 NULL), "Part 2.1");
1.32
1.33 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.34 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.35 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.36 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.37 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.38 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.39 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.40 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.41
1.42 CHECK_STATES((&g_States,
1.43 new State_PluginInUse(1, true),
1.44 @@ -152,7 +151,7 @@
1.45 NULL), "Part 2.2");
1.46
1.47 // Unload plugins one by one
1.48 - g_SHImpl.UnloadPlugin(3);
1.49 + Test_UnloadPlugin(g_SHPtr, 3);
1.50
1.51 pInst->Func1();
1.52 pInst->Func2();
1.53 @@ -170,10 +169,10 @@
1.54 new State_Func3_Called,
1.55 NULL), "Part 2.3.1");
1.56
1.57 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.58 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.59 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.60 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.61 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.62 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.63 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.64 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.65
1.66 CHECK_STATES((&g_States,
1.67 new State_PluginInUse(1, true),
1.68 @@ -182,7 +181,7 @@
1.69 new State_PluginInUse(4, false),
1.70 NULL), "Part 2.3.2");
1.71
1.72 - g_SHImpl.UnloadPlugin(2);
1.73 + Test_UnloadPlugin(g_SHPtr, 2);
1.74
1.75 pInst->Func1();
1.76 pInst->Func2();
1.77 @@ -197,10 +196,10 @@
1.78 new State_Func3_Called,
1.79 NULL), "Part 2.4.1");
1.80
1.81 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.82 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.83 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.84 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.85 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.86 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.87 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.88 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.89
1.90 CHECK_STATES((&g_States,
1.91 new State_PluginInUse(1, true),
1.92 @@ -209,7 +208,7 @@
1.93 new State_PluginInUse(4, false),
1.94 NULL), "Part 2.4.2");
1.95
1.96 - g_SHImpl.UnloadPlugin(1);
1.97 + Test_UnloadPlugin(g_SHPtr, 1);
1.98
1.99 pInst->Func1();
1.100 pInst->Func2();
1.101 @@ -221,10 +220,10 @@
1.102 new State_Func3_Called,
1.103 NULL), "Part 2.5.1");
1.104
1.105 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.106 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.107 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.108 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.109 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.110 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.111 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.112 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.113
1.114 CHECK_STATES((&g_States,
1.115 new State_PluginInUse(1, false),
1.116 @@ -275,10 +274,10 @@
1.117 new State_Func3_Called,
1.118 NULL), "Part 3.1");
1.119
1.120 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.121 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.122 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.123 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.124 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.125 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.126 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.127 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.128
1.129 CHECK_STATES((&g_States,
1.130 new State_PluginInUse(1, true),
1.131 @@ -288,7 +287,7 @@
1.132 NULL), "Part 3.2");
1.133
1.134 // Unload plugins one by one
1.135 - g_SHImpl.PausePlugin(3);
1.136 + Test_PausePlugin(g_SHPtr, 3);
1.137
1.138 pInst->Func1();
1.139 pInst->Func2();
1.140 @@ -306,10 +305,10 @@
1.141 new State_Func3_Called,
1.142 NULL), "Part 3.3.1");
1.143
1.144 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.145 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.146 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.147 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.148 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.149 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.150 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.151 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.152
1.153 CHECK_STATES((&g_States,
1.154 new State_PluginInUse(1, true),
1.155 @@ -318,7 +317,7 @@
1.156 new State_PluginInUse(4, false),
1.157 NULL), "Part 3.3.2");
1.158
1.159 - g_SHImpl.PausePlugin(2);
1.160 + Test_PausePlugin(g_SHPtr, 2);
1.161
1.162 pInst->Func1();
1.163 pInst->Func2();
1.164 @@ -333,10 +332,10 @@
1.165 new State_Func3_Called,
1.166 NULL), "Part 3.4.1");
1.167
1.168 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.169 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.170 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.171 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.172 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.173 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.174 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.175 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.176
1.177 CHECK_STATES((&g_States,
1.178 new State_PluginInUse(1, true),
1.179 @@ -345,7 +344,7 @@
1.180 new State_PluginInUse(4, false),
1.181 NULL), "Part 3.4.2");
1.182
1.183 - g_SHImpl.PausePlugin(1);
1.184 + Test_PausePlugin(g_SHPtr, 1);
1.185
1.186 pInst->Func1();
1.187 pInst->Func2();
1.188 @@ -357,10 +356,10 @@
1.189 new State_Func3_Called,
1.190 NULL), "Part 3.5.1");
1.191
1.192 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.193 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.194 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.195 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.196 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.197 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.198 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.199 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.200
1.201 CHECK_STATES((&g_States,
1.202 new State_PluginInUse(1, true),
1.203 @@ -369,14 +368,14 @@
1.204 new State_PluginInUse(4, false),
1.205 NULL), "Part 3.5.2");
1.206
1.207 - g_SHImpl.UnpausePlugin(1);
1.208 - g_SHImpl.UnpausePlugin(2);
1.209 - g_SHImpl.UnpausePlugin(3);
1.210 + Test_UnpausePlugin(g_SHPtr, 1);
1.211 + Test_UnpausePlugin(g_SHPtr, 2);
1.212 + Test_UnpausePlugin(g_SHPtr, 3);
1.213
1.214 - ADD_STATE(State_PluginInUse(1, g_SHImpl.IsPluginInUse(1)));
1.215 - ADD_STATE(State_PluginInUse(2, g_SHImpl.IsPluginInUse(2)));
1.216 - ADD_STATE(State_PluginInUse(3, g_SHImpl.IsPluginInUse(3)));
1.217 - ADD_STATE(State_PluginInUse(4, g_SHImpl.IsPluginInUse(4)));
1.218 + ADD_STATE(State_PluginInUse(1, Test_IsPluginInUse(g_SHPtr, 1)));
1.219 + ADD_STATE(State_PluginInUse(2, Test_IsPluginInUse(g_SHPtr, 2)));
1.220 + ADD_STATE(State_PluginInUse(3, Test_IsPluginInUse(g_SHPtr, 3)));
1.221 + ADD_STATE(State_PluginInUse(4, Test_IsPluginInUse(g_SHPtr, 4)));
1.222
1.223 CHECK_STATES((&g_States,
1.224 new State_PluginInUse(1, true),
1.225 @@ -405,7 +404,7 @@
1.226 NULL), "Part 3.7");
1.227
1.228 // 4) Shutdown :)
1.229 - g_SHImpl.CompleteShutdown();
1.230 + Test_CompleteShutdown(g_SHPtr);
1.231
1.232 pInst->Func1();
1.233 pInst->Func2();