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

pjohnmeyer · pjohnmeyer · commit b2e2959c7650 · 2013-01-09T23:43:37.000-06:00
move unittestpp.h and config.h to top-level folder, to allow 'include unittestpp/unittestpp.h' directives in client code
diff --git a/config.h b/config.h
diff --git a/src/AssertException.h b/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>
diff --git a/src/Checks.h b/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"
 
diff --git a/src/DeferredTestReporter.cpp b/src/DeferredTestReporter.cpp
@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "DeferredTestReporter.h"
diff --git a/src/DeferredTestReporter.h b/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
 
diff --git a/src/DeferredTestResult.cpp b/src/DeferredTestResult.cpp
@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "DeferredTestResult.h"
diff --git a/src/DeferredTestResult.h b/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>
diff --git a/src/ExceptionMacros.h b/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
diff --git a/src/ExecuteTest.h b/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"
diff --git a/src/MemoryOutStream.h b/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>
diff --git a/src/ReportAssertImpl.h b/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>
diff --git a/src/Test.cpp b/src/Test.cpp
@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #include "Test.h"
 #include "TestList.h"
 #include "TestResults.h"
diff --git a/src/TestMacros.h b/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"
diff --git a/src/TimeHelpers.h b/src/TimeHelpers.h
@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 
 #if defined UNITTEST_POSIX
     #include "Posix/TimeHelpers.h"
diff --git a/src/Win32/TimeHelpers.h b/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
diff --git a/src/XmlTestReporter.cpp b/src/XmlTestReporter.cpp
@@ -1,4 +1,4 @@
-#include "Config.h"
+#include "../config.h"
 #ifdef UNITTEST_USE_DEFERRED_REPORTER
 
 #include "XmlTestReporter.h"
diff --git a/src/XmlTestReporter.h b/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"
diff --git a/src/tests/Main.cpp b/src/tests/Main.cpp
@@ -1,6 +1,4 @@
-#include "../unittestpp.h"
-#include "../TestReporterStdout.h"
-
+#include "../../unittestpp.h"
 
 int main(int, char const *[])
 {
diff --git a/src/tests/TestAssertHandler.cpp b/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"
diff --git a/src/tests/TestCheckMacros.cpp b/src/tests/TestCheckMacros.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../CurrentTest.h"
 #include "RecordingReporter.h"
 #include "ScopedCurrentTest.h"
diff --git a/src/tests/TestChecks.cpp b/src/tests/TestChecks.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "RecordingReporter.h"
 
 using namespace UnitTest;
diff --git a/src/tests/TestCurrentTest.cpp b/src/tests/TestCurrentTest.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../CurrentTest.h"
 #include "ScopedCurrentTest.h"
 
diff --git a/src/tests/TestDeferredTestReporter.cpp b/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>
 
diff --git a/src/tests/TestExceptions.cpp b/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"
diff --git a/src/tests/TestMemoryOutStream.cpp b/src/tests/TestMemoryOutStream.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 
 #include "../MemoryOutStream.h"
 #include <cstring>
diff --git a/src/tests/TestTest.cpp b/src/tests/TestTest.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestReporter.h"
 #include "../TimeHelpers.h"
 #include "ScopedCurrentTest.h"
diff --git a/src/tests/TestTestList.cpp b/src/tests/TestTestList.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestList.h"
 
 using namespace UnitTest;
diff --git a/src/tests/TestTestMacros.cpp b/src/tests/TestTestMacros.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestMacros.h"
 #include "../TestList.h"
 #include "../TestResults.h"
diff --git a/src/tests/TestTestResults.cpp b/src/tests/TestTestResults.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestResults.h"
 #include "RecordingReporter.h"
 
diff --git a/src/tests/TestTestRunner.cpp b/src/tests/TestTestRunner.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "RecordingReporter.h"
 #include "../ReportAssert.h"
 #include "../TestList.h"
diff --git a/src/tests/TestTestSuite.cpp b/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)
diff --git a/src/tests/TestTimeConstraint.cpp b/src/tests/TestTimeConstraint.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TestResults.h"
 #include "../TimeHelpers.h"
 #include "RecordingReporter.h"
diff --git a/src/tests/TestTimeConstraintMacro.cpp b/src/tests/TestTimeConstraintMacro.cpp
@@ -1,4 +1,4 @@
-#include "../unittestpp.h"
+#include "../../unittestpp.h"
 #include "../TimeHelpers.h"
 
 #include "RecordingReporter.h"
diff --git a/src/tests/TestUnitTestPP.cpp b/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
diff --git a/src/tests/TestXmlTestReporter.cpp b/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>
diff --git a/src/unittestpp.h b/src/unittestpp.h
diff --git a/src/unittestpp.vcproj b/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
diff --git a/unittestpp.h b/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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Config.h"`
	`1`	`+#include "../config.h"`
`2`	`2`	`#ifdef UNITTEST_USE_DEFERRED_REPORTER`
`3`	`3`
`4`	`4`	`#include "DeferredTestReporter.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-#include "../unittestpp.h"`
`2`		`-#include "../TestReporterStdout.h"`
`3`		`-`
	`1`	`+#include "../../unittestpp.h"`
`4`	`2`
`5`	`3`	`int main(int, char const *[])`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@`
`177`	`177`	`>`
`178`	`178`	`</File>`
`179`	`179`	`<File`
`180`		`- RelativePath=".\Config.h"`
	`180`	`+ RelativePath="..\config.h"`
`181`	`181`	`>`
`182`	`182`	`</File>`
`183`	`183`	`<File`
`@@ -309,7 +309,7 @@`
`309`	`309`	`>`
`310`	`310`	`</File>`
`311`	`311`	`<File`
`312`		`- RelativePath=".\unittestpp.h"`
	`312`	`+ RelativePath="..\unittestpp.h"`
`313`	`313`	`>`
`314`	`314`	`</File>`
`315`	`315`	`<File`