Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp/examples/tutorial
Modified Files:
chainmock.cpp chainmock2.cpp cppunit.cpp verifying.cpp
visitmock.cpp visitmock2.cpp
Log Message:
restructuring and cleanup
Index: cppunit.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/cppunit.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cppunit.cpp 15 Oct 2005 15:50:36 -0000 1.12
+++ cppunit.cpp 10 Dec 2005 20:07:21 -0000 1.13
@@ -13,8 +13,8 @@
#include <mockpp/mockpp.h> // always first
#include <mockpp/Throwable.h>
-#include <mockpp/VisitableMockObject.h>
-#include <mockpp/ChainableMockObject.h>
+#include <mockpp/visiting/VisitableMockObject.h>
+#include <mockpp/chaining/ChainableMockObject.h>
#include <mockpp/chaining/ChainingMockObjectSupport.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
Index: verifying.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/verifying.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- verifying.cpp 1 May 2005 14:20:51 -0000 1.11
+++ verifying.cpp 10 Dec 2005 20:07:21 -0000 1.12
@@ -16,7 +16,8 @@
#ifdef HAVE_CPPUNIT
-#include <mockpp/VerifyingTestCase.h>
+#include <mockpp/framework/VerifyingTestCase.h>
+
#include <mockpp/ExpectationValue.h>
#include <mockpp/compat/AssertionFailedError.h>
@@ -123,5 +124,5 @@
#else
std::cout << "CppUnit was not available at compile time.\n";
return 1;
-#endif
+#endif
}
Index: visitmock2.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- visitmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2
+++ visitmock2.cpp 10 Dec 2005 20:07:21 -0000 1.3
@@ -13,8 +13,8 @@
#define MOCKPP_IMPORT_ABBREVIATED
#include <mockpp/mockpp.h> // always first
-#include <mockpp/VisitableMockObject.h>
-#include <mockpp/CountedVisitableMethod.h>
+#include <mockpp/visiting/VisitableMockObject.h>
+#include <mockpp/visiting/CountedVisitableMethod.h>
#include <mockpp/chaining/ChainingMockObjectSupport.h>
Index: visitmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- visitmock.cpp 26 Nov 2005 17:58:40 -0000 1.15
+++ visitmock.cpp 10 Dec 2005 20:07:21 -0000 1.16
@@ -13,7 +13,7 @@
#define MOCKPP_IMPORT_ABBREVIATED
#include <mockpp/mockpp.h> // always first
-#include <mockpp/VisitableMockObject.h>
+#include <mockpp/visiting/VisitableMockObject.h>
#include <mockpp/chaining/ChainingMockObjectSupport.h>
Index: chainmock2.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- chainmock2.cpp 26 Nov 2005 17:58:40 -0000 1.2
+++ chainmock2.cpp 10 Dec 2005 20:07:21 -0000 1.3
@@ -15,7 +15,7 @@
#include "interface.h"
#include "consumer.h"
-#include <mockpp/ChainableMockObject.h>
+#include <mockpp/chaining/ChainableMockObject.h>
#include <mockpp/chaining/CountedChainableMethod.h>
#include <mockpp/chaining/ChainingMockObjectSupport.h>
Index: chainmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chainmock.cpp 10 Dec 2005 15:17:15 -0000 1.12
+++ chainmock.cpp 10 Dec 2005 20:07:21 -0000 1.13
@@ -16,7 +16,7 @@
#include "consumer.h"
#include <mockpp/chaining/mockpp_pti.h>
-#include <mockpp/ChainableMockObject.h>
+#include <mockpp/chaining/ChainableMockObject.h>
#include <mockpp/chaining/ChainingMockObjectSupport.h>
#include <exception>
|
