[Mockpp-commits] mockpp/mockpp/tests ChainableMockObjectPolymorphism_test.cpp,1.6,1.7 ChainableMockO
Brought to you by:
ewald-arnold
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/tests Modified Files: ChainableMockObjectPolymorphism_test.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 ResponseVector_test.cpp SelectFramework.h VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_2_test.cpp VisitableMockMethod_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp Log Message: restructuring and cleanup Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChainableMockObject_5_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.15 +++ ChainableMockObject_5_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.16 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include "classes_ABCDE.h" Index: ChainableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_4_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ ChainableMockObject_4_test.cpp 10 Dec 2005 20:07:22 -0000 1.13 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ResponseVector_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ResponseVector_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ResponseVector_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ ResponseVector_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -32,7 +32,7 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> Index: VisitableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_void_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_5_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.26 +++ VisitableMockObject_5_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_4_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_4_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_4_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -39,7 +39,7 @@ #include <mockpp/constraint/IsNot.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.23 +++ VisitableMockObject_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.24 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- VisitableMockObject_1_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.23 +++ VisitableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.24 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: SelectFramework.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/SelectFramework.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SelectFramework.h 10 Dec 2005 15:18:34 -0000 1.3 +++ SelectFramework.h 10 Dec 2005 20:07:22 -0000 1.4 @@ -1 +1 @@ -#include <mockpp/SelectUnittestFramework.h> +#include <mockpp/framework/SelectUnittestFramework.h> Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_2_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObjectPolymorphism_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObjectPolymorphism_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObjectPolymorphism_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ ChainableMockObjectPolymorphism_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -37,7 +37,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: ChainableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -35,7 +35,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/matcher/TypelessMatcher.h> Index: ChainableMockObject_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -33,8 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> - +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VisitableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VisitableMockObject_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.22 +++ VisitableMockObject_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 @@ -39,7 +39,7 @@ #include <mockpp/constraint/IsNot.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_2_void_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VisitableMockObject_2_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.22 +++ VisitableMockObject_2_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.23 @@ -40,7 +40,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_2_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- VisitableMockObject_test.cpp 9 Dec 2005 18:56:20 -0000 1.26 +++ VisitableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.27 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_3_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -40,7 +40,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_3_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VisitableMockMethod_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ VisitableMockMethod_test.cpp 10 Dec 2005 20:07:22 -0000 1.19 @@ -35,17 +35,16 @@ //#define MOCKPP_COUNTED_WEAKNESS // only BCB5 -#include <mockpp/VisitableMockMethod.h> -#include <mockpp/VisitableMockMethod0.h> -#include <mockpp/VisitableMockMethod1.h> -#include <mockpp/VisitableMockMethod2.h> -#include <mockpp/VisitableMockMethod3.h> -#include <mockpp/VisitableMockMethod4.h> -#include <mockpp/VisitableMockMethod5.h> -#include <mockpp/VisitableMockMethod6.h> -#include <mockpp/CountedVisitableMethod.h> - -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h> +#include <mockpp/visiting/VisitableMockMethod0.h> +#include <mockpp/visiting/VisitableMockMethod1.h> +#include <mockpp/visiting/VisitableMockMethod2.h> +#include <mockpp/visiting/VisitableMockMethod3.h> +#include <mockpp/visiting/VisitableMockMethod4.h> +#include <mockpp/visiting/VisitableMockMethod5.h> +#include <mockpp/visiting/VisitableMockMethod6.h> +#include <mockpp/visiting/CountedVisitableMethod.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/constraint/OutBound.h> Index: VisitableMockMethod_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_2_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- VisitableMockMethod_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ VisitableMockMethod_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -33,8 +33,8 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockMethod2.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod2.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainableMockObject_test.cpp 9 Dec 2005 18:56:20 -0000 1.25 +++ ChainableMockObject_test.cpp 10 Dec 2005 20:07:22 -0000 1.26 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VerifyingTestCase_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCase_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- VerifyingTestCase_test.cpp 9 Dec 2005 18:56:20 -0000 1.18 +++ VerifyingTestCase_test.cpp 10 Dec 2005 20:07:22 -0000 1.19 @@ -39,7 +39,8 @@ # include <memory> #endif -#include <mockpp/VerifyingTestCase.h> +#include <mockpp/framework/VerifyingTestCase.h> + #include <mockpp/ExpectationValue.h> #include <mockpp/compat/Assert.h> Index: ChainableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockObject_3_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ ChainableMockObject_3_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_4_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_template_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_template_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- VisitableMockObject_template_test.cpp 9 Dec 2005 18:56:20 -0000 1.10 +++ VisitableMockObject_template_test.cpp 10 Dec 2005 20:07:22 -0000 1.11 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_template_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockMethod_1_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_1_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- VisitableMockMethod_1_test.cpp 9 Dec 2005 18:56:20 -0000 1.6 +++ VisitableMockMethod_1_test.cpp 10 Dec 2005 20:07:22 -0000 1.7 @@ -33,8 +33,8 @@ #include "SelectFramework.h" -#include <mockpp/VisitableMockMethod1.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod1.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChainableMockObject_1_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.16 +++ ChainableMockObject_1_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.17 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: ChainableMockObject_2_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_2_test.cpp 9 Dec 2005 18:56:20 -0000 1.12 +++ ChainableMockObject_2_test.cpp 10 Dec 2005 20:07:22 -0000 1.13 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/chaining/Invocation.h> Index: VisitableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_5_test.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- VisitableMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.30 +++ VisitableMockObject_5_test.cpp 10 Dec 2005 20:07:22 -0000 1.31 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_3_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_3_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_3_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_3_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -39,7 +39,7 @@ #include <mockpp/chaining/ChainingMockObjectSupport.h> #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/util/AssertMo.h> Index: VisitableMockObject_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_void_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VisitableMockObject_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.19 +++ VisitableMockObject_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.20 @@ -36,7 +36,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> class VisitableMockObject_void_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ChainableMockObject_5_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_5_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_5_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -33,7 +33,7 @@ #include "SelectFramework.h" -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include "classes_ABCDE.h" Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- VerifyingTestCaller_test.cpp 9 Dec 2005 18:56:20 -0000 1.11 +++ VerifyingTestCaller_test.cpp 10 Dec 2005 20:07:22 -0000 1.12 @@ -39,7 +39,7 @@ # include <memory> #endif -#include <mockpp/VerifyingTestCaller.h> +#include <mockpp/framework/VerifyingTestCaller.h> #include <mockpp/compat/Assert.h> Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_3_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.13 +++ ChainableMockObject_3_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.14 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/chaining/mockpp_pti.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: VisitableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_4_void_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockObject_4_void_test.cpp 9 Dec 2005 18:56:20 -0000 1.21 +++ VisitableMockObject_4_void_test.cpp 10 Dec 2005 20:07:22 -0000 1.22 @@ -34,7 +34,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> |