[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.26,1.27 ChainableMockObj
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.26,1.27 ChainableMockObject_1_test.cpp,1.5,1.6 ChainableMockObject_2_test.cpp,1.5,1.6 ChainableMockObject_3_test.cpp,1.4,1.5 ChainableMockObject_4_test.cpp,1.5,1.6 ChainableMockObject_5_test.cpp,1.7,1.8 ChainableMockObject_test.cpp,1.19,1.20 InvocationMockerBuilder_test.cpp,1.25,1.26 InvocationMocker_test.cpp,1.30,1.31 mock_test.cpp,1.21,1.22
|
From: Ewald A. <ewa...@us...> - 2005-04-02 20:45:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3635/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp ChainableMockObject_1_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_3_test.cpp ChainableMockObject_4_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_test.cpp InvocationMockerBuilder_test.cpp InvocationMocker_test.cpp mock_test.cpp Log Message: more fixes for msvc6 Index: ChainableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_5_test.cpp 24 Mar 2005 21:43:07 -0000 1.7 +++ ChainableMockObject_5_test.cpp 2 Apr 2005 20:45:32 -0000 1.8 @@ -293,7 +293,7 @@ try { - mcm.chainable_i(1, 2, 3, 4, 5) == 999; + mcm.chainable_i(1, 2, 3, 4, 5); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChainableMockObject_test.cpp 24 Mar 2005 21:43:07 -0000 1.19 +++ ChainableMockObject_test.cpp 2 Apr 2005 20:45:32 -0000 1.20 @@ -440,7 +440,7 @@ CPPUNIT_ASSERT(mcm.chainable_b() == 456); try { - mcm.chainable_a() == 123; + mcm.chainable_a(); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_4_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_4_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 @@ -109,23 +109,23 @@ .with(mockpp::eq( (unsigned int) 87), mockpp::eq( (unsigned int) 65), mockpp::eq( (unsigned int) 43), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(new mockpp::ReturnStub<int>(87654321)); - - CPPUNIT_ASSERT(mcm.chainable(12, 34, 56, 78) == 12345678); - CPPUNIT_ASSERT(mcm.chainable(87, 65, 43, 21) == 87654321); - + + CPPUNIT_ASSERT(mcm.chainable(12, 34, 56, 78) == 12345678); + CPPUNIT_ASSERT(mcm.chainable(87, 65, 43, 21) == 87654321); + try { - mcm.chainable(1, 2, 3, 4) == 999; + mcm.chainable(1, 2, 3, 4); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- InvocationMocker_test.cpp 2 Apr 2005 13:46:34 -0000 1.30 +++ InvocationMocker_test.cpp 2 Apr 2005 20:45:33 -0000 1.31 @@ -49,11 +49,6 @@ #include "classes_ABCDE.h" -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation; -typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; - -MOCKPP_PTI_DECLARE(SetterInvocation) - namespace { @@ -169,6 +164,8 @@ }; +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation; +typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation; void InvocationMocker_test::test_instance() @@ -179,6 +176,15 @@ } +} // namespace + + +MOCKPP_PTI_DECLARE(SetterInvocation) + + +namespace { + + void InvocationMocker_test::test_instance_void() { mockpp::InvocationMocker<void, SetterInvocation> im; @@ -357,10 +363,10 @@ } -//MOCKPP_PTI_IMPLEMENT(SetterInvocation) +} // namespace -} // namespace +MOCKPP_PTI_IMPLEMENT(SetterInvocation) #endif // HAVE_CPPUNIT Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mock_test.cpp 25 Mar 2005 17:20:36 -0000 1.21 +++ mock_test.cpp 2 Apr 2005 20:45:33 -0000 1.22 @@ -42,15 +42,22 @@ # include <cppunit/TestFailure.h> # include <cppunit/CompilerOutputter.h> + +#ifndef MSC_VER +using std::time; +using std::time_t; +#endif + + class MyListener : public CppUnit::TextTestProgressListener { - std::time_t starttime; + time_t starttime; public: void startTest( CppUnit::Test *test ) { - starttime = std::time(0); + starttime = time(0); std::cerr << ">>>>>>>>>>>>>>>> " << test->getName() << " : " << starttime << std::endl; @@ -66,8 +73,8 @@ void endTest(CppUnit::Test *test) { std::cerr << std::endl; - std::time_t endtime = std::time(0); - std::time_t difftime = starttime - endtime; + time_t endtime = time(0); + time_t difftime = starttime - endtime; unsigned m = difftime / 60; unsigned s = difftime % 60; std::cerr << "<<<<<<<<<<<<<<<< " << test->getName() Index: ChainableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_test.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChainableMockObject_3_test.cpp 17 Nov 2004 13:08:17 -0000 1.4 +++ ChainableMockObject_3_test.cpp 2 Apr 2005 20:45:32 -0000 1.5 @@ -106,23 +106,23 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 65), mockpp::eq( (unsigned int) 43), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(new mockpp::ReturnStub<int>(654321)); - - CPPUNIT_ASSERT(mcm.chainable(12, 34, 56) == 123456); - CPPUNIT_ASSERT(mcm.chainable(65, 43, 21) == 654321); - + + CPPUNIT_ASSERT(mcm.chainable(12, 34, 56) == 123456); + CPPUNIT_ASSERT(mcm.chainable(65, 43, 21) == 654321); + try { - mcm.chainable(1, 2, 3) == 999; + mcm.chainable(1, 2, 3); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- InvocationMockerBuilder_test.cpp 30 Dec 2004 20:54:06 -0000 1.25 +++ InvocationMockerBuilder_test.cpp 2 Apr 2005 20:45:32 -0000 1.26 @@ -99,11 +99,11 @@ : mockpp::InvocationMockerBuilder<AMB>( mocker, builderNamespace ) {} -#ifdef __BORLANDC__ +#if defined( __BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) mockpp::MatchBuilder<R, I> &with_cs( const CS &constraintset ) { return mockpp::InvocationMockerBuilder<AMB>::with_cs(constraintset); - } + } #else using mockpp::InvocationMockerBuilder<AMB>::with_cs; #endif Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_2_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_2_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 @@ -103,23 +103,23 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 43), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(new mockpp::ReturnStub<int>(4321)); - - CPPUNIT_ASSERT(mcm.chainable(12, 34) == 1234); - CPPUNIT_ASSERT(mcm.chainable(43, 21) == 4321); - + + CPPUNIT_ASSERT(mcm.chainable(12, 34) == 1234); + CPPUNIT_ASSERT(mcm.chainable(43, 21) == 4321); + try { - mcm.chainable(1, 2) == 999; + mcm.chainable(1, 2); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: ChainableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_1_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_1_test.cpp 2 Apr 2005 20:45:32 -0000 1.6 @@ -56,7 +56,7 @@ CPPUNIT_TEST_SUITE_END(); public: - + void test_parameter_1(); }; @@ -98,27 +98,27 @@ MOCKPP_CHAINER_FOR(MyChainableMockObject_1, chainable) chain(&mcm); chain.stubs(mockpp::once()) - .with(mockpp::eq((unsigned int) 12)) + .with(mockpp::eq((unsigned int) 12)) .will(new mockpp::ReturnStub<int>(21)); chain.stubs(mockpp::once()) .with(mockpp::eq((unsigned int) 34)) // @todoc pitfall .will(new mockpp::ReturnStub<int>(43)); - - CPPUNIT_ASSERT(mcm.chainable(12) == 21); - CPPUNIT_ASSERT(mcm.chainable(34) == 43); - + + CPPUNIT_ASSERT(mcm.chainable(12) == 21); + CPPUNIT_ASSERT(mcm.chainable(34) == 43); + try { - mcm.chainable(56) == 999; + mcm.chainable(56); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- AbstractDynamicChainingMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.26 +++ AbstractDynamicChainingMock_test.cpp 2 Apr 2005 20:45:32 -0000 1.27 @@ -216,7 +216,7 @@ void AbstractDynamicChainingMock_test::test_describer() { -#if !defined(__BORLANDC__) && (__GNUC__ >= 3) // @todo make compiling +#if !defined(__BORLANDC__) && ((__GNUC__ >= 3) || defined(_MSC_VER)) // @todo make compiling mockpp::AbstractDynamicChainingMock<int, GetterInvocation>::Describer desc; CPPUNIT_ASSERT(desc.hasDescription() == false); @@ -224,9 +224,9 @@ mockpp::InvocationMocker<int, GetterInvocation>::List matchers; CPPUNIT_ASSERT(desc.describeTo(s, - matchers, - mockpp::returnValue<int>(1).get(), - mockpp::String(MOCKPP_PCHAR("name")) ) == MOCKPP_PCHAR("") ); + matchers, + mockpp::returnValue<int>(1).get(), + mockpp::String(MOCKPP_PCHAR("name")) ) == MOCKPP_PCHAR("") ); #endif } |
