mockpp-commits

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

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

Modified Files:
	ChainableMockMethod_1_test.cpp ChainableMockObject_1_test.cpp 
	ChainingMockBuilder_test.cpp 
Log Message:
fix endless recursion

Index: ChainingMockBuilder_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockBuilder_test.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChainingMockBuilder_test.cpp	1 Jan 2006 16:34:47 -0000	1.29
+++ ChainingMockBuilder_test.cpp	6 Jan 2006 20:53:51 -0000	1.30
@@ -208,7 +208,7 @@
 
   MyBuilderNamespace bns;
   ChainingMockDummy<int, Getter5Invocation> cmd;
-  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 );
+  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ));
 
   cmd.verified = false;
   cm.verify();
@@ -233,7 +233,7 @@
   MyBuilderNamespace bns;
 
   ChainingMockDummy<int, Getter5Invocation> cmd;
-  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 );
+  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ));
 
   InvokableDummy<int, Getter5Invocation> *id = new InvokableDummy<int, Getter5Invocation>;
 
@@ -272,7 +272,7 @@
   MyBuilderNamespace bns;
 
   ChainingMockDummy<int, Getter5Invocation> cmd;
-  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ), 0 );
+  mockpp::ChainingMockBuilder<ArgMatchBuilder> cm ( &cmd, &bns, MOCKPP_PCHAR( "ChainingMockBuilder??" ));
 
   MyMatchBuilder<void, int> mbd1;
   MyMatchBuilder<void, int> mbd2;

Index: ChainableMockObject_1_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChainableMockObject_1_test.cpp	1 Jan 2006 16:34:47 -0000	1.20
+++ ChainableMockObject_1_test.cpp	6 Jan 2006 20:53:51 -0000	1.21
@@ -40,6 +40,8 @@
 #include <mockpp/constraint/OutBound.h>
 
 
+namespace {
+
 
 class ChainableMockObject_1_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK
 {
@@ -54,7 +56,8 @@
 CPPUNIT_TEST_SUITE( ChainableMockObject_1_test );
 
   CPPUNIT_TEST(test_outbound);
-  CPPUNIT_TEST( test_parameter_1 );
+  CPPUNIT_TEST(test_parameter_1);
+  CPPUNIT_TEST(test_resolver);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -64,6 +67,7 @@
 
   MOCKPP_TESTMETHOD_DECL void test_outbound();
   MOCKPP_TESTMETHOD_DECL void test_parameter_1();
+  MOCKPP_TESTMETHOD_DECL void test_resolver();
 };
 
 
@@ -72,11 +76,13 @@
 MOCKPP_CXXTEST_SUITE_REGISTRATION( ChainableMockObject_1_test );
 MOCKPP_CXXTEST(ChainableMockObject_1_test, test_outbound);
 MOCKPP_CXXTEST(ChainableMockObject_1_test,  test_parameter_1 );
+MOCKPP_CXXTEST(ChainableMockObject_1_test,  test_resolver);
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
 MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_outbound);
-MOCKPP_BOOST_TEST(ChainableMockObject_1_test:: test_parameter_1 );
+MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_parameter_1 );
+MOCKPP_BOOST_TEST(ChainableMockObject_1_test::test_resolver);
 
 #elif defined(MOCKPP_USE_CPPUNIT)
 
@@ -171,4 +177,31 @@
 }
 
 
+class MockUnitResolver : public mockpp::ChainableMockObject
+{
+
+public:
+
+    MockUnitResolver()
+        : mockpp::ChainableMockObject( MOCKPP_PCHAR("MockUnitResolver"), 0 )
+        , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT1( Find, _ )
+    {}
+
+    MOCKPP_CONST_CHAINABLE_EXT1( MockUnitResolver, int*, Find, const mockpp::String&,
+                                                   int*, _   , mockpp::String );
+};
+
+
+void ChainableMockObject_1_test::test_resolver()
+{
+    MockUnitResolver resolver;
+    MOCKPP_CHAINER_FOR_EXT( MockUnitResolver, Find, _) resolverChainer( &resolver );
+    resolverChainer.stubs( mockpp::once() ).will( new mockpp::ReturnStub< int* >( 0 ) );
+    resolverChainer.reset();
+    resolver.reset();
+}
+
+
+}
+
 

Index: ChainableMockMethod_1_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockMethod_1_test.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChainableMockMethod_1_test.cpp	1 Jan 2006 16:34:47 -0000	1.19
+++ ChainableMockMethod_1_test.cpp	6 Jan 2006 20:53:51 -0000	1.20
@@ -87,8 +87,8 @@
 
 #elif defined(MOCKPP_USE_BOOSTTEST)
 
-MOCKPP_BOOST_TEST(ChainableMockMethod_1_test:: test_parameter_1 );
-MOCKPP_BOOST_TEST(ChainableMockMethod_1_test:: test_parameter_1v );
+MOCKPP_BOOST_TEST(ChainableMockMethod_1_test::test_parameter_1 );
+MOCKPP_BOOST_TEST(ChainableMockMethod_1_test::test_parameter_1v );
 
 #elif defined(MOCKPP_USE_CPPUNIT)
 
@@ -191,6 +191,8 @@
 #endif
 
   mcm.verify();
+  mcm.reset();
+//  chain.reset();
 }