[Mockpp-commits] mockpp/mockpp/tests VisitableMockMethod_2_test.cpp,1.6,1.7

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

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

Modified Files:
	VisitableMockMethod_2_test.cpp 
Log Message:
more tests

Index: VisitableMockMethod_2_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- VisitableMockMethod_2_test.cpp	14 Nov 2005 17:25:14 -0000	1.6
+++ VisitableMockMethod_2_test.cpp	14 Nov 2005 17:39:21 -0000	1.7
@@ -137,10 +137,15 @@
   vmo.visitable(3, 3);
   vmo.visitable(4, 4);
   vmo.visitable(5, 5);
+  vmo.visitable(52, 58);
   vmb.addResponseValue(222, 2, 2);
   vmb.addResponseValue(333, 3, 3);
+  vmb.addResponseValue(666, mockpp::eq<unsigned>(2, 2),
+                             mockpp::eq<unsigned>(20, 2));
   vmb.addResponseThrowable(mockpp::make_throwable(444u), 4, 4);
   vmb.addResponseThrowable(mockpp::make_throwable(555u), 5, 5);
+  vmb.addResponseThrowable(mockpp::make_throwable(666u), mockpp::eq<unsigned>(50, 2),
+                                                           mockpp::eq<unsigned>(60, 2));
 
   vmo.activate();
 
@@ -161,7 +166,7 @@
   MOCKPP_ASSERT_EQUALS(123, vmo.visitable(5, 6));
 
   MOCKPP_ASSERT_EQUALS(222, vmo.visitable(2, 2));
-  MOCKPP_ASSERT_EQUALS(123, vmo.visitable(3, 21));
+  MOCKPP_ASSERT_EQUALS(666, vmo.visitable(3, 21));
   MOCKPP_ASSERT_EQUALS(333, vmo.visitable(3, 3));
 
   MOCKPP_ASSERT_THROWING(vmo.visitable(4, 4),
@@ -174,6 +179,11 @@
                          unsigned,
                          unsigned(555));
 
+  MOCKPP_ASSERT_THROWING(vmo.visitable(52, 58),
+                         MOCKPP_PCHAR("vmo.visitable()-3"),
+                         unsigned,
+                         unsigned(666));
+
   vmo.verify();
   vmb.verify();
 
@@ -287,7 +297,7 @@
                          unsigned(321));
 
   vmo.visitablev(2, 2);
-  vmo.visitablev(2, 20);
+  vmo.visitablev(1, 19);
   MOCKPP_ASSERT_EQUALS(999, vmo.visitable(20, 30));
   MOCKPP_ASSERT_EQUALS(999, vmo.visitable(200, 300));
   vmo.visitablev(3, 3);