Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16033/mockpp/tests
Modified Files:
ChainableMockMethod_1_test.cpp ChainableMockMethod_2_test.cpp
ChainableMockMethod_test.cpp
Log Message:
completed tests
Index: ChainableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_test.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChainableMockMethod_test.cpp 31 Oct 2005 19:24:10 -0000 1.10
+++ ChainableMockMethod_test.cpp 3 Nov 2005 20:44:06 -0000 1.11
@@ -37,8 +37,6 @@
#else
-//#define MOCKPP_COUNTED_WEAKNESS // only BCB5
-
#include <mockpp/chaining/ChainableMockMethod.h>
#include <mockpp/chaining/ChainableMockMethod0.h>
#include <mockpp/chaining/ChainableMockMethod1.h>
@@ -123,12 +121,12 @@
mockpp::ChainableMockMethod5<void, int, int, int, int, int> mmv5(MOCKPP_PCHAR("mm5"), 0);
mockpp::ChainableMockMethod6<void, int, int, int, int, int, int> mmv6(MOCKPP_PCHAR("mm6"), 0);
- mockpp::ChainableMockMethod0<int> mmi0(MOCKPP_PCHAR("mm0"), 0);
- mockpp::ChainableMockMethod1<int, int> mmi1(MOCKPP_PCHAR("mm1"), 0);
- mockpp::ChainableMockMethod2<int, int, int> mmi2(MOCKPP_PCHAR("mm2"), 0);
- mockpp::ChainableMockMethod3<int, int, int, int> mmi3(MOCKPP_PCHAR("mm3"), 0);
- mockpp::ChainableMockMethod4<int, int, int, int, int> mmi4(MOCKPP_PCHAR("mm4"), 0);
- mockpp::ChainableMockMethod5<int, int, int, int, int, int> mmi5(MOCKPP_PCHAR("mm5"), 0);
+ mockpp::ChainableMockMethod0<int> mmi0(MOCKPP_PCHAR("mm0"), 0);
+ mockpp::ChainableMockMethod1<int, int> mmi1(MOCKPP_PCHAR("mm1"), 0);
+ mockpp::ChainableMockMethod2<int, int, int> mmi2(MOCKPP_PCHAR("mm2"), 0);
+ mockpp::ChainableMockMethod3<int, int, int, int> mmi3(MOCKPP_PCHAR("mm3"), 0);
+ mockpp::ChainableMockMethod4<int, int, int, int, int> mmi4(MOCKPP_PCHAR("mm4"), 0);
+ mockpp::ChainableMockMethod5<int, int, int, int, int, int> mmi5(MOCKPP_PCHAR("mm5"), 0);
mockpp::ChainableMockMethod6<int, int, int, int, int, int, int> mmi6(MOCKPP_PCHAR("mm6"), 0);
mockpp::ChainableMockMethod<void> mmvd0(MOCKPP_PCHAR("mm0"), 0);
@@ -187,14 +185,15 @@
chain.stubs(mockpp::once())
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(1u, counter);
chain.stubs(mockpp::once())
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(2u, counter);
mcm.chainablev();
+ MOCKPP_ASSERT_EQUALS(1u, counter);
+
mcm.chainablev();
+ MOCKPP_ASSERT_EQUALS(2u, counter);
try
{
@@ -214,3 +213,4 @@
#endif // HAVE_CPPUNIT
+
Index: ChainableMockMethod_1_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_1_test.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChainableMockMethod_1_test.cpp 25 Oct 2005 20:20:18 -0000 1.8
+++ ChainableMockMethod_1_test.cpp 3 Nov 2005 20:44:06 -0000 1.9
@@ -145,15 +145,16 @@
chain.stubs(mockpp::once())
.with(mockpp::eq(12u))
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(1u, counter);
chain.stubs(mockpp::once())
.with(mockpp::eq(34u))
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(2u, counter);
mcm.chainablev(12);
+ MOCKPP_ASSERT_EQUALS(1u, counter);
+
mcm.chainablev(34);
+ MOCKPP_ASSERT_EQUALS(2u, counter);
try
{
@@ -173,3 +174,4 @@
#endif // HAVE_CPPUNIT
+
Index: ChainableMockMethod_2_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_2_test.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChainableMockMethod_2_test.cpp 25 Oct 2005 20:20:18 -0000 1.6
+++ ChainableMockMethod_2_test.cpp 3 Nov 2005 20:44:06 -0000 1.7
@@ -143,20 +143,24 @@
mockpp::ChainableMockMethod2<void, unsigned, long>::ChainerFor chain(mcm.chainablev_mocker);
unsigned counter = 0;
+// IncCounter<unsigned> ctr(counter);
+// ctr.typelessInvoke();
+
chain.stubs(mockpp::once())
.with(mockpp::eq<unsigned>(12u),
mockpp::eq<long>(23))
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(1u, counter);
chain.stubs(mockpp::once())
.with(mockpp::eq<unsigned>(34),
mockpp::eq<long>(45))
.will(new IncCounter<unsigned>(counter));
-// @todo MOCKPP_ASSERT_EQUALS(2u, counter);
mcm.chainablev(12, 23);
+ MOCKPP_ASSERT_EQUALS(1u, counter);
+
mcm.chainablev(34, 45);
+ MOCKPP_ASSERT_EQUALS(2u, counter);
try
{
@@ -176,3 +180,4 @@
#endif // HAVE_CPPUNIT
+
|
