Thread: [Mockpp-commits] mockpp/mockpp/stub DefaultResultStub.h,1.22,1.23 ReturnStub.h,1.22,1.23 StubHolder.
Brought to you by:
ewald-arnold
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/mockpp/stub Modified Files: DefaultResultStub.h ReturnStub.h StubHolder.h StubSequence.h TestFailureStub.h ThrowStub.h TypelessStubSequence.h VoidStub.h Log Message: improve onConsecutiveCalls family Index: VoidStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- VoidStub.h 15 Mar 2006 21:34:07 -0000 1.20 +++ VoidStub.h 8 Apr 2006 12:00:37 -0000 1.21 @@ -45,7 +45,7 @@ /** A stub for woid methods. Not really useful but needed for compatibility. * May also be useful to express this property within an expectation. * @ingroup grp_stub - * @see MOCKPP_NS::onConsecutiveCalls + * @see mockpp::onConsecutiveCalls */ class VoidStub : public TypelessStub<void> { Index: StubHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubHolder.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StubHolder.h 15 Mar 2006 21:34:07 -0000 1.13 +++ StubHolder.h 8 Apr 2006 12:00:37 -0000 1.14 @@ -55,7 +55,7 @@ /** Creates the object. * @param in_stub pointer to the stub */ - StubHolder(const typename TypelessStub<R>::AP &in_stub) + StubHolder(const AutoPointer<TypelessStub<R> > &in_stub) : stub(new TypelessStubAdapter<R, I>(in_stub)) {} @@ -88,6 +88,15 @@ * @attention After this method is called this object becomes invalid. * @return the stub object */ + Stub<R, I>* release() const // we we actually lie a bit + { + return stub.release(); + } + + /** Returns the stub object. + * @attention After this method is called this object becomes invalid. + * @return the stub object + */ operator AutoPointer<Stub<R, I> > () const // we we actually lie a bit { return stub; Index: DefaultResultStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/DefaultResultStub.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- DefaultResultStub.h 15 Mar 2006 21:34:07 -0000 1.22 +++ DefaultResultStub.h 8 Apr 2006 12:00:37 -0000 1.23 @@ -44,7 +44,7 @@ /** A stub returning the default value of the return type. * @ingroup grp_stub - * @see MOCKPP_NS::returnValue + * @see mockpp::returnValue */ template <typename R> // Returntype class DefaultResultStub : public TypelessStub<R> Index: TestFailureStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TestFailureStub.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- TestFailureStub.h 15 Mar 2006 21:34:07 -0000 1.23 +++ TestFailureStub.h 8 Apr 2006 12:00:37 -0000 1.24 @@ -45,7 +45,7 @@ /** Stub that always fails upon invocation. * @ingroup grp_stub - * @see MOCKPP_NS::never + * @see mockpp::never */ template <typename R, // Returntype typename I> // Invocation Index: ReturnStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ReturnStub.h 15 Mar 2006 21:34:07 -0000 1.22 +++ ReturnStub.h 8 Apr 2006 12:00:37 -0000 1.23 @@ -45,7 +45,7 @@ /** Always return the same specified value. * @ingroup grp_stub - * @see MOCKPP_NS::returnValue + * @see mockpp::returnValue */ template <typename R> // Returntype class ReturnStub : public TypelessStub<R> Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- TypelessStubSequence.h 5 Apr 2006 17:03:40 -0000 1.13 +++ TypelessStubSequence.h 8 Apr 2006 12:00:37 -0000 1.14 @@ -43,7 +43,7 @@ /** Use one stub after the other from a sequence. * @ingroup grp_stub - * @see MOCKPP_NS::throwException + * @see mockpp::throwException */ template <typename R> // Invocation class TypelessStubSequence : public TypelessStub<R> Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- StubSequence.h 5 Apr 2006 17:03:40 -0000 1.31 +++ StubSequence.h 8 Apr 2006 12:00:37 -0000 1.32 @@ -47,7 +47,7 @@ /** Use one stub after the other from a sequence. * @ingroup grp_stub - * @see MOCKPP_NS::onConsecutiveCalls + * @see mockpp::onConsecutiveCalls */ template <typename R, // Returntype typename I> // Invocation Index: ThrowStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ThrowStub.h 15 Mar 2006 21:34:07 -0000 1.34 +++ ThrowStub.h 8 Apr 2006 12:00:37 -0000 1.35 @@ -45,7 +45,7 @@ /** Base for stubs throwing exceptions. * @ingroup grp_stub - * @see MOCKPP_NS::throwException + * @see mockpp::throwException */ template <typename R> // Returntype class ThrowStubBase : public TypelessStub<R> |