[Mockpp-commits] mockpp/mockpp/tests ChainingMockObjectSupport_test.cpp,1.42,1.43

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

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

Modified Files:
	ChainingMockObjectSupport_test.cpp 
Log Message:
improve onConsecutiveCalls family

Index: ChainingMockObjectSupport_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChainingMockObjectSupport_test.cpp	15 Mar 2006 21:34:08 -0000	1.42
+++ ChainingMockObjectSupport_test.cpp	8 Apr 2006 12:00:37 -0000	1.43
@@ -505,13 +505,17 @@
 {
   MOCKPP_NS::Stub<int, int>::AP stub;
 
+  stub = MOCKPP_NS::onConsecutiveCalls<int, int>( MOCKPP_NS::Stub<int, int>::AP( new MyStub(1u)),
+                                        MOCKPP_NS::Stub<int, int>::AP( new MyStub(2u)));
+  MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) );
+
   stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ),
-                                     new MyStub( (long)2 ));
-   MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) );
+                                        new MyStub( (long)2 ));
+  MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2" ) );
 
   stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ),
-                                     new MyStub( (long)2 ),
-                                     new MyStub( (long)3 ) );
+                                        new MyStub( (long)2 ),
+                                        new MyStub( (long)3 ) );
   MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "custom1, and then custom2, and then custom3" ) );
 
   stub = MOCKPP_NS::onConsecutiveCalls( new MyStub( (long)1 ),
@@ -533,8 +537,12 @@
 {
   MOCKPP_NS::TypelessStub<long>::AP stub;
 
-  stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ),  // @todo MOCKPP_NS::returnValue
-                                     new MOCKPP_NS::ReturnStub<long>( 2 ));
+  stub = MOCKPP_NS::onConsecutiveCalls<long>( MOCKPP_NS::returnValue<long>( 2l ),
+                                              MOCKPP_NS::returnValue<long>( 3l ));
+  MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "returns <2>, and then returns <3>" ) );
+
+  stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ),
+                                        new MOCKPP_NS::ReturnStub<long>( 2 ));
   MOCKPP_ASSERT_TRUE( stub->toString() == MOCKPP_PCHAR( "returns <1>, and then returns <2>" ) );
 
   stub = MOCKPP_NS::onConsecutiveCalls( new MOCKPP_NS::ReturnStub<long>( 1 ),