1.1 --- a/sourcehook/test/testhookmangen.h Fri Nov 02 11:59:57 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.h Fri Nov 02 12:41:00 2007 +0000
1.3 @@ -518,6 +518,7 @@
1.4
1.5 #define THGM_MAKE_TEST0(id, ret_type) \
1.6 struct TestClass##id; \
1.7 + typedef ret_type RetType##id; \
1.8 typedef ParamState0<0 > ParamState_m##id; \
1.9 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.10 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.11 @@ -728,6 +729,7 @@
1.12
1.13 #define THGM_MAKE_TEST1(id, ret_type, param1) \
1.14 struct TestClass##id; \
1.15 + typedef ret_type RetType##id; \
1.16 typedef ParamState1<0, param1 > ParamState_m##id; \
1.17 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.18 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.19 @@ -938,6 +940,7 @@
1.20
1.21 #define THGM_MAKE_TEST2(id, ret_type, param1, param2) \
1.22 struct TestClass##id; \
1.23 + typedef ret_type RetType##id; \
1.24 typedef ParamState2<0, param1, param2 > ParamState_m##id; \
1.25 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.26 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.27 @@ -1148,6 +1151,7 @@
1.28
1.29 #define THGM_MAKE_TEST3(id, ret_type, param1, param2, param3) \
1.30 struct TestClass##id; \
1.31 + typedef ret_type RetType##id; \
1.32 typedef ParamState3<0, param1, param2, param3 > ParamState_m##id; \
1.33 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.34 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.35 @@ -1358,6 +1362,7 @@
1.36
1.37 #define THGM_MAKE_TEST4(id, ret_type, param1, param2, param3, param4) \
1.38 struct TestClass##id; \
1.39 + typedef ret_type RetType##id; \
1.40 typedef ParamState4<0, param1, param2, param3, param4 > ParamState_m##id; \
1.41 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.42 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.43 @@ -1568,6 +1573,7 @@
1.44
1.45 #define THGM_MAKE_TEST5(id, ret_type, param1, param2, param3, param4, param5) \
1.46 struct TestClass##id; \
1.47 + typedef ret_type RetType##id; \
1.48 typedef ParamState5<0, param1, param2, param3, param4, param5 > ParamState_m##id; \
1.49 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.50 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.51 @@ -1778,6 +1784,7 @@
1.52
1.53 #define THGM_MAKE_TEST6(id, ret_type, param1, param2, param3, param4, param5, param6) \
1.54 struct TestClass##id; \
1.55 + typedef ret_type RetType##id; \
1.56 typedef ParamState6<0, param1, param2, param3, param4, param5, param6 > ParamState_m##id; \
1.57 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.58 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.59 @@ -2015,10 +2022,21 @@
1.60 THGM_REMOVE_HOOK(id, 3); \
1.61 THGM_REMOVE_HOOK(id, 4);
1.62
1.63 +template<class T>
1.64 +T ComparableRef(T x)
1.65 +{
1.66 + return x;
1.67 +}
1.68 +
1.69 +template <class T>
1.70 +T* ComparableRef(T& x)
1.71 +{
1.72 + return &x;
1.73 +}
1.74
1.75 #define THGM_CALLS(id, call_params, exp_ret_norm, exp_ret_shcall, err) \
1.76 - CHECK_COND(pTest##id->Func call_params == exp_ret_norm, err " /retcallnorm"); \
1.77 - CHECK_COND(SH_CALL(pTest##id, &TestClass##id::Func) call_params == exp_ret_shcall, err " /retcallshcall");
1.78 + CHECK_COND(ComparableRef<RetType##id>(pTest##id->Func call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_norm)), err " /retcallnorm"); \
1.79 + CHECK_COND(ComparableRef<RetType##id>(SH_CALL(pTest##id, &TestClass##id::Func) call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_shcall)), err " /retcallshcall");
1.80
1.81 #define THGM_DO_TEST(id, call_params) \
1.82 setuppi_##id(); \