[Mockpp-commits] mockpp/mockpp/tests ArgumentsMatcher_test.cpp,1.10,1.11 ChainableMockObject_1_void_
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests ArgumentsMatcher_test.cpp,1.10,1.11 ChainableMockObject_1_void_test.cpp,1.9,1.10 ConstraintSet_test.cpp,1.13,1.14 InvocationMocker_test.cpp,1.34,1.35 Invocation_test.cpp,1.16,1.17 NoArgumentsMatcher_test.cpp,1.8,1.9 StubBuilder_test.cpp,1.13,1.14 mockpp_pti_test.cpp,1.4,1.5
|
From: Ewald A. <ewa...@us...> - 2005-07-24 12:55:19
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16296/mockpp/tests Modified Files: ArgumentsMatcher_test.cpp ChainableMockObject_1_void_test.cpp ConstraintSet_test.cpp InvocationMocker_test.cpp Invocation_test.cpp NoArgumentsMatcher_test.cpp StubBuilder_test.cpp mockpp_pti_test.cpp Log Message: OutBound capability for chainables Index: ArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ArgumentsMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ArgumentsMatcher_test.cpp 30 Dec 2004 20:54:04 -0000 1.10 +++ ArgumentsMatcher_test.cpp 24 Jul 2005 12:54:57 -0000 1.11 @@ -72,8 +72,10 @@ mockpp::ConstraintSet1<int> cs1 (new mockpp::IsEqual<int>(1)); typedef mockpp::Invocation1<int> SetterInvocation1; - SetterInvocation1 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), 1); - SetterInvocation1 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), 0); + int i1 = 1; + int i0 = 0; + SetterInvocation1 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), i1); + SetterInvocation1 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_1_Prop"), i0); mockpp::ArgumentsMatcher<SetterInvocation1> am(cs1); CPPUNIT_ASSERT(am.matches(sinv) == true); @@ -87,9 +89,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation2; - SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 2); - SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 0, 2); - SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i2); + SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i0, i2); + SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i0); mockpp::ArgumentsMatcher<SetterInvocation2> am(cs2); CPPUNIT_ASSERT(am.matches(sinv) == true); @@ -104,9 +109,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation2; - SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 2); - SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 0, 2); - SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation2 sinv (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i2); + SetterInvocation2 sinva (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i0, i2); + SetterInvocation2 sinvb (MOCKPP_PCHAR("MyArgumentsMatcherDummy::set_2_Prop"), i1, i0); mockpp::ArgumentsMatcher<SetterInvocation2> am(cs2); mockpp::String s = MOCKPP_PCHAR("cs?"); Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Invocation_test.cpp 30 Dec 2004 20:54:06 -0000 1.16 +++ Invocation_test.cpp 24 Jul 2005 12:54:57 -0000 1.17 @@ -109,11 +109,27 @@ CPPUNIT_ASSERT(ginv.toString() == MOCKPP_PCHAR("MyInvocationDummy::getProp()")); SetterInvocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + + int i1 = 1; + std::string abc = "abc"; + + mockpp::String s1 = MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"); + Setter1Invocation sinva1(s1, i1); + + mockpp::String s2 = MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"); + Setter2Invocation sinva2(s2, i1, abc); + + mockpp::String s3 = MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"); + std::string xyz = "xyz"; + Setter3Invocation sinva3(s3, i1, abc, xyz); + + mockpp::String s4 = MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"); + int i2 = 2; + Setter4Invocation sinva4(s4, i1, abc, xyz, i2); + + mockpp::String s5 = MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"); + std::string s__ = "=="; + Setter5Invocation sinva5(s5, i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == true); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -127,21 +143,27 @@ { typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + int i1 = 1; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop(1)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("(MyInvocationDummy::set_1_Prop"), 0); + int i0 = 0; + SetterInvocation sinv2(MOCKPP_PCHAR("(MyInvocationDummy::set_1_Prop"), i0); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - SetterInvocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + SetterInvocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + std::string abc = "abc"; + std::string xyz = "xyz"; + int i2 = 2; + std::string s__ = "=="; + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == true); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -155,24 +177,33 @@ { typedef mockpp::Invocation2<int, std::string> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + int i1 = 1; + int i2 = 2; + int i6 = 6; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop(1, abc)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abC"); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abC); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 6, "abc"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i6, abc); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - SetterInvocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + SetterInvocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == true); @@ -185,28 +216,36 @@ void Invocation_test::test_equals3() { typedef mockpp::Invocation3<int, std::string, std::string > SetterInvocation; + int i1 = 1; + int i2 = 2; + int i5 = 5; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop(1, abc, xyz)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyZ"); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyZ); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abC", "xyz"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abC, xyz); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 5, "abc", "xyz"); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i5, abc, xyz); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - SetterInvocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + SetterInvocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -220,30 +259,40 @@ { typedef mockpp::Invocation4<int, std::string, std::string, int > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + int i1 = 1; + int i0 = 0; + int i2 = 2; + int i5 = 5; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop(1, abc, xyz, 2)")); - SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv1) == true); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 0, "abc", "xyz", 2); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i0, abc, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv2) == false); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 5); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i5); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyZ", 2); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyZ, i2); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); - SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abC", "xyz", 2); + SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abC, xyz, i2); CPPUNIT_ASSERT(sinv.equals(sinv5) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - SetterInvocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + SetterInvocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + Setter5Invocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -257,34 +306,44 @@ { typedef mockpp::Invocation5<int, std::string, std::string, int, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + int i1 = 1; + int i2 = 2; + int i0 = 0; + std::string abc = "abc"; + std::string abC = "abC"; + std::string xyz = "xyz"; + std::string xyZ = "xyZ"; + std::string s__ = "=="; + std::string s_I = "=!"; + + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop(1, abc, xyz, 2, ==)")); - SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv2) == true); - SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=!"); + SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s_I); CPPUNIT_ASSERT(sinv.equals(sinv3) == false); - SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 1, "=="); + SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i1, s__); CPPUNIT_ASSERT(sinv.equals(sinv4) == false); - SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyZ", 2, "=="); + SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyZ, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv5) == false); - SetterInvocation sinv6(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abC", "xyz", 2, "=="); + SetterInvocation sinv6(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abC, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv6) == false); - SetterInvocation sinv7(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 0, "abc", "xyz", 2, "=="); + SetterInvocation sinv7(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i0, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinv7) == false); Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); - Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); - Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); - Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); - Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); - SetterInvocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); + Setter2Invocation sinva2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); + Setter3Invocation sinva3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); + Setter4Invocation sinva4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); + SetterInvocation sinva5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); @@ -298,7 +357,8 @@ { typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), 1); + int i1 = 1; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -311,7 +371,9 @@ { typedef mockpp::Invocation2<int, std::string> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), 1, "abc"); + int i = 1; + std::string s = "abc"; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i, s); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -327,7 +389,10 @@ { typedef mockpp::Invocation3<int, std::string, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), 1, "abc", "xyz"); + int i = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i, s1, s2); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -346,7 +411,11 @@ { typedef mockpp::Invocation4<int, std::string, std::string, int> SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), 1, "abc", "xyz", 2); + int i1 = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + int i2 = 2; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, s1, s2, i2); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); @@ -367,7 +436,12 @@ void Invocation_test::test_get5() { typedef mockpp::Invocation5<int, std::string, std::string, int, std::string > SetterInvocation; - SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), 1, "abc", "xyz", 2, "=="); + int i1 = 1; + std::string s1 = "abc"; + std::string s2 = "xyz"; + int i2 = 2; + std::string s3 = "=="; + SetterInvocation sinv(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, s1, s2, i2, s3); int p1 = sinv.getParameter1(); CPPUNIT_ASSERT(p1 == 1); Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- InvocationMocker_test.cpp 6 Apr 2005 19:35:23 -0000 1.34 +++ InvocationMocker_test.cpp 24 Jul 2005 12:54:57 -0000 1.35 @@ -191,7 +191,12 @@ void InvocationMocker_test::test_matches() { mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -229,7 +234,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -249,7 +259,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<void, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -274,7 +289,12 @@ { typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; mockpp::InvocationMocker<int, GetterInvocation> im; - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -304,7 +324,12 @@ CPPUNIT_ASSERT(descr->hasDescription()); mockpp::InvocationMocker<int, GetterInvocation> im(descr); - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); MyInvocationMatcher<GetterInvocation> *ivm1 = new MyInvocationMatcher<GetterInvocation>; MyInvocationMatcher<GetterInvocation> *ivm2 = new MyInvocationMatcher<GetterInvocation>; @@ -328,7 +353,12 @@ CPPUNIT_ASSERT(descr->hasDescription()); mockpp::InvocationMocker<int, GetterInvocation>im(descr); - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp"), ca, cb, cc, cd, ce); mockpp::ConstraintSet5<CA, CB, CC, CD, CE> cs1 (new mockpp::IsEqual<CA>(CA()), new mockpp::IsEqual<CB>(CB()), Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChainableMockObject_1_void_test.cpp 6 Apr 2005 19:33:43 -0000 1.9 +++ ChainableMockObject_1_void_test.cpp 24 Jul 2005 12:54:57 -0000 1.10 @@ -45,29 +45,33 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> +#include <mockpp/constraint/OutBound.h> + + +typedef mockpp::Invocation1<unsigned> TheInvocation; + +MOCKPP_PTI_IMPLEMENT(TheInvocation) + -typedef mockpp::Invocation1<unsigned> TheInvocation; - -MOCKPP_PTI_IMPLEMENT(TheInvocation) - - class ChainableMockObject_1_void_test : public CppUnit::TestFixture { public: CPPUNIT_TEST_SUITE( ChainableMockObject_1_void_test ); + CPPUNIT_TEST(test_outbound); CPPUNIT_TEST( test_parameter_1 ); CPPUNIT_TEST_SUITE_END(); public: + void test_outbound(); void test_parameter_1(); }; - - + + CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_1_void_test); @@ -90,9 +94,13 @@ MyChainableMockObject_1_void_ex(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) + , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(outbound, Ext) , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(chainable1, Ext) {} + MOCKPP_VOID_CHAINABLE_EXT1(MyChainableMockObject_1_void_ex, outbound, unsigned &, + Ext, unsigned ); + MOCKPP_VOID_CHAINABLE_EXT1(MyChainableMockObject_1_void_ex, chainable1, const std::string &, Ext, std::string); }; @@ -145,5 +153,27 @@ mcm.verify(); } +#include <iostream> + +void ChainableMockObject_1_void_test::test_outbound() +{ + MyChainableMockObject_1_void_ex mcm(MOCKPP_PCHAR("chainable-object")); + + MOCKPP_CHAINER_FOR_EXT(MyChainableMockObject_1_void_ex, outbound, Ext) chain(&mcm); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 123)); + + chain.stubs(mockpp::once()) + .with(mockpp::outBound( (unsigned int) 456)); +/* + unsigned val = 0; + mcm.outbound(val); + CPPUNIT_ASSERT_EQUAL((unsigned)123, val); + mcm.outbound(val); + CPPUNIT_ASSERT_EQUAL((unsigned)456, val); +*/ +} + #endif // HAVE_CPPUNIT Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NoArgumentsMatcher_test.cpp 30 Dec 2004 20:54:06 -0000 1.8 +++ NoArgumentsMatcher_test.cpp 24 Jul 2005 12:54:58 -0000 1.9 @@ -64,8 +64,9 @@ typedef mockpp::Invocation0 SetterInvocation0; typedef mockpp::Invocation1<int> SetterInvocation1; + int i2 = 2; SetterInvocation0 s0inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_0_Prop")); - SetterInvocation1 s1inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_1_Prop"), 2); + SetterInvocation1 s1inv(MOCKPP_PCHAR("MyNoArgumentsMatcherDummy::set_1_Prop"), i2); mockpp::NoArgumentsMatcher<SetterInvocation0> nam0; mockpp::NoArgumentsMatcher<SetterInvocation1> nam1; Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mockpp_pti_test.cpp 6 Apr 2005 19:31:20 -0000 1.4 +++ mockpp_pti_test.cpp 24 Jul 2005 12:54:58 -0000 1.5 @@ -48,17 +48,17 @@ typedef mockpp::Invocation1<int> Setter1Invocation; - + #if 1 -MOCKPP_PTI_IMPLEMENT(Setter1Invocation) -#else +MOCKPP_PTI_IMPLEMENT(Setter1Invocation) +#else MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(Setter1Invocation) MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(Setter1Invocation) MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(Setter1Invocation) MOCKPP_INVOCATIONMOCKER_PTI_IMPL(Setter1Invocation) MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(Setter1Invocation) MOCKPP_COREMOCK_PTI_IMPL(Setter1Invocation) -#endif +#endif namespace { @@ -116,7 +116,8 @@ void mockpp_pti_test::test_coremock() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); { MyVoidStub *mvs = new MyVoidStub; mockpp::CoreMock<void, Setter1Invocation> cmd(MOCKPP_PCHAR("name"), 0); @@ -138,7 +139,8 @@ void mockpp_pti_test::test_typeless() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; mockpp::TypelessStubAdapter<void, Setter1Invocation > tsa (mvs); tsa.invoke(si); @@ -198,7 +200,8 @@ void mockpp_pti_test::test_lifo() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; TestInvokable *ti1 = new TestInvokable; TestInvokable *ti2 = new TestInvokable; @@ -230,7 +233,8 @@ void mockpp_pti_test::test_fifo() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); MyVoidStub *mvs = new MyVoidStub; TestInvokable *ti1 = new TestInvokable; TestInvokable *ti2 = new TestInvokable; @@ -288,7 +292,8 @@ void mockpp_pti_test::test_invocation() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); mockpp::InvocationMocker<void, Setter1Invocation> im; MyInvocationMatcher *ivm1 = new MyInvocationMatcher; MyInvocationMatcher *ivm2 = new MyInvocationMatcher; @@ -368,7 +373,8 @@ void mockpp_pti_test::test_abstract() { - Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), 1); + int i1 = 1; + Setter1Invocation si(MOCKPP_PCHAR("Setter1Invocation"), i1); ChainingMockDummy cmd (new mockpp::LIFOInvocationDispatcher<void, Setter1Invocation>, MOCKPP_PCHAR( "adc-name" ), 0 ); MyVoidStub *stub = new MyVoidStub; MyMatcherDummy *mmd = new MyMatcherDummy; Index: ConstraintSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ConstraintSet_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ConstraintSet_test.cpp 30 Dec 2004 20:54:06 -0000 1.13 +++ ConstraintSet_test.cpp 24 Jul 2005 12:54:57 -0000 1.14 @@ -120,8 +120,10 @@ mockpp::ConstraintSet1<int> cs (new mockpp::IsEqual<int>(1)); typedef mockpp::Invocation1<int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), 1); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), 0); + int i0 = 0; + int i1 = 1; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), i1); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_1_Prop"), i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -134,9 +136,12 @@ new mockpp::IsEqual<int>(2)); typedef mockpp::Invocation2<int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 1, 2); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 0, 2); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), 1, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i1, i2); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i0, i2); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_2_Prop"), i1, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -152,10 +157,14 @@ new mockpp::IsEqual<int>(3)); typedef mockpp::Invocation3<int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 2, 3); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 0, 2, 3); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 0, 3); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), 1, 2, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i2, i3); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i0, i2, i3); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i0, i3); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_3_Prop"), i1, i2, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -173,11 +182,16 @@ new mockpp::IsEqual<int>(4)); typedef mockpp::Invocation4<int, int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 3, 4); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 0, 2, 3, 4); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 0, 3, 4); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 0, 4); - SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), 1, 2, 3, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + int i4 = 4; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i3, i4); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i0, i2, i3, i4); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i0, i3, i4); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i0, i4); + SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_4_Prop"), i1, i2, i3, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); @@ -197,12 +211,18 @@ new mockpp::IsEqual<int>(5)); typedef mockpp::Invocation5<int, int, int, int, int> SetterInvocation; - SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 4, 5); - SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 0, 2, 3, 4, 5); - SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 0, 3, 4, 5); - SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 0, 4, 5); - SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 0, 5); - SetterInvocation sinve(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), 1, 2, 3, 4, 0); + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + int i4 = 4; + int i5 = 5; + SetterInvocation sinv (MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i4, i5); + SetterInvocation sinva(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i0, i2, i3, i4, i5); + SetterInvocation sinvb(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i0, i3, i4, i5); + SetterInvocation sinvc(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i0, i4, i5); + SetterInvocation sinvd(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i0, i5); + SetterInvocation sinve(MOCKPP_PCHAR("MyConstraintSetDummy::set_5_Prop"), i1, i2, i3, i4, i0); CPPUNIT_ASSERT(cs.matches(sinv) == true); CPPUNIT_ASSERT(cs.matches(sinva) == false); Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StubBuilder_test.cpp 3 Apr 2005 18:32:54 -0000 1.13 +++ StubBuilder_test.cpp 24 Jul 2005 12:54:58 -0000 1.14 @@ -74,8 +74,8 @@ typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; typedef mockpp::Invocation5<CA, CB, CC, CD, CE> VoidInvocation; -MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation) - +MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation) + template <typename R, // Returntype typename I> // Invocation @@ -102,7 +102,12 @@ void StubBuilder_test::test_instance() { - GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp5"), CA(), CB(), CC(), CD(), CE()); + CA ca; + CB cb; + CC cc; + CD cd; + CE ce; + GetterInvocation ginv(MOCKPP_PCHAR("InvocationDummy::getProp5"), ca, cb, cc, cd, ce); MyStubBuilder<int, GetterInvocation> sbi; sbi.will(new mockpp::ReturnStub<int>(123)); |
