mockpp-commits Mailing List for Mock Objects for C++ (Page 31)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2005-10-02 18:51:48
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27415/bcb5 Modified Files: jmock_test.bpf mock_test.bpf mockpp.bpf Log Message: new files Index: mock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- mock_test.bpf 3 Sep 2005 09:44:42 -0000 1.33 +++ mock_test.bpf 2 Oct 2005 18:51:33 -0000 1.34 @@ -44,3 +44,5 @@ USEUNIT("..\mockpp\tests\ExpectationConglomeration_test.cpp"); USEUNIT("..\mockpp\tests\TimeServer_test.cpp"); USEUNIT("..\mockpp\tests\classes_ABCDE.cpp"); +USEUNIT("..\mockpp\tests\VisitableMockMethod_1_test.cpp"); +USEUNIT("..\mockpp\tests\VisitableMockMethod_2_test.cpp"); Index: jmock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpf,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- jmock_test.bpf 26 Sep 2005 19:32:15 -0000 1.26 +++ jmock_test.bpf 2 Oct 2005 18:51:33 -0000 1.27 @@ -70,6 +70,8 @@ USEUNIT("..\mockpp\tests\ChainingMockObjectSupport_test.cpp"); USEUNIT("..\mockpp\tests\mockpp_pti_test.cpp"); USEUNIT("..\mockpp\tests\OutBound_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_1_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockMethod_2_test.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file main Index: mockpp.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpf,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mockpp.bpf 3 Sep 2005 09:44:42 -0000 1.23 +++ mockpp.bpf 2 Oct 2005 18:51:33 -0000 1.24 @@ -41,5 +41,4 @@ USEUNIT("..\mockpp\MockTimeServer.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file - DllEntryPoint |
|
From: Ewald A. <ewa...@us...> - 2005-10-02 18:51:48
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27415/mockpp Modified Files: Makefile.am Added Files: VisitableMockMethod.h Log Message: new files --- NEW FILE: VisitableMockMethod.h --- /** @file @brief Visitable Mock Methods based on templates $Id: VisitableMockMethod.h,v 1.1 2005/10/02 18:51:33 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** begin : Thu Oct 2 2005 copyright : (C) 2002-2005 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ #ifndef MOCKPP_VisitableMockMethod_H #define MOCKPP_VisitableMockMethod_H #include <mockpp/mockpp.h> #include <mockpp/VisitableMockObject.h> namespace mockpp { template <typename R> class VisitableMockMethodBase : public MockObject { public: typedef R ReturnType; /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent Visitable mock object */ VisitableMockMethodBase(const String &name, VisitableMockObject *parent = 0) : MockObject(name, parent) {} String getMethodName() const { // static CppString method_name = getVerifiableName() + MOCKPP_PCHAR(".") + m_name; return getVerifiableName(); } }; template <typename R, typename P1> class VisitableMockMethod1 : public VisitableMockMethodBase<R> { public: /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent Visitable mock object */ VisitableMockMethod1(const String &name, VisitableMockObject *parent = 0) : VisitableMockMethodBase<R>(name, parent) {} R forward(P1 param1) const { return R(); } class ChainerFor { public: }; private: VisitableMockObject *Visitable_parent; }; } // namespace mockpp #endif // MOCKPP_VisitableMockMethod_H Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- Makefile.am 19 Sep 2005 18:39:58 -0000 1.86 +++ Makefile.am 2 Oct 2005 18:51:33 -0000 1.87 @@ -29,7 +29,8 @@ VisitableMockObject_macro.h VisitableMockObject_template.h ExpectationConglomeration.h \ ExpectationCounter.h mockpp.h Throwable.h ThrowableList.h MockObject.h VisitableMockObject.h \ VerifiableList.h Verifiable.h VerifyingTestCase.h SelfDescribing.h ChainableMockObject.h \ - VerifyingTestCaller.h TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h + VerifyingTestCaller.h TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h \ + VisitableMockMethod.h EXTRA_DIST = \ mockpp_config-bcb5.h \ |
|
From: Ewald A. <ewa...@us...> - 2005-10-02 18:51:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27415/mockpp/chaining Modified Files: ChainableMockMethod.h Log Message: new files Index: ChainableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChainableMockMethod.h 2 Oct 2005 10:56:02 -0000 1.1 +++ ChainableMockMethod.h 2 Oct 2005 18:51:33 -0000 1.2 @@ -39,28 +39,48 @@ namespace mockpp { +template <typename R> +class ChainableMockMethodBase : public MockObject +{ + public: + + /** Constructs the mock object. + * @param name human readable description about the expectation + * @param parent parent chainable mock object + */ + ChainableMockMethodBase(const String &name, ChainableMockObject *parent = 0) + : MockObject(name, parent) + {} + + String getMethodName() const + { +// static CppString method_name = getVerifiableName() + MOCKPP_PCHAR(".") + m_name; + return getVerifiableName(); + } +}; + + template <typename R, typename P1> -class ChainableMockMethod : public MockObject +class ChainableMockMethod1 : public ChainableMockMethodBase<R> { public: - typedef Invocation1<P1> InvocationType; - typedef CoreMock<R, InvocationType> CoreMockType; - typedef R ReturnType; + typedef R ReturnType; + typedef Invocation1<P1> InvocationType; + typedef CoreMock<R, InvocationType> CoreMockType; /** Constructs the mock object. * @param name human readable description about the expectation * @param parent parent chainable mock object */ - ChainableMockMethod(const String &name, ChainableMockObject *parent = 0) - : MockObject(name, parent) - , chainable_parent(parent) + ChainableMockMethod1(const String &name, ChainableMockObject *parent = 0) + : ChainableMockMethodBase<R>(name, parent) , coremock(MOCKPP_PCHAR("CoreMock_in_") + name, this) {} R forward(P1 param1) const { - Invocation1<P1> inv(MOCKPP_PCHAR("name"), param1); + InvocationType inv(MOCKPP_PCHAR("name"), param1); return coremock.invoke(inv); } @@ -69,11 +89,16 @@ return coremock; } - String getMethodName() const + typedef ChainingMockBuilder <ArgumentsMatchBuilder1<ReturnType, InvocationType> > Builder; + + class ChainerFor : public Builder { -// static CppString method_name = getVerifiableName() + MOCKPP_PCHAR(".") + m_name; - return getVerifiableName(); - } + public: + + ChainerFor(ChainableMockObject &obj, ChainableMockMethod1 &method) + : Builder(&method.getCoreMock(), &obj, method.getMethodName()) + {} + }; private: @@ -82,19 +107,49 @@ }; -template <typename CMM> -class ChainerFor - : public ChainingMockBuilder <ArgumentsMatchBuilder1<typename CMM::ReturnType, - typename CMM::InvocationType> > +template <typename R, typename P1, typename P2> +class ChainableMockMethod2 : public ChainableMockMethodBase<R> { public: - typedef ChainingMockBuilder <ArgumentsMatchBuilder1<typename CMM::ReturnType, - typename CMM::InvocationType> > Builder; + typedef R ReturnType; + typedef Invocation2<P1, P2> InvocationType; + typedef CoreMock<R, InvocationType> CoreMockType; - ChainerFor(ChainableMockObject &obj, CMM &method) - : Builder(&method.getCoreMock(), &obj, method.getMethodName()) + /** Constructs the mock object. + * @param name human readable description about the expectation + * @param parent parent chainable mock object + */ + ChainableMockMethod2(const String &name, ChainableMockObject *parent = 0) + : ChainableMockMethodBase<R>(name, parent) + , coremock(MOCKPP_PCHAR("CoreMock_in_") + name, this) {} + + R forward(P1 param1, P2 param2) const + { + InvocationType inv(MOCKPP_PCHAR("name"), param1, param2); + return coremock.invoke(inv); + } + + CoreMockType & getCoreMock() + { + return coremock; + } + + typedef ChainingMockBuilder <ArgumentsMatchBuilder2<ReturnType, InvocationType> > Builder; + + class ChainerFor : public Builder + { + public: + + ChainerFor(ChainableMockObject &obj, ChainableMockMethod2 &method) + : Builder(&method.getCoreMock(), &obj, method.getMethodName()) + {} + }; + + private: + + mutable CoreMockType coremock; }; |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:32:27
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv565/bcb5 Modified Files: jmock_test.bpf Log Message: update Index: jmock_test.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/jmock_test.bpf,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- jmock_test.bpf 3 Sep 2005 09:44:42 -0000 1.25 +++ jmock_test.bpf 26 Sep 2005 19:32:15 -0000 1.26 @@ -60,6 +60,7 @@ USEUNIT("..\mockpp\tests\ChainableMockObject_4_void_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_5_void_test.cpp"); +USEUNIT("..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_test.cpp"); USEUNIT("..\mockpp\tests\ChainableMockObject_1_test.cpp"); USEUNIT("..\mockpp\tests\MatchBuilder_test.cpp"); |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:32:23
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv565 Modified Files: ChangeLog Log Message: update Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- ChangeLog 23 Sep 2005 20:55:00 -0000 1.65 +++ ChangeLog 26 Sep 2005 19:32:15 -0000 1.66 @@ -3,6 +3,10 @@ mockpp history -------------- +2005-09-27 1.9.5: + + - updated msvc7.1 projects files + 2005-09-24 1.9.4: - missing & in macro MOCKPP_VOID_CONST_CHAINABLE3 |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:12:50
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28911/msvc71/mockpp/examples Modified Files: examples.vcproj Log Message: cleanup Index: examples.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/examples.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- examples.vcproj 23 May 2005 21:15:52 -0000 1.4 +++ examples.vcproj 26 Sep 2005 19:12:38 -0000 1.5 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""X:\Documents\src\cppunit-1.10.2\include";../../..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -42,7 +42,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\Debug/examples.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;C:\tmp\msvc_compile\cppunit;../../lib" + AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Debug/examples.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\Release/examples.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="../../lib" + AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Release/examples.pdb" SubSystem="1" TargetMachine="1"/> |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:12:50
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28911/msvc71/mockpp/tests Modified Files: mock_test.vcproj Log Message: cleanup Index: mock_test.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/tests/mock_test.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mock_test.vcproj 23 Jul 2005 18:44:02 -0000 1.7 +++ mock_test.vcproj 26 Sep 2005 19:12:39 -0000 1.8 @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../..,../../..,$(CPPUNIT_ROOT)/include" + AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,CPPUNIT_DLL" StringPooling="TRUE" RuntimeLibrary="2" @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\tests\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\tests\Debug" + OutputDirectory="C:\tmp\compile\mockpp\tests\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\tests\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -83,7 +83,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="X:\Documents\src\mockpp\mockpp;"X:\Documents\src\cppunit-1.10.2\include";../..;../../..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -104,7 +104,7 @@ OutputFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;c:\tmp\msvc_compile\cppunit;../../lib;"$(CPPUNIT_ROOT)/lib"" + AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pdb" SubSystem="1" @@ -202,6 +202,9 @@ RelativePath="..\..\..\mockpp\tests\ChainableMockObject_void_test.cpp"> </File> <File + RelativePath="..\..\..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"> + </File> + <File RelativePath="..\..\..\mockpp\tests\ChainingMockBuilder_test.cpp"> </File> <File @@ -346,6 +349,9 @@ RelativePath="..\..\..\mockpp\tests\MockObject_test.cpp"> </File> <File + RelativePath="..\..\..\mockpp\tests\mockpp_pti_test.cpp"> + </File> + <File RelativePath="..\..\..\mockpp\tests\mockpp_test.cpp"> </File> <File @@ -394,6 +400,9 @@ RelativePath="..\..\..\mockpp\tests\ThrowStub_test.cpp"> </File> <File + RelativePath="..\..\..\mockpp\tests\TimeServer_test.cpp"> + </File> + <File RelativePath="..\..\..\mockpp\tests\TrackingCounter_test.cpp"> </File> <File |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:12:48
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28911/msvc71/mockpp/examples/tutorial Modified Files: basicmock.vcproj chainmock.vcproj cppunit.vcproj poormock.vcproj poormock_se.vcproj visitmock.vcproj Log Message: cleanup Index: basicmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/basicmock.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- basicmock.vcproj 23 May 2005 21:15:52 -0000 1.5 +++ basicmock.vcproj 26 Sep 2005 19:12:39 -0000 1.6 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -42,7 +42,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib" + AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pdb" SubSystem="1" @@ -100,7 +100,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release./basicmock.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib" + AdditionalLibraryDirectories="../../../lib" ProgramDatabaseFile="./basicmock.pdb"/> <Tool Name="VCMIDLTool" Index: poormock_se.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/poormock_se.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock_se.vcproj 23 May 2005 21:16:01 -0000 1.2 +++ poormock_se.vcproj 26 Sep 2005 19:12:39 -0000 1.3 @@ -13,8 +13,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -43,7 +43,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib" + AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb" SubSystem="1" Index: poormock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/poormock.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- poormock.vcproj 23 May 2005 21:16:01 -0000 1.5 +++ poormock.vcproj 26 Sep 2005 19:12:39 -0000 1.6 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" Index: visitmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/visitmock.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- visitmock.vcproj 23 May 2005 21:16:01 -0000 1.5 +++ visitmock.vcproj 26 Sep 2005 19:12:39 -0000 1.6 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -42,7 +42,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="../../../lib;c:\tmp\msvc_compile\" + AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pdb" SubSystem="1" Index: chainmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/chainmock.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- chainmock.vcproj 23 May 2005 21:16:01 -0000 1.5 +++ chainmock.vcproj 26 Sep 2005 19:12:39 -0000 1.6 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -42,7 +42,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib" + AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pdb" SubSystem="1" Index: cppunit.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/cppunit.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cppunit.vcproj 23 May 2005 21:16:01 -0000 1.4 +++ cppunit.vcproj 26 Sep 2005 19:12:39 -0000 1.5 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -21,7 +21,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""X:\Documents\src\cppunit-1.10.2\include";../../../..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="../../../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -42,7 +42,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="c:\tmp\msvc_compile\;C:\tmp\msvc_compile\cppunit;"X:\Documents\src\cppunit-1.10.2\lib";../../../lib" + AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="../../../lib" + AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib" ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pdb" SubSystem="1" TargetMachine="1"/> |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 19:12:47
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28911/msvc71/mockpp Modified Files: Makefile.am mockpp.sln mockpp.vcproj mockpp_production.vcproj Log Message: cleanup Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 22 Mar 2005 20:44:18 -0000 1.1 +++ Makefile.am 26 Sep 2005 19:12:38 -0000 1.2 @@ -1,6 +1,6 @@ SUBDIRS = examples tests -EXTRA_DIST = mockpp.vcproj mockpp.sln +EXTRA_DIST = mockpp.vcproj mockpp_production.vcproj mockpp.sln CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~ Index: mockpp.sln =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mockpp.sln 23 May 2005 21:15:51 -0000 1.3 +++ mockpp.sln 26 Sep 2005 19:12:38 -0000 1.4 @@ -1,101 +1,101 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basicmock", "examples\tutorial\basicmock.vcproj", "{67066CA0-B2AD-456C-8663-A1D93B0E7949}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chainmock", "examples\tutorial\chainmock.vcproj", "{9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "examples\tutorial\cppunit.vcproj", "{4AEB7B36-6044-4B23-9754-22F7A28F785B}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples", "examples\examples.vcproj", "{15A26E8F-FE6D-4EA6-9B41-26306D17F76A}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock_test", "tests\mock_test.vcproj", "{F22BA7AF-9CFC-4F2A-947D-69AF7C466635}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - {6AB18DF8-7204-4B80-AE27-0CDB36E321B4} = {6AB18DF8-7204-4B80-AE27-0CDB36E321B4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp", "mockpp.vcproj", "{4B2B3833-C35A-4F2F-BFAF-B686D3827531}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poormock", "examples\tutorial\poormock.vcproj", "{6CD5CF99-3185-4FD1-B172-DE5947721854}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visitmock", "examples\tutorial\visitmock.vcproj", "{ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}" - ProjectSection(ProjectDependencies) = postProject - {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poormock_se", "examples\tutorial\poormock_se.vcproj", "{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp_production", "mockpp_production.vcproj", "{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Debug.ActiveCfg = Debug|Win32 - {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Debug.Build.0 = Debug|Win32 - {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Release.ActiveCfg = Release|Win32 - {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Release.Build.0 = Release|Win32 - {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Debug.ActiveCfg = Debug|Win32 - {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Debug.Build.0 = Debug|Win32 - {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Release.ActiveCfg = Release|Win32 - {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Release.Build.0 = Release|Win32 - {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Debug.ActiveCfg = Debug|Win32 - {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Debug.Build.0 = Debug|Win32 - {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Release.ActiveCfg = Release|Win32 - {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Release.Build.0 = Release|Win32 - {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Debug.ActiveCfg = Debug|Win32 - {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Debug.Build.0 = Debug|Win32 - {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Release.ActiveCfg = Release|Win32 - {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Release.Build.0 = Release|Win32 - {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Debug.ActiveCfg = Debug|Win32 - {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Debug.Build.0 = Debug|Win32 - {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Release.ActiveCfg = Release|Win32 - {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Release.Build.0 = Release|Win32 - {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Debug.ActiveCfg = Debug|Win32 - {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Debug.Build.0 = Debug|Win32 - {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Release.ActiveCfg = Release|Win32 - {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Release.Build.0 = Release|Win32 - {6CD5CF99-3185-4FD1-B172-DE5947721854}.Debug.ActiveCfg = Debug|Win32 - {6CD5CF99-3185-4FD1-B172-DE5947721854}.Debug.Build.0 = Debug|Win32 - {6CD5CF99-3185-4FD1-B172-DE5947721854}.Release.ActiveCfg = Release|Win32 - {6CD5CF99-3185-4FD1-B172-DE5947721854}.Release.Build.0 = Release|Win32 - {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Debug.ActiveCfg = Debug|Win32 - {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Debug.Build.0 = Debug|Win32 - {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.ActiveCfg = Release|Win32 - {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.Build.0 = Release|Win32 - {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.ActiveCfg = Debug|Win32 - {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.Build.0 = Debug|Win32 - {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.ActiveCfg = Release|Win32 - {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.Build.0 = Release|Win32 - {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.ActiveCfg = Debug|Win32 - {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.Build.0 = Debug|Win32 - {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.ActiveCfg = Release|Win32 - {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basicmock", "examples\tutorial\basicmock.vcproj", "{67066CA0-B2AD-456C-8663-A1D93B0E7949}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chainmock", "examples\tutorial\chainmock.vcproj", "{9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "examples\tutorial\cppunit.vcproj", "{4AEB7B36-6044-4B23-9754-22F7A28F785B}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples", "examples\examples.vcproj", "{15A26E8F-FE6D-4EA6-9B41-26306D17F76A}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock_test", "tests\mock_test.vcproj", "{F22BA7AF-9CFC-4F2A-947D-69AF7C466635}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + {6AB18DF8-7204-4B80-AE27-0CDB36E321B4} = {6AB18DF8-7204-4B80-AE27-0CDB36E321B4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp", "mockpp.vcproj", "{4B2B3833-C35A-4F2F-BFAF-B686D3827531}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poormock", "examples\tutorial\poormock.vcproj", "{6CD5CF99-3185-4FD1-B172-DE5947721854}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visitmock", "examples\tutorial\visitmock.vcproj", "{ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}" + ProjectSection(ProjectDependencies) = postProject + {4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poormock_se", "examples\tutorial\poormock_se.vcproj", "{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp_production", "mockpp_production.vcproj", "{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Debug.ActiveCfg = Debug|Win32 + {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Debug.Build.0 = Debug|Win32 + {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Release.ActiveCfg = Release|Win32 + {67066CA0-B2AD-456C-8663-A1D93B0E7949}.Release.Build.0 = Release|Win32 + {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Debug.ActiveCfg = Debug|Win32 + {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Debug.Build.0 = Debug|Win32 + {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Release.ActiveCfg = Release|Win32 + {9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}.Release.Build.0 = Release|Win32 + {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Debug.ActiveCfg = Debug|Win32 + {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Debug.Build.0 = Debug|Win32 + {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Release.ActiveCfg = Release|Win32 + {4AEB7B36-6044-4B23-9754-22F7A28F785B}.Release.Build.0 = Release|Win32 + {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Debug.ActiveCfg = Debug|Win32 + {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Debug.Build.0 = Debug|Win32 + {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Release.ActiveCfg = Release|Win32 + {15A26E8F-FE6D-4EA6-9B41-26306D17F76A}.Release.Build.0 = Release|Win32 + {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Debug.ActiveCfg = Debug|Win32 + {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Debug.Build.0 = Debug|Win32 + {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Release.ActiveCfg = Release|Win32 + {F22BA7AF-9CFC-4F2A-947D-69AF7C466635}.Release.Build.0 = Release|Win32 + {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Debug.ActiveCfg = Debug|Win32 + {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Debug.Build.0 = Debug|Win32 + {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Release.ActiveCfg = Release|Win32 + {4B2B3833-C35A-4F2F-BFAF-B686D3827531}.Release.Build.0 = Release|Win32 + {6CD5CF99-3185-4FD1-B172-DE5947721854}.Debug.ActiveCfg = Debug|Win32 + {6CD5CF99-3185-4FD1-B172-DE5947721854}.Debug.Build.0 = Debug|Win32 + {6CD5CF99-3185-4FD1-B172-DE5947721854}.Release.ActiveCfg = Release|Win32 + {6CD5CF99-3185-4FD1-B172-DE5947721854}.Release.Build.0 = Release|Win32 + {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Debug.ActiveCfg = Debug|Win32 + {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Debug.Build.0 = Debug|Win32 + {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.ActiveCfg = Release|Win32 + {ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}.Release.Build.0 = Release|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.ActiveCfg = Debug|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.Build.0 = Debug|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.ActiveCfg = Release|Win32 + {BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.Build.0 = Release|Win32 + {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.ActiveCfg = Debug|Win32 + {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.Build.0 = Debug|Win32 + {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.ActiveCfg = Release|Win32 + {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp.vcproj 23 May 2005 21:15:51 -0000 1.5 +++ mockpp.vcproj 26 Sep 2005 19:12:38 -0000 1.6 @@ -13,8 +13,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\Debug" - IntermediateDirectory="C:\tmp\msvc_compile\mockpp\Debug" + OutputDirectory="C:\tmp\compile\mockpp\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\Debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -22,7 +22,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""X:\Documents\src\cppunit-1.10.2\include";../../..;"$(CPPUNIT_ROOT)/include";../.." + AdditionalIncludeDirectories="../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -39,7 +39,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="c:\tmp\msvc_compile\mockppd.lib" + OutputFile="../lib/mockppd.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -74,7 +74,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../.." + AdditionalIncludeDirectories="../..,$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="2" @@ -137,6 +137,9 @@ RelativePath="..\..\mockpp\mockpp.cpp"> </File> <File + RelativePath="..\..\mockpp\MockTimeServer.cpp"> + </File> + <File RelativePath="..\..\mockpp\SelfDescribing.cpp"> </File> <File @@ -362,6 +365,12 @@ RelativePath="..\..\mockpp\mockpp_config.h"> </File> <File + RelativePath="..\..\mockpp\mockpp_dbc.h"> + </File> + <File + RelativePath="..\..\mockpp\MockTimeServer.h"> + </File> + <File RelativePath="..\..\mockpp\ReturnObjectList.h"> </File> <File @@ -650,6 +659,9 @@ RelativePath="..\..\mockpp\constraint\Or.h"> </File> <File + RelativePath="..\..\mockpp\constraint\OutBound.h"> + </File> + <File RelativePath="..\..\mockpp\constraint\StringContains.h"> </File> <File Index: mockpp_production.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp_production.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mockpp_production.vcproj 23 May 2005 21:15:51 -0000 1.1 +++ mockpp_production.vcproj 26 Sep 2005 19:12:38 -0000 1.2 @@ -12,9 +12,9 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="C:\tmp\msvc_compile\mockpp\production\Debug" - IntermediateDirectory="c:\tmp\msvc_compile\mockpp\production\Debug" - ConfigurationType="2" + OutputDirectory="C:\tmp\compile\mockpp\production\Debug" + IntermediateDirectory="c:\tmp\compile\mockpp\production\Debug" + ConfigurationType="4" UseOfMFC="0" CharacterSet="2"> <Tool @@ -33,14 +33,7 @@ <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/mockpp_production.dll" - LinkIncremental="2" - ModuleDefinitionFile="" - GenerateDebugInformation="TRUE" - SubSystem="2" - ImportLibrary="$(OutDir)/mockpp_production.lib" - TargetMachine="1"/> + Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" @@ -61,41 +54,31 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCWebDeploymentTool"/> - <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="2" - UseOfMFC="2" + OutputDirectory="C:\tmp\compile\mockpp\production\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\production\Release" + ConfigurationType="4" + UseOfMFC="0" CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="../.." PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL" RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" - UsePrecompiledHeader="3" + UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/mockpp_production.dll" - LinkIncremental="1" - ModuleDefinitionFile=".\mockpp_production.def" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mockpp_production.lib" - TargetMachine="1"/> + Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" @@ -116,8 +99,6 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCWebDeploymentTool"/> - <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> @@ -145,14 +126,6 @@ RelativePath="..\..\mockpp\production\TimeServer.h"> </File> </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> - </Filter> - <File - RelativePath=".\ReadMe.txt"> - </File> </Files> <Globals> </Globals> |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 18:26:37
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/meta In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15864/mockpp/bugs/meta Added Files: meta.cpp Log Message: new --- NEW FILE: meta.cpp --- template <class T> class Crc { }; |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 18:26:09
|
Update of /cvsroot/mockpp/mockpp/mockpp/bugs/meta In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15649/mockpp/bugs/meta Log Message: Directory /cvsroot/mockpp/mockpp/mockpp/bugs/meta added to the repository |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 18:25:39
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15309/mockpp/docs/en Modified Files: dev_advanced_jmock.docbook Makefile.am Log Message: update Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dev_advanced_jmock.docbook 23 Sep 2005 21:32:38 -0000 1.11 +++ dev_advanced_jmock.docbook 26 Sep 2005 18:25:10 -0000 1.12 @@ -208,7 +208,9 @@ of two objects. There is a template function <function>isSameComparison</function> which implements this default behaviour. If you need a differing implementation for a certain class you can provide -a specialized template.</para> +a specialized template. This may happen if you are using a shared pointer and +don't want to compare the this helper but the shared object at the end of +the pointers.</para> <para> <note> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile.am 23 Sep 2005 20:53:09 -0000 1.30 +++ Makefile.am 26 Sep 2005 18:25:10 -0000 1.31 @@ -61,10 +61,11 @@ pdf-files: mkdir -pv var -rm -rf ./var/*.fo + -rm -rf ./var/*.pdf cp -R $(srcdir)/common var cp -R $(srcdir)/images var xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook - fop var/mockpp.fo var/mockpp.pdf && cp var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf + fop var/mockpp.fo var/mockpp.pdf && cp -v var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf svg-files: xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook |
|
From: Ewald A. <ewa...@us...> - 2005-09-26 18:25:07
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15251/mockpp/tests Modified Files: ChainableMockObjectPolymorphism_test.cpp Makefile.am Log Message: update Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChainableMockObjectPolymorphism_test.cpp 22 Sep 2005 18:34:19 -0000 1.1 +++ ChainableMockObjectPolymorphism_test.cpp 26 Sep 2005 18:24:55 -0000 1.2 @@ -133,11 +133,6 @@ , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(doSomething) {} - bool operator==(const MockParameter2 &rhs) const - { - return this == &rhs; - } - MOCKPP_VOID_CHAINABLE0(MockParameter2, doSomething); }; @@ -175,12 +170,6 @@ }; -bool operator==(const Parameter &p1, const Parameter &p2) -{ - return &p1 == &p2; -} - - void MockVisitorPolymorphism_test::test_visitor_retrieves_parameter1() { // we create our class under test Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- Makefile.am 22 Sep 2005 18:34:19 -0000 1.80 +++ Makefile.am 26 Sep 2005 18:24:55 -0000 1.81 @@ -83,13 +83,8 @@ noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h -#compilecheck_SOURCES = compilecheck.cpp - ########################################################################### -#compilecheck_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) \ -# $(LIBCPPUNIT) -lstdc++ - jmock_test_LDFLAGS = -L/opt/intel_cc_80/lib mock_test_LDFLAGS = -L/opt/intel_cc_80/lib |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 21:32:49
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31256/mockpp/docs/en Modified Files: dev_advanced_jmock.docbook Log Message: docs Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- dev_advanced_jmock.docbook 23 Sep 2005 20:53:09 -0000 1.10 +++ dev_advanced_jmock.docbook 23 Sep 2005 21:32:38 -0000 1.11 @@ -213,7 +213,7 @@ <para> <note> <title>Potential backwards compatibility break</title> -<para>&mockpp; up to version 1.9.3 implementated +<para>&mockpp; up to version 1.9.3 implemented <classname>IsEqual</classname> and <classname>IsSame</classname> in exactly the same manner. Unfortunately this may now lead to dangling pointers and crashes if |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 21:32:49
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31256/mockpp/constraint Modified Files: IsEqual.h IsSame.h Log Message: docs Index: IsSame.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IsSame.h 23 Sep 2005 20:55:34 -0000 1.19 +++ IsSame.h 23 Sep 2005 21:32:38 -0000 1.20 @@ -47,7 +47,7 @@ * The default implementation compares the adresses of the two * objects. * @ingroup grp_constraint - * @see mockpp::same + * @see mockpp::IsSame * @param left left operand * @param right right operand * @return true if both operands are equal @@ -60,10 +60,13 @@ /** Is the value the same object as another value? - * Basically the same as IsEqual because there is no reasonable - * distinction in C++ as opposed to Java. + * Basically the same as \c IsEqual which compares with a value. + * \c IsSame compares by reference and a comparison template which can be + * specialized. * @ingroup grp_constraint * @see mockpp::same + * @see mockpp::IsEqual + * @see mockpp::isSameComparison */ template <typename T> class IsSame : public Constraint<T> Index: IsEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsEqual.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IsEqual.h 30 Jan 2005 12:09:18 -0000 1.19 +++ IsEqual.h 23 Sep 2005 21:32:38 -0000 1.20 @@ -44,9 +44,11 @@ /** Is the value equal to another value, as tested by the - * invoked method? + * invoked method? Basically the same as \c IsSame which compares + * by reference and a specializable comparison template. * @ingroup grp_constraint * @see mockpp::eq( const T& op ) + * @see mockpp::IsSame */ template <typename T> class IsEqual : public Constraint<T> |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 20:55:46
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22770/mockpp/constraint Modified Files: IsSame.h Log Message: comparison with template Index: IsSame.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- IsSame.h 22 Sep 2005 18:34:19 -0000 1.18 +++ IsSame.h 23 Sep 2005 20:55:34 -0000 1.19 @@ -43,6 +43,22 @@ namespace mockpp { +/** Default comparison function for \c IsSame. + * The default implementation compares the adresses of the two + * objects. + * @ingroup grp_constraint + * @see mockpp::same + * @param left left operand + * @param right right operand + * @return true if both operands are equal + */ +template <class T> +bool isSameComparison(const T &left, const T &right) +{ + return &left == &right; +} + + /** Is the value the same object as another value? * Basically the same as IsEqual because there is no reasonable * distinction in C++ as opposed to Java. @@ -73,7 +89,7 @@ */ virtual bool eval( const T &arg ) const { - return arg == ref; + return isSameComparison(arg, ref); } /** Appends the description of this object to the buffer. |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 20:55:08
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22654 Modified Files: ChangeLog configure.in Log Message: update Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- ChangeLog 22 Sep 2005 18:34:17 -0000 1.64 +++ ChangeLog 23 Sep 2005 20:55:00 -0000 1.65 @@ -3,12 +3,15 @@ mockpp history -------------- -2005-09-19 1.9.4: +2005-09-24 1.9.4: - missing & in macro MOCKPP_VOID_CONST_CHAINABLE3 - adding spaces around < > enables the use of templates - potential compatibilty break: IsSame compares now by reference - wheras IsEqual still compares by value + wheras IsEqual still compares by value. + + ==> Existing code using IsSame may crash now if the reference + points to a temporary object. 2005-09-17 1.9.3: Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- configure.in 17 Sep 2005 08:28:56 -0000 1.88 +++ configure.in 23 Sep 2005 20:55:00 -0000 1.89 @@ -17,7 +17,7 @@ # MOCKPP_MAJOR_VERSION=1 MOCKPP_MINOR_VERSION=9 -MOCKPP_PATCH_VERSION=3 +MOCKPP_PATCH_VERSION=4 MOCKPP_MICRO_VERSION=33 MOCKPP_INTERFACE_AGE=0 |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 20:54:31
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22516/mockpp/tests Modified Files: ChainingMockObjectSupport_test.cpp IsSame_test.cpp Log Message: adopted tests Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChainingMockObjectSupport_test.cpp 22 Sep 2005 18:34:19 -0000 1.29 +++ ChainingMockObjectSupport_test.cpp 23 Sep 2005 20:54:20 -0000 1.30 @@ -275,8 +275,8 @@ { std::string str( "string" ); mockpp::Constraint<std::string>::AP same = mockpp::same( str ); - CPPUNIT_ASSERT( same->eval( "string" ) == true ); - CPPUNIT_ASSERT( same->eval( "not-string" ) == false ); + CPPUNIT_ASSERT( same->eval( str ) == true ); + CPPUNIT_ASSERT( same->eval( "string" ) == false ); } Index: IsSame_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsSame_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- IsSame_test.cpp 22 Sep 2005 18:34:19 -0000 1.7 +++ IsSame_test.cpp 23 Sep 2005 20:54:20 -0000 1.8 @@ -73,8 +73,8 @@ { std::string str = "string"; mockpp::IsSame<std::string> same (str); - CPPUNIT_ASSERT(same.eval("string") == true); - CPPUNIT_ASSERT(same.eval("not-string") == false); + CPPUNIT_ASSERT(same.eval(str) == true); + CPPUNIT_ASSERT(same.eval("string") == false); } |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 20:53:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22270/mockpp/docs/en Modified Files: Makefile.am customize.xsl.in dev_advanced_jmock.docbook index.docbook Log Message: update for current features Index: customize.xsl.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/customize.xsl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- customize.xsl.in 27 May 2005 08:15:53 -0000 1.1 +++ customize.xsl.in 23 Sep 2005 20:53:09 -0000 1.2 @@ -35,6 +35,7 @@ <xsl:param name="chapter.autolabel" select="1"/> <xsl:param name="appendix.autolabel" select="1"/> <xsl:param name="section.autolabel" select="1"/> +<!-- xsl:param name="section.autolabel.max.depth" select="4"/ --> <xsl:param name="section.label.includes.component.label" select="1"/> <xsl:param name="callout.graphics.number.limit" select="'15'"/> <xsl:param name="use.id.as.filename" select="'1'"/> Index: index.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- index.docbook 29 Jul 2005 08:02:06 -0000 1.30 +++ index.docbook 23 Sep 2005 20:53:09 -0000 1.31 @@ -11,7 +11,7 @@ <!ENTITY copyyears '2002-2005' > <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de' > <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' > - <!ENTITY release_info '<releaseinfo>1.09.00</releaseinfo>' > + <!ENTITY release_info '<releaseinfo>1.09.04</releaseinfo>' > <!ENTITY chap_bookinfo SYSTEM 'bookinfo.docbook' > <!ENTITY chap_intro SYSTEM 'intro.docbook' > Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Makefile.am 17 Sep 2005 15:18:09 -0000 1.29 +++ Makefile.am 23 Sep 2005 20:53:09 -0000 1.30 @@ -33,8 +33,10 @@ ln -s ../../examples/tutorial/html tutorial -test -L api-doc && rm api-doc ln -s ../../docs/api/html api-doc - -rm -rf ./var mkdir -pv var + -rm -rf ./var/*.html + -rm -rf ./var/common + -rm -rf ./var/images cp -R $(srcdir)/common var cp -R $(srcdir)/images var xsltproc -o var/ $(srcdir)/customize-chunked.xsl $(srcdir)/index.docbook @@ -44,8 +46,10 @@ ln -s ../../examples/tutorial/html tutorial -test -L api-doc && rm api-doc ln -s ../../docs/api/html api-doc - -rm -rf ./var mkdir -pv var + -rm -rf ./var/*.html + -rm -rf ./var/common + -rm -rf ./var/images cp -R $(srcdir)/common var cp -R $(srcdir)/images var xsltproc -o var/ $(srcdir)/customize-flat.xsl $(srcdir)/index.docbook @@ -55,12 +59,12 @@ ################################################################ pdf-files: - -rm -rf ./var mkdir -pv var + -rm -rf ./var/*.fo cp -R $(srcdir)/common var cp -R $(srcdir)/images var xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook - fop var/mockpp.fo var/mockpp.pdf && mv var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf + fop var/mockpp.fo var/mockpp.pdf && cp var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf svg-files: xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook Index: dev_advanced_jmock.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_advanced_jmock.docbook,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dev_advanced_jmock.docbook 24 Jul 2005 12:54:37 -0000 1.9 +++ dev_advanced_jmock.docbook 23 Sep 2005 20:53:09 -0000 1.10 @@ -78,7 +78,7 @@ <title>Stubs And Expectations</title> <para>Chainable mock objects provide <emphasis>stubbed</emphasis> and -<emphasis>excpected</emphasis> methods. An expected method must occur as +<emphasis>expected</emphasis> methods. An expected method must occur as specified, otherwise the object will fail when verified. A stubbed method without specifiction may be invoked unlimited times or not at all but the test still passes.</para> @@ -158,10 +158,11 @@ <itemizedlist> <listitem><classname>IsEqual</classname>/<methodname>eq()</methodname> tests equality</listitem> + <listitem><classname>IsSame</classname>/<methodname>same()</methodname> tests if two objects are the same</listitem> <listitem><classname>IsCloseTo</classname>/<methodname>eq(a,b)</methodname> tests near equality</listitem> <listitem><classname>IsGreaterThan</classname>/<methodname>gt()</methodname> is true for higher values a reference value</listitem> <listitem><classname>IsLessThan</classname>/<methodname>lt()</methodname> is true for lower values than a reference value</listitem> - <listitem><classname>IsNot</classname>/<methodname>eq()</methodname> negates another contraint</listitem> + <listitem><classname>IsNot</classname>/<methodname>logic_not()</methodname> negates another contraint</listitem> <listitem><classname>And</classname>/<methodname>logic_and()</methodname> provides a logical-and of two constraints</listitem> <listitem><classname>Or</classname>/<methodname>logic_or()</methodname> provides a logical-or of two constraints</listitem> <listitem><classname>IsAnything</classname>/<methodname>any()</methodname> is always true</listitem> @@ -170,6 +171,15 @@ <listitem><classname>IsInstanceOf</classname>/<methodname>isA()</methodname> tests if an object is of a type</listitem> </itemizedlist> +<para>Creating your own constraints is quite easy. Look at the files in the +<filename>constraint</filename> directory to get an idea how this can be done.</para> + +<para>Use method <methodname>with()</methodname> to pass the constraints. Obviously this +method has the same number of parameters as your mocked method.</para> + +<sect4 id="outbound-constraint"> +<title>Outbound Values</title> + <para id="outbound">There is one special constraint which is not actually a real constraint. <classname>OutBound</classname> does not check for incoming parameter values but passes values back by a reference. This enables mocked methods like the following: @@ -184,12 +194,58 @@ </programlisting> </para> +</sect4> -<para>Creating your own constraints is quite easy. Look at the files in the -<filename>constraint</filename> directory to get an idea how this can be done.</para> +<sect4 id="comparing-constraint"> +<title>Constraints for Comparison</title> -<para>Use method <methodname>with()</methodname> to pass the constraints. Obviously this -method has the same number of parameters as your mocked method.</para> +<para>&mockpp; contains two conststraint classes to compare objects. +<classname>IsEqual</classname> is probably appropriate for most cases. It takes +an object and stores it's value for later comparison.</para> + +<para><classname>IsSame</classname> on the other hand is intended to check +for identical values. This usually means to compare the pointer values +of two objects. There is a template function +<function>isSameComparison</function> which implements this default behaviour. +If you need a differing implementation for a certain class you can provide +a specialized template.</para> + +<para> +<note> +<title>Potential backwards compatibility break</title> +<para>&mockpp; up to version 1.9.3 implementated +<classname>IsEqual</classname> and <classname>IsSame</classname> +in exactly the same manner. +Unfortunately this may now lead to dangling pointers and crashes if +existing code referes to temporary objects.</para> + +<para>The following fragment shows the problem. When constructing +the object a temporary string is created and this pointer is +passed to the constructor of <classname>IsEqual</classname>. +After this statement the string object is destroyed and this pointer becomes +invalid. + +<programlisting> + + mockpp::IsSame<std::string> same ("string"); + +</programlisting> + +To avoid this problem you have to create a variable which must exist +until the test completes. + +<programlisting> + + std::string str ("string"); + mockpp::IsSame<std::string> same (str); + +</programlisting> + +</para> +</note> + +</para> +</sect4> </sect3> |
|
From: Ewald A. <ewa...@us...> - 2005-09-23 20:53:22
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22270/mockpp/docs/en/common Modified Files: mockpp.css Log Message: update for current features Index: mockpp.css =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/common/mockpp.css,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mockpp.css 24 Jul 2005 12:54:37 -0000 1.8 +++ mockpp.css 23 Sep 2005 20:53:09 -0000 1.9 @@ -22,6 +22,7 @@ .methodname { color: #707000; } .classname { color: #707000; } .token { color: #707000; } +.function { color: #707000; } .NAVHEADER { display: yes } .NAVFOOTER { display: yes } |
|
From: Ewald A. <ewa...@us...> - 2005-09-22 18:34:32
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9065 Modified Files: ChangeLog mockpp.kdevelop Log Message: make IsSame compare by reference Index: mockpp.kdevelop =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- mockpp.kdevelop 15 Aug 2005 14:16:26 -0000 1.76 +++ mockpp.kdevelop 22 Sep 2005 18:34:19 -0000 1.77 @@ -16,6 +16,7 @@ <language>C</language> <language>Java</language> </secondaryLanguages> + <versioncontrol>kdevcvsservice</versioncontrol> </general> <kdevautoproject> <general> @@ -23,7 +24,7 @@ <useconfiguration>unicode</useconfiguration> </general> <run> - <mainprogram>mockpp/tests/mock_test</mainprogram> + <mainprogram>mockpp/tests/jmock_test</mainprogram> <programargs/> <terminal>false</terminal> <envvars/> @@ -46,14 +47,14 @@ <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <dontact>false</dontact> - <makebin>make</makebin> + <makebin>make check</makebin> <prio>0</prio> </make> <configurations> <unicode> <envvars/> <configargs>--enable-unicode</configargs> - <builddir>/home/compile/mockpp/u</builddir> + <builddir>/var/compile/mockpp/u</builddir> <topsourcedir/> <cppflags/> <ldflags/> Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- ChangeLog 19 Sep 2005 18:42:26 -0000 1.63 +++ ChangeLog 22 Sep 2005 18:34:17 -0000 1.64 @@ -7,6 +7,8 @@ - missing & in macro MOCKPP_VOID_CONST_CHAINABLE3 - adding spaces around < > enables the use of templates + - potential compatibilty break: IsSame compares now by reference + wheras IsEqual still compares by value 2005-09-17 1.9.3: |
|
From: Ewald A. <ewa...@us...> - 2005-09-22 18:34:30
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9065/mockpp/constraint Modified Files: IsSame.h Log Message: make IsSame compare by reference Index: IsSame.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IsSame.h 6 Jan 2005 13:09:22 -0000 1.17 +++ IsSame.h 22 Sep 2005 18:34:19 -0000 1.18 @@ -90,7 +90,7 @@ private: - const T ref; + const T &ref; }; |
|
From: Ewald A. <ewa...@us...> - 2005-09-22 18:34:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9065/mockpp/tests Modified Files: ChainingMockObjectSupport_test.cpp IsSame_test.cpp Makefile.am Added Files: ChainableMockObjectPolymorphism_test.cpp Log Message: make IsSame compare by reference --- NEW FILE: ChainableMockObjectPolymorphism_test.cpp --- /*************************************************************************** ChainableMockObjectPolymorphism_test.cpp - unit tests for MockVisitor class and polymorphic parameter methods ------------------- begin : Tue Sep 20 2004 copyright : (C) 2005 contributed by Mathieu Champlon email : mockpp at ewald-arnold dot de $Id: ChainableMockObjectPolymorphism_test.cpp,v 1.1 2005/09/22 18:34:19 ewald-arnold Exp $ ***************************************************************************/ /************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2 of the License, * or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ***************************************************************************/ #define MOCKPP_ENABLE_DEFAULT_FORMATTER #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT # warning CppUnit not available at compile time #else #include <mockpp/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> #include <mockpp/constraint/OutBound.h> #include <cppunit/extensions/HelperMacros.h> class MockVisitorPolymorphism_test : public CppUnit::TestFixture { public: CPPUNIT_TEST_SUITE( MockVisitorPolymorphism_test ); CPPUNIT_TEST(test_visitor_retrieves_parameter1); CPPUNIT_TEST(test_visitor_retrieves_parameter2); CPPUNIT_TEST_SUITE_END(); public: void test_visitor_retrieves_parameter1(); void test_visitor_retrieves_parameter2(); }; CPPUNIT_TEST_SUITE_REGISTRATION(MockVisitorPolymorphism_test); // let's suppose we have an interface defined like this : class Parameter { public: // this method won't be part of the test // it's only to show that this class is not a simple value object virtual void doSomething() = 0; }; // this interface will be mocked for the test class Visitor { public: virtual void visit( const Parameter & ) = 0; }; // this is the class under test class UnderTest { public: // it takes a Parameter as a configuration component UnderTest( const Parameter ¶meter ) : parameter_( parameter ) {} // this is the method we are about to test void accept( Visitor &visitor ) { visitor.visit( parameter_ ); } private: const Parameter& parameter_; }; // we need a mock for the Parameter in order to build an UnderTest instance class MockParameter1 : public mockpp::ChainableMockObject, public Parameter { public: MockParameter1(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(doSomething) {} MOCKPP_VOID_CHAINABLE0(MockParameter1, doSomething); }; // we need a mock for the Parameter in order to build an UnderTest instance class MockParameter2 : public mockpp::ChainableMockObject, public Parameter { public: MockParameter2(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(doSomething) {} bool operator==(const MockParameter2 &rhs) const { return this == &rhs; } MOCKPP_VOID_CHAINABLE0(MockParameter2, doSomething); }; // we mock the Visitor in order to call the apply method of UnderTest with it class MockVisitor1 : public mockpp::ChainableMockObject, public Visitor { public: MockVisitor1(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE1(visit) {} // here is the first problem as Parameter is just an interface MOCKPP_VOID_CHAINABLE_EXT1(MockVisitor1, visit, const Parameter &, , Parameter); }; // we mock the Visitor in order to call the apply method of UnderTest with it class MockVisitor2 : public mockpp::ChainableMockObject, public Visitor { public: MockVisitor2(const mockpp::String &name) : mockpp::ChainableMockObject(name, 0) , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE1(visit) {} // here is the first problem as Parameter is just an interface MOCKPP_VOID_CHAINABLE_EXT1(MockVisitor2, visit, const Parameter &, , MockParameter2); }; bool operator==(const Parameter &p1, const Parameter &p2) { return &p1 == &p2; } void MockVisitorPolymorphism_test::test_visitor_retrieves_parameter1() { // we create our class under test MockParameter1 mp1(MOCKPP_PCHAR("mock-parameter1")); UnderTest ut1(mp1); // we program the mock visitor as we expect MockVisitor1 mv(MOCKPP_PCHAR("mock-visitor")); MOCKPP_CHAINER_FOR(MockVisitor1, visit) chain(&mv); // here is the second problem as we would like to verify that the // call is made with precisely 'mp' and nothing else chain.stubs(mockpp::once()) .with(mockpp::same<Parameter>(mp1)); // we trigger the tested method ut1.accept(mv); // and finally verify the expectation mv.verify(); } void MockVisitorPolymorphism_test::test_visitor_retrieves_parameter2() { // we create our class under test MockParameter2 mp2(MOCKPP_PCHAR("mock-parameter2")); UnderTest ut2(mp2); // we program the mock visitor as we expect MockVisitor2 mv(MOCKPP_PCHAR("mock-visitor")); MOCKPP_CHAINER_FOR(MockVisitor2, visit) chain(&mv); // here is the second problem as we would like to verify that the // call is made with precisely 'mp' and nothing else chain.stubs(mockpp::once()) .with(mockpp::same(mp2)); // we trigger the tested method ut2.accept(mv); // and finally verify the expectation mv.verify(); } #endif // HAVE_CPPUNIT Index: ChainingMockObjectSupport_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockObjectSupport_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ChainingMockObjectSupport_test.cpp 3 Apr 2005 18:32:54 -0000 1.28 +++ ChainingMockObjectSupport_test.cpp 22 Sep 2005 18:34:19 -0000 1.29 @@ -273,7 +273,8 @@ void ChainingMockObjectSupport_test::test_same_func() { - mockpp::Constraint<std::string>::AP same = mockpp::same( std::string( "string" ) ); + std::string str( "string" ); + mockpp::Constraint<std::string>::AP same = mockpp::same( str ); CPPUNIT_ASSERT( same->eval( "string" ) == true ); CPPUNIT_ASSERT( same->eval( "not-string" ) == false ); } Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- Makefile.am 19 Sep 2005 18:36:28 -0000 1.79 +++ Makefile.am 22 Sep 2005 18:34:19 -0000 1.80 @@ -56,26 +56,26 @@ VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp jmock_test_SOURCES = And_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp \ - IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ - IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ - Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ - TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ - CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ - AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ - InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ - TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ - ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ - AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ - CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ - InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ - InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ - InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ - ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ - ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ - ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ - ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ - StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp \ - OutBound_test.cpp + IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ + IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ + Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ + TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ + CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ + AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ + InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ + TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ + ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ + AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ + CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ + InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ + InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ + InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ + ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ + ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ + ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ + ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ + StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp \ + OutBound_test.cpp ChainableMockObjectPolymorphism_test.cpp readability_test_SOURCES = readability_test.cpp classes_ABCDE.cpp Index: IsSame_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsSame_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- IsSame_test.cpp 30 Dec 2004 20:54:06 -0000 1.6 +++ IsSame_test.cpp 22 Sep 2005 18:34:19 -0000 1.7 @@ -71,7 +71,8 @@ void IsSame_test::test_invoke() { - mockpp::IsSame<std::string> same ("string"); + std::string str = "string"; + mockpp::IsSame<std::string> same (str); CPPUNIT_ASSERT(same.eval("string") == true); CPPUNIT_ASSERT(same.eval("not-string") == false); } |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:42:34
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24276 Modified Files: bug-report ChangeLog Log Message: update Index: bug-report =================================================================== RCS file: /cvsroot/mockpp/mockpp/bug-report,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- bug-report 2 Apr 2005 14:09:58 -0000 1.5 +++ bug-report 19 Sep 2005 18:42:26 -0000 1.6 @@ -2,13 +2,13 @@ ./configure >x1 2>x2 make check -k -i >x3 2>x4 set >x5 -gcc -v >x6 +gcc -v 2>x6 uname -a >x7 -ll /usr/local/lib >x8 +ls -la /usr/local/lib >x8 tar cf mockpp-bug-report.tar x1 x2 x3 x4 x5 x6 x7 x8 config.cache \ - config.log config.status config.h mockpp/config.h + config.log config.status config.h mockpp/mockpp_config.h gzip mockpp-bug-report.tar echo "*****************************************************" echo "send mockpp-bug-report.tar.gz to mo...@ew..." echo "*****************************************************" -rm x1 x2 x3 x4 x5 x6 x7 x8 +rm x1 x2 x3 x4 x5 x6 x7 x8 \ No newline at end of file Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- ChangeLog 17 Sep 2005 15:18:09 -0000 1.62 +++ ChangeLog 19 Sep 2005 18:42:26 -0000 1.63 @@ -2,6 +2,12 @@ mockpp history -------------- + +2005-09-19 1.9.4: + + - missing & in macro MOCKPP_VOID_CONST_CHAINABLE3 + - adding spaces around < > enables the use of templates + 2005-09-17 1.9.3: - an ambiguity with included files on Cygwin platforms |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:42:18
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24238/mockpp Modified Files: ChainableMockObject.h Log Message: added missing & Index: ChainableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ChainableMockObject.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChainableMockObject.h 29 Jul 2005 10:07:24 -0000 1.26 +++ ChainableMockObject.h 19 Sep 2005 18:42:08 -0000 1.27 @@ -390,8 +390,8 @@ #define MOCKPP_VOID_CHAINABLE3(classname, name, type1, type2, type3) \ public: \ void name(const type1 ¶m1, const type2 ¶m2, const type3 ¶m3) \ - MOCKPP_VOID_CHAINABLE3_IMPL(classname, name, const type1 &, const type2, const type3 &, \ - name, type1, type2, type3) + MOCKPP_VOID_CHAINABLE3_IMPL(classname, name, const type1 &, const type2 &, const type3 &, \ + name, type1, type2, type3) /** Implements a const method with 3 parameters for a mock object. * Serves also as a backwards compatibility macro. |
