mockpp-commits

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

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

Modified Files:
	VisitableMockMethod_test.cpp 
Log Message:
backup

Index: VisitableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VisitableMockMethod_test.cpp	15 Oct 2005 15:40:59 -0000	1.2
+++ VisitableMockMethod_test.cpp	17 Oct 2005 19:15:09 -0000	1.3
@@ -42,6 +42,10 @@
 
 #include <mockpp/constraint/OutBound.h>
 
+#include <mockpp/compat/Assert.h>
+
+#include <mockpp/Throwable.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace { // anon
@@ -77,6 +81,7 @@
     MyVisitableMockObject_0(const mockpp::String &name)
       : mockpp::VisitableMockObject(name, 0)
       , visitable_mocker(MOCKPP_PCHAR("visitable"), this)
+      , visitablev_mocker(MOCKPP_PCHAR("visitablev"), this)
     {}
 
     int visitable()
@@ -84,7 +89,13 @@
       return visitable_mocker.forward();
     }
 
-    mockpp::VisitableMockMethod0<int> visitable_mocker;
+    void visitable()
+    {
+      visitablev_mocker.forward();
+    }
+
+    mockpp::VisitableMockMethod0<int>  visitable_mocker;
+    mockpp::VisitableMockMethod0<void> visitable_mockerv;
 };
 
 
@@ -92,7 +103,7 @@
 {
   MyVisitableMockObject_0 mcm(MOCKPP_PCHAR("Visitable-object"));
 /*
-  mockpp::VisitableMockMethod0<int>::ChainerFor chain(mcm, mcm.Visitable_mocker);
+  mockpp::VisitableMockMethod0<int>::ChainerFor chain(mcm.Visitable_mocker);
 
   MOCKPP_ASSERT_TRUE(mcm.Visitable(12) == 21);
   MOCKPP_ASSERT_TRUE(mcm.Visitable(34) == 43);
@@ -117,7 +128,18 @@
 {
   mockpp::VisitableMockObject vmo (MOCKPP_PCHAR("mockobj"), 0);
   mockpp::VisitableMockMethodBase vmb (MOCKPP_PCHAR("methodbase"), &vmo);
+  MOCKPP_ASSERT_TRUE(vmb.getMethodName() == MOCKPP_PCHAR("methodbase"));
+  MOCKPP_ASSERT_TRUE(vmb.getVisitableMockObject() == &vmo);
 
+  mockpp::VisitableMockMethodBase::ControllerFor<mockpp::VisitableMockMethodBase> ctr(&vmb);
+  ctr.unsetThrowablesInline();
+  ctr.addThrowable(mockpp::make_throwable(123u));
+  ctr.addThrowable(123u);
+  ctr.setDefaultThrowable(mockpp::make_throwable(321u));
+
+//  ctr.verify();
+
+  ctr.reset();
 }