Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22022/mockpp/tests
Modified Files:
VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp
Log Message:
fix evaluation order
Index: VisitableMockMethod_2_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VisitableMockMethod_2_test.cpp 13 Nov 2005 11:52:26 -0000 1.4
+++ VisitableMockMethod_2_test.cpp 13 Nov 2005 14:07:12 -0000 1.5
@@ -100,32 +100,49 @@
vmb.addReturnValue(888, 2);
vmo.reset();
- ////////////////79//////////////////////////////////////
+ //////////////////////////////////////////////////////
vmb.setDefaultReturnValue(123);
- vmb.addReturnValue(321, 2);
+ vmb.addReturnValue(321, 1);
vmb.addThrowable(mockpp::make_throwable(123u));
+ vmb.addReturnValue(432, 1);
+ vmb.addThrowable(mockpp::make_throwable(321u));
+
vmb.forward(1, 2);
vmb.forward(2, 3);
vmb.forward(3, 4);
vmb.forward(4, 5);
+ vmb.forward(5, 6);
+ vmb.forward(2, 2);
+ vmb.forward(3, 3);
+ vmb.forward(4, 4);
+ vmb.forward(5, 5);
vmb.addResponseValue(222, 2, 2);
vmb.addResponseValue(333, 3, 3);
vmb.addResponseThrowable(mockpp::make_throwable(444u), 4, 4);
vmb.addResponseThrowable(mockpp::make_throwable(555u), 5, 5);
+
vmo.activate();
MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2));
- MOCKPP_ASSERT_EQUALS(321, vmb.forward(2, 3));
- MOCKPP_ASSERT_EQUALS(123, vmb.forward(3, 4));
- MOCKPP_ASSERT_EQUALS(222, vmb.forward(2, 2));
- MOCKPP_ASSERT_EQUALS(333, vmb.forward(3, 3));
- MOCKPP_ASSERT_THROWING(vmb.forward(9, 9),
- MOCKPP_PCHAR("vmb.forward()-1"),
+ MOCKPP_ASSERT_THROWING(vmb.forward(2, 3),
+ MOCKPP_PCHAR("vmb.forward()-1a"),
unsigned,
unsigned(123));
+ MOCKPP_ASSERT_EQUALS(432, vmb.forward(3, 4));
+
+ MOCKPP_ASSERT_THROWING(vmb.forward(4, 5),
+ MOCKPP_PCHAR("vmb.forward()-1b"),
+ unsigned,
+ unsigned(321));
+
+ MOCKPP_ASSERT_EQUALS(123, vmb.forward(5, 6));
+
+ MOCKPP_ASSERT_EQUALS(222, vmb.forward(2, 2));
+ MOCKPP_ASSERT_EQUALS(333, vmb.forward(3, 3));
+
MOCKPP_ASSERT_THROWING(vmb.forward(4, 4),
MOCKPP_PCHAR("vmb.forward()-2"),
unsigned,
@@ -145,21 +162,63 @@
vmb.unsetThrowablesInline();
vmb.setDefaultReturnValue(123);
- vmb.addReturnValue(321, 2);
+
+ vmb.addReturnValue(321, 1);
vmb.addThrowable(mockpp::make_throwable(123u));
+ vmb.addReturnValue(432, 1);
+ vmb.addThrowable(mockpp::make_throwable(321u));
+
+ vmb.forward(9, 9);
+ vmb.forward(8, 8);
+ vmb.forward(1, 2);
+ vmb.forward(2, 3);
+ vmb.forward(3, 4);
vmo.activate();
MOCKPP_ASSERT_THROWING(vmb.forward(9, 9),
- MOCKPP_PCHAR("vmb.forward()-2"),
+ MOCKPP_PCHAR("vmb.forward()-2a"),
unsigned,
unsigned(123));
+ MOCKPP_ASSERT_THROWING(vmb.forward(9, 9),
+ MOCKPP_PCHAR("vmb.forward()-2b"),
+ unsigned,
+ unsigned(321));
+
MOCKPP_ASSERT_EQUALS(321, vmb.forward(1, 2));
- MOCKPP_ASSERT_EQUALS(321, vmb.forward(2, 3));
+ MOCKPP_ASSERT_EQUALS(432, vmb.forward(2, 3));
MOCKPP_ASSERT_EQUALS(123, vmb.forward(3, 4));
vmo.verify();
vmb.verify();
+
+ //////////////////////////////////////////////////////
+
+ vmo.reset();
+ vmb.setDefaultThrowable(mockpp::make_throwable(111u));
+ vmb.addThrowable(mockpp::make_throwable(123u));
+
+ vmb.forward(1, 2);
+ vmb.forward(2, 3);
+ vmb.forward(3, 4);
+ vmo.activate();
+
+ MOCKPP_ASSERT_THROWING(vmb.forward(1, 2),
+ MOCKPP_PCHAR("vmb.forward()-3a"),
+ unsigned,
+ unsigned(123));
+
+ MOCKPP_ASSERT_THROWING(vmb.forward(2, 3),
+ MOCKPP_PCHAR("vmb.forward()-3b"),
+ unsigned,
+ unsigned(111));
+
+ MOCKPP_ASSERT_THROWING(vmb.forward(3, 4),
+ MOCKPP_PCHAR("vmb.forward()-3c"),
+ unsigned,
+ unsigned(111));
+
+ vmo.verify();
vmb.verify();
}
Index: VisitableMockMethod_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- VisitableMockMethod_test.cpp 13 Nov 2005 11:52:26 -0000 1.12
+++ VisitableMockMethod_test.cpp 13 Nov 2005 14:07:12 -0000 1.13
@@ -286,6 +286,8 @@
MOCKPP_ASSERT_EQUALS(321, vmb.determineReturnValue());
MOCKPP_ASSERT_EQUALS(123, vmb.determineReturnValue());
+ vmb.throwAvailableException();
+ vmb.throwAvailableException();
MOCKPP_ASSERT_THROWING(vmb.throwAvailableException(),
MOCKPP_PCHAR("vmb.throwAvailableException()-1"),
unsigned,
|
