r12 | charles.nicholson | 2010-03-17 18:59:25 -0500 (Wed, 17 Mar 2010) | 1 line

move unittestpp.h and config.h to top-level folder, to allow 'include unittestpp/unittestpp.h' directives in client code

src/AssertException.h

@@ -1,8 +1,7 @@
 #ifndef UNITTEST_ASSERTEXCEPTION_H
 #define UNITTEST_ASSERTEXCEPTION_H
 
-#include "Config.h"
-
+#include "../config.h"
 #ifdef UNITTEST_USE_EXCEPTIONS
 
 #include <exception>

src/Checks.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_CHECKS_H
 #define UNITTEST_CHECKS_H
 
-#include "Config.h"
+#include "../config.h"
 #include "TestResults.h"
 #include "MemoryOutStream.h"
 

src/DeferredTestReporter.cpp

@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "DeferredTestReporter.h"

src/DeferredTestReporter.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_DEFERREDTESTREPORTER_H
 #define UNITTEST_DEFERREDTESTREPORTER_H
 
-#include "Config.h"
+#include "../config.h"
 
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 

src/DeferredTestResult.cpp

@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "DeferredTestResult.h"

src/DeferredTestResult.h

@@ -1,8 +1,7 @@
 #ifndef UNITTEST_DEFERREDTESTRESULT_H
 #define UNITTEST_DEFERREDTESTRESULT_H
 
-#include "Config.h"
-
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include <string>

src/ExceptionMacros.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_EXCEPTIONMACROS_H
 #define UNITTEST_EXCEPTIONMACROS_H
 
-#include "Config.h"
+#include "../config.h"
 
 #ifdef UNITTEST_USE_EXCEPTIONS
 	#define UT_TRY(x) try x

src/ExecuteTest.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_EXECUTE_TEST_H
 #define UNITTEST_EXECUTE_TEST_H
 
-#include "Config.h"
+#include "../config.h"
 #include "ExceptionMacros.h"
 #include "TestDetails.h"
 #include "TestResults.h"

src/MemoryOutStream.h

@@ -1,8 +1,7 @@
 #ifndef UNITTEST_MEMORYOUTSTREAM_H
 #define UNITTEST_MEMORYOUTSTREAM_H
 
-#include "Config.h"
-
+#include "../config.h"
 #ifndef UNITTEST_USE_CUSTOM_STREAMS
 
 #include <sstream>

src/ReportAssertImpl.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_REPORTASSERTIMPL_H
 #define UNITTEST_REPORTASSERTIMPL_H
 
-#include "Config.h"
+#include "../config.h"
 
 #ifndef UNITTEST_USE_EXCEPTIONS
 	#include <csetjmp>

src/Test.cpp

@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #include "Test.h"
 #include "TestList.h"
 #include "TestResults.h"

src/TestMacros.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_TESTMACROS_H
 #define UNITTEST_TESTMACROS_H
 
-#include "Config.h"
+#include "../config.h"
 #include "TestSuite.h"
 #include "ExceptionMacros.h"
 #include "ExecuteTest.h"

src/TimeHelpers.h

@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 
 #if defined UNITTEST_POSIX
     #include "Posix/TimeHelpers.h"

src/Win32/TimeHelpers.h

@@ -1,8 +1,7 @@
 #ifndef UNITTEST_TIMEHELPERS_H
 #define UNITTEST_TIMEHELPERS_H
 
-#include "../Config.h"
-
+#include "../../config.h"
 
 #ifdef UNITTEST_MINGW
     #ifndef __int64

src/XmlTestReporter.cpp

@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "XmlTestReporter.h"

src/XmlTestReporter.h

@@ -1,7 +1,7 @@
 #ifndef UNITTEST_XMLTESTREPORTER_H
 #define UNITTEST_XMLTESTREPORTER_H
 
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "DeferredTestReporter.h"

src/tests/Main.cpp

