[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.21,1.22 AbstractInvocati
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.21,1.22 AbstractInvocationDispatcher_test.cpp,1.17,1.18 ChainingMockObjectSupport_test.cpp,1.22,1.23 IsInstanceOf_test.cpp,1.8,1.9 Makefile.am,1.66,1.67 MyBuilderNamespace.h,1.11,1.12 VisitableMockObject_5_test.cpp,1.22,1.23
|
From: Ewald A. <ewa...@us...> - 2005-03-12 17:51:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23860/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockObjectSupport_test.cpp IsInstanceOf_test.cpp Makefile.am MyBuilderNamespace.h VisitableMockObject_5_test.cpp Log Message: fixes for g++ 2.95.3 under OpenBsd 3.1 Index: AbstractInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractInvocationDispatcher_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- AbstractInvocationDispatcher_test.cpp 11 Mar 2005 00:24:57 -0000 1.17 +++ AbstractInvocationDispatcher_test.cpp 12 Mar 2005 17:50:55 -0000 1.18 @@ -206,7 +206,7 @@ CPPUNIT_ASSERT( s == MOCKPP_PCHAR( "??t1\nt2\n" )); aid.clear(); - s.clear(); + s = MOCKPP_PCHAR(""); CPPUNIT_ASSERT( aid.describeTo(s) == MOCKPP_PCHAR( "no expectations set" )); } Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- Makefile.am 6 Mar 2005 21:45:50 -0000 1.66 +++ Makefile.am 12 Mar 2005 17:50:55 -0000 1.67 @@ -2,10 +2,10 @@ CLEANFILES = *.~* *.~~* *~ -mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la -ldl -lstdc++ \ +mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la $(LIBDL) -lstdc++ \ $(EA_EXTRA_LIB) $(LIBCPPUNIT) -jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la -ldl -lstdc++ \ +jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la $(LIBDL) -lstdc++ \ $(EA_EXTRA_LIB) $(LIBCPPUNIT) AM_LDFLAGS = $(all_libraries) Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- IsInstanceOf_test.cpp 12 Mar 2005 10:16:06 -0000 1.8 +++ IsInstanceOf_test.cpp 12 Mar 2005 17:50:55 -0000 1.9 @@ -74,6 +74,15 @@ int a; }; +class C +{ + public: + + virtual ~C() { } + + int a; +}; + void IsInstanceOf_test::test_describe() { mockpp::IsInstanceOf<A> instance; @@ -87,12 +96,17 @@ { A a; B b; + C c; mockpp::IsInstanceOf<A> instance; CPPUNIT_ASSERT(instance.eval(a) == true); CPPUNIT_ASSERT(instance.eval(b) == true); - B &rb = b; - CPPUNIT_ASSERT(instance.eval(rb) == false); + + B &rb1 = *((B*) 0); + CPPUNIT_ASSERT(instance.eval(rb1) == false); + + B &rb2 = (B&) c; + CPPUNIT_ASSERT(instance.eval(rb2) == false); } Index: MyBuilderNamespace.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MyBuilderNamespace.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MyBuilderNamespace.h 22 Jan 2005 20:41:04 -0000 1.11 +++ MyBuilderNamespace.h 12 Mar 2005 17:50:55 -0000 1.12 @@ -30,6 +30,8 @@ #include <mockpp/matcher/InvokedRecorder.h> +#include <algorithm> + class MyBuilderNamespace : public mockpp::BuilderNamespace { Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChainingMockObjectSupport_test.cpp 5 Jan 2005 19:30:05 -0000 1.22 +++ ChainingMockObjectSupport_test.cpp 12 Mar 2005 17:50:55 -0000 1.23 @@ -125,16 +125,32 @@ }; +class C +{ + public: + + virtual ~C() { } + + int c; +}; + + void ChainingMockObjectSupport_test::test_instance() { A a; B b; + C c; mockpp::Constraint<A>::AP instance0 = mockpp::isA( a ); mockpp::Constraint<A>::AP instance = mockpp::isA( A() ); CPPUNIT_ASSERT( instance->eval( a ) == true ); CPPUNIT_ASSERT( instance->eval( b ) == true ); - CPPUNIT_ASSERT( instance->eval( *( reinterpret_cast<B*>( 0 ) ) ) == false ); + + B &rb1 = *((B*) 0); + CPPUNIT_ASSERT( instance->eval( rb1 ) == false ); + + B &rb2 = (B&) c; + CPPUNIT_ASSERT( instance->eval( rb2 ) == false ); } Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VisitableMockObject_5_test.cpp 4 Mar 2005 17:40:32 -0000 1.22 +++ VisitableMockObject_5_test.cpp 12 Mar 2005 17:50:55 -0000 1.23 @@ -470,7 +470,6 @@ MOCKPP_CONST_VISITABLE_EXT1(MyVisitableMockObject_5ex, int, abc_const_visitable1, const CA&, int, Ext, CA); - MOCKPP_CONST_VISITABLE_EXT0(MyVisitableMockObject_5ex, int, abc_const_visitable0, int, Ext); bool isClear() Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- AbstractDynamicChainingMock_test.cpp 27 Feb 2005 11:48:16 -0000 1.21 +++ AbstractDynamicChainingMock_test.cpp 12 Mar 2005 17:50:55 -0000 1.22 @@ -210,6 +210,7 @@ public: void setProp() {} + int getProp() { return 0; @@ -226,7 +227,7 @@ void AbstractDynamicChainingMock_test::test_describer() { -#ifndef __BORLANDC__ // todo +#if !defined(__BORLANDC__) && (__GNUC__ >= 3) // @todo make compiling mockpp::AbstractDynamicChainingMock<int, GetterInvocation>::Describer desc; CPPUNIT_ASSERT(desc.hasDescription() == false); |
