[Mockpp-commits] mockpp/mockpp/tests ChainableMockMethod_test.cpp,1.7,1.8 VisitableMockMethod_test.cpp,1.7,1.8

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27948/mockpp/tests

Modified Files:
	ChainableMockMethod_test.cpp VisitableMockMethod_test.cpp 
Log Message:
counted methods available

Index: VisitableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- VisitableMockMethod_test.cpp	29 Oct 2005 18:17:30 -0000	1.7
+++ VisitableMockMethod_test.cpp	30 Oct 2005 13:54:15 -0000	1.8
@@ -45,6 +45,7 @@
 #include <mockpp/VisitableMockMethod4.h>
 #include <mockpp/VisitableMockMethod5.h>
 #include <mockpp/VisitableMockMethod6.h>
+#include <mockpp/CountedVisitableMethod.h>
 
 #include <mockpp/VisitableMockObject.h>
 
@@ -154,6 +155,22 @@
   mockpp::VisitableMockMethod4<int, int, int, int, int> mmi4(MOCKPP_PCHAR("mm4"), 0);  
   mockpp::VisitableMockMethod5<int, int, int, int, int, int> mmi5(MOCKPP_PCHAR("mm5"), 0);  
   mockpp::VisitableMockMethod6<int, int, int, int, int, int, int> mmi6(MOCKPP_PCHAR("mm6"), 0);  
+
+  mockpp::VisitableMockMethod<void> mmvd0(MOCKPP_PCHAR("mm0"), 0);
+  mockpp::VisitableMockMethod<void, int> mmvd1(MOCKPP_PCHAR("mm1"), 0);
+  mockpp::VisitableMockMethod<void, int, int> mmvd2(MOCKPP_PCHAR("mm2"), 0);
+  mockpp::VisitableMockMethod<void, int, int, int> mmvd3(MOCKPP_PCHAR("mm3"), 0);
+  mockpp::VisitableMockMethod<void, int, int, int, int> mmvd4(MOCKPP_PCHAR("mm4"), 0);
+  mockpp::VisitableMockMethod<void, int, int, int, int, int> mmvd5(MOCKPP_PCHAR("mm5"), 0);
+  mockpp::VisitableMockMethod<void, int, int, int, int, int, int> mmvd6(MOCKPP_PCHAR("mm6"), 0);
+
+  mockpp::VisitableMockMethod<int> mmid0(MOCKPP_PCHAR("mm0"), 0);  
+  mockpp::VisitableMockMethod<int, int> mmid1(MOCKPP_PCHAR("mm1"), 0);  
+  mockpp::VisitableMockMethod<int, int, int> mmid2(MOCKPP_PCHAR("mm2"), 0);  
+  mockpp::VisitableMockMethod<int, int, int, int> mmid3(MOCKPP_PCHAR("mm3"), 0);  
+  mockpp::VisitableMockMethod<int, int, int, int, int> mmid4(MOCKPP_PCHAR("mm4"), 0);  
+  mockpp::VisitableMockMethod<int, int, int, int, int, int> mmid5(MOCKPP_PCHAR("mm5"), 0);  
+  mockpp::VisitableMockMethod<int, int, int, int, int, int, int> mmid6(MOCKPP_PCHAR("mm6"), 0);  
 }
 
 

Index: ChainableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_test.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChainableMockMethod_test.cpp	29 Oct 2005 18:17:30 -0000	1.7
+++ ChainableMockMethod_test.cpp	30 Oct 2005 13:54:15 -0000	1.8
@@ -45,12 +45,15 @@
 #include <mockpp/chaining/ChainableMockMethod4.h>
 #include <mockpp/chaining/ChainableMockMethod5.h>
 #include <mockpp/chaining/ChainableMockMethod6.h>
+#include <mockpp/chaining/CountedChainableMethod.h>
 
 #include <mockpp/chaining/ChainingMockObjectSupport.h>
 #include <mockpp/chaining/Invocation.h>
 
 #include <mockpp/constraint/OutBound.h>
 
+#include <mockpp/CountParameters.h>
+
 #include "IncCounter.h"
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -124,7 +127,23 @@
   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::ChainableMockMethod6<int, int, int, int, int, int, int> mmi6(MOCKPP_PCHAR("mm6"), 0);
+
+  mockpp::ChainableMockMethod<void> mmvd0(MOCKPP_PCHAR("mm0"), 0);
+  mockpp::ChainableMockMethod<void, int> mmvd1(MOCKPP_PCHAR("mm1"), 0);
+  mockpp::ChainableMockMethod<void, int, int> mmvd2(MOCKPP_PCHAR("mm2"), 0);
+  mockpp::ChainableMockMethod<void, int, int, int> mmvd3(MOCKPP_PCHAR("mm3"), 0);
+  mockpp::ChainableMockMethod<void, int, int, int, int> mmvd4(MOCKPP_PCHAR("mm4"), 0);
+  mockpp::ChainableMockMethod<void, int, int, int, int, int> mmvd5(MOCKPP_PCHAR("mm5"), 0);
+  mockpp::ChainableMockMethod<void, int, int, int, int, int, int> mmvd6(MOCKPP_PCHAR("mm6"), 0);
+
+  mockpp::ChainableMockMethod<int> mmid0(MOCKPP_PCHAR("mm0"), 0);  
+  mockpp::ChainableMockMethod<int, int> mmid1(MOCKPP_PCHAR("mm1"), 0);  
+  mockpp::ChainableMockMethod<int, int, int> mmid2(MOCKPP_PCHAR("mm2"), 0);  
+  mockpp::ChainableMockMethod<int, int, int, int> mmid3(MOCKPP_PCHAR("mm3"), 0);  
+  mockpp::ChainableMockMethod<int, int, int, int, int> mmid4(MOCKPP_PCHAR("mm4"), 0);  
+  mockpp::ChainableMockMethod<int, int, int, int, int, int> mmid5(MOCKPP_PCHAR("mm5"), 0);  
+  mockpp::ChainableMockMethod<int, int, int, int, int, int, int> mmid6(MOCKPP_PCHAR("mm6"), 0);
 }