[Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.27,1.28
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.27,1.28
|
From: Ewald A. <ewa...@us...> - 2005-04-09 16:44:11
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27422/mockpp Modified Files: VisitableMockObject_macro.h Log Message: add object name to method names Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- VisitableMockObject_macro.h 4 Mar 2005 17:39:40 -0000 1.27 +++ VisitableMockObject_macro.h 9 Apr 2005 16:43:55 -0000 1.28 @@ -691,12 +691,12 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ return;\ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name ); \ return;\ } \ @@ -721,13 +721,13 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ return; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ @@ -744,7 +744,7 @@ \ void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ } \ @@ -772,14 +772,14 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ return; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ @@ -799,7 +799,7 @@ void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ m_name ## Parameter1.addExpected(cons1.release()); \ @@ -831,7 +831,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -839,7 +839,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ @@ -862,7 +862,7 @@ const mockpp::ConstraintHolder<v_type2> ¶m2, \ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ @@ -898,7 +898,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -907,7 +907,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ @@ -933,7 +933,7 @@ const mockpp::ConstraintHolder<v_type3> ¶m3, \ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ @@ -973,7 +973,7 @@ std::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -983,7 +983,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ @@ -1012,7 +1012,7 @@ const mockpp::ConstraintHolder<v_type4> ¶m4, \ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ @@ -1045,13 +1045,13 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name); \ \ if (m_name ## ReturnValues.hasMoreObjects()) \ @@ -1085,14 +1085,14 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ @@ -1117,7 +1117,7 @@ \ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ m_name ## Parameter1.addExpected(cons1.release()); \ return v_ret_type(); \ @@ -1149,7 +1149,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ v_ret_type ret_val = v_ret_type(); \ @@ -1157,7 +1157,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ @@ -1185,7 +1185,7 @@ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ m_name ## Parameter1.addExpected(cons1.release()); \ @@ -1221,7 +1221,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1230,7 +1230,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ @@ -1261,7 +1261,7 @@ const mockpp::ConstraintHolder<v_type2> ¶m2, \ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ @@ -1300,7 +1300,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1310,7 +1310,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ @@ -1344,7 +1344,7 @@ const mockpp::ConstraintHolder<v_type3> ¶m3, \ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ @@ -1387,7 +1387,7 @@ std::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(func_name); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1398,7 +1398,7 @@ } \ else \ { \ - addActualMethod(func_name); \ + addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ try { \ mockpp::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ @@ -1435,7 +1435,7 @@ const mockpp::ConstraintHolder<v_type4> ¶m4, \ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(std::string(#m_name)); \ + addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ mockpp::Constraint<v_type1>::AP cons1 (param1); \ mockpp::Constraint<v_type2>::AP cons2 (param2); \ mockpp::Constraint<v_type3>::AP cons3 (param3); \ |
