Thread: [Mockpp-commits] mockpp/mockpp/tests Invocation_test.cpp,1.17,1.18
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-10-02 22:44:54
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31987/mockpp/tests Modified Files: Invocation_test.cpp Log Message: removed superfluous InvocationX::equals Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Invocation_test.cpp 24 Jul 2005 12:54:57 -0000 1.17 +++ Invocation_test.cpp 1 Oct 2005 16:24:08 -0000 1.18 @@ -27,6 +27,8 @@ * ***************************************************************************/ +#define MOCKPP_USE_INVOCATION_EQUALS + #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -130,12 +132,15 @@ mockpp::String s5 = MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"); std::string s__ = "=="; Setter5Invocation sinva5(s5, i1, abc, xyz, i2, s__); + +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == true); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); CPPUNIT_ASSERT(sinv.equals(sinva3) == false); CPPUNIT_ASSERT(sinv.equals(sinva4) == false); CPPUNIT_ASSERT(sinv.equals(sinva5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS } @@ -148,11 +153,15 @@ CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop(1)")); SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv1) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS int i0 = 0; SetterInvocation sinv2(MOCKPP_PCHAR("(MyInvocationDummy::set_1_Prop"), i0); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv2) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); SetterInvocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); @@ -164,12 +173,14 @@ 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__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == true); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); CPPUNIT_ASSERT(sinv.equals(sinva3) == false); CPPUNIT_ASSERT(sinv.equals(sinva4) == false); CPPUNIT_ASSERT(sinv.equals(sinva5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS } @@ -190,13 +201,19 @@ CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop(1, abc)")); SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abc); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv1) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i1, abC); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv2) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_2_Prop"), i6, abc); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv3) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); @@ -204,12 +221,14 @@ 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__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == true); CPPUNIT_ASSERT(sinv.equals(sinva3) == false); CPPUNIT_ASSERT(sinv.equals(sinva4) == false); CPPUNIT_ASSERT(sinv.equals(sinva5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS } @@ -229,16 +248,24 @@ CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop(1, abc, xyz)")); SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyz); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv1) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abc, xyZ); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv2) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i1, abC, xyz); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv3) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_3_Prop"), i5, abc, xyz); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv4) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); @@ -246,12 +273,14 @@ 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__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); CPPUNIT_ASSERT(sinv.equals(sinva3) == true); CPPUNIT_ASSERT(sinv.equals(sinva4) == false); CPPUNIT_ASSERT(sinv.equals(sinva5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS } @@ -273,19 +302,29 @@ CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop(1, abc, xyz, 2)")); SetterInvocation sinv1(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i2); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv1) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i0, abc, xyz, i2); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv2) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyz, i5); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv3) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abc, xyZ, i2); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv4) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_4_Prop"), i1, abC, xyz, i2); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); @@ -293,12 +332,14 @@ 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__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); CPPUNIT_ASSERT(sinv.equals(sinva3) == false); CPPUNIT_ASSERT(sinv.equals(sinva4) == true); CPPUNIT_ASSERT(sinv.equals(sinva5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS } @@ -321,22 +362,34 @@ CPPUNIT_ASSERT(sinv.toString() == MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop(1, abc, xyz, 2, ==)")); SetterInvocation sinv2(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv2) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv3(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i2, s_I); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv3) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv4(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyz, i1, s__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv4) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv5(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abc, xyZ, i2, s__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv5) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv6(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i1, abC, xyz, i2, s__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv6) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS SetterInvocation sinv7(MOCKPP_PCHAR("MyInvocationDummy::set_5_Prop"), i0, abc, xyz, i2, s__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinv7) == false); +#endif // MOCKPP_USE_INVOCATION_EQUALS Setter0Invocation sinva0(MOCKPP_PCHAR("MyInvocationDummy::set_0_Prop")); Setter1Invocation sinva1(MOCKPP_PCHAR("MyInvocationDummy::set_1_Prop"), i1); @@ -344,12 +397,14 @@ 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__); +#ifdef MOCKPP_USE_INVOCATION_EQUALS CPPUNIT_ASSERT(sinv.equals(sinva0) == false); CPPUNIT_ASSERT(sinv.equals(sinva1) == false); CPPUNIT_ASSERT(sinv.equals(sinva2) == false); CPPUNIT_ASSERT(sinv.equals(sinva3) == false); CPPUNIT_ASSERT(sinv.equals(sinva4) == false); CPPUNIT_ASSERT(sinv.equals(sinva5) == true); +#endif // MOCKPP_USE_INVOCATION_EQUALS } |