@@ -1,6 +1,4 @@
-#include "../unittestpp.h"
-#include "../TestReporterStdout.h"
-
+#include "../../unittestpp.h"
 
 int main(int, char const *[])
 {

src/tests/TestAssertHandler.cpp

@@ -1,6 +1,6 @@
-#include "../Config.h"
+#include "../../config.h"
+#include "../../unittestpp.h"
 
-#include "../unittestpp.h"
 #include "../ReportAssert.h"
 #include "../ReportAssertImpl.h"
 #include "../AssertException.h"

src/tests/TestCheckMacros.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../CurrentTest.h"
 #include "RecordingReporter.h"
 #include "ScopedCurrentTest.h"

src/tests/TestChecks.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "RecordingReporter.h"
 
 using namespace UnitTest;

src/tests/TestCurrentTest.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../CurrentTest.h"
 #include "ScopedCurrentTest.h"
 

src/tests/TestDeferredTestReporter.cpp

@@ -1,8 +1,8 @@
-#include "../Config.h"
+#include "../../config.h"
 
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../DeferredTestReporter.h"
 #include <cstring>
 

src/tests/TestExceptions.cpp

@@ -1,8 +1,7 @@
-#include "../Config.h"
-
+#include "../../config.h"
 #ifdef UNITTEST_USE_EXCEPTIONS
 
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../CurrentTest.h"
 #include "RecordingReporter.h"
 #include "ScopedCurrentTest.h"

src/tests/TestMemoryOutStream.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 
 #include "../MemoryOutStream.h"
 #include <cstring>

src/tests/TestTest.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestReporter.h"
 #include "../TimeHelpers.h"
 #include "ScopedCurrentTest.h"

src/tests/TestTestList.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestList.h"
 
 using namespace UnitTest;

src/tests/TestTestMacros.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestMacros.h"
 #include "../TestList.h"
 #include "../TestResults.h"

src/tests/TestTestResults.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestResults.h"
 #include "RecordingReporter.h"
 

src/tests/TestTestRunner.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "RecordingReporter.h"
 #include "../ReportAssert.h"
 #include "../TestList.h"

src/tests/TestTestSuite.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 
 // We're really testing if it's possible to use the same suite in two files
 // to compile and link successfuly (TestTestSuite.cpp has suite with the same name)

src/tests/TestTimeConstraint.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestResults.h"
 #include "../TimeHelpers.h"
 #include "RecordingReporter.h"

src/tests/TestTimeConstraintMacro.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TimeHelpers.h"
 
 #include "RecordingReporter.h"

src/tests/TestUnitTestPP.cpp

@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "ScopedCurrentTest.h"
 
 // These are sample tests that show the different features of the framework

src/tests/TestXmlTestReporter.cpp

@@ -1,7 +1,7 @@
-#include "../Config.h"
+#include "../../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../XmlTestReporter.h"
 
 #include <sstream>

src/unittestpp.h

@@ -1,11 +0,0 @@
-#ifndef UNITTESTPP_H
-#define UNITTESTPP_H
-
-#include "Config.h"
-#include "TestMacros.h"
-#include "CheckMacros.h"
-#include "TestRunner.h"
-#include "TimeConstraint.h"
-#include "ReportAssert.h"
-
-#endif

src/unittestpp.vcproj

@@ -177,7 +177,7 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Config.h"
+			RelativePath="..\config.h"
 			>
 		</File>
 		<File
@@ -309,7 +309,7 @@
 			>
 		</File>
 		<File
-			RelativePath=".\unittestpp.h"
+			RelativePath="..\unittestpp.h"
 			>
 		</File>
 		<File

unittestpp.h

@@ -0,0 +1,11 @@
+#ifndef UNITTESTPP_H
+#define UNITTESTPP_H
+
+#include "config.h"
+#include "src/TestMacros.h"
+#include "src/CheckMacros.h"
+#include "src/TestRunner.h"
+#include "src/TimeConstraint.h"
+#include "src/ReportAssert.h"
+
+#endif