diff -r a748d39fd792 -r 968e67c7780c core/sourcehook/test/testrefret.cpp --- a/core/sourcehook/test/testrefret.cpp Fri Dec 17 22:20:10 2010 -0500 +++ b/core/sourcehook/test/testrefret.cpp Fri Dec 17 22:22:44 2010 -0500 @@ -49,6 +49,11 @@ } }; + SH_DECL_HOOK0(Test, Func1, SH_NOATTRIB, 0, int&); + SH_DECL_MANUALHOOK0(Manual_Test_Func1, 0, 0, 0, int&); + SH_DECL_HOOK1(Test, Func2, SH_NOATTRIB, 0, const int&, int); + SH_DECL_MANUALHOOK1(Manual_Test_Func2, 1, 0, 0, const int&, int); + class CHook { public: @@ -76,12 +81,18 @@ RETURN_META_VALUE(MRES_OVERRIDE, m_Var); } - virtual const int& Func2_Pre1(int p1) + virtual const int& Func2_PreRecall_OverrideRet_Normal(int p1) { ADD_STATE(State_Func2_Pre1(p1, &m_Var)); RETURN_META_VALUE_NEWPARAMS(MRES_OVERRIDE, m_Var, static_cast(&Test::Func2), (1337)); } + virtual const int& Func2_PreRecall_OverrideRet_Manual(int p1) + { + ADD_STATE(State_Func2_Pre1(p1, &m_Var)); + RETURN_META_VALUE_MNEWPARAMS(MRES_OVERRIDE, m_Var, Manual_Test_Func2, (1337)); + } + virtual const int& Func2_Post1(int p1) { ADD_STATE(State_Func2_Post1(p1, &META_RESULT_ORIG_RET(int&), &META_RESULT_OVERRIDE_RET(int&))); @@ -89,117 +100,220 @@ } }; - SH_DECL_HOOK0(Test, Func1, SH_NOATTRIB, 0, int&); - SH_DECL_HOOK1(Test, Func2, SH_NOATTRIB, 0, const int&, int); - Test *MyTestFactory() { return new Test; } } -bool TestRefRet(std::string &error) +class TesterRefRet { - GET_SHPTR(g_SHPtr); - g_PLID = 1; - - Test *pTest = MyTestFactory(); - CAutoPtrDestruction apd(pTest); +public: + Test *pTest; CHook hook; - int &ret1 = pTest->Func1(); - ADD_STATE(State_Func1_Ret(&ret1)); + TesterRefRet() + { + pTest = NULL; + } + + bool doTests(std::string &error) + { + GET_SHPTR(g_SHPtr); + g_PLID = 1; - CHECK_STATES((&g_States, - new State_Func1(&pTest->m_Var1), - new State_Func1_Ret(&pTest->m_Var1), - NULL), "Part 1"); + pTest = MyTestFactory(); + CAutoPtrDestruction apd(pTest); + + int &ret1 = pTest->Func1(); + ADD_STATE(State_Func1_Ret(&ret1)); + + CHECK_STATES((&g_States, + new State_Func1(&pTest->m_Var1), + new State_Func1_Ret(&pTest->m_Var1), + NULL), "Part 1"); - // Now add Func1_Pre1, which supercedes and returns hook.m_Var - SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre1), false); + // Now add Func1_Pre1, which supercedes and returns hook.m_Var + AddHook__Test_Func1__Func1_Pre(); + + int &ret2 = pTest->Func1(); + ADD_STATE(State_Func1_Ret(&ret2)); + + CHECK_STATES((&g_States, + new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var + new State_Func1(&pTest->m_Var1), // Function says that it's going to return pTest->m_Var1 + new State_Func1_Ret(&hook.m_Var), // hook.m_Var is returned + NULL), "Part 2"); - int &ret2 = pTest->Func1(); - ADD_STATE(State_Func1_Ret(&ret2)); - - CHECK_STATES((&g_States, - new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var - new State_Func1(&pTest->m_Var1), // Function says that it's going to return pTest->m_Var1 - new State_Func1_Ret(&hook.m_Var), // hook.m_Var is returned - NULL), "Part 2"); + // Now add Func1_Post1, which only reports orig ret and override ret + AddHook__Test_Func1__Func1_Post(); + + int &ret3 = pTest->Func1(); + ADD_STATE(State_Func1_Ret(&ret3)); + + CHECK_STATES((&g_States, + new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var + new State_Func1(&pTest->m_Var1), // Function says that it's going to return pTest->m_Var1 + new State_Func1_Post1(&pTest->m_Var1, &hook.m_Var), // origret(=p1) is what it wanted to + // return, overrideret(=p2) is pre1's var + new State_Func1_Ret(&hook.m_Var), // hook.m_Var is returned + NULL), "Part 3"); - // Now add Func1_Post1, which only reports orig ret and override ret - SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post1), true); + // Now add Func1_Pre2, which supercedes and returns g_Var (it also sets the override ret from pre1 to 1337) + // and add Func1_Post2, which overrides and returns hook.m_Var again. + + AddHook__Test_Func1__Func1_Pre2(); + AddHook__Test_Func1__Func1_Post2(); + + int &ret4 = pTest->Func1(); + ADD_STATE(State_Func1_Ret(&ret4)); + + CHECK_STATES((&g_States, + new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var + new State_Func1_Pre2(MRES_OVERRIDE, // current status + &hook.m_Var, // override ret (which it set to 1337) + &g_Var), // what it's going to ret, AND supercede with + + new State_Func1_Post1(&g_Var, &g_Var), // origret(=p1) is what pre2 superceded with, + // so overrideret(=p2) has to be the same + new State_Func1_Post2(&hook.m_Var), // post2 is going to override with hook.m_Var again + new State_Func1_Ret(&hook.m_Var), // ==>>> hook.m_Var is returned + NULL), "Part 4"); - int &ret3 = pTest->Func1(); - ADD_STATE(State_Func1_Ret(&ret3)); - - CHECK_STATES((&g_States, - new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var - new State_Func1(&pTest->m_Var1), // Function says that it's going to return pTest->m_Var1 - new State_Func1_Post1(&pTest->m_Var1, &hook.m_Var), // origret(=p1) is what it wanted to - // return, overrideret(=p2) is pre1's var - new State_Func1_Ret(&hook.m_Var), // hook.m_Var is returned - NULL), "Part 3"); + CHECK_COND(hook.m_Var == 1337, "Part 4.1"); + + // Through a callclass + SourceHook::CallClass *cc1 = SH_GET_CALLCLASS(pTest); + int &ret5 = SH_CALL(cc1, &Test::Func1)(); + ADD_STATE(State_Func1_Ret(&ret5)); + + CHECK_STATES((&g_States, + new State_Func1(&pTest->m_Var1), + new State_Func1_Ret(&pTest->m_Var1), + NULL), "Part 5"); + + SH_RELEASE_CALLCLASS(cc1); - // Now add Func1_Pre2, which supercedes and returns g_Var (it also sets the override ret from pre1 to 1337) - // and add Func1_Post2, which overrides and returns hook.m_Var again. + //////////////////////////////////////////////////////////////////////////////////////// + // Func2 tests + const int &ret21 = pTest->Func2(500); + ADD_STATE(State_Func2_Ret(&ret21)); - SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre2), false); - SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post2), true); + CHECK_STATES((&g_States, + new State_Func2(500, &pTest->m_Var2), + new State_Func2_Ret(&pTest->m_Var2), + NULL), "Part 6"); - int &ret4 = pTest->Func1(); - ADD_STATE(State_Func1_Ret(&ret4)); + AddHook__Test_Func2__Func2_Pre1(); + AddHook__Test_Func2__Func2_Post1(); + + const int &ret22 = pTest->Func2(500); + ADD_STATE(State_Func2_Ret(&ret22)); - CHECK_STATES((&g_States, - new State_Func1_Pre1(&hook.m_Var), // Pre1 says that it's going to override with hook.m_Var - new State_Func1_Pre2(MRES_OVERRIDE, // current status - &hook.m_Var, // override ret (which it set to 1337) - &g_Var), // what it's going to ret, AND supercede with + CHECK_STATES((&g_States, + new State_Func2_Pre1(500, &hook.m_Var), // p1 was 500; it's going to override with hook.m_Var; and also change p1 to 1337 + new State_Func2(1337, &pTest->m_Var2), // p1 was 1337; it's going to ret pTest->m_Var2 + new State_Func2_Post1(1337, // p1 was 1337 + &pTest->m_Var2, // orig ret was pTest->m_Var2 + &hook.m_Var), // override ret was hook.m_Var + new State_Func2_Ret(&hook.m_Var), // really returned hook.m_Var + NULL), "Part 7"); + + return true; + } - new State_Func1_Post1(&g_Var, &g_Var), // origret(=p1) is what pre2 superceded with, - // so overrideret(=p2) has to be the same - new State_Func1_Post2(&hook.m_Var), // post2 is going to override with hook.m_Var again - new State_Func1_Ret(&hook.m_Var), // ==>>> hook.m_Var is returned - NULL), "Part 4"); + virtual void AddHook__Test_Func1__Func1_Pre() = 0; + virtual void AddHook__Test_Func1__Func1_Post() = 0; + + virtual void AddHook__Test_Func1__Func1_Pre2() = 0; + virtual void AddHook__Test_Func1__Func1_Post2() = 0; + + virtual void AddHook__Test_Func2__Func2_Pre1() = 0; + virtual void AddHook__Test_Func2__Func2_Post1() = 0; +}; - CHECK_COND(hook.m_Var == 1337, "Part 4.1"); - - // Through a callclass - SourceHook::CallClass *cc1 = SH_GET_CALLCLASS(pTest); - int &ret5 = SH_CALL(cc1, &Test::Func1)(); - ADD_STATE(State_Func1_Ret(&ret5)); +class TesterRefRetNonManual : public TesterRefRet +{ +public: + void AddHook__Test_Func1__Func1_Pre() + { + SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre1), false); + } + + void AddHook__Test_Func1__Func1_Post() + { + SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post1), true); + } - CHECK_STATES((&g_States, - new State_Func1(&pTest->m_Var1), - new State_Func1_Ret(&pTest->m_Var1), - NULL), "Part 5"); + void AddHook__Test_Func1__Func1_Pre2() + { + SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre2), false); + } - SH_RELEASE_CALLCLASS(cc1); + void AddHook__Test_Func1__Func1_Post2() + { + SH_ADD_HOOK(Test, Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post2), true); + } + + void AddHook__Test_Func2__Func2_Pre1() + { + SH_ADD_HOOK(Test, Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_PreRecall_OverrideRet_Normal), false); + } - //////////////////////////////////////////////////////////////////////////////////////// - // Func2 tests - const int &ret21 = pTest->Func2(500); - ADD_STATE(State_Func2_Ret(&ret21)); + void AddHook__Test_Func2__Func2_Post1() + { + SH_ADD_HOOK(Test, Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_Post1), true); + } +}; + +class TesterRefRetManual : public TesterRefRet +{ +public: + void AddHook__Test_Func1__Func1_Pre() + { + SH_ADD_MANUALHOOK(Manual_Test_Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre1), false); + } - CHECK_STATES((&g_States, - new State_Func2(500, &pTest->m_Var2), - new State_Func2_Ret(&pTest->m_Var2), - NULL), "Part 6"); + void AddHook__Test_Func1__Func1_Post() + { + SH_ADD_MANUALHOOK(Manual_Test_Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post1), true); + } - SH_ADD_HOOK(Test, Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_Pre1), false); - SH_ADD_HOOK(Test, Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_Post1), true); + void AddHook__Test_Func1__Func1_Pre2() + { + SH_ADD_MANUALHOOK(Manual_Test_Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Pre2), false); + } + + void AddHook__Test_Func1__Func1_Post2() + { + SH_ADD_MANUALHOOK(Manual_Test_Func1, pTest, SH_MEMBER(&hook, &CHook::Func1_Post2), true); + } - const int &ret22 = pTest->Func2(500); - ADD_STATE(State_Func2_Ret(&ret22)); + void AddHook__Test_Func2__Func2_Pre1() + { + SH_ADD_MANUALHOOK(Manual_Test_Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_PreRecall_OverrideRet_Manual), false); + } + + void AddHook__Test_Func2__Func2_Post1() + { + SH_ADD_MANUALHOOK(Manual_Test_Func2, pTest, SH_MEMBER(&hook, &CHook::Func2_Post1), true); + } +}; - CHECK_STATES((&g_States, - new State_Func2_Pre1(500, &hook.m_Var), // p1 was 500; it's going to override with hook.m_Var; and also change p1 to 1337 - new State_Func2(1337, &pTest->m_Var2), // p1 was 1337; it's going to ret pTest->m_Var2 - new State_Func2_Post1(1337, // p1 was 1337 - &pTest->m_Var2, // orig ret was pTest->m_Var2 - &hook.m_Var), // override ret was hook.m_Var - new State_Func2_Ret(&hook.m_Var), // really returned hook.m_Var - NULL), "Part 7"); - - return true; +bool TestRefRet(std::string &error) +{ + TesterRefRet *testerNonManual = new TesterRefRetNonManual; + bool resNonManual = testerNonManual->doTests(error); + if (!resNonManual) + { + return false; + } + + TesterRefRet *testerManual = new TesterRefRetManual; + bool resManual = testerManual->doTests(error); + if (!resManual) + { + return false; + } + return true; }