From b2e2959c7650d06b91ea48e601b15406d7860c18 Mon Sep 17 00:00:00 2001 From: Patrick Johnmeyer Date: Wed, 9 Jan 2013 23:43:37 -0600 Subject: [PATCH] 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/Config.h => config.h | 0 src/AssertException.h | 3 +-- src/Checks.h | 2 +- src/DeferredTestReporter.cpp | 2 +- src/DeferredTestReporter.h | 2 +- src/DeferredTestResult.cpp | 2 +- src/DeferredTestResult.h | 3 +-- src/ExceptionMacros.h | 2 +- src/ExecuteTest.h | 2 +- src/MemoryOutStream.h | 3 +-- src/ReportAssertImpl.h | 2 +- src/Test.cpp | 2 +- src/TestMacros.h | 2 +- src/TimeHelpers.h | 2 +- src/Win32/TimeHelpers.h | 3 +-- src/XmlTestReporter.cpp | 2 +- src/XmlTestReporter.h | 2 +- src/tests/Main.cpp | 4 +--- src/tests/TestAssertHandler.cpp | 4 ++-- src/tests/TestCheckMacros.cpp | 2 +- src/tests/TestChecks.cpp | 2 +- src/tests/TestCurrentTest.cpp | 2 +- src/tests/TestDeferredTestReporter.cpp | 4 ++-- src/tests/TestExceptions.cpp | 5 ++--- src/tests/TestMemoryOutStream.cpp | 2 +- src/tests/TestTest.cpp | 2 +- src/tests/TestTestList.cpp | 2 +- src/tests/TestTestMacros.cpp | 2 +- src/tests/TestTestResults.cpp | 2 +- src/tests/TestTestRunner.cpp | 2 +- src/tests/TestTestSuite.cpp | 2 +- src/tests/TestTimeConstraint.cpp | 2 +- src/tests/TestTimeConstraintMacro.cpp | 2 +- src/tests/TestUnitTestPP.cpp | 2 +- src/tests/TestXmlTestReporter.cpp | 4 ++-- src/unittestpp.h | 11 ----------- src/unittestpp.vcproj | 4 ++-- unittestpp.h | 11 +++++++++++ 38 files changed, 51 insertions(+), 58 deletions(-) rename src/Config.h => config.h (100%) delete mode 100644 src/unittestpp.h create mode 100644 unittestpp.h diff --git a/src/Config.h b/config.h similarity index 100% rename from src/Config.h rename to config.h diff --git a/src/AssertException.h b/src/AssertException.h index 07f3400..5d27556 100644 --- 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 diff --git a/src/Checks.h b/src/Checks.h index e3ec7b2..b6bbdb8 100644 --- 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 index 8b7a29c..2d8c550 100644 --- 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 index c037af3..3fcc9f5 100644 --- 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 index 33fc145..bd8b36e 100644 --- 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 index db3ffaa..ad139c0 100644 --- 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 diff --git a/src/ExceptionMacros.h b/src/ExceptionMacros.h index f10e780..311d7e5 100644 --- 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 index 423a6b7..f90aa7f 100644 --- 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 index 754c1e5..2727b17 100644 --- 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 diff --git a/src/ReportAssertImpl.h b/src/ReportAssertImpl.h index f53bade..43cc569 100644 --- 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 diff --git a/src/Test.cpp b/src/Test.cpp index d00749c..eaab9aa 100644 --- 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 index 912f8ca..c111604 100644 --- 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 index cbc3ff4..24f0efd 100644 --- 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 index 9bbf12b..0d9ed7f 100644 --- 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 index 24aa85d..9d938c1 100644 --- 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 index a50aefc..abd9fce 100644 --- 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 index 3eb37da..963ad7b 100644 --- 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 index 7cbce10..99e707a 100644 --- 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 index 33fdc44..6b9fb66 100644 --- 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 index ae34792..f32d2e7 100644 --- 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 index dd129c3..766539f 100644 --- 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 index fcdbd0f..3dcb2af 100644 --- 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 diff --git a/src/tests/TestExceptions.cpp b/src/tests/TestExceptions.cpp index 1c4349a..88f9c70 100644 --- 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 index 41a7843..7a3bc64 100644 --- a/src/tests/TestMemoryOutStream.cpp +++ b/src/tests/TestMemoryOutStream.cpp @@ -1,4 +1,4 @@ -#include "../unittestpp.h" +#include "../../unittestpp.h" #include "../MemoryOutStream.h" #include diff --git a/src/tests/TestTest.cpp b/src/tests/TestTest.cpp index cc48884..59eb759 100644 --- 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 index 6b88ed4..fdeba34 100644 --- 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 index d613580..f8028d8 100644 --- 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 index a8a0325..15fff1e 100644 --- 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 index d0de516..3dc3edc 100644 --- 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 index 1abbf49..07e51cd 100644 --- 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 index 6f2021d..96f880c 100644 --- 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 index 6939cff..76f15c3 100644 --- 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 index 3fdf7a8..a9da7a4 100644 --- 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 index cf2e1f2..4c17b6c 100644 --- 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 diff --git a/src/unittestpp.h b/src/unittestpp.h deleted file mode 100644 index db0dfb9..0000000 --- a/src/unittestpp.h +++ /dev/null @@ -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 diff --git a/src/unittestpp.vcproj b/src/unittestpp.vcproj index 7e48179..0ff7274 100644 --- a/src/unittestpp.vcproj +++ b/src/unittestpp.vcproj @@ -177,7 +177,7 @@ >