diff --git a/CppParser/testsuite/CMakeLists.txt b/CppParser/testsuite/CMakeLists.txt index 26b83b5b2..4283a2992 100644 --- a/CppParser/testsuite/CMakeLists.txt +++ b/CppParser/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation PocoCppUnit ) diff --git a/CppParser/testsuite/Makefile b/CppParser/testsuite/Makefile index 0e209175d..bcc78aa92 100644 --- a/CppParser/testsuite/Makefile +++ b/CppParser/testsuite/Makefile @@ -14,6 +14,6 @@ objects = CppParserTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoCppParser PocoFoundation CppUnit +target_libs = PocoCppParser PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj b/CppParser/testsuite/TestSuite_vs120.vcxproj index 65b39d0c0..e3c95a1ff 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj index 91b676543..a7a0b7cc1 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/src/AttributesParserTest.cpp b/CppParser/testsuite/src/AttributesParserTest.cpp index bcc8fcc6d..aa9b25234 100644 --- a/CppParser/testsuite/src/AttributesParserTest.cpp +++ b/CppParser/testsuite/src/AttributesParserTest.cpp @@ -11,8 +11,8 @@ #include "AttributesParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CppParser/Attributes.h" #include "Poco/CppParser/AttributesParser.h" #include diff --git a/CppParser/testsuite/src/AttributesParserTest.h b/CppParser/testsuite/src/AttributesParserTest.h index 78ff718b8..df5a03afb 100644 --- a/CppParser/testsuite/src/AttributesParserTest.h +++ b/CppParser/testsuite/src/AttributesParserTest.h @@ -17,7 +17,7 @@ #include "Poco/CppParser/CppParser.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AttributesParserTest: public CppUnit::TestCase diff --git a/CppParser/testsuite/src/AttributesTestSuite.h b/CppParser/testsuite/src/AttributesTestSuite.h index 6d62a98e6..3dff3f0ec 100644 --- a/CppParser/testsuite/src/AttributesTestSuite.h +++ b/CppParser/testsuite/src/AttributesTestSuite.h @@ -16,7 +16,7 @@ #define AttributesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class AttributesTestSuite diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index 004ce4f82..d1af53176 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -11,8 +11,8 @@ #include "CppParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CppParser/Utility.h" #include "Poco/CppParser/Symbol.h" #include diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h index 006ac6d37..5d6aabf15 100644 --- a/CppParser/testsuite/src/CppParserTest.h +++ b/CppParser/testsuite/src/CppParserTest.h @@ -17,7 +17,7 @@ #include "Poco/CppParser/CppParser.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CppParserTest: public CppUnit::TestCase diff --git a/CppParser/testsuite/src/CppParserTestSuite.h b/CppParser/testsuite/src/CppParserTestSuite.h index 3ba97606d..7d1284c07 100644 --- a/CppParser/testsuite/src/CppParserTestSuite.h +++ b/CppParser/testsuite/src/CppParserTestSuite.h @@ -16,7 +16,7 @@ #define CppParserTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CppParserTestSuite diff --git a/CppParser/testsuite/src/Driver.cpp b/CppParser/testsuite/src/Driver.cpp index b03341e07..d20639504 100644 --- a/CppParser/testsuite/src/Driver.cpp +++ b/CppParser/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CppParserTestSuite.h" diff --git a/CppUnit/CppUnit_CE_vs90.vcproj b/CppUnit/CppUnit_CE_vs90.vcproj index b7235dba5..02c7dd3a6 100644 --- a/CppUnit/CppUnit_CE_vs90.vcproj +++ b/CppUnit/CppUnit_CE_vs90.vcproj @@ -626,67 +626,67 @@ Filter="*.h" > diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj b/CppUnit/CppUnit_WEC2013_vs110.vcxproj index 6cfe507c8..d6fcb7322 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj @@ -149,12 +149,12 @@ NotSet - ..\bin\$(Platform)\CppUnitd.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.lib + ..\bin\$(Platform)\$(TargetName).pdb + ..\lib\$(Platform)\$(TargetName).lib @@ -187,12 +187,12 @@ 0x0c07 - ..\bin\$(Platform)\CppUnit.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\$(Platform)\CppUnit.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -214,7 +214,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -225,7 +225,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmdd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -258,7 +258,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -280,7 +280,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -291,7 +291,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmtd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -324,7 +324,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmt.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -338,22 +338,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj b/CppUnit/CppUnit_WEC2013_vs120.vcxproj index a863a58bb..cfacfc879 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj @@ -111,12 +111,12 @@ obj\$(Platform)\$(Configuration)\ ..\lib\$(Platform)\ obj\$(Platform)\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -149,12 +149,12 @@ NotSet - ..\bin\$(Platform)\CppUnitd.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\$(Platform)\CppUnitd.pdb - ..\lib\$(Platform)\CppUnitd.lib + ..\bin\$(Platform)\$(TargetName).pdb + ..\lib\$(Platform)\$(TargetName).lib @@ -187,12 +187,12 @@ 0x0c07 - ..\bin\$(Platform)\CppUnit.dll + ..\bin\$(Platform)\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\$(Platform)\CppUnit.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -214,7 +214,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmdd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -225,7 +225,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmdd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -258,7 +258,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -280,7 +280,7 @@ $(IntDir) - ..\lib\$(Platform)\CppUnitmtd.pdb + ..\lib\$(Platform)\$(TargetName).pdb Level3 true Default @@ -291,7 +291,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmtd.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -324,7 +324,7 @@ 0x0c07 - ..\lib\$(Platform)\CppUnitmt.lib + ..\lib\$(Platform)\$(TargetName).lib @@ -338,22 +338,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs100.vcxproj b/CppUnit/CppUnit_vs100.vcxproj index 9e3900390..ad2e9031a 100644 --- a/CppUnit/CppUnit_vs100.vcxproj +++ b/CppUnit/CppUnit_vs100.vcxproj @@ -100,12 +100,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -113,7 +113,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -122,7 +122,7 @@ Default false include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -148,12 +148,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -163,7 +163,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -174,7 +174,7 @@ Speed true include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -196,12 +196,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -211,7 +211,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -233,7 +233,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -245,7 +245,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -254,7 +254,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -287,7 +287,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -296,7 +296,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -318,7 +318,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -330,7 +330,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -339,7 +339,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -372,11 +372,11 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib - + @@ -386,22 +386,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs110.vcxproj b/CppUnit/CppUnit_vs110.vcxproj index f7c991872..d181547a4 100644 --- a/CppUnit/CppUnit_vs110.vcxproj +++ b/CppUnit/CppUnit_vs110.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + $(ProjectName)d + $(ProjectName) + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)md + $(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs120.vcxproj b/CppUnit/CppUnit_vs120.vcxproj index 9c45b9377..8755a64a5 100644 --- a/CppUnit/CppUnit_vs120.vcxproj +++ b/CppUnit/CppUnit_vs120.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + Poco$(ProjectName)d + Poco$(ProjectName) + Poco$(ProjectName)mdd + Poco$(ProjectName)mtd + Poco$(ProjectName)md + Poco$(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -128,7 +128,7 @@ Default false include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -180,7 +180,7 @@ Speed true include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,7 +392,7 @@ - + diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj index bd263a6eb..e1b94d3a4 100644 --- a/CppUnit/CppUnit_vs140.vcxproj +++ b/CppUnit/CppUnit_vs140.vcxproj @@ -106,12 +106,12 @@ obj\$(Configuration)\ ..\lib\ obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt + PocoCppUnitd + PocoCppUnit + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnitmd + PocoCppUnitmt @@ -119,7 +119,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin\CppUnitd.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib + ..\bin\$(TargetName).pdb + ..\lib\$(TargetName).lib MachineX86 @@ -169,7 +169,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin\CppUnit.dll + ..\bin\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib\CppUnit.lib + ..\lib\$(TargetName).lib MachineX86 @@ -217,7 +217,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib\CppUnitmdd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib\CppUnitmdd.lib + ..\lib\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib\CppUnitmd.lib + ..\lib\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib\CppUnitmtd.pdb + ..\lib\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib\CppUnitmtd.lib + ..\lib\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib\CppUnit.tlb + .\lib\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib\CppUnitmt.lib + ..\lib\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_vs90.vcproj b/CppUnit/CppUnit_vs90.vcproj index f1c8158f0..3f871434b 100644 --- a/CppUnit/CppUnit_vs90.vcproj +++ b/CppUnit/CppUnit_vs90.vcproj @@ -42,7 +42,7 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\lib\CppUnit.tlb" + TypeLibraryName=".\lib\$(TargetName).tlb" HeaderFileName="" /> diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj b/CppUnit/CppUnit_x64_vs100.vcxproj index 655826ff5..2579f04cd 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj +++ b/CppUnit/CppUnit_x64_vs100.vcxproj @@ -100,12 +100,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + $(ProjectName)64d + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)64 + $(ProjectName)64md + $(ProjectName)64mt @@ -113,7 +113,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -148,12 +148,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\$(TargetName).lib MachineX64 @@ -163,7 +163,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -196,12 +196,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\$(TargetName).lib MachineX64 @@ -211,7 +211,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -233,7 +233,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -245,7 +245,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -254,7 +254,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -287,7 +287,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -296,7 +296,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -318,7 +318,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -330,7 +330,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -339,7 +339,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -372,7 +372,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -386,22 +386,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj b/CppUnit/CppUnit_x64_vs110.vcxproj index c5a56904a..236eb020a 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj +++ b/CppUnit/CppUnit_x64_vs110.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + $(ProjectName)64d + $(ProjectName)mdd + $(ProjectName)mtd + $(ProjectName)64 + $(ProjectName)64md + $(ProjectName)64mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\$(TargetName).lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\$(TargetName).lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj b/CppUnit/CppUnit_x64_vs120.vcxproj index b20ad3937..d62c1a5a1 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj +++ b/CppUnit/CppUnit_x64_vs120.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + Poco$(ProjectName)64d + Poco$(ProjectName)mdd + Poco$(ProjectName)mtd + Poco$(ProjectName)64 + Poco$(ProjectName)md + Poco$(ProjectName)mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\Poco$(ProjectName)d.lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\Poco$(ProjectName).lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj b/CppUnit/CppUnit_x64_vs140.vcxproj index 67519df3c..9c6f83f72 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj +++ b/CppUnit/CppUnit_x64_vs140.vcxproj @@ -106,12 +106,12 @@ obj64\$(Configuration)\ ..\lib64\ obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt + PocoCppUnit64d + PocoCppUnitmdd + PocoCppUnitmtd + PocoCppUnit64 + PocoCppUnit64md + PocoCppUnit64mt @@ -119,7 +119,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -154,12 +154,12 @@ NotSet - ..\bin64\CppUnit64d.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib + ..\bin64\$(TargetName).pdb + ..\lib64\PocoCppUnit64d.lib MachineX64 @@ -169,7 +169,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -202,12 +202,12 @@ 0x0c07 - ..\bin64\CppUnit64.dll + ..\bin64\$(TargetName).dll true %(AdditionalLibraryDirectories) - ..\lib64\CppUnit.lib + ..\lib64\PocoCppUnit64.lib MachineX64 @@ -217,7 +217,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -239,7 +239,7 @@ $(IntDir) - ..\lib64\CppUnitmdd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -251,7 +251,7 @@ 0x0c07 - ..\lib64\CppUnitmdd.lib + ..\lib64\$(TargetName).lib @@ -260,7 +260,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -293,7 +293,7 @@ 0x0c07 - ..\lib64\CppUnitmd.lib + ..\lib64\$(TargetName).lib @@ -302,7 +302,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -324,7 +324,7 @@ $(IntDir) - ..\lib64\CppUnitmtd.pdb + ..\lib64\$(TargetName).pdb Level3 true ProgramDatabase @@ -336,7 +336,7 @@ 0x0c07 - ..\lib64\CppUnitmtd.lib + ..\lib64\$(TargetName).lib @@ -345,7 +345,7 @@ true true Win32 - .\lib64\CppUnit.tlb + .\lib64\$(TargetName).tlb @@ -378,7 +378,7 @@ 0x0c07 - ..\lib64\CppUnitmt.lib + ..\lib64\$(TargetName).lib @@ -392,22 +392,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CppUnit/CppUnit_x64_vs90.vcproj b/CppUnit/CppUnit_x64_vs90.vcproj index 1f9e7b07b..9167c334a 100644 --- a/CppUnit/CppUnit_x64_vs90.vcproj +++ b/CppUnit/CppUnit_x64_vs90.vcproj @@ -42,7 +42,7 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\lib64\CppUnit.tlb" + TypeLibraryName=".\lib64\$(TargetName).tlb" HeaderFileName="" /> diff --git a/CppUnit/Makefile b/CppUnit/Makefile index 43e7ea053..ba8c05295 100644 --- a/CppUnit/Makefile +++ b/CppUnit/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.4/CppUnit/Makefile#1 $ +# $Id: //poco/1.4/PocoCppUnit/Makefile#1 $ # # Makefile for Poco CppUnit # diff --git a/CppUnit/WinTestRunner/CMakeLists.txt b/CppUnit/WinTestRunner/CMakeLists.txt index 27416cb8d..1195a4d1d 100644 --- a/CppUnit/WinTestRunner/CMakeLists.txt +++ b/CppUnit/WinTestRunner/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties( "${LIBNAME}" PROPERTIES VERSION "1" SOVERSION "1" DEFINE_SYMBOL WinTestRunner_EXPORTS) -target_link_libraries( "${LIBNAME}" CppUnit ) +target_link_libraries( "${LIBNAME}" PocoCppUnit ) target_include_directories( "${LIBNAME}" PUBLIC $ diff --git a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h index 2e7ac7014..55b646c81 100644 --- a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h +++ b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h @@ -22,7 +22,7 @@ #endif -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include #include diff --git a/CppUnit/WinTestRunner/src/ActiveTest.h b/CppUnit/WinTestRunner/src/ActiveTest.h index bf9df5e7d..4b8724e9c 100644 --- a/CppUnit/WinTestRunner/src/ActiveTest.h +++ b/CppUnit/WinTestRunner/src/ActiveTest.h @@ -9,8 +9,8 @@ #define ActiveTest_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestDecorator.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestDecorator.h" #include diff --git a/CppUnit/WinTestRunner/src/GUITestResult.h b/CppUnit/WinTestRunner/src/GUITestResult.h index 3fae4e00a..a017e48f7 100644 --- a/CppUnit/WinTestRunner/src/GUITestResult.h +++ b/CppUnit/WinTestRunner/src/GUITestResult.h @@ -9,8 +9,8 @@ #define GuiTestResult_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestResult.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/TestResult.h" #include diff --git a/CppUnit/WinTestRunner/src/ProgressBar.h b/CppUnit/WinTestRunner/src/ProgressBar.h index 09eaa4796..03384b5fe 100644 --- a/CppUnit/WinTestRunner/src/ProgressBar.h +++ b/CppUnit/WinTestRunner/src/ProgressBar.h @@ -9,7 +9,7 @@ #define ProgressBar_INCLUDED -#include "CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnit.h" #include diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp index b8aca676a..03b66b56f 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp @@ -13,7 +13,7 @@ #include "ActiveTest.h" #include "GUITestResult.h" #include "ProgressBar.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" #include "TestRunnerDlg.h" diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.h b/CppUnit/WinTestRunner/src/TestRunnerDlg.h index 8357bda2e..f31bc3adc 100644 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.h +++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.h @@ -9,8 +9,8 @@ #define TestRunnerDlg_INCLUDED -#include "CppUnit/CppUnit.h" -#include "CppUnit/CppUnitException.h" +#include "Poco/CppUnit/CppUnit.h" +#include "Poco/CppUnit/CppUnitException.h" #include "ActiveTest.h" #include #include "../res/Resource.h" diff --git a/CppUnit/WinTestRunner/src/WinTestRunner.cpp b/CppUnit/WinTestRunner/src/WinTestRunner.cpp index cc5ff5721..cc9edb584 100644 --- a/CppUnit/WinTestRunner/src/WinTestRunner.cpp +++ b/CppUnit/WinTestRunner/src/WinTestRunner.cpp @@ -7,7 +7,7 @@ #include "WinTestRunner/WinTestRunner.h" #include "TestRunnerDlg.h" -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include diff --git a/CppUnit/include/Poco/CppUnit/CppUnit.h b/CppUnit/include/Poco/CppUnit/CppUnit.h index 1a4f2d692..6729a903d 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnit.h +++ b/CppUnit/include/Poco/CppUnit/CppUnit.h @@ -24,23 +24,52 @@ // from a DLL simpler. All files within this DLL are compiled with the Poco_CppUnitEXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// Poco_CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols +// CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) && defined(POCO_DLL) - #if defined(Poco_CppUnit_EXPORTS) - #define Poco_CppUnit_API __declspec(dllexport) + #if defined(CppUnit_EXPORTS) + #define CppUnit_API __declspec(dllexport) #else - #define Poco_CppUnit_API __declspec(dllimport) + #define CppUnit_API __declspec(dllimport) #endif #endif -#if !defined(Poco_CppUnit_API) +#if !defined(CppUnit_API) #if defined (__GNUC__) && (__GNUC__ >= 4) - #define Poco_CppUnit_API __attribute__ ((visibility ("default"))) + #define CppUnit_API __attribute__ ((visibility ("default"))) #else - #define Poco_CppUnit_API + #define CppUnit_API + #endif +#endif + +// +// Automatically link Foundation library. +// +#if defined(_MSC_VER) + #if defined(POCO_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "d.lib" + #else + #define POCO_LIB_SUFFIX ".lib" + #endif + #elif defined(_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mdd.lib" + #else + #define POCO_LIB_SUFFIX "md.lib" + #endif + #else + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mtd.lib" + #else + #define POCO_LIB_SUFFIX "mt.lib" + #endif + #endif + + #if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(CppUnit_EXPORTS) + #pragma comment(lib, "PocoCppUnit" POCO_LIB_SUFFIX) #endif #endif diff --git a/CppUnit/include/Poco/CppUnit/CppUnitException.h b/CppUnit/include/Poco/CppUnit/CppUnitException.h index 7cd0fc519..670290c58 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnitException.h +++ b/CppUnit/include/Poco/CppUnit/CppUnitException.h @@ -17,7 +17,7 @@ namespace CppUnit { -class Poco_CppUnit_API CppUnitException: public std::exception +class CppUnit_API CppUnitException: public std::exception /// CppUnitException is an exception that serves /// descriptive strings through its what() method { diff --git a/CppUnit/include/Poco/CppUnit/RepeatedTest.h b/CppUnit/include/Poco/CppUnit/RepeatedTest.h index 739e3d14e..a23021837 100644 --- a/CppUnit/include/Poco/CppUnit/RepeatedTest.h +++ b/CppUnit/include/Poco/CppUnit/RepeatedTest.h @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class Poco_CppUnit_API RepeatedTest: public TestDecorator +class CppUnit_API RepeatedTest: public TestDecorator { REFERENCEOBJECT (RepeatedTest) diff --git a/CppUnit/include/Poco/CppUnit/Test.h b/CppUnit/include/Poco/CppUnit/Test.h index fcd462e47..0d4128500 100644 --- a/CppUnit/include/Poco/CppUnit/Test.h +++ b/CppUnit/include/Poco/CppUnit/Test.h @@ -24,7 +24,7 @@ class TestResult; * See TestResult. * */ -class Poco_CppUnit_API Test +class CppUnit_API Test { public: virtual ~Test() = 0; diff --git a/CppUnit/include/Poco/CppUnit/TestCaller.h b/CppUnit/include/Poco/CppUnit/TestCaller.h index 208ab50ae..d859bb7ce 100644 --- a/CppUnit/include/Poco/CppUnit/TestCaller.h +++ b/CppUnit/include/Poco/CppUnit/TestCaller.h @@ -96,7 +96,7 @@ private: } // namespace CppUnit -#define Poco_CppUnit_addTest(suite, cls, mth) \ +#define CppUnit_addTest(suite, cls, mth) \ suite->addTest(new CppUnit::TestCaller(#mth, &cls::mth)) diff --git a/CppUnit/include/Poco/CppUnit/TestCase.h b/CppUnit/include/Poco/CppUnit/TestCase.h index a07f8f2eb..cbe648a57 100644 --- a/CppUnit/include/Poco/CppUnit/TestCase.h +++ b/CppUnit/include/Poco/CppUnit/TestCase.h @@ -83,7 +83,7 @@ class TestResult; * see TestResult, TestSuite and TestCaller * */ -class Poco_CppUnit_API TestCase: public Test +class CppUnit_API TestCase: public Test { REFERENCEOBJECT (TestCase) diff --git a/CppUnit/include/Poco/CppUnit/TestDecorator.h b/CppUnit/include/Poco/CppUnit/TestDecorator.h index cde751020..dc781ac31 100644 --- a/CppUnit/include/Poco/CppUnit/TestDecorator.h +++ b/CppUnit/include/Poco/CppUnit/TestDecorator.h @@ -26,7 +26,7 @@ class TestResult; * Does not assume ownership of the test it decorates * */ -class Poco_CppUnit_API TestDecorator: public Test +class CppUnit_API TestDecorator: public Test { REFERENCEOBJECT(TestDecorator) diff --git a/CppUnit/include/Poco/CppUnit/TestFailure.h b/CppUnit/include/Poco/CppUnit/TestFailure.h index 860e7852f..830dec1c8 100644 --- a/CppUnit/include/Poco/CppUnit/TestFailure.h +++ b/CppUnit/include/Poco/CppUnit/TestFailure.h @@ -33,7 +33,7 @@ class Test; * see TestSuite * */ -class Poco_CppUnit_API TestFailure +class CppUnit_API TestFailure { REFERENCEOBJECT (TestFailure) diff --git a/CppUnit/include/Poco/CppUnit/TestResult.h b/CppUnit/include/Poco/CppUnit/TestResult.h index e0d4c00c1..3470a8b53 100644 --- a/CppUnit/include/Poco/CppUnit/TestResult.h +++ b/CppUnit/include/Poco/CppUnit/TestResult.h @@ -41,7 +41,7 @@ class Test; * * see Test */ -class Poco_CppUnit_API TestResult +class CppUnit_API TestResult { REFERENCEOBJECT (TestResult) diff --git a/CppUnit/include/Poco/CppUnit/TestRunner.h b/CppUnit/include/Poco/CppUnit/TestRunner.h index f92ccdce1..8b859f5f8 100644 --- a/CppUnit/include/Poco/CppUnit/TestRunner.h +++ b/CppUnit/include/Poco/CppUnit/TestRunner.h @@ -38,7 +38,7 @@ class Test; * TestRunner [-all] [-print] [-wait] ExampleTestCase * */ -class Poco_CppUnit_API TestRunner +class CppUnit_API TestRunner { typedef std::pair Mapping; typedef std::vector Mappings; diff --git a/CppUnit/include/Poco/CppUnit/TestSetup.h b/CppUnit/include/Poco/CppUnit/TestSetup.h index a68825488..57be08f19 100644 --- a/CppUnit/include/Poco/CppUnit/TestSetup.h +++ b/CppUnit/include/Poco/CppUnit/TestSetup.h @@ -21,7 +21,7 @@ class Test; class TestResult; -class Poco_CppUnit_API TestSetup: public TestDecorator +class CppUnit_API TestSetup: public TestDecorator { REFERENCEOBJECT (TestSetup) diff --git a/CppUnit/include/Poco/CppUnit/TestSuite.h b/CppUnit/include/Poco/CppUnit/TestSuite.h index 907e51077..7aba91da0 100644 --- a/CppUnit/include/Poco/CppUnit/TestSuite.h +++ b/CppUnit/include/Poco/CppUnit/TestSuite.h @@ -35,7 +35,7 @@ class TestResult; * * see Test and TestCaller */ -class Poco_CppUnit_API TestSuite: public Test +class CppUnit_API TestSuite: public Test { REFERENCEOBJECT (TestSuite) diff --git a/CppUnit/include/Poco/CppUnit/TextTestResult.h b/CppUnit/include/Poco/CppUnit/TextTestResult.h index 8279cd893..901e740a9 100644 --- a/CppUnit/include/Poco/CppUnit/TextTestResult.h +++ b/CppUnit/include/Poco/CppUnit/TextTestResult.h @@ -18,7 +18,7 @@ namespace CppUnit { -class Poco_CppUnit_API TextTestResult: public TestResult +class CppUnit_API TextTestResult: public TestResult { public: TextTestResult(); diff --git a/Crypto/testsuite/CMakeLists.txt b/Crypto/testsuite/CMakeLists.txt index a3ce109ec..cd158f0c6 100644 --- a/Crypto/testsuite/CMakeLists.txt +++ b/Crypto/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation PocoCppUnit ) if(UNIX) target_link_libraries( ${TESTUNIT} pthread) endif(UNIX) diff --git a/Crypto/testsuite/Makefile b/Crypto/testsuite/Makefile index e1702500c..7921f1eda 100644 --- a/Crypto/testsuite/Makefile +++ b/Crypto/testsuite/Makefile @@ -20,6 +20,6 @@ objects = CryptoTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoCrypto PocoFoundation CppUnit +target_libs = PocoCrypto PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index 854eb0df2..5eb21b838 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index f4873256a..92a483c98 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp index cfc9e67f3..c5e46512d 100644 --- a/Crypto/testsuite/src/CryptoTest.cpp +++ b/Crypto/testsuite/src/CryptoTest.cpp @@ -11,8 +11,8 @@ #include "CryptoTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/Cipher.h" #include "Poco/Crypto/CipherKey.h" diff --git a/Crypto/testsuite/src/CryptoTest.h b/Crypto/testsuite/src/CryptoTest.h index 95b655f6a..14300a749 100644 --- a/Crypto/testsuite/src/CryptoTest.h +++ b/Crypto/testsuite/src/CryptoTest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CryptoTest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/CryptoTestSuite.h b/Crypto/testsuite/src/CryptoTestSuite.h index 0469b7cae..1c6b0a130 100644 --- a/Crypto/testsuite/src/CryptoTestSuite.h +++ b/Crypto/testsuite/src/CryptoTestSuite.h @@ -16,7 +16,7 @@ #define CryptoTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CryptoTestSuite diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp index e1763e6bf..3d5160f46 100644 --- a/Crypto/testsuite/src/DigestEngineTest.cpp +++ b/Crypto/testsuite/src/DigestEngineTest.cpp @@ -11,8 +11,8 @@ #include "DigestEngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/DigestEngine.h" diff --git a/Crypto/testsuite/src/DigestEngineTest.h b/Crypto/testsuite/src/DigestEngineTest.h index 89fc24d30..7a395b990 100644 --- a/Crypto/testsuite/src/DigestEngineTest.h +++ b/Crypto/testsuite/src/DigestEngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DigestEngineTest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/Driver.cpp b/Crypto/testsuite/src/Driver.cpp index 96ff4f221..afcb3708f 100644 --- a/Crypto/testsuite/src/Driver.cpp +++ b/Crypto/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CryptoTestSuite.h" #include "Poco/Crypto/Crypto.h" diff --git a/Crypto/testsuite/src/RSATest.cpp b/Crypto/testsuite/src/RSATest.cpp index 690cfa096..f67d71ae5 100644 --- a/Crypto/testsuite/src/RSATest.cpp +++ b/Crypto/testsuite/src/RSATest.cpp @@ -11,8 +11,8 @@ #include "RSATest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Crypto/RSADigestEngine.h" #include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/Cipher.h" diff --git a/Crypto/testsuite/src/RSATest.h b/Crypto/testsuite/src/RSATest.h index ebef26753..609a6c2de 100644 --- a/Crypto/testsuite/src/RSATest.h +++ b/Crypto/testsuite/src/RSATest.h @@ -17,7 +17,7 @@ #include "Poco/Crypto/Crypto.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RSATest: public CppUnit::TestCase diff --git a/Crypto/testsuite/src/WinCEDriver.cpp b/Crypto/testsuite/src/WinCEDriver.cpp index 704c23157..6cabc793c 100644 --- a/Crypto/testsuite/src/WinCEDriver.cpp +++ b/Crypto/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "CryptoTestSuite.h" #include "Poco/Crypto/Crypto.h" #include diff --git a/Data/MySQL/testsuite/CMakeLists.txt b/Data/MySQL/testsuite/CMakeLists.txt index 01ae1c1db..dc350033a 100644 --- a/Data/MySQL/testsuite/CMakeLists.txt +++ b/Data/MySQL/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/MySQL/testsuite/Makefile b/Data/MySQL/testsuite/Makefile index a845628f3..a4b8f10ff 100644 --- a/Data/MySQL/testsuite/Makefile +++ b/Data/MySQL/testsuite/Makefile @@ -17,6 +17,6 @@ objects = MySQLTestSuite Driver MySQLTest SQLExecutor target = testrunner target_version = 1 -target_libs = PocoDataMySQL PocoData PocoFoundation CppUnit +target_libs = PocoDataMySQL PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj index 54dcd4475..ffab9cb71 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 5b357abea..afca2df9a 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/src/Driver.cpp b/Data/MySQL/testsuite/src/Driver.cpp index fc1b33660..390a12fe2 100644 --- a/Data/MySQL/testsuite/src/Driver.cpp +++ b/Data/MySQL/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MySQLTestSuite.h" diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index 1ab1f59a6..bc98d83b5 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -11,8 +11,8 @@ #include "MySQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index d3eea4a65..2afbfa50d 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.h +++ b/Data/MySQL/testsuite/src/MySQLTest.h @@ -19,7 +19,7 @@ #include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/Session.h" #include "Poco/SharedPtr.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" diff --git a/Data/MySQL/testsuite/src/MySQLTestSuite.h b/Data/MySQL/testsuite/src/MySQLTestSuite.h index c6bc62f65..b21ea668e 100644 --- a/Data/MySQL/testsuite/src/MySQLTestSuite.h +++ b/Data/MySQL/testsuite/src/MySQLTestSuite.h @@ -16,7 +16,7 @@ #define MySQLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MySQLTestSuite { diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 00cfb351f..404b7af4a 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -10,7 +10,7 @@ // -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" #include "Poco/Format.h" diff --git a/Data/ODBC/testsuite/CMakeLists.txt b/Data/ODBC/testsuite/CMakeLists.txt index 30cc13695..7ac827094 100644 --- a/Data/ODBC/testsuite/CMakeLists.txt +++ b/Data/ODBC/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index b50776cb3..11e5b2982 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -37,6 +37,6 @@ endif target = testrunner target_version = 1 -target_libs = PocoDataODBC PocoData PocoFoundation CppUnit +target_libs = PocoDataODBC PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj index f9e88a477..c56158ea1 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj index 5c87ec804..1b29b1cf9 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/src/Driver.cpp b/Data/ODBC/testsuite/src/Driver.cpp index 599ad5460..934f89915 100644 --- a/Data/ODBC/testsuite/src/Driver.cpp +++ b/Data/ODBC/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ODBCTestSuite.h" diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp index c09f00bd8..df16aa579 100644 --- a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp @@ -11,8 +11,8 @@ #include "ODBCAccessTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.h b/Data/ODBC/testsuite/src/ODBCAccessTest.h index d29587b02..8321790d5 100644 --- a/Data/ODBC/testsuite/src/ODBCAccessTest.h +++ b/Data/ODBC/testsuite/src/ODBCAccessTest.h @@ -20,7 +20,7 @@ #include "Poco/Data/Session.h" #include "Poco/Data/ODBC/Utility.h" #include "Poco/SharedPtr.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp index dc4078eb4..ad77170de 100644 --- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp +++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp @@ -11,8 +11,8 @@ #include "ODBCDB2Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index ba1aedf30..f148e3092 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -12,8 +12,8 @@ #include "ODBCMySQLTest.h" #include "ODBCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp index 75ecd7c2c..410816325 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp @@ -11,8 +11,8 @@ #include "ODBCOracleTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Tuple.h" #include "Poco/Format.h" diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp index a4f9b95d6..2c4c2e158 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp @@ -11,8 +11,8 @@ #include "ODBCPostgreSQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "ODBCTest.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp index 3ba078628..d8c218d36 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp @@ -11,8 +11,8 @@ #include "ODBCSQLServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp index 9c47b5c16..2cf641e56 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp @@ -11,8 +11,8 @@ #include "ODBCSQLiteTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp index fe1323f5d..3d7b0c610 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCTest.cpp @@ -11,8 +11,8 @@ #include "ODBCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Any.h" diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h index a0a09c01d..a185e0f51 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.h +++ b/Data/ODBC/testsuite/src/ODBCTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/ODBC/ODBC.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Data/Session.h" #include "Poco/Data/ODBC/Utility.h" #include "Poco/SharedPtr.h" diff --git a/Data/ODBC/testsuite/src/ODBCTestSuite.h b/Data/ODBC/testsuite/src/ODBCTestSuite.h index 4c967fca9..5a0ca760b 100644 --- a/Data/ODBC/testsuite/src/ODBCTestSuite.h +++ b/Data/ODBC/testsuite/src/ODBCTestSuite.h @@ -16,7 +16,7 @@ #define ODBCTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ODBCTestSuite diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 9baf6d7f4..43538f565 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -10,7 +10,7 @@ // -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" #include "Poco/Format.h" diff --git a/Data/SQLite/testsuite/CMakeLists.txt b/Data/SQLite/testsuite/CMakeLists.txt index 536c8742d..0e1699d3d 100644 --- a/Data/SQLite/testsuite/CMakeLists.txt +++ b/Data/SQLite/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation PocoCppUnit ) diff --git a/Data/SQLite/testsuite/Makefile b/Data/SQLite/testsuite/Makefile index b8b3c965a..95977b01e 100644 --- a/Data/SQLite/testsuite/Makefile +++ b/Data/SQLite/testsuite/Makefile @@ -13,6 +13,6 @@ objects = SQLiteTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoDataSQLite PocoData PocoFoundation CppUnit +target_libs = PocoDataSQLite PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index a293790e0..d09b41273 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index 65b61bd5b..4e51b521f 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/src/Driver.cpp b/Data/SQLite/testsuite/src/Driver.cpp index 2688cddb2..2b6311b36 100644 --- a/Data/SQLite/testsuite/src/Driver.cpp +++ b/Data/SQLite/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "SQLiteTestSuite.h" diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index 254474940..59529fb0e 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -11,8 +11,8 @@ #include "SQLiteTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/Date.h" #include "Poco/Data/Time.h" #include "Poco/Data/LOB.h" diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h index 57b37522a..746b6e321 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.h +++ b/Data/SQLite/testsuite/src/SQLiteTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/SQLite/SQLite.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" namespace Poco { diff --git a/Data/SQLite/testsuite/src/SQLiteTestSuite.h b/Data/SQLite/testsuite/src/SQLiteTestSuite.h index b52d2b9dd..2fff2397e 100644 --- a/Data/SQLite/testsuite/src/SQLiteTestSuite.h +++ b/Data/SQLite/testsuite/src/SQLiteTestSuite.h @@ -16,7 +16,7 @@ #define SQLiteTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SQLiteTestSuite diff --git a/Data/SQLite/testsuite/src/WinCEDriver.cpp b/Data/SQLite/testsuite/src/WinCEDriver.cpp index 9027a28be..66f5ffe6e 100644 --- a/Data/SQLite/testsuite/src/WinCEDriver.cpp +++ b/Data/SQLite/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "SQLiteTestSuite.h" #include diff --git a/Data/testsuite/CMakeLists.txt b/Data/testsuite/CMakeLists.txt index b20cff408..c372c2b8f 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -23,4 +23,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation PocoCppUnit) diff --git a/Data/testsuite/Makefile b/Data/testsuite/Makefile index 6425cfdd7..c2fb2932d 100644 --- a/Data/testsuite/Makefile +++ b/Data/testsuite/Makefile @@ -22,6 +22,6 @@ objects = DataTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoData PocoFoundation CppUnit +target_libs = PocoData PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Data/testsuite/TestSuite_vs120.vcxproj b/Data/testsuite/TestSuite_vs120.vcxproj index 2f2a5411d..f49222d74 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj +++ b/Data/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj b/Data/testsuite/TestSuite_x64_vs120.vcxproj index 9ba2740a9..7725608ca 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp index bec8145fc..1f2a1e00d 100644 --- a/Data/testsuite/src/DataTest.cpp +++ b/Data/testsuite/src/DataTest.cpp @@ -11,8 +11,8 @@ #include "DataTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/Session.h" #include "Poco/Data/SessionFactory.h" #include "Poco/Data/LOB.h" diff --git a/Data/testsuite/src/DataTest.h b/Data/testsuite/src/DataTest.h index 98e83d8e9..091bb328b 100644 --- a/Data/testsuite/src/DataTest.h +++ b/Data/testsuite/src/DataTest.h @@ -20,7 +20,7 @@ #include "Poco/BinaryReader.h" #include "Poco/BinaryWriter.h" #include "Poco/Data/Row.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DataTest: public CppUnit::TestCase diff --git a/Data/testsuite/src/DataTestSuite.h b/Data/testsuite/src/DataTestSuite.h index 670d7911b..f89edd69a 100644 --- a/Data/testsuite/src/DataTestSuite.h +++ b/Data/testsuite/src/DataTestSuite.h @@ -16,7 +16,7 @@ #define DataTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DataTestSuite diff --git a/Data/testsuite/src/Driver.cpp b/Data/testsuite/src/Driver.cpp index 7aa0003a2..daa8e11b6 100644 --- a/Data/testsuite/src/Driver.cpp +++ b/Data/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "DataTestSuite.h" diff --git a/Data/testsuite/src/SessionPoolTest.cpp b/Data/testsuite/src/SessionPoolTest.cpp index e290ca0f8..9c07516fb 100644 --- a/Data/testsuite/src/SessionPoolTest.cpp +++ b/Data/testsuite/src/SessionPoolTest.cpp @@ -11,8 +11,8 @@ #include "SessionPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Data/SessionPool.h" #include "Poco/Data/SessionPoolContainer.h" #include "Poco/Thread.h" diff --git a/Data/testsuite/src/SessionPoolTest.h b/Data/testsuite/src/SessionPoolTest.h index 4c24381df..1f761827d 100644 --- a/Data/testsuite/src/SessionPoolTest.h +++ b/Data/testsuite/src/SessionPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/Data.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SessionPoolTest: public CppUnit::TestCase diff --git a/Data/testsuite/src/WinCEDriver.cpp b/Data/testsuite/src/WinCEDriver.cpp index 71c7ebda0..89f60439a 100644 --- a/Data/testsuite/src/WinCEDriver.cpp +++ b/Data/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "DataTestSuite.h" #include diff --git a/Foundation/testsuite/CMakeLists.txt b/Foundation/testsuite/CMakeLists.txt index ba7366ae2..4ed3c2baf 100644 --- a/Foundation/testsuite/CMakeLists.txt +++ b/Foundation/testsuite/CMakeLists.txt @@ -28,7 +28,7 @@ add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) set_tests_properties(${LIBNAME} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=.") # The SharedLibaryTest has to look for shared libraries in the working directory -target_link_libraries( ${TESTUNIT} PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoFoundation PocoCppUnit ) if(UNIX) target_link_libraries( ${TESTUNIT} pthread) endif(UNIX) diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver index b018c49b9..7b94c6225 100644 --- a/Foundation/testsuite/Makefile-Driver +++ b/Foundation/testsuite/Makefile-Driver @@ -44,7 +44,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \ target = testrunner target_version = 1 -target_libs = PocoFoundation CppUnit +target_libs = PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj index 5f8dcdc2c..efcf6554e 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj index 7b1596b0d..1204d85a6 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,13 +136,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -167,13 +167,13 @@ true true true - + Level3 - + Default - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,287 +304,287 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.cpp b/Foundation/testsuite/src/ActiveDispatcherTest.cpp index d59bb6b4e..0c62a15d1 100644 --- a/Foundation/testsuite/src/ActiveDispatcherTest.cpp +++ b/Foundation/testsuite/src/ActiveDispatcherTest.cpp @@ -11,8 +11,8 @@ #include "ActiveDispatcherTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ActiveDispatcher.h" #include "Poco/ActiveMethod.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.h b/Foundation/testsuite/src/ActiveDispatcherTest.h index 2c4268c4b..8af9b49bb 100644 --- a/Foundation/testsuite/src/ActiveDispatcherTest.h +++ b/Foundation/testsuite/src/ActiveDispatcherTest.h @@ -14,7 +14,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActiveDispatcherTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ActiveMethodTest.cpp b/Foundation/testsuite/src/ActiveMethodTest.cpp index 5d28ee330..821c0d506 100644 --- a/Foundation/testsuite/src/ActiveMethodTest.cpp +++ b/Foundation/testsuite/src/ActiveMethodTest.cpp @@ -11,8 +11,8 @@ #include "ActiveMethodTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ActiveMethod.h" #include "Poco/Thread.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/ActiveMethodTest.h b/Foundation/testsuite/src/ActiveMethodTest.h index 2b1f9474e..25f0f2407 100644 --- a/Foundation/testsuite/src/ActiveMethodTest.h +++ b/Foundation/testsuite/src/ActiveMethodTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActiveMethodTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ActivityTest.cpp b/Foundation/testsuite/src/ActivityTest.cpp index 8c0bce179..df548318d 100644 --- a/Foundation/testsuite/src/ActivityTest.cpp +++ b/Foundation/testsuite/src/ActivityTest.cpp @@ -11,8 +11,8 @@ #include "ActivityTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Activity.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/ActivityTest.h b/Foundation/testsuite/src/ActivityTest.h index d99f19ebf..e7a8dbfbd 100644 --- a/Foundation/testsuite/src/ActivityTest.h +++ b/Foundation/testsuite/src/ActivityTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ActivityTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AnyTest.cpp b/Foundation/testsuite/src/AnyTest.cpp index cd2b0da6e..046f9479f 100644 --- a/Foundation/testsuite/src/AnyTest.cpp +++ b/Foundation/testsuite/src/AnyTest.cpp @@ -11,8 +11,8 @@ #include "AnyTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Any.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/AnyTest.h b/Foundation/testsuite/src/AnyTest.h index 8d8a5a14b..8578342fa 100644 --- a/Foundation/testsuite/src/AnyTest.h +++ b/Foundation/testsuite/src/AnyTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AnyTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ArrayTest.cpp b/Foundation/testsuite/src/ArrayTest.cpp index 55c492731..0a72165f9 100644 --- a/Foundation/testsuite/src/ArrayTest.cpp +++ b/Foundation/testsuite/src/ArrayTest.cpp @@ -11,8 +11,8 @@ #include "ArrayTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Array.h" #include #include diff --git a/Foundation/testsuite/src/ArrayTest.h b/Foundation/testsuite/src/ArrayTest.h index d843e42f5..9a1cca116 100644 --- a/Foundation/testsuite/src/ArrayTest.h +++ b/Foundation/testsuite/src/ArrayTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ArrayTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AutoPtrTest.cpp b/Foundation/testsuite/src/AutoPtrTest.cpp index 31717aeab..fee0ee70b 100644 --- a/Foundation/testsuite/src/AutoPtrTest.cpp +++ b/Foundation/testsuite/src/AutoPtrTest.cpp @@ -11,8 +11,8 @@ #include "AutoPtrTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/AutoPtrTest.h b/Foundation/testsuite/src/AutoPtrTest.h index 1369de7a2..c7b95599c 100644 --- a/Foundation/testsuite/src/AutoPtrTest.h +++ b/Foundation/testsuite/src/AutoPtrTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AutoPtrTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.cpp b/Foundation/testsuite/src/AutoReleasePoolTest.cpp index 6db568d12..66eec9e5f 100644 --- a/Foundation/testsuite/src/AutoReleasePoolTest.cpp +++ b/Foundation/testsuite/src/AutoReleasePoolTest.cpp @@ -11,8 +11,8 @@ #include "AutoReleasePoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/AutoReleasePool.h" diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.h b/Foundation/testsuite/src/AutoReleasePoolTest.h index a26f8d6cc..f107ee264 100644 --- a/Foundation/testsuite/src/AutoReleasePoolTest.h +++ b/Foundation/testsuite/src/AutoReleasePoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AutoReleasePoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp index 4bc1c33d4..397f78c54 100644 --- a/Foundation/testsuite/src/Base32Test.cpp +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -11,8 +11,8 @@ #include "Base32Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Base32Encoder.h" #include "Poco/Base32Decoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/Base32Test.h b/Foundation/testsuite/src/Base32Test.h index 8b7f42233..ae118e757 100644 --- a/Foundation/testsuite/src/Base32Test.h +++ b/Foundation/testsuite/src/Base32Test.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class Base32Test: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Base64Test.cpp b/Foundation/testsuite/src/Base64Test.cpp index f5af89e09..a03b0602f 100644 --- a/Foundation/testsuite/src/Base64Test.cpp +++ b/Foundation/testsuite/src/Base64Test.cpp @@ -11,8 +11,8 @@ #include "Base64Test.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Base64Encoder.h" #include "Poco/Base64Decoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/Base64Test.h b/Foundation/testsuite/src/Base64Test.h index 66280de4c..931ab0859 100644 --- a/Foundation/testsuite/src/Base64Test.h +++ b/Foundation/testsuite/src/Base64Test.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class Base64Test: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/BasicEventTest.cpp b/Foundation/testsuite/src/BasicEventTest.cpp index f593c1a79..f925c75dc 100644 --- a/Foundation/testsuite/src/BasicEventTest.cpp +++ b/Foundation/testsuite/src/BasicEventTest.cpp @@ -12,8 +12,8 @@ #include "BasicEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Expire.h" #include "Poco/Delegate.h" #include "Poco/FunctionDelegate.h" diff --git a/Foundation/testsuite/src/BasicEventTest.h b/Foundation/testsuite/src/BasicEventTest.h index 4dc0d037e..408aa7534 100644 --- a/Foundation/testsuite/src/BasicEventTest.h +++ b/Foundation/testsuite/src/BasicEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/BasicEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp index b9f689908..5f43f5f11 100644 --- a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp +++ b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp @@ -11,8 +11,8 @@ #include "BinaryReaderWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/BinaryWriter.h" #include "Poco/BinaryReader.h" #include "Poco/Buffer.h" diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.h b/Foundation/testsuite/src/BinaryReaderWriterTest.h index c6dadbee7..87ed4b375 100644 --- a/Foundation/testsuite/src/BinaryReaderWriterTest.h +++ b/Foundation/testsuite/src/BinaryReaderWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/BinaryReader.h" #include "Poco/BinaryWriter.h" diff --git a/Foundation/testsuite/src/ByteOrderTest.cpp b/Foundation/testsuite/src/ByteOrderTest.cpp index f34cb8616..613053481 100644 --- a/Foundation/testsuite/src/ByteOrderTest.cpp +++ b/Foundation/testsuite/src/ByteOrderTest.cpp @@ -11,8 +11,8 @@ #include "ByteOrderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ByteOrder.h" diff --git a/Foundation/testsuite/src/ByteOrderTest.h b/Foundation/testsuite/src/ByteOrderTest.h index 61a76a486..2cb5596f9 100644 --- a/Foundation/testsuite/src/ByteOrderTest.h +++ b/Foundation/testsuite/src/ByteOrderTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ByteOrderTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CacheTestSuite.h b/Foundation/testsuite/src/CacheTestSuite.h index 8a70b0905..9513eaa1f 100644 --- a/Foundation/testsuite/src/CacheTestSuite.h +++ b/Foundation/testsuite/src/CacheTestSuite.h @@ -16,7 +16,7 @@ #define CacheTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CacheTestSuite diff --git a/Foundation/testsuite/src/ChannelTest.cpp b/Foundation/testsuite/src/ChannelTest.cpp index 270d63a05..8f5281025 100644 --- a/Foundation/testsuite/src/ChannelTest.cpp +++ b/Foundation/testsuite/src/ChannelTest.cpp @@ -11,8 +11,8 @@ #include "ChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SplitterChannel.h" #include "Poco/AsyncChannel.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/ChannelTest.h b/Foundation/testsuite/src/ChannelTest.h index 2b031ac87..5f92a7963 100644 --- a/Foundation/testsuite/src/ChannelTest.h +++ b/Foundation/testsuite/src/ChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ClassLoaderTest.cpp b/Foundation/testsuite/src/ClassLoaderTest.cpp index a0e24104f..b631d75c1 100644 --- a/Foundation/testsuite/src/ClassLoaderTest.cpp +++ b/Foundation/testsuite/src/ClassLoaderTest.cpp @@ -11,8 +11,8 @@ #include "ClassLoaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ClassLoader.h" #include "Poco/Manifest.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ClassLoaderTest.h b/Foundation/testsuite/src/ClassLoaderTest.h index 68403f047..0fb8a7f00 100644 --- a/Foundation/testsuite/src/ClassLoaderTest.h +++ b/Foundation/testsuite/src/ClassLoaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ClassLoaderTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ClockTest.cpp b/Foundation/testsuite/src/ClockTest.cpp index 6adbf72f3..4b1e4f85a 100644 --- a/Foundation/testsuite/src/ClockTest.cpp +++ b/Foundation/testsuite/src/ClockTest.cpp @@ -11,8 +11,8 @@ #include "ClockTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Clock.h" #include "Poco/Thread.h" #include diff --git a/Foundation/testsuite/src/ClockTest.h b/Foundation/testsuite/src/ClockTest.h index b1a77ced8..e98164ef2 100644 --- a/Foundation/testsuite/src/ClockTest.h +++ b/Foundation/testsuite/src/ClockTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ClockTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ConditionTest.cpp b/Foundation/testsuite/src/ConditionTest.cpp index 9f341a6ce..a3e2b62ce 100644 --- a/Foundation/testsuite/src/ConditionTest.cpp +++ b/Foundation/testsuite/src/ConditionTest.cpp @@ -11,8 +11,8 @@ #include "ConditionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/Condition.h" diff --git a/Foundation/testsuite/src/ConditionTest.h b/Foundation/testsuite/src/ConditionTest.h index d9a750a87..f9bf65a28 100644 --- a/Foundation/testsuite/src/ConditionTest.h +++ b/Foundation/testsuite/src/ConditionTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ConditionTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index fe1a73dca..01166429c 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -11,8 +11,8 @@ #include "CoreTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Bugcheck.h" #include "Poco/Exception.h" #include "Poco/Environment.h" diff --git a/Foundation/testsuite/src/CoreTest.h b/Foundation/testsuite/src/CoreTest.h index 3b5a85f80..82cf7f5b1 100644 --- a/Foundation/testsuite/src/CoreTest.h +++ b/Foundation/testsuite/src/CoreTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CoreTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CoreTestSuite.h b/Foundation/testsuite/src/CoreTestSuite.h index 2cccb675f..3b8b78237 100644 --- a/Foundation/testsuite/src/CoreTestSuite.h +++ b/Foundation/testsuite/src/CoreTestSuite.h @@ -16,7 +16,7 @@ #define CoreTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CoreTestSuite diff --git a/Foundation/testsuite/src/CountingStreamTest.cpp b/Foundation/testsuite/src/CountingStreamTest.cpp index be7ade9e3..859268406 100644 --- a/Foundation/testsuite/src/CountingStreamTest.cpp +++ b/Foundation/testsuite/src/CountingStreamTest.cpp @@ -11,8 +11,8 @@ #include "CountingStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/CountingStream.h" #include diff --git a/Foundation/testsuite/src/CountingStreamTest.h b/Foundation/testsuite/src/CountingStreamTest.h index d13ed53f7..9d0e39fcb 100644 --- a/Foundation/testsuite/src/CountingStreamTest.h +++ b/Foundation/testsuite/src/CountingStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CountingStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/CryptTestSuite.h b/Foundation/testsuite/src/CryptTestSuite.h index d24207782..1876090a3 100644 --- a/Foundation/testsuite/src/CryptTestSuite.h +++ b/Foundation/testsuite/src/CryptTestSuite.h @@ -16,7 +16,7 @@ #define CryptTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class CryptTestSuite diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.cpp b/Foundation/testsuite/src/DateTimeFormatterTest.cpp index f6b4b11b1..b0b949665 100644 --- a/Foundation/testsuite/src/DateTimeFormatterTest.cpp +++ b/Foundation/testsuite/src/DateTimeFormatterTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTimeFormatter.h" #include "Poco/DateTimeFormat.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.h b/Foundation/testsuite/src/DateTimeFormatterTest.h index 2ff6747d4..7e8893f36 100644 --- a/Foundation/testsuite/src/DateTimeFormatterTest.h +++ b/Foundation/testsuite/src/DateTimeFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeParserTest.cpp b/Foundation/testsuite/src/DateTimeParserTest.cpp index 57322c3e3..0a58e7038 100644 --- a/Foundation/testsuite/src/DateTimeParserTest.cpp +++ b/Foundation/testsuite/src/DateTimeParserTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTimeParser.h" #include "Poco/DateTimeFormat.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/DateTimeParserTest.h b/Foundation/testsuite/src/DateTimeParserTest.h index f1d4f2553..7accebcfe 100644 --- a/Foundation/testsuite/src/DateTimeParserTest.h +++ b/Foundation/testsuite/src/DateTimeParserTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeParserTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeTest.cpp b/Foundation/testsuite/src/DateTimeTest.cpp index 969e7bc9b..9261e8324 100644 --- a/Foundation/testsuite/src/DateTimeTest.cpp +++ b/Foundation/testsuite/src/DateTimeTest.cpp @@ -11,8 +11,8 @@ #include "DateTimeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DateTime.h" #include "Poco/Timestamp.h" #include "Poco/Timespan.h" diff --git a/Foundation/testsuite/src/DateTimeTest.h b/Foundation/testsuite/src/DateTimeTest.h index 7b8bb6e1a..0b5fd9e4f 100644 --- a/Foundation/testsuite/src/DateTimeTest.h +++ b/Foundation/testsuite/src/DateTimeTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DateTimeTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DateTimeTestSuite.h b/Foundation/testsuite/src/DateTimeTestSuite.h index 8b00fabfa..ae46cd2fd 100644 --- a/Foundation/testsuite/src/DateTimeTestSuite.h +++ b/Foundation/testsuite/src/DateTimeTestSuite.h @@ -16,7 +16,7 @@ #define DateTimeTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DateTimeTestSuite diff --git a/Foundation/testsuite/src/DigestStreamTest.cpp b/Foundation/testsuite/src/DigestStreamTest.cpp index ba8982987..540745b75 100644 --- a/Foundation/testsuite/src/DigestStreamTest.cpp +++ b/Foundation/testsuite/src/DigestStreamTest.cpp @@ -12,8 +12,8 @@ #include "DigestStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DigestStream.h" #include "Poco/MD5Engine.h" #include diff --git a/Foundation/testsuite/src/DigestStreamTest.h b/Foundation/testsuite/src/DigestStreamTest.h index caf47971e..a140db75f 100644 --- a/Foundation/testsuite/src/DigestStreamTest.h +++ b/Foundation/testsuite/src/DigestStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DigestStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp index d2d94ff79..d95d7aa7d 100644 --- a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp +++ b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp @@ -11,8 +11,8 @@ #include "DirectoryIteratorsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DirectoryIterator.h" #include "Poco/SortedDirectoryIterator.h" #include "Poco/RecursiveDirectoryIterator.h" diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.h b/Foundation/testsuite/src/DirectoryIteratorsTest.h index 6eec889a5..cea356519 100644 --- a/Foundation/testsuite/src/DirectoryIteratorsTest.h +++ b/Foundation/testsuite/src/DirectoryIteratorsTest.h @@ -18,7 +18,7 @@ #include "Poco/Foundation.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DirectoryIteratorsTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.cpp b/Foundation/testsuite/src/DirectoryWatcherTest.cpp index 24c718949..603d402e3 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.cpp +++ b/Foundation/testsuite/src/DirectoryWatcherTest.cpp @@ -16,8 +16,8 @@ #ifndef POCO_NO_INOTIFY -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DirectoryWatcher.h" #include "Poco/Delegate.h" #include "Poco/FileStream.h" diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.h b/Foundation/testsuite/src/DirectoryWatcherTest.h index 24fab5823..9ff0da113 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.h +++ b/Foundation/testsuite/src/DirectoryWatcherTest.h @@ -24,7 +24,7 @@ #include "Poco/DirectoryWatcher.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DirectoryWatcherTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/Driver.cpp b/Foundation/testsuite/src/Driver.cpp index b9f21e804..1f18c8958 100644 --- a/Foundation/testsuite/src/Driver.cpp +++ b/Foundation/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "FoundationTestSuite.h" diff --git a/Foundation/testsuite/src/DynamicFactoryTest.cpp b/Foundation/testsuite/src/DynamicFactoryTest.cpp index 478aace1c..3a1e0f829 100644 --- a/Foundation/testsuite/src/DynamicFactoryTest.cpp +++ b/Foundation/testsuite/src/DynamicFactoryTest.cpp @@ -11,8 +11,8 @@ #include "DynamicFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DynamicFactory.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/DynamicFactoryTest.h b/Foundation/testsuite/src/DynamicFactoryTest.h index 4b199bc35..76db47688 100644 --- a/Foundation/testsuite/src/DynamicFactoryTest.h +++ b/Foundation/testsuite/src/DynamicFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DynamicFactoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/DynamicTestSuite.h b/Foundation/testsuite/src/DynamicTestSuite.h index c8375fd6d..580a99e14 100644 --- a/Foundation/testsuite/src/DynamicTestSuite.h +++ b/Foundation/testsuite/src/DynamicTestSuite.h @@ -16,7 +16,7 @@ #define DynamicTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DynamicTestSuite diff --git a/Foundation/testsuite/src/EventTestSuite.h b/Foundation/testsuite/src/EventTestSuite.h index 6952f8d44..1e78e806c 100644 --- a/Foundation/testsuite/src/EventTestSuite.h +++ b/Foundation/testsuite/src/EventTestSuite.h @@ -16,7 +16,7 @@ #define EventTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class EventTestSuite diff --git a/Foundation/testsuite/src/ExpireCacheTest.cpp b/Foundation/testsuite/src/ExpireCacheTest.cpp index 0e8cde480..ef65623f4 100644 --- a/Foundation/testsuite/src/ExpireCacheTest.cpp +++ b/Foundation/testsuite/src/ExpireCacheTest.cpp @@ -11,8 +11,8 @@ #include "ExpireCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/ExpireCache.h" #include "Poco/AccessExpireCache.h" diff --git a/Foundation/testsuite/src/ExpireCacheTest.h b/Foundation/testsuite/src/ExpireCacheTest.h index fc5accaa1..ccc46585d 100644 --- a/Foundation/testsuite/src/ExpireCacheTest.h +++ b/Foundation/testsuite/src/ExpireCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ExpireCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp index 31ef4baaf..8631ebe83 100644 --- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp +++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "ExpireLRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/ExpireLRUCache.h" #include "Poco/AccessExpireLRUCache.h" diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.h b/Foundation/testsuite/src/ExpireLRUCacheTest.h index 0edf12475..30381fb95 100644 --- a/Foundation/testsuite/src/ExpireLRUCacheTest.h +++ b/Foundation/testsuite/src/ExpireLRUCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ExpireLRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp index 1a07b91b0..67683dc3c 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp @@ -11,8 +11,8 @@ #include "FIFOBufferStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FIFOBuffer.h" #include "Poco/FIFOBufferStream.h" #include "Poco/Delegate.h" diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.h b/Foundation/testsuite/src/FIFOBufferStreamTest.h index 0605d644b..85d75c725 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.h +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FIFOBufferStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferTest.cpp b/Foundation/testsuite/src/FIFOBufferTest.cpp index a3819d6ef..2bde55d36 100644 --- a/Foundation/testsuite/src/FIFOBufferTest.cpp +++ b/Foundation/testsuite/src/FIFOBufferTest.cpp @@ -11,8 +11,8 @@ #include "FIFOBufferTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Buffer.h" #include "Poco/Exception.h" #include "Poco/Delegate.h" diff --git a/Foundation/testsuite/src/FIFOBufferTest.h b/Foundation/testsuite/src/FIFOBufferTest.h index 8e4a8a64c..bb5ba8767 100644 --- a/Foundation/testsuite/src/FIFOBufferTest.h +++ b/Foundation/testsuite/src/FIFOBufferTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FIFOBufferTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FIFOBufferTestSuite.h b/Foundation/testsuite/src/FIFOBufferTestSuite.h index f0bce19a0..acbe506c8 100644 --- a/Foundation/testsuite/src/FIFOBufferTestSuite.h +++ b/Foundation/testsuite/src/FIFOBufferTestSuite.h @@ -16,7 +16,7 @@ #define FIFOBufferTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FIFOBufferTestSuite diff --git a/Foundation/testsuite/src/FIFOEventTest.cpp b/Foundation/testsuite/src/FIFOEventTest.cpp index fdc4ac0e7..8951a78ad 100644 --- a/Foundation/testsuite/src/FIFOEventTest.cpp +++ b/Foundation/testsuite/src/FIFOEventTest.cpp @@ -12,8 +12,8 @@ #include "FIFOEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Delegate.h" #include "Poco/Expire.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/FIFOEventTest.h b/Foundation/testsuite/src/FIFOEventTest.h index 1d7b31a7b..87e383989 100644 --- a/Foundation/testsuite/src/FIFOEventTest.h +++ b/Foundation/testsuite/src/FIFOEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/FIFOEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/FPETest.cpp b/Foundation/testsuite/src/FPETest.cpp index 5f4fba2b8..c398587d0 100644 --- a/Foundation/testsuite/src/FPETest.cpp +++ b/Foundation/testsuite/src/FPETest.cpp @@ -11,8 +11,8 @@ #include "FPETest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FPEnvironment.h" diff --git a/Foundation/testsuite/src/FPETest.h b/Foundation/testsuite/src/FPETest.h index 82e13d80e..dbddf3791 100644 --- a/Foundation/testsuite/src/FPETest.h +++ b/Foundation/testsuite/src/FPETest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FPETest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileChannelTest.cpp b/Foundation/testsuite/src/FileChannelTest.cpp index bb0c86643..c13d7aa1a 100644 --- a/Foundation/testsuite/src/FileChannelTest.cpp +++ b/Foundation/testsuite/src/FileChannelTest.cpp @@ -11,8 +11,8 @@ #include "FileChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FileChannel.h" #include "Poco/Message.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/FileChannelTest.h b/Foundation/testsuite/src/FileChannelTest.h index d70d67069..7561926fb 100644 --- a/Foundation/testsuite/src/FileChannelTest.h +++ b/Foundation/testsuite/src/FileChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileStreamTest.cpp b/Foundation/testsuite/src/FileStreamTest.cpp index 27ad70b58..757f95e21 100644 --- a/Foundation/testsuite/src/FileStreamTest.cpp +++ b/Foundation/testsuite/src/FileStreamTest.cpp @@ -11,8 +11,8 @@ #include "FileStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/FileStream.h" #include "Poco/File.h" #include "Poco/TemporaryFile.h" diff --git a/Foundation/testsuite/src/FileStreamTest.h b/Foundation/testsuite/src/FileStreamTest.h index 8fca17353..0414c9d7e 100644 --- a/Foundation/testsuite/src/FileStreamTest.h +++ b/Foundation/testsuite/src/FileStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FileTest.cpp b/Foundation/testsuite/src/FileTest.cpp index 9b2117a11..99929ba1c 100644 --- a/Foundation/testsuite/src/FileTest.cpp +++ b/Foundation/testsuite/src/FileTest.cpp @@ -11,8 +11,8 @@ #include "FileTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/File.h" #include "Poco/TemporaryFile.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/FileTest.h b/Foundation/testsuite/src/FileTest.h index 0177a9eca..886e27569 100644 --- a/Foundation/testsuite/src/FileTest.h +++ b/Foundation/testsuite/src/FileTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FileTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FilesystemTestSuite.h b/Foundation/testsuite/src/FilesystemTestSuite.h index 7a6101af2..631f0bb5d 100644 --- a/Foundation/testsuite/src/FilesystemTestSuite.h +++ b/Foundation/testsuite/src/FilesystemTestSuite.h @@ -16,7 +16,7 @@ #define FilesystemTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FilesystemTestSuite diff --git a/Foundation/testsuite/src/FormatTest.cpp b/Foundation/testsuite/src/FormatTest.cpp index 1ace4f9b5..44a228ee5 100644 --- a/Foundation/testsuite/src/FormatTest.cpp +++ b/Foundation/testsuite/src/FormatTest.cpp @@ -11,8 +11,8 @@ #include "FormatTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Any.h" #include "Poco/Format.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/FormatTest.h b/Foundation/testsuite/src/FormatTest.h index 87c15e762..16e86f6f6 100644 --- a/Foundation/testsuite/src/FormatTest.h +++ b/Foundation/testsuite/src/FormatTest.h @@ -14,7 +14,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FormatTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/FoundationTestSuite.h b/Foundation/testsuite/src/FoundationTestSuite.h index 5f4404304..0013c5c5b 100644 --- a/Foundation/testsuite/src/FoundationTestSuite.h +++ b/Foundation/testsuite/src/FoundationTestSuite.h @@ -16,7 +16,7 @@ #define FoundationTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FoundationTestSuite diff --git a/Foundation/testsuite/src/GlobTest.cpp b/Foundation/testsuite/src/GlobTest.cpp index 25c887ec6..6b2892537 100644 --- a/Foundation/testsuite/src/GlobTest.cpp +++ b/Foundation/testsuite/src/GlobTest.cpp @@ -11,8 +11,8 @@ #include "GlobTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Glob.h" #include "Poco/File.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/GlobTest.h b/Foundation/testsuite/src/GlobTest.h index d017c708a..439e63950 100644 --- a/Foundation/testsuite/src/GlobTest.h +++ b/Foundation/testsuite/src/GlobTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include diff --git a/Foundation/testsuite/src/HMACEngineTest.cpp b/Foundation/testsuite/src/HMACEngineTest.cpp index 2b21e1e6d..befeada21 100644 --- a/Foundation/testsuite/src/HMACEngineTest.cpp +++ b/Foundation/testsuite/src/HMACEngineTest.cpp @@ -11,8 +11,8 @@ #include "HMACEngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HMACEngine.h" #include "Poco/MD5Engine.h" diff --git a/Foundation/testsuite/src/HMACEngineTest.h b/Foundation/testsuite/src/HMACEngineTest.h index 9c2196a01..5b1a94c65 100644 --- a/Foundation/testsuite/src/HMACEngineTest.h +++ b/Foundation/testsuite/src/HMACEngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HMACEngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp index 5f14ad4ea..8725bf277 100644 --- a/Foundation/testsuite/src/HashMapTest.cpp +++ b/Foundation/testsuite/src/HashMapTest.cpp @@ -11,8 +11,8 @@ #include "HashMapTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashMap.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/HashMapTest.h b/Foundation/testsuite/src/HashMapTest.h index 4bc02bacc..ba6021cf5 100644 --- a/Foundation/testsuite/src/HashMapTest.h +++ b/Foundation/testsuite/src/HashMapTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashMapTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashSetTest.cpp b/Foundation/testsuite/src/HashSetTest.cpp index 288ee57c7..a24bb8c65 100644 --- a/Foundation/testsuite/src/HashSetTest.cpp +++ b/Foundation/testsuite/src/HashSetTest.cpp @@ -11,8 +11,8 @@ #include "HashSetTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashSet.h" #include diff --git a/Foundation/testsuite/src/HashSetTest.h b/Foundation/testsuite/src/HashSetTest.h index 3366631f3..5034ab3d2 100644 --- a/Foundation/testsuite/src/HashSetTest.h +++ b/Foundation/testsuite/src/HashSetTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashSetTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashTableTest.cpp b/Foundation/testsuite/src/HashTableTest.cpp index da305b991..3152e63e6 100644 --- a/Foundation/testsuite/src/HashTableTest.cpp +++ b/Foundation/testsuite/src/HashTableTest.cpp @@ -11,8 +11,8 @@ #include "HashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HashTable.h" #include "Poco/NumberFormatter.h" diff --git a/Foundation/testsuite/src/HashTableTest.h b/Foundation/testsuite/src/HashTableTest.h index 962c633b9..e5d216cad 100644 --- a/Foundation/testsuite/src/HashTableTest.h +++ b/Foundation/testsuite/src/HashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/HashingTestSuite.h b/Foundation/testsuite/src/HashingTestSuite.h index eb0cd1268..b934d0d9b 100644 --- a/Foundation/testsuite/src/HashingTestSuite.h +++ b/Foundation/testsuite/src/HashingTestSuite.h @@ -16,7 +16,7 @@ #define HashingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HashingTestSuite diff --git a/Foundation/testsuite/src/HexBinaryTest.cpp b/Foundation/testsuite/src/HexBinaryTest.cpp index fe3796dd6..ad5951e1a 100644 --- a/Foundation/testsuite/src/HexBinaryTest.cpp +++ b/Foundation/testsuite/src/HexBinaryTest.cpp @@ -11,8 +11,8 @@ #include "HexBinaryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/HexBinaryEncoder.h" #include "Poco/HexBinaryDecoder.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/HexBinaryTest.h b/Foundation/testsuite/src/HexBinaryTest.h index e6c23ebb4..b11d413bd 100644 --- a/Foundation/testsuite/src/HexBinaryTest.h +++ b/Foundation/testsuite/src/HexBinaryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HexBinaryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LRUCacheTest.cpp b/Foundation/testsuite/src/LRUCacheTest.cpp index 24a64eb94..068eaf1fe 100644 --- a/Foundation/testsuite/src/LRUCacheTest.cpp +++ b/Foundation/testsuite/src/LRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "LRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/LRUCache.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/LRUCacheTest.h b/Foundation/testsuite/src/LRUCacheTest.h index cf6623433..67935ff57 100644 --- a/Foundation/testsuite/src/LRUCacheTest.h +++ b/Foundation/testsuite/src/LRUCacheTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" #include "Poco/KeyValueArgs.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LineEndingConverterTest.cpp b/Foundation/testsuite/src/LineEndingConverterTest.cpp index 70d85ba45..2179accfa 100644 --- a/Foundation/testsuite/src/LineEndingConverterTest.cpp +++ b/Foundation/testsuite/src/LineEndingConverterTest.cpp @@ -11,8 +11,8 @@ #include "LineEndingConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LineEndingConverter.h" #include "Poco/StreamCopier.h" #include diff --git a/Foundation/testsuite/src/LineEndingConverterTest.h b/Foundation/testsuite/src/LineEndingConverterTest.h index fea8bbfae..07b26c268 100644 --- a/Foundation/testsuite/src/LineEndingConverterTest.h +++ b/Foundation/testsuite/src/LineEndingConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LineEndingConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LinearHashTableTest.cpp b/Foundation/testsuite/src/LinearHashTableTest.cpp index 6c7607845..1f6b98c1d 100644 --- a/Foundation/testsuite/src/LinearHashTableTest.cpp +++ b/Foundation/testsuite/src/LinearHashTableTest.cpp @@ -11,8 +11,8 @@ #include "LinearHashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LinearHashTable.h" #include "Poco/HashTable.h" #include "Poco/Stopwatch.h" diff --git a/Foundation/testsuite/src/LinearHashTableTest.h b/Foundation/testsuite/src/LinearHashTableTest.h index 1e7761cf8..71bcabd00 100644 --- a/Foundation/testsuite/src/LinearHashTableTest.h +++ b/Foundation/testsuite/src/LinearHashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LinearHashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ListMapTest.cpp b/Foundation/testsuite/src/ListMapTest.cpp index e3b1ae0c1..42e47cf48 100644 --- a/Foundation/testsuite/src/ListMapTest.cpp +++ b/Foundation/testsuite/src/ListMapTest.cpp @@ -11,8 +11,8 @@ #include "ListMapTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ListMap.h" #include "Poco/Exception.h" #include diff --git a/Foundation/testsuite/src/ListMapTest.h b/Foundation/testsuite/src/ListMapTest.h index 8bd3f7e94..3ee08591f 100644 --- a/Foundation/testsuite/src/ListMapTest.h +++ b/Foundation/testsuite/src/ListMapTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ListMapTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LocalDateTimeTest.cpp b/Foundation/testsuite/src/LocalDateTimeTest.cpp index f3381419e..b4d06f8b2 100644 --- a/Foundation/testsuite/src/LocalDateTimeTest.cpp +++ b/Foundation/testsuite/src/LocalDateTimeTest.cpp @@ -11,8 +11,8 @@ #include "LocalDateTimeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LocalDateTime.h" #include "Poco/DateTime.h" #include "Poco/Timestamp.h" diff --git a/Foundation/testsuite/src/LocalDateTimeTest.h b/Foundation/testsuite/src/LocalDateTimeTest.h index e1d0b439e..c7f21a100 100644 --- a/Foundation/testsuite/src/LocalDateTimeTest.h +++ b/Foundation/testsuite/src/LocalDateTimeTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LocalDateTimeTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LogStreamTest.cpp b/Foundation/testsuite/src/LogStreamTest.cpp index 3e8b6d1e3..d62cf3ac7 100644 --- a/Foundation/testsuite/src/LogStreamTest.cpp +++ b/Foundation/testsuite/src/LogStreamTest.cpp @@ -11,8 +11,8 @@ #include "LogStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Logger.h" #include "Poco/LogStream.h" #include "Poco/AutoPtr.h" diff --git a/Foundation/testsuite/src/LogStreamTest.h b/Foundation/testsuite/src/LogStreamTest.h index e66826d8e..2a44af003 100644 --- a/Foundation/testsuite/src/LogStreamTest.h +++ b/Foundation/testsuite/src/LogStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LogStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggerTest.cpp b/Foundation/testsuite/src/LoggerTest.cpp index 896d439e9..3ae79b37f 100644 --- a/Foundation/testsuite/src/LoggerTest.cpp +++ b/Foundation/testsuite/src/LoggerTest.cpp @@ -11,8 +11,8 @@ #include "LoggerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Logger.h" #include "Poco/AutoPtr.h" #include "TestChannel.h" diff --git a/Foundation/testsuite/src/LoggerTest.h b/Foundation/testsuite/src/LoggerTest.h index 3c0933b7d..0a711a513 100644 --- a/Foundation/testsuite/src/LoggerTest.h +++ b/Foundation/testsuite/src/LoggerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingFactoryTest.cpp b/Foundation/testsuite/src/LoggingFactoryTest.cpp index 4ad770796..f11eafb8c 100644 --- a/Foundation/testsuite/src/LoggingFactoryTest.cpp +++ b/Foundation/testsuite/src/LoggingFactoryTest.cpp @@ -11,8 +11,8 @@ #include "LoggingFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LoggingFactory.h" #include "Poco/Instantiator.h" #include "Poco/Channel.h" diff --git a/Foundation/testsuite/src/LoggingFactoryTest.h b/Foundation/testsuite/src/LoggingFactoryTest.h index 065b9b749..8922870f8 100644 --- a/Foundation/testsuite/src/LoggingFactoryTest.h +++ b/Foundation/testsuite/src/LoggingFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingFactoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingRegistryTest.cpp b/Foundation/testsuite/src/LoggingRegistryTest.cpp index 8ed076521..7d306c758 100644 --- a/Foundation/testsuite/src/LoggingRegistryTest.cpp +++ b/Foundation/testsuite/src/LoggingRegistryTest.cpp @@ -11,8 +11,8 @@ #include "LoggingRegistryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/LoggingRegistry.h" #include "Poco/ConsoleChannel.h" #include "Poco/PatternFormatter.h" diff --git a/Foundation/testsuite/src/LoggingRegistryTest.h b/Foundation/testsuite/src/LoggingRegistryTest.h index aa93598ca..f13a3f75d 100644 --- a/Foundation/testsuite/src/LoggingRegistryTest.h +++ b/Foundation/testsuite/src/LoggingRegistryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingRegistryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/LoggingTestSuite.h b/Foundation/testsuite/src/LoggingTestSuite.h index b8cce69bf..2472f0b56 100644 --- a/Foundation/testsuite/src/LoggingTestSuite.h +++ b/Foundation/testsuite/src/LoggingTestSuite.h @@ -16,7 +16,7 @@ #define LoggingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class LoggingTestSuite diff --git a/Foundation/testsuite/src/MD4EngineTest.cpp b/Foundation/testsuite/src/MD4EngineTest.cpp index c31a90096..a4702738c 100644 --- a/Foundation/testsuite/src/MD4EngineTest.cpp +++ b/Foundation/testsuite/src/MD4EngineTest.cpp @@ -11,8 +11,8 @@ #include "MD4EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MD4Engine.h" diff --git a/Foundation/testsuite/src/MD4EngineTest.h b/Foundation/testsuite/src/MD4EngineTest.h index b56ddddbe..b8e803129 100644 --- a/Foundation/testsuite/src/MD4EngineTest.h +++ b/Foundation/testsuite/src/MD4EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MD4EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MD5EngineTest.cpp b/Foundation/testsuite/src/MD5EngineTest.cpp index b4c4fa24b..cf9af69e1 100644 --- a/Foundation/testsuite/src/MD5EngineTest.cpp +++ b/Foundation/testsuite/src/MD5EngineTest.cpp @@ -11,8 +11,8 @@ #include "MD5EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MD5Engine.h" diff --git a/Foundation/testsuite/src/MD5EngineTest.h b/Foundation/testsuite/src/MD5EngineTest.h index 97b86ec23..f0504c0f0 100644 --- a/Foundation/testsuite/src/MD5EngineTest.h +++ b/Foundation/testsuite/src/MD5EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MD5EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ManifestTest.cpp b/Foundation/testsuite/src/ManifestTest.cpp index 2a78b4f69..a4ddd09fd 100644 --- a/Foundation/testsuite/src/ManifestTest.cpp +++ b/Foundation/testsuite/src/ManifestTest.cpp @@ -11,8 +11,8 @@ #include "ManifestTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Manifest.h" #include "Poco/MetaObject.h" #include diff --git a/Foundation/testsuite/src/ManifestTest.h b/Foundation/testsuite/src/ManifestTest.h index f296eff64..35e3fd61a 100644 --- a/Foundation/testsuite/src/ManifestTest.h +++ b/Foundation/testsuite/src/ManifestTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ManifestTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MemoryPoolTest.cpp b/Foundation/testsuite/src/MemoryPoolTest.cpp index dd482d822..ca8a9b246 100644 --- a/Foundation/testsuite/src/MemoryPoolTest.cpp +++ b/Foundation/testsuite/src/MemoryPoolTest.cpp @@ -11,8 +11,8 @@ #include "MemoryPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/MemoryPool.h" #include diff --git a/Foundation/testsuite/src/MemoryPoolTest.h b/Foundation/testsuite/src/MemoryPoolTest.h index 8bc36edba..bfb2a365a 100644 --- a/Foundation/testsuite/src/MemoryPoolTest.h +++ b/Foundation/testsuite/src/MemoryPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MemoryPoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp index 86ea9557a..480bafcc3 100644 --- a/Foundation/testsuite/src/MemoryStreamTest.cpp +++ b/Foundation/testsuite/src/MemoryStreamTest.cpp @@ -11,8 +11,8 @@ #include "MemoryStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Buffer.h" #include "Poco/MemoryStream.h" #include diff --git a/Foundation/testsuite/src/MemoryStreamTest.h b/Foundation/testsuite/src/MemoryStreamTest.h index 5a37005cc..7a0da9507 100644 --- a/Foundation/testsuite/src/MemoryStreamTest.h +++ b/Foundation/testsuite/src/MemoryStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MemoryStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/MutexTest.cpp b/Foundation/testsuite/src/MutexTest.cpp index 9b3f70f24..b248ddb70 100644 --- a/Foundation/testsuite/src/MutexTest.cpp +++ b/Foundation/testsuite/src/MutexTest.cpp @@ -11,8 +11,8 @@ #include "MutexTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Mutex.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/MutexTest.h b/Foundation/testsuite/src/MutexTest.h index 1e20c5e63..82879f258 100644 --- a/Foundation/testsuite/src/MutexTest.h +++ b/Foundation/testsuite/src/MutexTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MutexTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NDCTest.cpp b/Foundation/testsuite/src/NDCTest.cpp index 9ae2a35dd..94c13418e 100644 --- a/Foundation/testsuite/src/NDCTest.cpp +++ b/Foundation/testsuite/src/NDCTest.cpp @@ -11,8 +11,8 @@ #include "NDCTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NestedDiagnosticContext.h" #include diff --git a/Foundation/testsuite/src/NDCTest.h b/Foundation/testsuite/src/NDCTest.h index 11a95df78..e6221f80e 100644 --- a/Foundation/testsuite/src/NDCTest.h +++ b/Foundation/testsuite/src/NDCTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NDCTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedEventTest.cpp b/Foundation/testsuite/src/NamedEventTest.cpp index 4f22197c8..320082dfa 100644 --- a/Foundation/testsuite/src/NamedEventTest.cpp +++ b/Foundation/testsuite/src/NamedEventTest.cpp @@ -11,8 +11,8 @@ #include "NamedEventTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedEvent.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/NamedEventTest.h b/Foundation/testsuite/src/NamedEventTest.h index 2921f8d61..7e902e6a0 100644 --- a/Foundation/testsuite/src/NamedEventTest.h +++ b/Foundation/testsuite/src/NamedEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedEventTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedMutexTest.cpp b/Foundation/testsuite/src/NamedMutexTest.cpp index 3d3b3047f..41e5f2719 100644 --- a/Foundation/testsuite/src/NamedMutexTest.cpp +++ b/Foundation/testsuite/src/NamedMutexTest.cpp @@ -11,8 +11,8 @@ #include "NamedMutexTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedMutex.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/NamedMutexTest.h b/Foundation/testsuite/src/NamedMutexTest.h index e627e31e3..96e6e15cb 100644 --- a/Foundation/testsuite/src/NamedMutexTest.h +++ b/Foundation/testsuite/src/NamedMutexTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedMutexTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp index 3442e52b5..4ebafc8a0 100644 --- a/Foundation/testsuite/src/NamedTuplesTest.cpp +++ b/Foundation/testsuite/src/NamedTuplesTest.cpp @@ -11,8 +11,8 @@ #include "NamedTuplesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NamedTuple.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/NamedTuplesTest.h b/Foundation/testsuite/src/NamedTuplesTest.h index 22580124b..bfe56563a 100644 --- a/Foundation/testsuite/src/NamedTuplesTest.h +++ b/Foundation/testsuite/src/NamedTuplesTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamedTuplesTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NotificationCenterTest.cpp b/Foundation/testsuite/src/NotificationCenterTest.cpp index fa5b98c71..bc0d932f7 100644 --- a/Foundation/testsuite/src/NotificationCenterTest.cpp +++ b/Foundation/testsuite/src/NotificationCenterTest.cpp @@ -11,8 +11,8 @@ #include "NotificationCenterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NotificationCenter.h" #include "Poco/Observer.h" #include "Poco/NObserver.h" diff --git a/Foundation/testsuite/src/NotificationCenterTest.h b/Foundation/testsuite/src/NotificationCenterTest.h index e5dd6f151..700d33c2f 100644 --- a/Foundation/testsuite/src/NotificationCenterTest.h +++ b/Foundation/testsuite/src/NotificationCenterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Notification.h" #include "Poco/AutoPtr.h" #include diff --git a/Foundation/testsuite/src/NotificationQueueTest.cpp b/Foundation/testsuite/src/NotificationQueueTest.cpp index 559869b34..3b3669989 100644 --- a/Foundation/testsuite/src/NotificationQueueTest.cpp +++ b/Foundation/testsuite/src/NotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "NotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/NotificationQueueTest.h b/Foundation/testsuite/src/NotificationQueueTest.h index e261a7c05..2ed2e162d 100644 --- a/Foundation/testsuite/src/NotificationQueueTest.h +++ b/Foundation/testsuite/src/NotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/NotificationsTestSuite.h b/Foundation/testsuite/src/NotificationsTestSuite.h index 7f9f6c563..ef653d272 100644 --- a/Foundation/testsuite/src/NotificationsTestSuite.h +++ b/Foundation/testsuite/src/NotificationsTestSuite.h @@ -16,7 +16,7 @@ #define NotificationsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NotificationsTestSuite diff --git a/Foundation/testsuite/src/NullStreamTest.cpp b/Foundation/testsuite/src/NullStreamTest.cpp index 27ceffb1e..cdd941a65 100644 --- a/Foundation/testsuite/src/NullStreamTest.cpp +++ b/Foundation/testsuite/src/NullStreamTest.cpp @@ -11,8 +11,8 @@ #include "NullStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NullStream.h" diff --git a/Foundation/testsuite/src/NullStreamTest.h b/Foundation/testsuite/src/NullStreamTest.h index c6c2b19b0..98781b145 100644 --- a/Foundation/testsuite/src/NullStreamTest.h +++ b/Foundation/testsuite/src/NullStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NullStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp index e6935a711..a88fa09c3 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.cpp +++ b/Foundation/testsuite/src/NumberFormatterTest.cpp @@ -11,8 +11,8 @@ #include "NumberFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/NumberFormatter.h" #include diff --git a/Foundation/testsuite/src/NumberFormatterTest.h b/Foundation/testsuite/src/NumberFormatterTest.h index fd0bacb80..1fee768b6 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.h +++ b/Foundation/testsuite/src/NumberFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NumberFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp index cb656494b..1071d40ff 100644 --- a/Foundation/testsuite/src/NumberParserTest.cpp +++ b/Foundation/testsuite/src/NumberParserTest.cpp @@ -11,8 +11,8 @@ #include "NumberParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Types.h" #include "Poco/Format.h" diff --git a/Foundation/testsuite/src/NumberParserTest.h b/Foundation/testsuite/src/NumberParserTest.h index 510f4525e..3a64560a3 100644 --- a/Foundation/testsuite/src/NumberParserTest.h +++ b/Foundation/testsuite/src/NumberParserTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NumberParser.h" #include "Poco/NumberFormatter.h" #undef max diff --git a/Foundation/testsuite/src/ObjectPoolTest.cpp b/Foundation/testsuite/src/ObjectPoolTest.cpp index 1f631f5fd..6f7a602b8 100644 --- a/Foundation/testsuite/src/ObjectPoolTest.cpp +++ b/Foundation/testsuite/src/ObjectPoolTest.cpp @@ -11,8 +11,8 @@ #include "ObjectPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ObjectPool.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ObjectPoolTest.h b/Foundation/testsuite/src/ObjectPoolTest.h index d70ae8e85..39b3887ed 100644 --- a/Foundation/testsuite/src/ObjectPoolTest.h +++ b/Foundation/testsuite/src/ObjectPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ObjectPoolTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.cpp b/Foundation/testsuite/src/PBKDF2EngineTest.cpp index 5a3ed21e1..a3e004bab 100644 --- a/Foundation/testsuite/src/PBKDF2EngineTest.cpp +++ b/Foundation/testsuite/src/PBKDF2EngineTest.cpp @@ -11,8 +11,8 @@ #include "PBKDF2EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PBKDF2Engine.h" #include "Poco/HMACEngine.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.h b/Foundation/testsuite/src/PBKDF2EngineTest.h index 1f8899665..7a81f194d 100644 --- a/Foundation/testsuite/src/PBKDF2EngineTest.h +++ b/Foundation/testsuite/src/PBKDF2EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PBKDF2EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PathTest.cpp b/Foundation/testsuite/src/PathTest.cpp index a601e8067..ac8a92506 100644 --- a/Foundation/testsuite/src/PathTest.cpp +++ b/Foundation/testsuite/src/PathTest.cpp @@ -11,8 +11,8 @@ #include "PathTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Path.h" #include "Poco/Exception.h" #include "Poco/Random.h" diff --git a/Foundation/testsuite/src/PathTest.h b/Foundation/testsuite/src/PathTest.h index 1279589f1..e14aebebd 100644 --- a/Foundation/testsuite/src/PathTest.h +++ b/Foundation/testsuite/src/PathTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PathTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PatternFormatterTest.cpp b/Foundation/testsuite/src/PatternFormatterTest.cpp index 77987996f..120a4ae8f 100644 --- a/Foundation/testsuite/src/PatternFormatterTest.cpp +++ b/Foundation/testsuite/src/PatternFormatterTest.cpp @@ -11,8 +11,8 @@ #include "PatternFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PatternFormatter.h" #include "Poco/Message.h" #include "Poco/DateTime.h" diff --git a/Foundation/testsuite/src/PatternFormatterTest.h b/Foundation/testsuite/src/PatternFormatterTest.h index 20478b7b5..251eab16b 100644 --- a/Foundation/testsuite/src/PatternFormatterTest.h +++ b/Foundation/testsuite/src/PatternFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PatternFormatterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/PriorityEventTest.cpp b/Foundation/testsuite/src/PriorityEventTest.cpp index 749314792..82037c571 100644 --- a/Foundation/testsuite/src/PriorityEventTest.cpp +++ b/Foundation/testsuite/src/PriorityEventTest.cpp @@ -12,8 +12,8 @@ #include "PriorityEventTest.h" #include "DummyDelegate.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PriorityDelegate.h" #include "Poco/PriorityExpire.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/PriorityEventTest.h b/Foundation/testsuite/src/PriorityEventTest.h index a7d972018..07d96d441 100644 --- a/Foundation/testsuite/src/PriorityEventTest.h +++ b/Foundation/testsuite/src/PriorityEventTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/PriorityEvent.h" #include "Poco/EventArgs.h" diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp index 8240a2a84..e8be40a1f 100644 --- a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp +++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "PriorityNotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/PriorityNotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.h b/Foundation/testsuite/src/PriorityNotificationQueueTest.h index 72652881d..1c031efcb 100644 --- a/Foundation/testsuite/src/PriorityNotificationQueueTest.h +++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/PriorityNotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/ProcessTest.cpp b/Foundation/testsuite/src/ProcessTest.cpp index 71d6eabb3..736507375 100644 --- a/Foundation/testsuite/src/ProcessTest.cpp +++ b/Foundation/testsuite/src/ProcessTest.cpp @@ -11,8 +11,8 @@ #include "ProcessTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Process.h" #include "Poco/Pipe.h" #include "Poco/PipeStream.h" diff --git a/Foundation/testsuite/src/ProcessTest.h b/Foundation/testsuite/src/ProcessTest.h index e22c2b7e6..f3e9d67d5 100644 --- a/Foundation/testsuite/src/ProcessTest.h +++ b/Foundation/testsuite/src/ProcessTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ProcessTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ProcessesTestSuite.h b/Foundation/testsuite/src/ProcessesTestSuite.h index 50a73942f..b2e52b890 100644 --- a/Foundation/testsuite/src/ProcessesTestSuite.h +++ b/Foundation/testsuite/src/ProcessesTestSuite.h @@ -16,7 +16,7 @@ #define ProcessesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ProcessesTestSuite diff --git a/Foundation/testsuite/src/RWLockTest.cpp b/Foundation/testsuite/src/RWLockTest.cpp index e8b6a30f1..0c66064cc 100644 --- a/Foundation/testsuite/src/RWLockTest.cpp +++ b/Foundation/testsuite/src/RWLockTest.cpp @@ -11,8 +11,8 @@ #include "RWLockTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RWLock.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/RWLockTest.h b/Foundation/testsuite/src/RWLockTest.h index fdda37e23..316ef8b70 100644 --- a/Foundation/testsuite/src/RWLockTest.h +++ b/Foundation/testsuite/src/RWLockTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RWLockTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RandomStreamTest.cpp b/Foundation/testsuite/src/RandomStreamTest.cpp index 2d641062f..e549a92fd 100644 --- a/Foundation/testsuite/src/RandomStreamTest.cpp +++ b/Foundation/testsuite/src/RandomStreamTest.cpp @@ -11,8 +11,8 @@ #include "RandomStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RandomStream.h" #include #include diff --git a/Foundation/testsuite/src/RandomStreamTest.h b/Foundation/testsuite/src/RandomStreamTest.h index c5be0d950..713c6a962 100644 --- a/Foundation/testsuite/src/RandomStreamTest.h +++ b/Foundation/testsuite/src/RandomStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RandomStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RandomTest.cpp b/Foundation/testsuite/src/RandomTest.cpp index c5ed53590..1825600e3 100644 --- a/Foundation/testsuite/src/RandomTest.cpp +++ b/Foundation/testsuite/src/RandomTest.cpp @@ -11,8 +11,8 @@ #include "RandomTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Random.h" #include #include diff --git a/Foundation/testsuite/src/RandomTest.h b/Foundation/testsuite/src/RandomTest.h index 4b04dc848..ff5baa8a1 100644 --- a/Foundation/testsuite/src/RandomTest.h +++ b/Foundation/testsuite/src/RandomTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RandomTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/RegularExpressionTest.cpp b/Foundation/testsuite/src/RegularExpressionTest.cpp index cd6c1fb13..3f749e4af 100644 --- a/Foundation/testsuite/src/RegularExpressionTest.cpp +++ b/Foundation/testsuite/src/RegularExpressionTest.cpp @@ -11,8 +11,8 @@ #include "RegularExpressionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/RegularExpression.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/RegularExpressionTest.h b/Foundation/testsuite/src/RegularExpressionTest.h index ef49ae344..78a3cb06c 100644 --- a/Foundation/testsuite/src/RegularExpressionTest.h +++ b/Foundation/testsuite/src/RegularExpressionTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RegularExpressionTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SHA1EngineTest.cpp b/Foundation/testsuite/src/SHA1EngineTest.cpp index a0e95f3c2..8d5ae0e51 100644 --- a/Foundation/testsuite/src/SHA1EngineTest.cpp +++ b/Foundation/testsuite/src/SHA1EngineTest.cpp @@ -11,8 +11,8 @@ #include "SHA1EngineTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/SHA1EngineTest.h b/Foundation/testsuite/src/SHA1EngineTest.h index 1f097b871..b47f1e40f 100644 --- a/Foundation/testsuite/src/SHA1EngineTest.h +++ b/Foundation/testsuite/src/SHA1EngineTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SHA1EngineTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SemaphoreTest.cpp b/Foundation/testsuite/src/SemaphoreTest.cpp index 515f6db10..4d0a7dde6 100644 --- a/Foundation/testsuite/src/SemaphoreTest.cpp +++ b/Foundation/testsuite/src/SemaphoreTest.cpp @@ -11,8 +11,8 @@ #include "SemaphoreTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/Semaphore.h" diff --git a/Foundation/testsuite/src/SemaphoreTest.h b/Foundation/testsuite/src/SemaphoreTest.h index 5254fdc30..1f3510a26 100644 --- a/Foundation/testsuite/src/SemaphoreTest.h +++ b/Foundation/testsuite/src/SemaphoreTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SemaphoreTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedLibraryTest.cpp b/Foundation/testsuite/src/SharedLibraryTest.cpp index d53c1ea09..4808f0ba5 100644 --- a/Foundation/testsuite/src/SharedLibraryTest.cpp +++ b/Foundation/testsuite/src/SharedLibraryTest.cpp @@ -11,8 +11,8 @@ #include "SharedLibraryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedLibrary.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/SharedLibraryTest.h b/Foundation/testsuite/src/SharedLibraryTest.h index e41190e58..2c526e446 100644 --- a/Foundation/testsuite/src/SharedLibraryTest.h +++ b/Foundation/testsuite/src/SharedLibraryTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedLibraryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedLibraryTestSuite.h b/Foundation/testsuite/src/SharedLibraryTestSuite.h index fedd3ed2d..e1334f616 100644 --- a/Foundation/testsuite/src/SharedLibraryTestSuite.h +++ b/Foundation/testsuite/src/SharedLibraryTestSuite.h @@ -16,7 +16,7 @@ #define SharedLibraryTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SharedLibraryTestSuite diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp index 001e4dee3..d91f6049f 100644 --- a/Foundation/testsuite/src/SharedMemoryTest.cpp +++ b/Foundation/testsuite/src/SharedMemoryTest.cpp @@ -11,8 +11,8 @@ #include "SharedMemoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedMemory.h" #include "Poco/Path.h" #include "Poco/File.h" diff --git a/Foundation/testsuite/src/SharedMemoryTest.h b/Foundation/testsuite/src/SharedMemoryTest.h index e777f9c08..bef883f5a 100644 --- a/Foundation/testsuite/src/SharedMemoryTest.h +++ b/Foundation/testsuite/src/SharedMemoryTest.h @@ -18,7 +18,7 @@ #include "Poco/Foundation.h" #include "Poco/Path.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedMemoryTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SharedPtrTest.cpp b/Foundation/testsuite/src/SharedPtrTest.cpp index 8dce9b1f4..68bc8190d 100644 --- a/Foundation/testsuite/src/SharedPtrTest.cpp +++ b/Foundation/testsuite/src/SharedPtrTest.cpp @@ -11,8 +11,8 @@ #include "SharedPtrTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SharedPtr.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/SharedPtrTest.h b/Foundation/testsuite/src/SharedPtrTest.h index 6b1eaf831..b3756ae8a 100644 --- a/Foundation/testsuite/src/SharedPtrTest.h +++ b/Foundation/testsuite/src/SharedPtrTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SharedPtrTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SimpleFileChannelTest.cpp b/Foundation/testsuite/src/SimpleFileChannelTest.cpp index aa320bedb..eb080b746 100644 --- a/Foundation/testsuite/src/SimpleFileChannelTest.cpp +++ b/Foundation/testsuite/src/SimpleFileChannelTest.cpp @@ -19,8 +19,8 @@ #include "Poco/DateTimeFormatter.h" #include "Poco/AutoPtr.h" #include "SimpleFileChannelTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" using Poco::SimpleFileChannel; diff --git a/Foundation/testsuite/src/SimpleFileChannelTest.h b/Foundation/testsuite/src/SimpleFileChannelTest.h index 16901c01a..c062578a0 100644 --- a/Foundation/testsuite/src/SimpleFileChannelTest.h +++ b/Foundation/testsuite/src/SimpleFileChannelTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SimpleFileChannelTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/SimpleHashTableTest.cpp b/Foundation/testsuite/src/SimpleHashTableTest.cpp index 3ee4081eb..05710fbf0 100644 --- a/Foundation/testsuite/src/SimpleHashTableTest.cpp +++ b/Foundation/testsuite/src/SimpleHashTableTest.cpp @@ -11,8 +11,8 @@ #include "SimpleHashTableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SimpleHashTable.h" #include "Poco/NumberFormatter.h" diff --git a/Foundation/testsuite/src/SimpleHashTableTest.h b/Foundation/testsuite/src/SimpleHashTableTest.h index 6c31e9e4d..85d655f27 100644 --- a/Foundation/testsuite/src/SimpleHashTableTest.h +++ b/Foundation/testsuite/src/SimpleHashTableTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SimpleHashTableTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StopwatchTest.cpp b/Foundation/testsuite/src/StopwatchTest.cpp index 87c8633f0..164a47b0a 100644 --- a/Foundation/testsuite/src/StopwatchTest.cpp +++ b/Foundation/testsuite/src/StopwatchTest.cpp @@ -11,8 +11,8 @@ #include "StopwatchTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Stopwatch.h" #include "Poco/Timestamp.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/StopwatchTest.h b/Foundation/testsuite/src/StopwatchTest.h index 92ab4bd58..adae374f7 100644 --- a/Foundation/testsuite/src/StopwatchTest.h +++ b/Foundation/testsuite/src/StopwatchTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StopwatchTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamConverterTest.cpp b/Foundation/testsuite/src/StreamConverterTest.cpp index 3d3e6368d..d6be3c896 100644 --- a/Foundation/testsuite/src/StreamConverterTest.cpp +++ b/Foundation/testsuite/src/StreamConverterTest.cpp @@ -11,8 +11,8 @@ #include "StreamConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamConverter.h" #include "Poco/ASCIIEncoding.h" #include "Poco/Latin1Encoding.h" diff --git a/Foundation/testsuite/src/StreamConverterTest.h b/Foundation/testsuite/src/StreamConverterTest.h index 2db255e2e..6e779c135 100644 --- a/Foundation/testsuite/src/StreamConverterTest.h +++ b/Foundation/testsuite/src/StreamConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamCopierTest.cpp b/Foundation/testsuite/src/StreamCopierTest.cpp index 2daa50e9b..b16a242cc 100644 --- a/Foundation/testsuite/src/StreamCopierTest.cpp +++ b/Foundation/testsuite/src/StreamCopierTest.cpp @@ -11,8 +11,8 @@ #include "StreamCopierTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamCopier.h" #include diff --git a/Foundation/testsuite/src/StreamCopierTest.h b/Foundation/testsuite/src/StreamCopierTest.h index 51e43ffb5..229738668 100644 --- a/Foundation/testsuite/src/StreamCopierTest.h +++ b/Foundation/testsuite/src/StreamCopierTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamCopierTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamTokenizerTest.cpp b/Foundation/testsuite/src/StreamTokenizerTest.cpp index 5bd090e7e..935f902a3 100644 --- a/Foundation/testsuite/src/StreamTokenizerTest.cpp +++ b/Foundation/testsuite/src/StreamTokenizerTest.cpp @@ -11,8 +11,8 @@ #include "StreamTokenizerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StreamTokenizer.h" #include "Poco/Token.h" #include "Poco/Ascii.h" diff --git a/Foundation/testsuite/src/StreamTokenizerTest.h b/Foundation/testsuite/src/StreamTokenizerTest.h index 7b7562b49..c4deeeba7 100644 --- a/Foundation/testsuite/src/StreamTokenizerTest.h +++ b/Foundation/testsuite/src/StreamTokenizerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StreamTokenizerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/StreamsTestSuite.h b/Foundation/testsuite/src/StreamsTestSuite.h index 8498e1e88..dfe6e884d 100644 --- a/Foundation/testsuite/src/StreamsTestSuite.h +++ b/Foundation/testsuite/src/StreamsTestSuite.h @@ -16,7 +16,7 @@ #define StreamsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class StreamsTestSuite diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index d3519cf94..5a1431cfb 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -11,8 +11,8 @@ #include "StringTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/String.h" #include "Poco/JSONString.h" #include "Poco/Format.h" diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index 9974d930d..4c55e42d3 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/NumericString.h" #include "Poco/MemoryStream.h" diff --git a/Foundation/testsuite/src/StringTokenizerTest.cpp b/Foundation/testsuite/src/StringTokenizerTest.cpp index a2e4f6127..3885ab433 100644 --- a/Foundation/testsuite/src/StringTokenizerTest.cpp +++ b/Foundation/testsuite/src/StringTokenizerTest.cpp @@ -11,8 +11,8 @@ #include #include "StringTokenizerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/StringTokenizer.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/StringTokenizerTest.h b/Foundation/testsuite/src/StringTokenizerTest.h index 5b5528368..9805d2132 100644 --- a/Foundation/testsuite/src/StringTokenizerTest.h +++ b/Foundation/testsuite/src/StringTokenizerTest.h @@ -15,7 +15,7 @@ #define StringTokenizerTest_INCLUDED #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class StringTokenizerTest: public CppUnit::TestCase { diff --git a/Foundation/testsuite/src/TaskManagerTest.cpp b/Foundation/testsuite/src/TaskManagerTest.cpp index 85d5ea11b..8bdc3fe2c 100644 --- a/Foundation/testsuite/src/TaskManagerTest.cpp +++ b/Foundation/testsuite/src/TaskManagerTest.cpp @@ -11,8 +11,8 @@ #include "TaskManagerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/TaskManager.h" #include "Poco/Task.h" diff --git a/Foundation/testsuite/src/TaskManagerTest.h b/Foundation/testsuite/src/TaskManagerTest.h index 3cb9467fe..cd8dddf0b 100644 --- a/Foundation/testsuite/src/TaskManagerTest.h +++ b/Foundation/testsuite/src/TaskManagerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TaskManagerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TaskTest.cpp b/Foundation/testsuite/src/TaskTest.cpp index c8ef856a5..16bdbf93a 100644 --- a/Foundation/testsuite/src/TaskTest.cpp +++ b/Foundation/testsuite/src/TaskTest.cpp @@ -11,8 +11,8 @@ #include "TaskTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Task.h" #include "Poco/Thread.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/TaskTest.h b/Foundation/testsuite/src/TaskTest.h index 5d022f224..07765ecb0 100644 --- a/Foundation/testsuite/src/TaskTest.h +++ b/Foundation/testsuite/src/TaskTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TaskTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TaskTestSuite.h b/Foundation/testsuite/src/TaskTestSuite.h index f0e6b4419..d5aa6c50e 100644 --- a/Foundation/testsuite/src/TaskTestSuite.h +++ b/Foundation/testsuite/src/TaskTestSuite.h @@ -16,7 +16,7 @@ #define TaskTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TaskTestSuite diff --git a/Foundation/testsuite/src/TeeStreamTest.cpp b/Foundation/testsuite/src/TeeStreamTest.cpp index d0d64e50f..40470b021 100644 --- a/Foundation/testsuite/src/TeeStreamTest.cpp +++ b/Foundation/testsuite/src/TeeStreamTest.cpp @@ -11,8 +11,8 @@ #include "TeeStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TeeStream.h" #include diff --git a/Foundation/testsuite/src/TeeStreamTest.h b/Foundation/testsuite/src/TeeStreamTest.h index 48595589b..63fcb25fd 100644 --- a/Foundation/testsuite/src/TeeStreamTest.h +++ b/Foundation/testsuite/src/TeeStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TeeStreamTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.cpp b/Foundation/testsuite/src/TextBufferIteratorTest.cpp index 85854607c..7c010f74d 100644 --- a/Foundation/testsuite/src/TextBufferIteratorTest.cpp +++ b/Foundation/testsuite/src/TextBufferIteratorTest.cpp @@ -11,8 +11,8 @@ #include "TextBufferIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextBufferIterator.h" #include "Poco/Latin1Encoding.h" #include "Poco/UTF8Encoding.h" diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.h b/Foundation/testsuite/src/TextBufferIteratorTest.h index ab36e1c58..70e5e9180 100644 --- a/Foundation/testsuite/src/TextBufferIteratorTest.h +++ b/Foundation/testsuite/src/TextBufferIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextBufferIteratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextConverterTest.cpp b/Foundation/testsuite/src/TextConverterTest.cpp index afe304bc3..308493a05 100644 --- a/Foundation/testsuite/src/TextConverterTest.cpp +++ b/Foundation/testsuite/src/TextConverterTest.cpp @@ -11,8 +11,8 @@ #include "TextConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextConverter.h" #include "Poco/ASCIIEncoding.h" #include "Poco/Latin1Encoding.h" diff --git a/Foundation/testsuite/src/TextConverterTest.h b/Foundation/testsuite/src/TextConverterTest.h index 897ca9a5a..3ee216b72 100644 --- a/Foundation/testsuite/src/TextConverterTest.h +++ b/Foundation/testsuite/src/TextConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextConverterTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp index f9b0460ba..8de11b392 100644 --- a/Foundation/testsuite/src/TextEncodingTest.cpp +++ b/Foundation/testsuite/src/TextEncodingTest.cpp @@ -11,8 +11,8 @@ #include "TextEncodingTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextEncoding.h" #include "Poco/Latin1Encoding.h" #include "Poco/Latin2Encoding.h" diff --git a/Foundation/testsuite/src/TextEncodingTest.h b/Foundation/testsuite/src/TextEncodingTest.h index 7a5f3d278..94244f216 100644 --- a/Foundation/testsuite/src/TextEncodingTest.h +++ b/Foundation/testsuite/src/TextEncodingTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextEncodingTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextIteratorTest.cpp b/Foundation/testsuite/src/TextIteratorTest.cpp index 42dc17e60..d17d393a6 100644 --- a/Foundation/testsuite/src/TextIteratorTest.cpp +++ b/Foundation/testsuite/src/TextIteratorTest.cpp @@ -11,8 +11,8 @@ #include "TextIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TextIterator.h" #include "Poco/Latin1Encoding.h" #include "Poco/UTF8Encoding.h" diff --git a/Foundation/testsuite/src/TextIteratorTest.h b/Foundation/testsuite/src/TextIteratorTest.h index e1760a92c..376df85ad 100644 --- a/Foundation/testsuite/src/TextIteratorTest.h +++ b/Foundation/testsuite/src/TextIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextIteratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TextTestSuite.h b/Foundation/testsuite/src/TextTestSuite.h index 7181254c3..c628fae00 100644 --- a/Foundation/testsuite/src/TextTestSuite.h +++ b/Foundation/testsuite/src/TextTestSuite.h @@ -16,7 +16,7 @@ #define TextTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TextTestSuite diff --git a/Foundation/testsuite/src/ThreadLocalTest.cpp b/Foundation/testsuite/src/ThreadLocalTest.cpp index 61fc60351..f051260f7 100644 --- a/Foundation/testsuite/src/ThreadLocalTest.cpp +++ b/Foundation/testsuite/src/ThreadLocalTest.cpp @@ -11,8 +11,8 @@ #include "ThreadLocalTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ThreadLocal.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" diff --git a/Foundation/testsuite/src/ThreadLocalTest.h b/Foundation/testsuite/src/ThreadLocalTest.h index e2656ed5c..3e7dddd69 100644 --- a/Foundation/testsuite/src/ThreadLocalTest.h +++ b/Foundation/testsuite/src/ThreadLocalTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ThreadLocalTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ThreadPoolTest.cpp b/Foundation/testsuite/src/ThreadPoolTest.cpp index 3ec9cd262..ba9177050 100644 --- a/Foundation/testsuite/src/ThreadPoolTest.cpp +++ b/Foundation/testsuite/src/ThreadPoolTest.cpp @@ -11,8 +11,8 @@ #include "ThreadPoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/ThreadPool.h" #include "Poco/RunnableAdapter.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/ThreadPoolTest.h b/Foundation/testsuite/src/ThreadPoolTest.h index 1da8babd2..297570e1a 100644 --- a/Foundation/testsuite/src/ThreadPoolTest.h +++ b/Foundation/testsuite/src/ThreadPoolTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Event.h" #include "Poco/Mutex.h" diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp index 3306169f1..ad4f5df98 100644 --- a/Foundation/testsuite/src/ThreadTest.cpp +++ b/Foundation/testsuite/src/ThreadTest.cpp @@ -11,8 +11,8 @@ #include "ThreadTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Runnable.h" #include "Poco/ThreadTarget.h" diff --git a/Foundation/testsuite/src/ThreadTest.h b/Foundation/testsuite/src/ThreadTest.h index 3176ce4dd..b5bb56a32 100644 --- a/Foundation/testsuite/src/ThreadTest.h +++ b/Foundation/testsuite/src/ThreadTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ThreadTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/ThreadingTestSuite.h b/Foundation/testsuite/src/ThreadingTestSuite.h index c42a17cb5..fd82d7de3 100644 --- a/Foundation/testsuite/src/ThreadingTestSuite.h +++ b/Foundation/testsuite/src/ThreadingTestSuite.h @@ -16,7 +16,7 @@ #define ThreadingTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ThreadingTestSuite diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp index e21e74401..52418d19b 100644 --- a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp +++ b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp @@ -11,8 +11,8 @@ #include "TimedNotificationQueueTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/TimedNotificationQueue.h" #include "Poco/Notification.h" #include "Poco/Timestamp.h" diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.h b/Foundation/testsuite/src/TimedNotificationQueueTest.h index c5eeb2c7c..ba620579d 100644 --- a/Foundation/testsuite/src/TimedNotificationQueueTest.h +++ b/Foundation/testsuite/src/TimedNotificationQueueTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/TimedNotificationQueue.h" #include "Poco/Mutex.h" #include diff --git a/Foundation/testsuite/src/TimerTest.cpp b/Foundation/testsuite/src/TimerTest.cpp index ecdef30be..1707a8562 100644 --- a/Foundation/testsuite/src/TimerTest.cpp +++ b/Foundation/testsuite/src/TimerTest.cpp @@ -11,8 +11,8 @@ #include "TimerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Thread.h" #include "Poco/Stopwatch.h" diff --git a/Foundation/testsuite/src/TimerTest.h b/Foundation/testsuite/src/TimerTest.h index c137a57b3..485d19ce7 100644 --- a/Foundation/testsuite/src/TimerTest.h +++ b/Foundation/testsuite/src/TimerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Timer.h" #include "Poco/Event.h" diff --git a/Foundation/testsuite/src/TimespanTest.cpp b/Foundation/testsuite/src/TimespanTest.cpp index 15e8afc73..1f146ee29 100644 --- a/Foundation/testsuite/src/TimespanTest.cpp +++ b/Foundation/testsuite/src/TimespanTest.cpp @@ -11,8 +11,8 @@ #include "TimespanTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timespan.h" diff --git a/Foundation/testsuite/src/TimespanTest.h b/Foundation/testsuite/src/TimespanTest.h index 962572294..ad565c2a3 100644 --- a/Foundation/testsuite/src/TimespanTest.h +++ b/Foundation/testsuite/src/TimespanTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimespanTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp index 13679f0ff..a4e010ad8 100644 --- a/Foundation/testsuite/src/TimestampTest.cpp +++ b/Foundation/testsuite/src/TimestampTest.cpp @@ -11,8 +11,8 @@ #include "TimestampTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timestamp.h" #include "Poco/Thread.h" diff --git a/Foundation/testsuite/src/TimestampTest.h b/Foundation/testsuite/src/TimestampTest.h index 6ed4c046e..86ffaacfe 100644 --- a/Foundation/testsuite/src/TimestampTest.h +++ b/Foundation/testsuite/src/TimestampTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimestampTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TimezoneTest.cpp b/Foundation/testsuite/src/TimezoneTest.cpp index 53446a1eb..b9b4818d0 100644 --- a/Foundation/testsuite/src/TimezoneTest.cpp +++ b/Foundation/testsuite/src/TimezoneTest.cpp @@ -11,8 +11,8 @@ #include "TimezoneTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Timezone.h" #include diff --git a/Foundation/testsuite/src/TimezoneTest.h b/Foundation/testsuite/src/TimezoneTest.h index 420b6dbbe..ee750d570 100644 --- a/Foundation/testsuite/src/TimezoneTest.h +++ b/Foundation/testsuite/src/TimezoneTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TimezoneTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TuplesTest.cpp b/Foundation/testsuite/src/TuplesTest.cpp index 241f19589..810de7751 100644 --- a/Foundation/testsuite/src/TuplesTest.cpp +++ b/Foundation/testsuite/src/TuplesTest.cpp @@ -11,8 +11,8 @@ #include "TuplesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Tuple.h" #include "Poco/Void.h" #include diff --git a/Foundation/testsuite/src/TuplesTest.h b/Foundation/testsuite/src/TuplesTest.h index 9190f2cd3..c840c837f 100644 --- a/Foundation/testsuite/src/TuplesTest.h +++ b/Foundation/testsuite/src/TuplesTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TuplesTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/TypeListTest.cpp b/Foundation/testsuite/src/TypeListTest.cpp index 02bcdd2b0..e101666b0 100644 --- a/Foundation/testsuite/src/TypeListTest.cpp +++ b/Foundation/testsuite/src/TypeListTest.cpp @@ -11,8 +11,8 @@ #include "TypeListTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Tuple.h" #include "Poco/TypeList.h" #include "Poco/Void.h" diff --git a/Foundation/testsuite/src/TypeListTest.h b/Foundation/testsuite/src/TypeListTest.h index 1aa0c34a6..4be96a227 100644 --- a/Foundation/testsuite/src/TypeListTest.h +++ b/Foundation/testsuite/src/TypeListTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TypeListTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.cpp b/Foundation/testsuite/src/URIStreamOpenerTest.cpp index 80ddb7452..295b715e3 100644 --- a/Foundation/testsuite/src/URIStreamOpenerTest.cpp +++ b/Foundation/testsuite/src/URIStreamOpenerTest.cpp @@ -11,8 +11,8 @@ #include "URIStreamOpenerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/URIStreamOpener.h" #include "Poco/URIStreamFactory.h" #include "Poco/URI.h" diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.h b/Foundation/testsuite/src/URIStreamOpenerTest.h index 2d3543d76..ae781798b 100644 --- a/Foundation/testsuite/src/URIStreamOpenerTest.h +++ b/Foundation/testsuite/src/URIStreamOpenerTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class URIStreamOpenerTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp index e7753f7e2..0a5bd774c 100644 --- a/Foundation/testsuite/src/URITest.cpp +++ b/Foundation/testsuite/src/URITest.cpp @@ -11,8 +11,8 @@ #include "URITest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/URI.h" #include "Poco/Path.h" diff --git a/Foundation/testsuite/src/URITest.h b/Foundation/testsuite/src/URITest.h index 83416c8f6..bec1c6864 100644 --- a/Foundation/testsuite/src/URITest.h +++ b/Foundation/testsuite/src/URITest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class URITest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/URITestSuite.h b/Foundation/testsuite/src/URITestSuite.h index 76d3c574f..244402f03 100644 --- a/Foundation/testsuite/src/URITestSuite.h +++ b/Foundation/testsuite/src/URITestSuite.h @@ -16,7 +16,7 @@ #define URITestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class URITestSuite diff --git a/Foundation/testsuite/src/UTF8StringTest.cpp b/Foundation/testsuite/src/UTF8StringTest.cpp index 1f14fea93..118db736b 100644 --- a/Foundation/testsuite/src/UTF8StringTest.cpp +++ b/Foundation/testsuite/src/UTF8StringTest.cpp @@ -11,8 +11,8 @@ #include "UTF8StringTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UTF8String.h" diff --git a/Foundation/testsuite/src/UTF8StringTest.h b/Foundation/testsuite/src/UTF8StringTest.h index af59a299d..9b57a94f2 100644 --- a/Foundation/testsuite/src/UTF8StringTest.h +++ b/Foundation/testsuite/src/UTF8StringTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UTF8StringTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.cpp b/Foundation/testsuite/src/UUIDGeneratorTest.cpp index 8e69d3e6d..86a84080e 100644 --- a/Foundation/testsuite/src/UUIDGeneratorTest.cpp +++ b/Foundation/testsuite/src/UUIDGeneratorTest.cpp @@ -11,8 +11,8 @@ #include "UUIDGeneratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UUIDGenerator.h" #include "Poco/UUID.h" #include "Poco/SHA1Engine.h" diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.h b/Foundation/testsuite/src/UUIDGeneratorTest.h index b9f93e7d3..49b59335a 100644 --- a/Foundation/testsuite/src/UUIDGeneratorTest.h +++ b/Foundation/testsuite/src/UUIDGeneratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UUIDGeneratorTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDTest.cpp b/Foundation/testsuite/src/UUIDTest.cpp index 613fc0468..a5297608b 100644 --- a/Foundation/testsuite/src/UUIDTest.cpp +++ b/Foundation/testsuite/src/UUIDTest.cpp @@ -11,8 +11,8 @@ #include "UUIDTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UUID.h" #include "Poco/Exception.h" diff --git a/Foundation/testsuite/src/UUIDTest.h b/Foundation/testsuite/src/UUIDTest.h index baf877aca..abef55143 100644 --- a/Foundation/testsuite/src/UUIDTest.h +++ b/Foundation/testsuite/src/UUIDTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UUIDTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UUIDTestSuite.h b/Foundation/testsuite/src/UUIDTestSuite.h index e6e4c3dcb..9f1f6b9a0 100644 --- a/Foundation/testsuite/src/UUIDTestSuite.h +++ b/Foundation/testsuite/src/UUIDTestSuite.h @@ -16,7 +16,7 @@ #define UUIDTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class UUIDTestSuite diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp index 8e8cfbae0..1d26fef62 100644 --- a/Foundation/testsuite/src/UnicodeConverterTest.cpp +++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp @@ -15,8 +15,8 @@ #include "Poco/UnicodeConverter.h" #include "UnicodeConverterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/UTFString.h" diff --git a/Foundation/testsuite/src/UnicodeConverterTest.h b/Foundation/testsuite/src/UnicodeConverterTest.h index 593f19bd1..deac47e6d 100644 --- a/Foundation/testsuite/src/UnicodeConverterTest.h +++ b/Foundation/testsuite/src/UnicodeConverterTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/UnicodeConverter.h" #include "Poco/UTFString.h" #include diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp index 9b95f293b..e992fd745 100644 --- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp +++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp @@ -11,8 +11,8 @@ #include "UniqueExpireCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/UniqueExpireCache.h" #include "Poco/UniqueAccessExpireCache.h" diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.h b/Foundation/testsuite/src/UniqueExpireCacheTest.h index 45071edda..7ee9bf426 100644 --- a/Foundation/testsuite/src/UniqueExpireCacheTest.h +++ b/Foundation/testsuite/src/UniqueExpireCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UniqueExpireCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp index cac8e683f..d63bd3108 100644 --- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp +++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp @@ -11,8 +11,8 @@ #include "UniqueExpireLRUCacheTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/UniqueExpireLRUCache.h" #include "Poco/UniqueAccessExpireLRUCache.h" diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h index bcacfbe75..bf6249088 100644 --- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h +++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h @@ -16,7 +16,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class UniqueExpireLRUCacheTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp index 10d7d6271..e1743f985 100644 --- a/Foundation/testsuite/src/VarTest.cpp +++ b/Foundation/testsuite/src/VarTest.cpp @@ -11,8 +11,8 @@ #include "VarTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Exception.h" #include "Poco/Dynamic/Var.h" #include "Poco/Bugcheck.h" diff --git a/Foundation/testsuite/src/VarTest.h b/Foundation/testsuite/src/VarTest.h index f911042d5..00bcdd9ca 100644 --- a/Foundation/testsuite/src/VarTest.h +++ b/Foundation/testsuite/src/VarTest.h @@ -19,7 +19,7 @@ #include "Poco/Dynamic/Var.h" #include "Poco/Dynamic/VarIterator.h" #include "Poco/Exception.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class VarTest: public CppUnit::TestCase diff --git a/Foundation/testsuite/src/WinCEDriver.cpp b/Foundation/testsuite/src/WinCEDriver.cpp index b1f6076f1..f0a24df66 100644 --- a/Foundation/testsuite/src/WinCEDriver.cpp +++ b/Foundation/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "FoundationTestSuite.h" #include diff --git a/Foundation/testsuite/src/ZLibTest.cpp b/Foundation/testsuite/src/ZLibTest.cpp index c7dad81bf..44656eb7e 100644 --- a/Foundation/testsuite/src/ZLibTest.cpp +++ b/Foundation/testsuite/src/ZLibTest.cpp @@ -11,8 +11,8 @@ #include "ZLibTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/InflatingStream.h" #include "Poco/DeflatingStream.h" #include "Poco/MemoryStream.h" diff --git a/Foundation/testsuite/src/ZLibTest.h b/Foundation/testsuite/src/ZLibTest.h index ab2f2a49d..0150afd14 100644 --- a/Foundation/testsuite/src/ZLibTest.h +++ b/Foundation/testsuite/src/ZLibTest.h @@ -17,7 +17,7 @@ #include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ZLibTest: public CppUnit::TestCase diff --git a/JSON/testsuite/CMakeLists.txt b/JSON/testsuite/CMakeLists.txt index 7ef42b406..ef4a852ed 100644 --- a/JSON/testsuite/CMakeLists.txt +++ b/JSON/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoJSON PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoJSON PocoFoundation PocoCppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/JSON/testsuite/Makefile b/JSON/testsuite/Makefile index 0514f380f..c8db2ae41 100644 --- a/JSON/testsuite/Makefile +++ b/JSON/testsuite/Makefile @@ -12,7 +12,7 @@ objects = Driver JSONTest JSONTestSuite target = testrunner target_version = 1 -target_libs = PocoJSON PocoFoundation CppUnit +target_libs = PocoJSON PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj b/JSON/testsuite/TestSuite_vs120.vcxproj index 4d0f4e926..4e92483f9 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj b/JSON/testsuite/TestSuite_x64_vs120.vcxproj index 777a86080..d792a33fb 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/src/Driver.cpp b/JSON/testsuite/src/Driver.cpp index d07c6872e..cc5c44ce5 100644 --- a/JSON/testsuite/src/Driver.cpp +++ b/JSON/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "JSONTestSuite.h" diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index f7be93ff3..6417f9b1d 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -11,8 +11,8 @@ #include "JSONTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Path.h" #include "Poco/Environment.h" #include "Poco/File.h" diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index 1d5fe832f..637de2e50 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -17,7 +17,7 @@ #include "Poco/JSON/JSON.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/JSON/Object.h" #include "Poco/JSON/Parser.h" #include "Poco/JSON/Query.h" diff --git a/JSON/testsuite/src/JSONTestSuite.h b/JSON/testsuite/src/JSONTestSuite.h index 431d80869..1fc0f9c88 100644 --- a/JSON/testsuite/src/JSONTestSuite.h +++ b/JSON/testsuite/src/JSONTestSuite.h @@ -16,7 +16,7 @@ #define JSONTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class JSONTestSuite diff --git a/JSON/testsuite/src/WinCEDriver.cpp b/JSON/testsuite/src/WinCEDriver.cpp index e4a382055..4325fc282 100644 --- a/JSON/testsuite/src/WinCEDriver.cpp +++ b/JSON/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "JSONTestSuite.h" #include diff --git a/Makefile b/Makefile index 6d3f769d8..18d2cdd06 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit diff --git a/MongoDB/testsuite/CMakeLists.txt b/MongoDB/testsuite/CMakeLists.txt index d65c57f61..1f8f3da1a 100644 --- a/MongoDB/testsuite/CMakeLists.txt +++ b/MongoDB/testsuite/CMakeLists.txt @@ -20,4 +20,4 @@ set(TESTUNIT "${LIBNAME}-testrunner") add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoMongoDB PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoMongoDB PocoFoundation PocoCppUnit ) diff --git a/MongoDB/testsuite/Makefile b/MongoDB/testsuite/Makefile index 131145907..4fa053760 100644 --- a/MongoDB/testsuite/Makefile +++ b/MongoDB/testsuite/Makefile @@ -12,6 +12,6 @@ objects = Driver MongoDBTest MongoDBTestSuite target = testrunner target_version = 1 -target_libs = PocoMongoDB PocoFoundation PocoNet CppUnit +target_libs = PocoMongoDB PocoFoundation PocoNet PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj b/MongoDB/testsuite/TestSuite_vs120.vcxproj index 281dd04d7..dc30ecb7a 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj index 5d44f6868..0d26b83f3 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/src/Driver.cpp b/MongoDB/testsuite/src/Driver.cpp index 82ed47087..fa5817b05 100644 --- a/MongoDB/testsuite/src/Driver.cpp +++ b/MongoDB/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MongoDBTestSuite.h" diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp index e601e7f9b..c3a095fab 100644 --- a/MongoDB/testsuite/src/MongoDBTest.cpp +++ b/MongoDB/testsuite/src/MongoDBTest.cpp @@ -27,8 +27,8 @@ #include "Poco/UUIDGenerator.h" #include "MongoDBTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" using namespace Poco::MongoDB; diff --git a/MongoDB/testsuite/src/MongoDBTest.h b/MongoDB/testsuite/src/MongoDBTest.h index ab2055ec8..0772cac29 100644 --- a/MongoDB/testsuite/src/MongoDBTest.h +++ b/MongoDB/testsuite/src/MongoDBTest.h @@ -19,7 +19,7 @@ #include "Poco/MongoDB/MongoDB.h" #include "Poco/MongoDB/Connection.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MongoDBTest: public CppUnit::TestCase diff --git a/MongoDB/testsuite/src/MongoDBTestSuite.h b/MongoDB/testsuite/src/MongoDBTestSuite.h index 78fe83e61..493802908 100644 --- a/MongoDB/testsuite/src/MongoDBTestSuite.h +++ b/MongoDB/testsuite/src/MongoDBTestSuite.h @@ -16,7 +16,7 @@ #define MongoDBTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MongoDBTestSuite diff --git a/MongoDB/testsuite/src/WinCEDriver.cpp b/MongoDB/testsuite/src/WinCEDriver.cpp index 4eb5b6801..1b9f5306e 100644 --- a/MongoDB/testsuite/src/WinCEDriver.cpp +++ b/MongoDB/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "MongoDBTestSuite.h" #include diff --git a/Net/testsuite/CMakeLists.txt b/Net/testsuite/CMakeLists.txt index 6f3585ccc..fdab1eb8a 100644 --- a/Net/testsuite/CMakeLists.txt +++ b/Net/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index 1f0d65f31..a145759a0 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -32,7 +32,7 @@ objects = \ target = testrunner target_version = 1 -target_libs = PocoNet PocoFoundation CppUnit +target_libs = PocoNet PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj index 1cb4fe2d9..3725063ec 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj +++ b/Net/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj index 160e63693..ad65cc320 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/src/DNSTest.cpp b/Net/testsuite/src/DNSTest.cpp index c230e7883..559cad4e0 100644 --- a/Net/testsuite/src/DNSTest.cpp +++ b/Net/testsuite/src/DNSTest.cpp @@ -11,8 +11,8 @@ #include "DNSTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/DNS.h" #include "Poco/Net/HostEntry.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/DNSTest.h b/Net/testsuite/src/DNSTest.h index e940585e3..a40f92f06 100644 --- a/Net/testsuite/src/DNSTest.h +++ b/Net/testsuite/src/DNSTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DNSTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/DatagramSocketTest.cpp b/Net/testsuite/src/DatagramSocketTest.cpp index 7d676bf0a..e9d516daf 100644 --- a/Net/testsuite/src/DatagramSocketTest.cpp +++ b/Net/testsuite/src/DatagramSocketTest.cpp @@ -11,8 +11,8 @@ #include "DatagramSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "UDPEchoServer.h" #include "Poco/Net/DatagramSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/DatagramSocketTest.h b/Net/testsuite/src/DatagramSocketTest.h index a702b869b..e315307b3 100644 --- a/Net/testsuite/src/DatagramSocketTest.h +++ b/Net/testsuite/src/DatagramSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DatagramSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/DialogSocketTest.cpp b/Net/testsuite/src/DialogSocketTest.cpp index 156b04dcc..f9c895d12 100644 --- a/Net/testsuite/src/DialogSocketTest.cpp +++ b/Net/testsuite/src/DialogSocketTest.cpp @@ -11,8 +11,8 @@ #include "DialogSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/DialogSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/DialogSocketTest.h b/Net/testsuite/src/DialogSocketTest.h index 93ac0171c..d91dd802a 100644 --- a/Net/testsuite/src/DialogSocketTest.h +++ b/Net/testsuite/src/DialogSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DialogSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/Driver.cpp b/Net/testsuite/src/Driver.cpp index e459d3986..3c379115a 100644 --- a/Net/testsuite/src/Driver.cpp +++ b/Net/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetTestSuite.h" diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp index c3ef9f46d..062104265 100644 --- a/Net/testsuite/src/FTPClientSessionTest.cpp +++ b/Net/testsuite/src/FTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "FTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/FTPClientSession.h" #include "Poco/Net/DialogSocket.h" diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h index 6e6fa238e..5b700355f 100644 --- a/Net/testsuite/src/FTPClientSessionTest.h +++ b/Net/testsuite/src/FTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" namespace Poco { diff --git a/Net/testsuite/src/FTPClientTestSuite.h b/Net/testsuite/src/FTPClientTestSuite.h index 4b573d02b..3f5631858 100644 --- a/Net/testsuite/src/FTPClientTestSuite.h +++ b/Net/testsuite/src/FTPClientTestSuite.h @@ -16,7 +16,7 @@ #define FTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class FTPClientTestSuite diff --git a/Net/testsuite/src/FTPStreamFactoryTest.cpp b/Net/testsuite/src/FTPStreamFactoryTest.cpp index 2b0bec91c..1a7e78d94 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/FTPStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "FTPStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/FTPStreamFactory.h" #include "Poco/Net/DialogSocket.h" diff --git a/Net/testsuite/src/FTPStreamFactoryTest.h b/Net/testsuite/src/FTPStreamFactoryTest.h index 07e067bec..af90f10a5 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.h +++ b/Net/testsuite/src/FTPStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class FTPStreamFactoryTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTMLFormTest.cpp b/Net/testsuite/src/HTMLFormTest.cpp index 2289a026d..6966d50ad 100644 --- a/Net/testsuite/src/HTMLFormTest.cpp +++ b/Net/testsuite/src/HTMLFormTest.cpp @@ -11,8 +11,8 @@ #include "HTMLFormTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTMLForm.h" #include "Poco/Net/PartSource.h" #include "Poco/Net/StringPartSource.h" diff --git a/Net/testsuite/src/HTMLFormTest.h b/Net/testsuite/src/HTMLFormTest.h index 6c09421ee..e4ad6c41f 100644 --- a/Net/testsuite/src/HTMLFormTest.h +++ b/Net/testsuite/src/HTMLFormTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTMLFormTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTMLTestSuite.h b/Net/testsuite/src/HTMLTestSuite.h index 2e87a28fa..242c81107 100644 --- a/Net/testsuite/src/HTMLTestSuite.h +++ b/Net/testsuite/src/HTMLTestSuite.h @@ -16,7 +16,7 @@ #define HTMLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTMLTestSuite diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index 0903f2627..87a31d697 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/Net/testsuite/src/HTTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" diff --git a/Net/testsuite/src/HTTPClientSessionTest.h b/Net/testsuite/src/HTTPClientSessionTest.h index 09824f7cf..4028db75f 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.h +++ b/Net/testsuite/src/HTTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPClientTestSuite.h b/Net/testsuite/src/HTTPClientTestSuite.h index 12eef6add..d02ef56b3 100644 --- a/Net/testsuite/src/HTTPClientTestSuite.h +++ b/Net/testsuite/src/HTTPClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPClientTestSuite diff --git a/Net/testsuite/src/HTTPCookieTest.cpp b/Net/testsuite/src/HTTPCookieTest.cpp index 65aebfdf3..c0d1f74d6 100644 --- a/Net/testsuite/src/HTTPCookieTest.cpp +++ b/Net/testsuite/src/HTTPCookieTest.cpp @@ -11,8 +11,8 @@ #include "HTTPCookieTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPCookie.h" #include "Poco/Timestamp.h" #include "Poco/Timespan.h" diff --git a/Net/testsuite/src/HTTPCookieTest.h b/Net/testsuite/src/HTTPCookieTest.h index a5900a46b..a2cd3d16a 100644 --- a/Net/testsuite/src/HTTPCookieTest.h +++ b/Net/testsuite/src/HTTPCookieTest.h @@ -18,7 +18,7 @@ #include "Poco/Net/Net.h" #include "Poco/DateTime.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPCookieTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPCredentialsTest.cpp b/Net/testsuite/src/HTTPCredentialsTest.cpp index d91351e3c..9741bd7b9 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.cpp +++ b/Net/testsuite/src/HTTPCredentialsTest.cpp @@ -11,8 +11,8 @@ #include "HTTPCredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/HTTPBasicCredentials.h" diff --git a/Net/testsuite/src/HTTPCredentialsTest.h b/Net/testsuite/src/HTTPCredentialsTest.h index 4f0d3ac8a..daced6ba3 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.h +++ b/Net/testsuite/src/HTTPCredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPCredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPRequestTest.cpp b/Net/testsuite/src/HTTPRequestTest.cpp index 1180d529a..ff72cad0d 100644 --- a/Net/testsuite/src/HTTPRequestTest.cpp +++ b/Net/testsuite/src/HTTPRequestTest.cpp @@ -11,8 +11,8 @@ #include "HTTPRequestTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/NetException.h" #include diff --git a/Net/testsuite/src/HTTPRequestTest.h b/Net/testsuite/src/HTTPRequestTest.h index cc389e659..12759606d 100644 --- a/Net/testsuite/src/HTTPRequestTest.h +++ b/Net/testsuite/src/HTTPRequestTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPRequestTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPResponseTest.cpp b/Net/testsuite/src/HTTPResponseTest.cpp index 424ecfd5a..49b865e1c 100644 --- a/Net/testsuite/src/HTTPResponseTest.cpp +++ b/Net/testsuite/src/HTTPResponseTest.cpp @@ -11,8 +11,8 @@ #include "HTTPResponseTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/HTTPCookie.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/HTTPResponseTest.h b/Net/testsuite/src/HTTPResponseTest.h index 9cd342041..59c69f3a0 100644 --- a/Net/testsuite/src/HTTPResponseTest.h +++ b/Net/testsuite/src/HTTPResponseTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPResponseTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPServerTest.cpp b/Net/testsuite/src/HTTPServerTest.cpp index 0479cc1b1..7dc31b554 100644 --- a/Net/testsuite/src/HTTPServerTest.cpp +++ b/Net/testsuite/src/HTTPServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/AbstractHTTPRequestHandler.h" diff --git a/Net/testsuite/src/HTTPServerTest.h b/Net/testsuite/src/HTTPServerTest.h index 033d10f89..839a330a7 100644 --- a/Net/testsuite/src/HTTPServerTest.h +++ b/Net/testsuite/src/HTTPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPServerTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPServerTestSuite.h b/Net/testsuite/src/HTTPServerTestSuite.h index c5fb36306..e483185eb 100644 --- a/Net/testsuite/src/HTTPServerTestSuite.h +++ b/Net/testsuite/src/HTTPServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPServerTestSuite diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.cpp b/Net/testsuite/src/HTTPStreamFactoryTest.cpp index 45e7d9b2f..9c513e87f 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/HTTPStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/URI.h" diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.h b/Net/testsuite/src/HTTPStreamFactoryTest.h index a05b4479c..d01e64999 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.h +++ b/Net/testsuite/src/HTTPStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPStreamFactoryTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/HTTPTestSuite.h b/Net/testsuite/src/HTTPTestSuite.h index b2151615d..9def3b5c0 100644 --- a/Net/testsuite/src/HTTPTestSuite.h +++ b/Net/testsuite/src/HTTPTestSuite.h @@ -16,7 +16,7 @@ #define HTTPTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPTestSuite diff --git a/Net/testsuite/src/ICMPClientTest.cpp b/Net/testsuite/src/ICMPClientTest.cpp index c20766703..1ac1923a8 100644 --- a/Net/testsuite/src/ICMPClientTest.cpp +++ b/Net/testsuite/src/ICMPClientTest.cpp @@ -11,8 +11,8 @@ #include "ICMPClientTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/ICMPSocket.h" #include "Poco/Net/ICMPClient.h" #include "Poco/Net/ICMPEventArgs.h" diff --git a/Net/testsuite/src/ICMPClientTest.h b/Net/testsuite/src/ICMPClientTest.h index 32c84cb15..c19731b05 100644 --- a/Net/testsuite/src/ICMPClientTest.h +++ b/Net/testsuite/src/ICMPClientTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Net/ICMPClient.h" #include "Poco/Net/ICMPEventArgs.h" diff --git a/Net/testsuite/src/ICMPClientTestSuite.h b/Net/testsuite/src/ICMPClientTestSuite.h index 2d3e80501..1244e8520 100644 --- a/Net/testsuite/src/ICMPClientTestSuite.h +++ b/Net/testsuite/src/ICMPClientTestSuite.h @@ -16,7 +16,7 @@ #define ICMPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ICMPClientTestSuite diff --git a/Net/testsuite/src/ICMPSocketTest.cpp b/Net/testsuite/src/ICMPSocketTest.cpp index 7611a1cd6..8906f3951 100644 --- a/Net/testsuite/src/ICMPSocketTest.cpp +++ b/Net/testsuite/src/ICMPSocketTest.cpp @@ -11,8 +11,8 @@ #include "ICMPSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "UDPEchoServer.h" #include "Poco/Net/ICMPSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/ICMPSocketTest.h b/Net/testsuite/src/ICMPSocketTest.h index 2508924fb..413fd6866 100644 --- a/Net/testsuite/src/ICMPSocketTest.h +++ b/Net/testsuite/src/ICMPSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ICMPSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/IPAddressTest.cpp b/Net/testsuite/src/IPAddressTest.cpp index 8f122dc6e..e80db2dd0 100644 --- a/Net/testsuite/src/IPAddressTest.cpp +++ b/Net/testsuite/src/IPAddressTest.cpp @@ -11,8 +11,8 @@ #include "IPAddressTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/IPAddress.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/IPAddressTest.h b/Net/testsuite/src/IPAddressTest.h index 27837c354..0f53e5a5a 100644 --- a/Net/testsuite/src/IPAddressTest.h +++ b/Net/testsuite/src/IPAddressTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class IPAddressTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp index 5fd56def7..bf2c95585 100644 --- a/Net/testsuite/src/MailMessageTest.cpp +++ b/Net/testsuite/src/MailMessageTest.cpp @@ -11,8 +11,8 @@ #include "MailMessageTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MailMessage.h" #include "Poco/Net/MailRecipient.h" #include "Poco/Net/PartHandler.h" diff --git a/Net/testsuite/src/MailMessageTest.h b/Net/testsuite/src/MailMessageTest.h index c52be7f07..11596fa49 100644 --- a/Net/testsuite/src/MailMessageTest.h +++ b/Net/testsuite/src/MailMessageTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MailMessageTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailStreamTest.cpp b/Net/testsuite/src/MailStreamTest.cpp index 6ab95602a..30565db9c 100644 --- a/Net/testsuite/src/MailStreamTest.cpp +++ b/Net/testsuite/src/MailStreamTest.cpp @@ -11,8 +11,8 @@ #include "MailStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MailStream.h" #include "Poco/StreamCopier.h" #include diff --git a/Net/testsuite/src/MailStreamTest.h b/Net/testsuite/src/MailStreamTest.h index 57bda1998..6208da543 100644 --- a/Net/testsuite/src/MailStreamTest.h +++ b/Net/testsuite/src/MailStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MailStreamTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MailTestSuite.h b/Net/testsuite/src/MailTestSuite.h index 44a2a3037..580551a83 100644 --- a/Net/testsuite/src/MailTestSuite.h +++ b/Net/testsuite/src/MailTestSuite.h @@ -16,7 +16,7 @@ #define MailTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MailTestSuite diff --git a/Net/testsuite/src/MediaTypeTest.cpp b/Net/testsuite/src/MediaTypeTest.cpp index 50e1158c1..6a2e717b3 100644 --- a/Net/testsuite/src/MediaTypeTest.cpp +++ b/Net/testsuite/src/MediaTypeTest.cpp @@ -11,8 +11,8 @@ #include "MediaTypeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MediaType.h" diff --git a/Net/testsuite/src/MediaTypeTest.h b/Net/testsuite/src/MediaTypeTest.h index 7a8030126..b76948d89 100644 --- a/Net/testsuite/src/MediaTypeTest.h +++ b/Net/testsuite/src/MediaTypeTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MediaTypeTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp index 793119f02..86552bcfa 100644 --- a/Net/testsuite/src/MessageHeaderTest.cpp +++ b/Net/testsuite/src/MessageHeaderTest.cpp @@ -11,8 +11,8 @@ #include "MessageHeaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MessageHeader.h" #include "Poco/Net/NetException.h" #include diff --git a/Net/testsuite/src/MessageHeaderTest.h b/Net/testsuite/src/MessageHeaderTest.h index 156db25ed..c477b9208 100644 --- a/Net/testsuite/src/MessageHeaderTest.h +++ b/Net/testsuite/src/MessageHeaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MessageHeaderTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MessagesTestSuite.h b/Net/testsuite/src/MessagesTestSuite.h index 4da02b45d..75c897094 100644 --- a/Net/testsuite/src/MessagesTestSuite.h +++ b/Net/testsuite/src/MessagesTestSuite.h @@ -16,7 +16,7 @@ #define MessagesTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class MessagesTestSuite diff --git a/Net/testsuite/src/MulticastSocketTest.cpp b/Net/testsuite/src/MulticastSocketTest.cpp index 7191e2071..da178f104 100644 --- a/Net/testsuite/src/MulticastSocketTest.cpp +++ b/Net/testsuite/src/MulticastSocketTest.cpp @@ -16,8 +16,8 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "MulticastEchoServer.h" #include "Poco/Net/MulticastSocket.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/MulticastSocketTest.h b/Net/testsuite/src/MulticastSocketTest.h index dcdea0cab..f017e78e7 100644 --- a/Net/testsuite/src/MulticastSocketTest.h +++ b/Net/testsuite/src/MulticastSocketTest.h @@ -22,7 +22,7 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MulticastSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MultipartReaderTest.cpp b/Net/testsuite/src/MultipartReaderTest.cpp index a409e18e6..d34a0e42c 100644 --- a/Net/testsuite/src/MultipartReaderTest.cpp +++ b/Net/testsuite/src/MultipartReaderTest.cpp @@ -11,8 +11,8 @@ #include "MultipartReaderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MultipartReader.h" #include "Poco/Net/MessageHeader.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/MultipartReaderTest.h b/Net/testsuite/src/MultipartReaderTest.h index 3985423cd..6962095cf 100644 --- a/Net/testsuite/src/MultipartReaderTest.h +++ b/Net/testsuite/src/MultipartReaderTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MultipartReaderTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/MultipartWriterTest.cpp b/Net/testsuite/src/MultipartWriterTest.cpp index 80beeb59c..62da0d066 100644 --- a/Net/testsuite/src/MultipartWriterTest.cpp +++ b/Net/testsuite/src/MultipartWriterTest.cpp @@ -11,8 +11,8 @@ #include "MultipartWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/MultipartWriter.h" #include "Poco/Net/MessageHeader.h" #include diff --git a/Net/testsuite/src/MultipartWriterTest.h b/Net/testsuite/src/MultipartWriterTest.h index 0a4b55a57..96813c834 100644 --- a/Net/testsuite/src/MultipartWriterTest.h +++ b/Net/testsuite/src/MultipartWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class MultipartWriterTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/NTPClientTest.cpp b/Net/testsuite/src/NTPClientTest.cpp index 71b4a8418..64aa40724 100644 --- a/Net/testsuite/src/NTPClientTest.cpp +++ b/Net/testsuite/src/NTPClientTest.cpp @@ -11,8 +11,8 @@ #include "NTPClientTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NTPClient.h" #include "Poco/Net/NTPEventArgs.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/NTPClientTest.h b/Net/testsuite/src/NTPClientTest.h index 3c71d8d16..33344e039 100644 --- a/Net/testsuite/src/NTPClientTest.h +++ b/Net/testsuite/src/NTPClientTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Net/NTPClient.h" #include "Poco/Net/NTPEventArgs.h" diff --git a/Net/testsuite/src/NTPClientTestSuite.h b/Net/testsuite/src/NTPClientTestSuite.h index dcafdb3e4..6e5bcc3ea 100644 --- a/Net/testsuite/src/NTPClientTestSuite.h +++ b/Net/testsuite/src/NTPClientTestSuite.h @@ -16,7 +16,7 @@ #define NTPClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NTPClientTestSuite diff --git a/Net/testsuite/src/NameValueCollectionTest.cpp b/Net/testsuite/src/NameValueCollectionTest.cpp index 7bf30e328..d800673b4 100644 --- a/Net/testsuite/src/NameValueCollectionTest.cpp +++ b/Net/testsuite/src/NameValueCollectionTest.cpp @@ -11,8 +11,8 @@ #include "NameValueCollectionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NameValueCollection.h" #include "Poco/Exception.h" diff --git a/Net/testsuite/src/NameValueCollectionTest.h b/Net/testsuite/src/NameValueCollectionTest.h index 947f932c3..a6af74e2b 100644 --- a/Net/testsuite/src/NameValueCollectionTest.h +++ b/Net/testsuite/src/NameValueCollectionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NameValueCollectionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/NetCoreTestSuite.h b/Net/testsuite/src/NetCoreTestSuite.h index f7f6c03da..eb2d86008 100644 --- a/Net/testsuite/src/NetCoreTestSuite.h +++ b/Net/testsuite/src/NetCoreTestSuite.h @@ -16,7 +16,7 @@ #define NetCoreTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetCoreTestSuite diff --git a/Net/testsuite/src/NetTestSuite.h b/Net/testsuite/src/NetTestSuite.h index 9b04efad8..93734700d 100644 --- a/Net/testsuite/src/NetTestSuite.h +++ b/Net/testsuite/src/NetTestSuite.h @@ -16,7 +16,7 @@ #define NetTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetTestSuite diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index 2214396b7..7f828f565 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/Net/testsuite/src/NetworkInterfaceTest.cpp @@ -16,8 +16,8 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/NetworkInterface.h" #include "Poco/Net/IPAddress.h" #include diff --git a/Net/testsuite/src/NetworkInterfaceTest.h b/Net/testsuite/src/NetworkInterfaceTest.h index a71d8f873..d286054af 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.h +++ b/Net/testsuite/src/NetworkInterfaceTest.h @@ -22,7 +22,7 @@ #ifdef POCO_NET_HAS_INTERFACE -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NetworkInterfaceTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuth10CredentialsTest.cpp b/Net/testsuite/src/OAuth10CredentialsTest.cpp index c47b8ba6e..ad546419e 100644 --- a/Net/testsuite/src/OAuth10CredentialsTest.cpp +++ b/Net/testsuite/src/OAuth10CredentialsTest.cpp @@ -11,8 +11,8 @@ #include "OAuth10CredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPResponse.h" #include "Poco/Net/OAuth10Credentials.h" diff --git a/Net/testsuite/src/OAuth10CredentialsTest.h b/Net/testsuite/src/OAuth10CredentialsTest.h index eb035426f..028bd5892 100644 --- a/Net/testsuite/src/OAuth10CredentialsTest.h +++ b/Net/testsuite/src/OAuth10CredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OAuth10CredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuth20CredentialsTest.cpp b/Net/testsuite/src/OAuth20CredentialsTest.cpp index 6735cf0f8..8f0594720 100644 --- a/Net/testsuite/src/OAuth20CredentialsTest.cpp +++ b/Net/testsuite/src/OAuth20CredentialsTest.cpp @@ -11,8 +11,8 @@ #include "OAuth20CredentialsTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/OAuth20Credentials.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/OAuth20CredentialsTest.h b/Net/testsuite/src/OAuth20CredentialsTest.h index f146d456f..3932195e0 100644 --- a/Net/testsuite/src/OAuth20CredentialsTest.h +++ b/Net/testsuite/src/OAuth20CredentialsTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OAuth20CredentialsTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/OAuthTestSuite.h b/Net/testsuite/src/OAuthTestSuite.h index 7ecb345f3..5d790ec79 100644 --- a/Net/testsuite/src/OAuthTestSuite.h +++ b/Net/testsuite/src/OAuthTestSuite.h @@ -16,7 +16,7 @@ #define OAuthTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class OAuthTestSuite diff --git a/Net/testsuite/src/POP3ClientSessionTest.cpp b/Net/testsuite/src/POP3ClientSessionTest.cpp index 61dd7112b..b9b0b23a3 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.cpp +++ b/Net/testsuite/src/POP3ClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "POP3ClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/POP3ClientSession.h" #include "Poco/Net/MailMessage.h" diff --git a/Net/testsuite/src/POP3ClientSessionTest.h b/Net/testsuite/src/POP3ClientSessionTest.h index 8303f6efa..944cecfd9 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.h +++ b/Net/testsuite/src/POP3ClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class POP3ClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/QuotedPrintableTest.cpp b/Net/testsuite/src/QuotedPrintableTest.cpp index 78c6e1b11..d2b371fd6 100644 --- a/Net/testsuite/src/QuotedPrintableTest.cpp +++ b/Net/testsuite/src/QuotedPrintableTest.cpp @@ -11,8 +11,8 @@ #include "QuotedPrintableTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/QuotedPrintableEncoder.h" #include "Poco/Net/QuotedPrintableDecoder.h" #include diff --git a/Net/testsuite/src/QuotedPrintableTest.h b/Net/testsuite/src/QuotedPrintableTest.h index 57f992d06..2dabe8b45 100644 --- a/Net/testsuite/src/QuotedPrintableTest.h +++ b/Net/testsuite/src/QuotedPrintableTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class QuotedPrintableTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/RawSocketTest.cpp b/Net/testsuite/src/RawSocketTest.cpp index 2dc9c1d17..b043066af 100644 --- a/Net/testsuite/src/RawSocketTest.cpp +++ b/Net/testsuite/src/RawSocketTest.cpp @@ -11,8 +11,8 @@ #include "RawSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/RawSocket.h" #include "Poco/Net/RawSocketImpl.h" #include "Poco/Net/SocketAddress.h" diff --git a/Net/testsuite/src/RawSocketTest.h b/Net/testsuite/src/RawSocketTest.h index a13bcec56..c159c5882 100644 --- a/Net/testsuite/src/RawSocketTest.h +++ b/Net/testsuite/src/RawSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class RawSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/ReactorTestSuite.h b/Net/testsuite/src/ReactorTestSuite.h index 064a6fc9a..55705b9ce 100644 --- a/Net/testsuite/src/ReactorTestSuite.h +++ b/Net/testsuite/src/ReactorTestSuite.h @@ -16,7 +16,7 @@ #define ReactorTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ReactorTestSuite diff --git a/Net/testsuite/src/SMTPClientSessionTest.cpp b/Net/testsuite/src/SMTPClientSessionTest.cpp index bd785088e..a36f75e91 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.cpp +++ b/Net/testsuite/src/SMTPClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "SMTPClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "DialogServer.h" #include "Poco/Net/SMTPClientSession.h" #include "Poco/Net/MailMessage.h" diff --git a/Net/testsuite/src/SMTPClientSessionTest.h b/Net/testsuite/src/SMTPClientSessionTest.h index 6d8961c59..f083790ae 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.h +++ b/Net/testsuite/src/SMTPClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SMTPClientSessionTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketAddressTest.cpp b/Net/testsuite/src/SocketAddressTest.cpp index e54cedb21..fabf0b251 100644 --- a/Net/testsuite/src/SocketAddressTest.cpp +++ b/Net/testsuite/src/SocketAddressTest.cpp @@ -11,8 +11,8 @@ #include "SocketAddressTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/SocketAddress.h" #include "Poco/Net/NetException.h" diff --git a/Net/testsuite/src/SocketAddressTest.h b/Net/testsuite/src/SocketAddressTest.h index 2faa081c5..0235fc8dc 100644 --- a/Net/testsuite/src/SocketAddressTest.h +++ b/Net/testsuite/src/SocketAddressTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketAddressTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketReactorTest.cpp b/Net/testsuite/src/SocketReactorTest.cpp index fce4a70c7..938d900b1 100644 --- a/Net/testsuite/src/SocketReactorTest.cpp +++ b/Net/testsuite/src/SocketReactorTest.cpp @@ -11,8 +11,8 @@ #include "SocketReactorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/SocketReactor.h" #include "Poco/Net/SocketNotification.h" #include "Poco/Net/SocketConnector.h" diff --git a/Net/testsuite/src/SocketReactorTest.h b/Net/testsuite/src/SocketReactorTest.h index 6f3d13817..9e4dff90f 100644 --- a/Net/testsuite/src/SocketReactorTest.h +++ b/Net/testsuite/src/SocketReactorTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketReactorTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketStreamTest.cpp b/Net/testsuite/src/SocketStreamTest.cpp index e016e7f1f..8c9d15338 100644 --- a/Net/testsuite/src/SocketStreamTest.cpp +++ b/Net/testsuite/src/SocketStreamTest.cpp @@ -11,8 +11,8 @@ #include "SocketStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/StreamSocket.h" diff --git a/Net/testsuite/src/SocketStreamTest.h b/Net/testsuite/src/SocketStreamTest.h index 00f24363a..93ea5c4c9 100644 --- a/Net/testsuite/src/SocketStreamTest.h +++ b/Net/testsuite/src/SocketStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketStreamTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp index 4c8603c15..c0030e9c2 100644 --- a/Net/testsuite/src/SocketTest.cpp +++ b/Net/testsuite/src/SocketTest.cpp @@ -11,8 +11,8 @@ #include "SocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "EchoServer.h" #include "Poco/Net/StreamSocket.h" #include "Poco/Net/ServerSocket.h" diff --git a/Net/testsuite/src/SocketTest.h b/Net/testsuite/src/SocketTest.h index 0b29662c0..a249aefc1 100644 --- a/Net/testsuite/src/SocketTest.h +++ b/Net/testsuite/src/SocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/SocketsTestSuite.h b/Net/testsuite/src/SocketsTestSuite.h index 29efbe228..1aa0891b1 100644 --- a/Net/testsuite/src/SocketsTestSuite.h +++ b/Net/testsuite/src/SocketsTestSuite.h @@ -16,7 +16,7 @@ #define SocketsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SocketsTestSuite diff --git a/Net/testsuite/src/SyslogTest.cpp b/Net/testsuite/src/SyslogTest.cpp index 1d3954946..51e7b05d7 100644 --- a/Net/testsuite/src/SyslogTest.cpp +++ b/Net/testsuite/src/SyslogTest.cpp @@ -11,8 +11,8 @@ #include "SyslogTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/RemoteSyslogChannel.h" #include "Poco/Net/RemoteSyslogListener.h" #include "Poco/Net/DNS.h" diff --git a/Net/testsuite/src/SyslogTest.h b/Net/testsuite/src/SyslogTest.h index cb4c9ea93..fcf66ff95 100644 --- a/Net/testsuite/src/SyslogTest.h +++ b/Net/testsuite/src/SyslogTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SyslogTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/TCPServerTest.cpp b/Net/testsuite/src/TCPServerTest.cpp index d0d8c49b4..9f11d461e 100644 --- a/Net/testsuite/src/TCPServerTest.cpp +++ b/Net/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/Net/testsuite/src/TCPServerTest.h b/Net/testsuite/src/TCPServerTest.h index 5ef556c46..138a970ff 100644 --- a/Net/testsuite/src/TCPServerTest.h +++ b/Net/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/TCPServerTestSuite.h b/Net/testsuite/src/TCPServerTestSuite.h index 24a10f1ae..0bdf92935 100644 --- a/Net/testsuite/src/TCPServerTestSuite.h +++ b/Net/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp index cd092fd63..72f6dcaf3 100644 --- a/Net/testsuite/src/WebSocketTest.cpp +++ b/Net/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPClientSession.h" diff --git a/Net/testsuite/src/WebSocketTest.h b/Net/testsuite/src/WebSocketTest.h index 07f18a857..0db9f4086 100644 --- a/Net/testsuite/src/WebSocketTest.h +++ b/Net/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/Net/testsuite/src/WebSocketTestSuite.h b/Net/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/Net/testsuite/src/WebSocketTestSuite.h +++ b/Net/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/Net/testsuite/src/WinCEDriver.cpp b/Net/testsuite/src/WinCEDriver.cpp index f2f5742d8..7e449fd1e 100644 --- a/Net/testsuite/src/WinCEDriver.cpp +++ b/Net/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetTestSuite.h" #include diff --git a/NetSSL_OpenSSL/testsuite/CMakeLists.txt b/NetSSL_OpenSSL/testsuite/CMakeLists.txt index 5819a70d9..e3ca71508 100644 --- a/NetSSL_OpenSSL/testsuite/CMakeLists.txt +++ b/NetSSL_OpenSSL/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/NetSSL_OpenSSL/testsuite/Makefile b/NetSSL_OpenSSL/testsuite/Makefile index 02bb9cea3..06082d337 100644 --- a/NetSSL_OpenSSL/testsuite/Makefile +++ b/NetSSL_OpenSSL/testsuite/Makefile @@ -22,6 +22,6 @@ objects = NetSSLTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation CppUnit +target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj index 703ec1e07..31a4b6f49 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj index 7d2e37ebb..344922c71 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/src/Driver.cpp b/NetSSL_OpenSSL/testsuite/src/Driver.cpp index 5e65c53e8..70606a759 100644 --- a/NetSSL_OpenSSL/testsuite/src/Driver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Path.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp index 93d0678dc..c1a420636 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h index 41e89c05e..206921ffc 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSClientSessionTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h index 94f7059da..548d5aa46 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSClientTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp index 7e603dd26..c48855ab2 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h index 7ff9ed68e..68b2c488b 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSServerTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h index cc97bf2c1..a4b6449c5 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSServerTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp index a19c20692..d83cefce8 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h index 13cfba3e0..448472d94 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSStreamFactoryTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h index afc1f5abb..4559e1b3c 100644 --- a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h @@ -16,7 +16,7 @@ #define NetSSLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetSSLTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp index 4a39a1f12..d5b9edd52 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h index 8673230e3..7cc228c4a 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h index 644bb9bf5..950283cd2 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp index 1555d687b..cb84c562f 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPSClientSession.h" diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h index 939acf630..e3212f467 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp index a6cc405f5..3a049cec8 100644 --- a/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/NetSSL_Win/testsuite/CMakeLists.txt b/NetSSL_Win/testsuite/CMakeLists.txt index 5819a70d9..e3ca71508 100644 --- a/NetSSL_Win/testsuite/CMakeLists.txt +++ b/NetSSL_Win/testsuite/CMakeLists.txt @@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation PocoCppUnit) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj index 55cb0766c..547708afd 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj index 20c95e0b3..f96f35d95 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/src/Driver.cpp b/NetSSL_Win/testsuite/src/Driver.cpp index 9a497e4ad..a4cac6424 100644 --- a/NetSSL_Win/testsuite/src/Driver.cpp +++ b/NetSSL_Win/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp index 706b45a7f..f01050459 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSClientSessionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSClientSession.h" #include "Poco/Net/HTTPRequest.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h index fee50dcb2..140606b65 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSClientSessionTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSClientSessionTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h b/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h index dd83f9032..55a42bf69 100644 --- a/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h +++ b/NetSSL_Win/testsuite/src/HTTPSClientTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSClientTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSClientTestSuite diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp index 4df59314a..40af0fbc4 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPServer.h" #include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPRequestHandler.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTest.h b/NetSSL_Win/testsuite/src/HTTPSServerTest.h index dd3062e81..2b3ad7f02 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSServerTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h b/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h index e16548843..0fea1ff6e 100644 --- a/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h +++ b/NetSSL_Win/testsuite/src/HTTPSServerTestSuite.h @@ -16,7 +16,7 @@ #define HTTPSServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class HTTPSServerTestSuite diff --git a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp index ade7c79a4..0d011e309 100644 --- a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -11,8 +11,8 @@ #include "HTTPSStreamFactoryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/HTTPSStreamFactory.h" #include "Poco/Net/NetException.h" #include "Poco/Util/Application.h" diff --git a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h index df195c44a..2d501a0cb 100644 --- a/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h +++ b/NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HTTPSStreamFactoryTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/NetSSLTestSuite.h b/NetSSL_Win/testsuite/src/NetSSLTestSuite.h index 103b0cf51..9b3b3a1fd 100644 --- a/NetSSL_Win/testsuite/src/NetSSLTestSuite.h +++ b/NetSSL_Win/testsuite/src/NetSSLTestSuite.h @@ -16,7 +16,7 @@ #define NetSSLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class NetSSLTestSuite diff --git a/NetSSL_Win/testsuite/src/TCPServerTest.cpp b/NetSSL_Win/testsuite/src/TCPServerTest.cpp index 780510a67..cd3c59cb2 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTest.cpp +++ b/NetSSL_Win/testsuite/src/TCPServerTest.cpp @@ -11,8 +11,8 @@ #include "TCPServerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/TCPServer.h" #include "Poco/Net/TCPServerConnection.h" #include "Poco/Net/TCPServerConnectionFactory.h" diff --git a/NetSSL_Win/testsuite/src/TCPServerTest.h b/NetSSL_Win/testsuite/src/TCPServerTest.h index a71fe40a2..4b52a1dba 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTest.h +++ b/NetSSL_Win/testsuite/src/TCPServerTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TCPServerTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/TCPServerTestSuite.h b/NetSSL_Win/testsuite/src/TCPServerTestSuite.h index e803a85d5..1b304f860 100644 --- a/NetSSL_Win/testsuite/src/TCPServerTestSuite.h +++ b/NetSSL_Win/testsuite/src/TCPServerTestSuite.h @@ -16,7 +16,7 @@ #define TCPServerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TCPServerTestSuite diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.cpp b/NetSSL_Win/testsuite/src/WebSocketTest.cpp index 1555d687b..cb84c562f 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_Win/testsuite/src/WebSocketTest.cpp @@ -11,8 +11,8 @@ #include "WebSocketTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPSClientSession.h" diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.h b/NetSSL_Win/testsuite/src/WebSocketTest.h index 939acf630..e3212f467 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.h +++ b/NetSSL_Win/testsuite/src/WebSocketTest.h @@ -17,7 +17,7 @@ #include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/WebSocketTestSuite.h b/NetSSL_Win/testsuite/src/WebSocketTestSuite.h index 83b5dbb81..17c148393 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTestSuite.h +++ b/NetSSL_Win/testsuite/src/WebSocketTestSuite.h @@ -16,7 +16,7 @@ #define WebSocketTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WebSocketTestSuite diff --git a/NetSSL_Win/testsuite/src/WinCEDriver.cpp b/NetSSL_Win/testsuite/src/WinCEDriver.cpp index 3365f9bc1..e6d9d7a25 100644 --- a/NetSSL_Win/testsuite/src/WinCEDriver.cpp +++ b/NetSSL_Win/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "NetSSLTestSuite.h" #include "Poco/Util/Application.h" #include "Poco/Net/HTTPStreamFactory.h" diff --git a/PDF/testsuite/CMakeLists.txt b/PDF/testsuite/CMakeLists.txt index 79ca02515..6ccf6b057 100644 --- a/PDF/testsuite/CMakeLists.txt +++ b/PDF/testsuite/CMakeLists.txt @@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoPDF PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoPDF PocoFoundation PocoCppUnit ) diff --git a/PDF/testsuite/Makefile b/PDF/testsuite/Makefile index 1508a1aed..81cf471f4 100644 --- a/PDF/testsuite/Makefile +++ b/PDF/testsuite/Makefile @@ -12,6 +12,6 @@ objects = PDFTestSuite Driver PDFTest target = testrunner target_version = 1 -target_libs = PocoPDF PocoFoundation CppUnit +target_libs = PocoPDF PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj b/PDF/testsuite/TestSuite_vs120.vcxproj index f660ce367..b26d7762e 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj b/PDF/testsuite/TestSuite_x64_vs120.vcxproj index e349275ba..85cc48da9 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/src/Driver.cpp b/PDF/testsuite/src/Driver.cpp index c76cb9f36..2478a2027 100644 --- a/PDF/testsuite/src/Driver.cpp +++ b/PDF/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "PDFTestSuite.h" diff --git a/PDF/testsuite/src/PDFTest.cpp b/PDF/testsuite/src/PDFTest.cpp index 3f2483091..437d03f3a 100644 --- a/PDF/testsuite/src/PDFTest.cpp +++ b/PDF/testsuite/src/PDFTest.cpp @@ -11,8 +11,8 @@ #include "PDFTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" PDFTest::PDFTest(const std::string& name): CppUnit::TestCase(name) diff --git a/PDF/testsuite/src/PDFTest.h b/PDF/testsuite/src/PDFTest.h index a639da9d8..9cada4b86 100644 --- a/PDF/testsuite/src/PDFTest.h +++ b/PDF/testsuite/src/PDFTest.h @@ -17,7 +17,7 @@ #include "Poco/PDF/PDF.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PDFTest: public CppUnit::TestCase diff --git a/PDF/testsuite/src/PDFTestSuite.h b/PDF/testsuite/src/PDFTestSuite.h index fc8b28f2c..0ab961d7f 100644 --- a/PDF/testsuite/src/PDFTestSuite.h +++ b/PDF/testsuite/src/PDFTestSuite.h @@ -16,7 +16,7 @@ #define PDFTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class PDFTestSuite diff --git a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp index ddd7a079e..f669bda86 100644 --- a/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp +++ b/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpp @@ -21,7 +21,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net responseStream << "\n"; responseStream << "\n"; responseStream << ""; -#line 6 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" +#line 6 "/cygdrive/z/git/poco-cppunit/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" Poco::DateTime now; std::string dt(Poco::DateTimeFormatter::format(now, "%W, %e %b %y %H:%M:%S %Z")); @@ -33,7 +33,7 @@ void TimeHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net responseStream << "\n"; responseStream << "\n"; responseStream << "

"; -#line 16 "/cygdrive/z/git/poco/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" +#line 16 "/cygdrive/z/git/poco-cppunit/PageCompiler/samples/HTTPTimeServer/src/TimeHandler.cpsp" responseStream << ( dt ); responseStream << "

\n"; responseStream << "\n"; diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template index a77aa9cbc..a193117ca 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template @@ -53,7 +53,7 @@ /> diff --git a/Util/testsuite/CMakeLists.txt b/Util/testsuite/CMakeLists.txt index c65d4565d..4ef22c101 100644 --- a/Util/testsuite/CMakeLists.txt +++ b/Util/testsuite/CMakeLists.txt @@ -24,4 +24,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation PocoCppUnit) diff --git a/Util/testsuite/Makefile b/Util/testsuite/Makefile index e79c22233..7ced5e77f 100644 --- a/Util/testsuite/Makefile +++ b/Util/testsuite/Makefile @@ -21,7 +21,7 @@ objects = AbstractConfigurationTest ConfigurationTestSuite \ target = testrunner target_version = 1 -target_libs = PocoUtil PocoXML PocoJSON PocoFoundation CppUnit +target_libs = PocoUtil PocoXML PocoJSON PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Util/testsuite/TestSuite_vs120.vcxproj b/Util/testsuite/TestSuite_vs120.vcxproj index 165f52350..9bab91003 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj +++ b/Util/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj b/Util/testsuite/TestSuite_x64_vs120.vcxproj index 436a3c6a2..f25dd6945 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/src/AbstractConfigurationTest.cpp b/Util/testsuite/src/AbstractConfigurationTest.cpp index c74ca5c0d..857e00a2b 100644 --- a/Util/testsuite/src/AbstractConfigurationTest.cpp +++ b/Util/testsuite/src/AbstractConfigurationTest.cpp @@ -11,7 +11,7 @@ #include "AbstractConfigurationTest.h" -#include "CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestCaller.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/AbstractConfigurationTest.h b/Util/testsuite/src/AbstractConfigurationTest.h index b6eb0c954..c5cf4ec19 100644 --- a/Util/testsuite/src/AbstractConfigurationTest.h +++ b/Util/testsuite/src/AbstractConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/AutoPtr.h" #include "Poco/Util/AbstractConfiguration.h" diff --git a/Util/testsuite/src/ConfigurationMapperTest.cpp b/Util/testsuite/src/ConfigurationMapperTest.cpp index abf854b70..d900ad1ea 100644 --- a/Util/testsuite/src/ConfigurationMapperTest.cpp +++ b/Util/testsuite/src/ConfigurationMapperTest.cpp @@ -11,8 +11,8 @@ #include "ConfigurationMapperTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/ConfigurationMapper.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/ConfigurationTestSuite.h b/Util/testsuite/src/ConfigurationTestSuite.h index 2bc60fe63..4d3104645 100644 --- a/Util/testsuite/src/ConfigurationTestSuite.h +++ b/Util/testsuite/src/ConfigurationTestSuite.h @@ -16,7 +16,7 @@ #define ConfigurationTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ConfigurationTestSuite diff --git a/Util/testsuite/src/ConfigurationViewTest.cpp b/Util/testsuite/src/ConfigurationViewTest.cpp index db73b4f5b..1dc552bd6 100644 --- a/Util/testsuite/src/ConfigurationViewTest.cpp +++ b/Util/testsuite/src/ConfigurationViewTest.cpp @@ -11,8 +11,8 @@ #include "ConfigurationViewTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/Driver.cpp b/Util/testsuite/src/Driver.cpp index 89e235d55..ad57a8f14 100644 --- a/Util/testsuite/src/Driver.cpp +++ b/Util/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "UtilTestSuite.h" diff --git a/Util/testsuite/src/FilesystemConfigurationTest.cpp b/Util/testsuite/src/FilesystemConfigurationTest.cpp index b2eee7a66..0d8c13dbd 100644 --- a/Util/testsuite/src/FilesystemConfigurationTest.cpp +++ b/Util/testsuite/src/FilesystemConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "FilesystemConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/FilesystemConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/File.h" diff --git a/Util/testsuite/src/HelpFormatterTest.cpp b/Util/testsuite/src/HelpFormatterTest.cpp index 091f57482..309311452 100644 --- a/Util/testsuite/src/HelpFormatterTest.cpp +++ b/Util/testsuite/src/HelpFormatterTest.cpp @@ -11,8 +11,8 @@ #include "HelpFormatterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/HelpFormatter.h" diff --git a/Util/testsuite/src/HelpFormatterTest.h b/Util/testsuite/src/HelpFormatterTest.h index 5b32526d9..b1584dd7a 100644 --- a/Util/testsuite/src/HelpFormatterTest.h +++ b/Util/testsuite/src/HelpFormatterTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class HelpFormatterTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/IniFileConfigurationTest.cpp b/Util/testsuite/src/IniFileConfigurationTest.cpp index 6a8957fbf..2c077d1a5 100644 --- a/Util/testsuite/src/IniFileConfigurationTest.cpp +++ b/Util/testsuite/src/IniFileConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "IniFileConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/IniFileConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp index 0774566ab..91cf14590 100644 --- a/Util/testsuite/src/JSONConfigurationTest.cpp +++ b/Util/testsuite/src/JSONConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "JSONConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/JSONConfiguration.h" #include "Poco/JSON/JSONException.h" diff --git a/Util/testsuite/src/LayeredConfigurationTest.cpp b/Util/testsuite/src/LayeredConfigurationTest.cpp index 693cdcc01..52a2b2c47 100644 --- a/Util/testsuite/src/LayeredConfigurationTest.cpp +++ b/Util/testsuite/src/LayeredConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "LayeredConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/LayeredConfiguration.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/LoggingConfiguratorTest.cpp b/Util/testsuite/src/LoggingConfiguratorTest.cpp index d1dc56668..057e1cbf6 100644 --- a/Util/testsuite/src/LoggingConfiguratorTest.cpp +++ b/Util/testsuite/src/LoggingConfiguratorTest.cpp @@ -11,8 +11,8 @@ #include "LoggingConfiguratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/LoggingConfigurator.h" #include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/LoggingRegistry.h" diff --git a/Util/testsuite/src/LoggingConfiguratorTest.h b/Util/testsuite/src/LoggingConfiguratorTest.h index cbd03a396..7d3074fb3 100644 --- a/Util/testsuite/src/LoggingConfiguratorTest.h +++ b/Util/testsuite/src/LoggingConfiguratorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class LoggingConfiguratorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/MapConfigurationTest.cpp b/Util/testsuite/src/MapConfigurationTest.cpp index 26064e2df..85d6bff70 100644 --- a/Util/testsuite/src/MapConfigurationTest.cpp +++ b/Util/testsuite/src/MapConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "MapConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/MapConfiguration.h" #include "Poco/AutoPtr.h" diff --git a/Util/testsuite/src/OptionProcessorTest.cpp b/Util/testsuite/src/OptionProcessorTest.cpp index 708c64b7c..3b7273817 100644 --- a/Util/testsuite/src/OptionProcessorTest.cpp +++ b/Util/testsuite/src/OptionProcessorTest.cpp @@ -11,8 +11,8 @@ #include "OptionProcessorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/OptionProcessor.h" diff --git a/Util/testsuite/src/OptionProcessorTest.h b/Util/testsuite/src/OptionProcessorTest.h index f8aef18ad..6f99828d2 100644 --- a/Util/testsuite/src/OptionProcessorTest.h +++ b/Util/testsuite/src/OptionProcessorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionProcessorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionSetTest.cpp b/Util/testsuite/src/OptionSetTest.cpp index a4108e9d9..0fc1118ce 100644 --- a/Util/testsuite/src/OptionSetTest.cpp +++ b/Util/testsuite/src/OptionSetTest.cpp @@ -11,8 +11,8 @@ #include "OptionSetTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionException.h" diff --git a/Util/testsuite/src/OptionSetTest.h b/Util/testsuite/src/OptionSetTest.h index e3b806814..37ff9c12a 100644 --- a/Util/testsuite/src/OptionSetTest.h +++ b/Util/testsuite/src/OptionSetTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionSetTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionTest.cpp b/Util/testsuite/src/OptionTest.cpp index 11cdeb2e9..c4d1c1b8f 100644 --- a/Util/testsuite/src/OptionTest.cpp +++ b/Util/testsuite/src/OptionTest.cpp @@ -11,8 +11,8 @@ #include "OptionTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionException.h" diff --git a/Util/testsuite/src/OptionTest.h b/Util/testsuite/src/OptionTest.h index 14e7b246d..d1c1e585a 100644 --- a/Util/testsuite/src/OptionTest.h +++ b/Util/testsuite/src/OptionTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class OptionTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/OptionsTestSuite.h b/Util/testsuite/src/OptionsTestSuite.h index e33e9fae4..40d00f446 100644 --- a/Util/testsuite/src/OptionsTestSuite.h +++ b/Util/testsuite/src/OptionsTestSuite.h @@ -16,7 +16,7 @@ #define OptionsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class OptionsTestSuite diff --git a/Util/testsuite/src/PropertyFileConfigurationTest.cpp b/Util/testsuite/src/PropertyFileConfigurationTest.cpp index 2ecabe9eb..2df77c48b 100644 --- a/Util/testsuite/src/PropertyFileConfigurationTest.cpp +++ b/Util/testsuite/src/PropertyFileConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "PropertyFileConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/SystemConfigurationTest.cpp b/Util/testsuite/src/SystemConfigurationTest.cpp index f5d8d68c1..b8bacdd48 100644 --- a/Util/testsuite/src/SystemConfigurationTest.cpp +++ b/Util/testsuite/src/SystemConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "SystemConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/SystemConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/SystemConfigurationTest.h b/Util/testsuite/src/SystemConfigurationTest.h index 65ee5b77f..5183ec89f 100644 --- a/Util/testsuite/src/SystemConfigurationTest.h +++ b/Util/testsuite/src/SystemConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class SystemConfigurationTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/TimerTest.cpp b/Util/testsuite/src/TimerTest.cpp index 5c4d5ae5c..ce8ea5d1d 100644 --- a/Util/testsuite/src/TimerTest.cpp +++ b/Util/testsuite/src/TimerTest.cpp @@ -11,8 +11,8 @@ #include "TimerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/Timer.h" #include "Poco/Util/TimerTaskAdapter.h" diff --git a/Util/testsuite/src/TimerTest.h b/Util/testsuite/src/TimerTest.h index 6c4d03ef9..369103647 100644 --- a/Util/testsuite/src/TimerTest.h +++ b/Util/testsuite/src/TimerTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/Util/TimerTask.h" #include "Poco/Event.h" diff --git a/Util/testsuite/src/TimerTestSuite.h b/Util/testsuite/src/TimerTestSuite.h index 34b663314..c41d6b944 100644 --- a/Util/testsuite/src/TimerTestSuite.h +++ b/Util/testsuite/src/TimerTestSuite.h @@ -16,7 +16,7 @@ #define TimerTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class TimerTestSuite diff --git a/Util/testsuite/src/UtilTestSuite.h b/Util/testsuite/src/UtilTestSuite.h index fe5d6b0b9..2c6fc0283 100644 --- a/Util/testsuite/src/UtilTestSuite.h +++ b/Util/testsuite/src/UtilTestSuite.h @@ -16,7 +16,7 @@ #define UtilTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class UtilTestSuite diff --git a/Util/testsuite/src/ValidatorTest.cpp b/Util/testsuite/src/ValidatorTest.cpp index 54066bb87..d6cacdc70 100644 --- a/Util/testsuite/src/ValidatorTest.cpp +++ b/Util/testsuite/src/ValidatorTest.cpp @@ -11,8 +11,8 @@ #include "ValidatorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/RegExpValidator.h" #include "Poco/Util/IntValidator.h" #include "Poco/Util/Option.h" diff --git a/Util/testsuite/src/ValidatorTest.h b/Util/testsuite/src/ValidatorTest.h index 7bc1d4223..dda953447 100644 --- a/Util/testsuite/src/ValidatorTest.h +++ b/Util/testsuite/src/ValidatorTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ValidatorTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WinCEDriver.cpp b/Util/testsuite/src/WinCEDriver.cpp index 9af67a695..538ecdede 100644 --- a/Util/testsuite/src/WinCEDriver.cpp +++ b/Util/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "UtilTestSuite.h" #include diff --git a/Util/testsuite/src/WinConfigurationTest.cpp b/Util/testsuite/src/WinConfigurationTest.cpp index e557fc360..5b0f6257a 100644 --- a/Util/testsuite/src/WinConfigurationTest.cpp +++ b/Util/testsuite/src/WinConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "WinConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/WinRegistryConfiguration.h" #include "Poco/Util/WinRegistryKey.h" #include "Poco/Environment.h" diff --git a/Util/testsuite/src/WinConfigurationTest.h b/Util/testsuite/src/WinConfigurationTest.h index 23fc13b4a..1e7ed4796 100644 --- a/Util/testsuite/src/WinConfigurationTest.h +++ b/Util/testsuite/src/WinConfigurationTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WinConfigurationTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WinRegistryTest.cpp b/Util/testsuite/src/WinRegistryTest.cpp index b4537243c..d7b8bfc6b 100644 --- a/Util/testsuite/src/WinRegistryTest.cpp +++ b/Util/testsuite/src/WinRegistryTest.cpp @@ -11,8 +11,8 @@ #include "WinRegistryTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/WinRegistryKey.h" #include "Poco/Environment.h" #include "Poco/Exception.h" diff --git a/Util/testsuite/src/WinRegistryTest.h b/Util/testsuite/src/WinRegistryTest.h index b006deb4f..78dcb3c5a 100644 --- a/Util/testsuite/src/WinRegistryTest.h +++ b/Util/testsuite/src/WinRegistryTest.h @@ -17,7 +17,7 @@ #include "Poco/Util/Util.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class WinRegistryTest: public CppUnit::TestCase diff --git a/Util/testsuite/src/WindowsTestSuite.h b/Util/testsuite/src/WindowsTestSuite.h index 4bbbb0065..beb2ce7e1 100644 --- a/Util/testsuite/src/WindowsTestSuite.h +++ b/Util/testsuite/src/WindowsTestSuite.h @@ -16,7 +16,7 @@ #define WindowsTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class WindowsTestSuite diff --git a/Util/testsuite/src/XMLConfigurationTest.cpp b/Util/testsuite/src/XMLConfigurationTest.cpp index 7f3f0862c..3fc69006e 100644 --- a/Util/testsuite/src/XMLConfigurationTest.cpp +++ b/Util/testsuite/src/XMLConfigurationTest.cpp @@ -11,8 +11,8 @@ #include "XMLConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Util/XMLConfiguration.h" #include "Poco/AutoPtr.h" #include "Poco/Exception.h" diff --git a/XML/testsuite/CMakeLists.txt b/XML/testsuite/CMakeLists.txt index 30b18a41f..c69a89961 100644 --- a/XML/testsuite/CMakeLists.txt +++ b/XML/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -target_link_libraries( ${TESTUNIT} PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoXML PocoFoundation PocoCppUnit) diff --git a/XML/testsuite/Makefile b/XML/testsuite/Makefile index 5fd0b7406..d1843d431 100644 --- a/XML/testsuite/Makefile +++ b/XML/testsuite/Makefile @@ -17,7 +17,7 @@ objects = AttributesImplTest ChildNodesTest DOMTestSuite DocumentTest \ target = testrunner target_version = 1 -target_libs = PocoXML PocoFoundation CppUnit +target_libs = PocoXML PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/XML/testsuite/TestSuite_vs120.vcxproj b/XML/testsuite/TestSuite_vs120.vcxproj index 7f8d12d55..4437a391d 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj +++ b/XML/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj b/XML/testsuite/TestSuite_x64_vs120.vcxproj index 6710d869a..cc05ee181 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/src/AttributesImplTest.cpp b/XML/testsuite/src/AttributesImplTest.cpp index c915cc0a6..3becee606 100644 --- a/XML/testsuite/src/AttributesImplTest.cpp +++ b/XML/testsuite/src/AttributesImplTest.cpp @@ -11,8 +11,8 @@ #include "AttributesImplTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/AttributesImpl.h" diff --git a/XML/testsuite/src/AttributesImplTest.h b/XML/testsuite/src/AttributesImplTest.h index 671357a62..f160e7706 100644 --- a/XML/testsuite/src/AttributesImplTest.h +++ b/XML/testsuite/src/AttributesImplTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class AttributesImplTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/ChildNodesTest.cpp b/XML/testsuite/src/ChildNodesTest.cpp index 562a4a6c1..cbf301a12 100644 --- a/XML/testsuite/src/ChildNodesTest.cpp +++ b/XML/testsuite/src/ChildNodesTest.cpp @@ -11,8 +11,8 @@ #include "ChildNodesTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/NodeList.h" diff --git a/XML/testsuite/src/ChildNodesTest.h b/XML/testsuite/src/ChildNodesTest.h index 913377dc2..dfdb0a82b 100644 --- a/XML/testsuite/src/ChildNodesTest.h +++ b/XML/testsuite/src/ChildNodesTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ChildNodesTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/DOMTestSuite.h b/XML/testsuite/src/DOMTestSuite.h index f76c91037..93b6e5650 100644 --- a/XML/testsuite/src/DOMTestSuite.h +++ b/XML/testsuite/src/DOMTestSuite.h @@ -16,7 +16,7 @@ #define DOMTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class DOMTestSuite diff --git a/XML/testsuite/src/DocumentTest.cpp b/XML/testsuite/src/DocumentTest.cpp index 687749dd7..7cf529098 100644 --- a/XML/testsuite/src/DocumentTest.cpp +++ b/XML/testsuite/src/DocumentTest.cpp @@ -11,8 +11,8 @@ #include "DocumentTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Text.h" diff --git a/XML/testsuite/src/DocumentTest.h b/XML/testsuite/src/DocumentTest.h index d472fb79f..838f9ea8a 100644 --- a/XML/testsuite/src/DocumentTest.h +++ b/XML/testsuite/src/DocumentTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DocumentTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/DocumentTypeTest.cpp b/XML/testsuite/src/DocumentTypeTest.cpp index 1801e59cd..0cb830bea 100644 --- a/XML/testsuite/src/DocumentTypeTest.cpp +++ b/XML/testsuite/src/DocumentTypeTest.cpp @@ -11,8 +11,8 @@ #include "DocumentTypeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/DocumentType.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Notation.h" diff --git a/XML/testsuite/src/DocumentTypeTest.h b/XML/testsuite/src/DocumentTypeTest.h index 2f839aa45..d88f1d760 100644 --- a/XML/testsuite/src/DocumentTypeTest.h +++ b/XML/testsuite/src/DocumentTypeTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class DocumentTypeTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/Driver.cpp b/XML/testsuite/src/Driver.cpp index fa39ed92e..176727012 100644 --- a/XML/testsuite/src/Driver.cpp +++ b/XML/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "XMLTestSuite.h" diff --git a/XML/testsuite/src/ElementTest.cpp b/XML/testsuite/src/ElementTest.cpp index 33aef2990..f62aa1c62 100644 --- a/XML/testsuite/src/ElementTest.cpp +++ b/XML/testsuite/src/ElementTest.cpp @@ -11,8 +11,8 @@ #include "ElementTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Attr.h" diff --git a/XML/testsuite/src/ElementTest.h b/XML/testsuite/src/ElementTest.h index 0f5cce0a2..143797d17 100644 --- a/XML/testsuite/src/ElementTest.h +++ b/XML/testsuite/src/ElementTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ElementTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/EventTest.cpp b/XML/testsuite/src/EventTest.cpp index c41f14593..2b654c579 100644 --- a/XML/testsuite/src/EventTest.cpp +++ b/XML/testsuite/src/EventTest.cpp @@ -11,8 +11,8 @@ #include "EventTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Event.h" #include "Poco/DOM/MutationEvent.h" #include "Poco/DOM/EventListener.h" diff --git a/XML/testsuite/src/EventTest.h b/XML/testsuite/src/EventTest.h index a50abe472..e6f46a60c 100644 --- a/XML/testsuite/src/EventTest.h +++ b/XML/testsuite/src/EventTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class EventTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NamePoolTest.cpp b/XML/testsuite/src/NamePoolTest.cpp index 2faeae022..2ef21927e 100644 --- a/XML/testsuite/src/NamePoolTest.cpp +++ b/XML/testsuite/src/NamePoolTest.cpp @@ -11,8 +11,8 @@ #include "NamePoolTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/NamePool.h" #include "Poco/XML/Name.h" #include "Poco/DOM/AutoPtr.h" diff --git a/XML/testsuite/src/NamePoolTest.h b/XML/testsuite/src/NamePoolTest.h index feaae8562..fed36e8ce 100644 --- a/XML/testsuite/src/NamePoolTest.h +++ b/XML/testsuite/src/NamePoolTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamePoolTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NameTest.cpp b/XML/testsuite/src/NameTest.cpp index 5a7711219..e611fbcb0 100644 --- a/XML/testsuite/src/NameTest.cpp +++ b/XML/testsuite/src/NameTest.cpp @@ -11,8 +11,8 @@ #include "NameTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/Name.h" diff --git a/XML/testsuite/src/NameTest.h b/XML/testsuite/src/NameTest.h index ad307da71..4d24cec02 100644 --- a/XML/testsuite/src/NameTest.h +++ b/XML/testsuite/src/NameTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NameTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NamespaceSupportTest.cpp b/XML/testsuite/src/NamespaceSupportTest.cpp index b20c31b4a..7111448b4 100644 --- a/XML/testsuite/src/NamespaceSupportTest.cpp +++ b/XML/testsuite/src/NamespaceSupportTest.cpp @@ -11,8 +11,8 @@ #include "NamespaceSupportTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/NamespaceSupport.h" diff --git a/XML/testsuite/src/NamespaceSupportTest.h b/XML/testsuite/src/NamespaceSupportTest.h index d243c877e..6d43c4f0f 100644 --- a/XML/testsuite/src/NamespaceSupportTest.h +++ b/XML/testsuite/src/NamespaceSupportTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NamespaceSupportTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeAppenderTest.cpp b/XML/testsuite/src/NodeAppenderTest.cpp index 1da757a35..fce137d57 100644 --- a/XML/testsuite/src/NodeAppenderTest.cpp +++ b/XML/testsuite/src/NodeAppenderTest.cpp @@ -11,8 +11,8 @@ #include "NodeAppenderTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/NodeAppender.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/NodeAppenderTest.h b/XML/testsuite/src/NodeAppenderTest.h index 2616d8043..e72185065 100644 --- a/XML/testsuite/src/NodeAppenderTest.h +++ b/XML/testsuite/src/NodeAppenderTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeAppenderTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeIteratorTest.cpp b/XML/testsuite/src/NodeIteratorTest.cpp index 29c18c36e..8584fa174 100644 --- a/XML/testsuite/src/NodeIteratorTest.cpp +++ b/XML/testsuite/src/NodeIteratorTest.cpp @@ -11,8 +11,8 @@ #include "NodeIteratorTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/NodeIterator.h" #include "Poco/DOM/NodeFilter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/NodeIteratorTest.h b/XML/testsuite/src/NodeIteratorTest.h index a01d5ebca..690228eaa 100644 --- a/XML/testsuite/src/NodeIteratorTest.h +++ b/XML/testsuite/src/NodeIteratorTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeIteratorTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/NodeTest.cpp b/XML/testsuite/src/NodeTest.cpp index f443ef304..0a774fba7 100644 --- a/XML/testsuite/src/NodeTest.cpp +++ b/XML/testsuite/src/NodeTest.cpp @@ -11,8 +11,8 @@ #include "NodeTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Document.h" #include "Poco/DOM/Element.h" #include "Poco/DOM/DocumentFragment.h" diff --git a/XML/testsuite/src/NodeTest.h b/XML/testsuite/src/NodeTest.h index d46bfe67e..c67b18baf 100644 --- a/XML/testsuite/src/NodeTest.h +++ b/XML/testsuite/src/NodeTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class NodeTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/ParserWriterTest.cpp b/XML/testsuite/src/ParserWriterTest.cpp index 8d15dd1cf..c2702a890 100644 --- a/XML/testsuite/src/ParserWriterTest.cpp +++ b/XML/testsuite/src/ParserWriterTest.cpp @@ -11,8 +11,8 @@ #include "ParserWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/DOMParser.h" #include "Poco/DOM/DOMWriter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/ParserWriterTest.h b/XML/testsuite/src/ParserWriterTest.h index b6dab69f2..ebb8a09d4 100644 --- a/XML/testsuite/src/ParserWriterTest.h +++ b/XML/testsuite/src/ParserWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ParserWriterTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/SAXParserTest.cpp b/XML/testsuite/src/SAXParserTest.cpp index 1e09271e9..24a3063ed 100644 --- a/XML/testsuite/src/SAXParserTest.cpp +++ b/XML/testsuite/src/SAXParserTest.cpp @@ -11,8 +11,8 @@ #include "SAXParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/SAX/SAXParser.h" #include "Poco/SAX/InputSource.h" #include "Poco/SAX/EntityResolver.h" diff --git a/XML/testsuite/src/SAXParserTest.h b/XML/testsuite/src/SAXParserTest.h index 2410a5e44..debd07cd6 100644 --- a/XML/testsuite/src/SAXParserTest.h +++ b/XML/testsuite/src/SAXParserTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" #include "Poco/SAX/XMLReader.h" diff --git a/XML/testsuite/src/SAXTestSuite.h b/XML/testsuite/src/SAXTestSuite.h index 3b0f88e82..ff49f4923 100644 --- a/XML/testsuite/src/SAXTestSuite.h +++ b/XML/testsuite/src/SAXTestSuite.h @@ -16,7 +16,7 @@ #define SAXTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class SAXTestSuite diff --git a/XML/testsuite/src/TextTest.cpp b/XML/testsuite/src/TextTest.cpp index fc7df67bd..713032eef 100644 --- a/XML/testsuite/src/TextTest.cpp +++ b/XML/testsuite/src/TextTest.cpp @@ -11,8 +11,8 @@ #include "TextTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/Text.h" #include "Poco/DOM/CDATASection.h" #include "Poco/DOM/Element.h" diff --git a/XML/testsuite/src/TextTest.h b/XML/testsuite/src/TextTest.h index 772693ee1..5374a70db 100644 --- a/XML/testsuite/src/TextTest.h +++ b/XML/testsuite/src/TextTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TextTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/TreeWalkerTest.cpp b/XML/testsuite/src/TreeWalkerTest.cpp index e8f48e659..d7dbe28e5 100644 --- a/XML/testsuite/src/TreeWalkerTest.cpp +++ b/XML/testsuite/src/TreeWalkerTest.cpp @@ -11,8 +11,8 @@ #include "TreeWalkerTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/DOM/TreeWalker.h" #include "Poco/DOM/NodeFilter.h" #include "Poco/DOM/Document.h" diff --git a/XML/testsuite/src/TreeWalkerTest.h b/XML/testsuite/src/TreeWalkerTest.h index d09b3cfa5..bf01ed88b 100644 --- a/XML/testsuite/src/TreeWalkerTest.h +++ b/XML/testsuite/src/TreeWalkerTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class TreeWalkerTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/WinCEDriver.cpp b/XML/testsuite/src/WinCEDriver.cpp index a95ed5899..5369700cc 100644 --- a/XML/testsuite/src/WinCEDriver.cpp +++ b/XML/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "XMLTestSuite.h" #include diff --git a/XML/testsuite/src/XMLStreamParserTest.cpp b/XML/testsuite/src/XMLStreamParserTest.cpp index 09c96ae5b..058687573 100644 --- a/XML/testsuite/src/XMLStreamParserTest.cpp +++ b/XML/testsuite/src/XMLStreamParserTest.cpp @@ -10,8 +10,8 @@ // #include "XMLStreamParserTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/XMLStreamParser.h" #include "Poco/Exception.h" #include diff --git a/XML/testsuite/src/XMLStreamParserTest.h b/XML/testsuite/src/XMLStreamParserTest.h index 2579a74c3..e90808606 100644 --- a/XML/testsuite/src/XMLStreamParserTest.h +++ b/XML/testsuite/src/XMLStreamParserTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class XMLStreamParserTest: public CppUnit::TestCase diff --git a/XML/testsuite/src/XMLTestSuite.h b/XML/testsuite/src/XMLTestSuite.h index bafb5b79c..b9ebf992d 100644 --- a/XML/testsuite/src/XMLTestSuite.h +++ b/XML/testsuite/src/XMLTestSuite.h @@ -16,7 +16,7 @@ #define XMLTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class XMLTestSuite diff --git a/XML/testsuite/src/XMLWriterTest.cpp b/XML/testsuite/src/XMLWriterTest.cpp index 10667d039..a311d5996 100644 --- a/XML/testsuite/src/XMLWriterTest.cpp +++ b/XML/testsuite/src/XMLWriterTest.cpp @@ -11,8 +11,8 @@ #include "XMLWriterTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/XML/XMLWriter.h" #include "Poco/SAX/AttributesImpl.h" #include "Poco/Exception.h" diff --git a/XML/testsuite/src/XMLWriterTest.h b/XML/testsuite/src/XMLWriterTest.h index 65af24f83..2444921aa 100644 --- a/XML/testsuite/src/XMLWriterTest.h +++ b/XML/testsuite/src/XMLWriterTest.h @@ -17,7 +17,7 @@ #include "Poco/XML/XML.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class XMLWriterTest: public CppUnit::TestCase diff --git a/Zip/testsuite/CMakeLists.txt b/Zip/testsuite/CMakeLists.txt index dd7ee3a7b..3f9bc4eae 100644 --- a/Zip/testsuite/CMakeLists.txt +++ b/Zip/testsuite/CMakeLists.txt @@ -19,7 +19,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${TESTUNIT} PocoZip PocoNet PocoFoundation CppUnit ) +target_link_libraries( ${TESTUNIT} PocoZip PocoNet PocoFoundation PocoCppUnit ) # The test is run in the build directory. So the test data is copied there too add_custom_command(TARGET ${TESTUNIT} POST_BUILD diff --git a/Zip/testsuite/Makefile b/Zip/testsuite/Makefile index 8b2ea6725..f4224edd2 100644 --- a/Zip/testsuite/Makefile +++ b/Zip/testsuite/Makefile @@ -13,6 +13,6 @@ objects = ZipTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoZip PocoNet PocoFoundation CppUnit +target_libs = PocoZip PocoNet PocoFoundation PocoCppUnit include $(POCO_BASE)/build/rules/exec diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj b/Zip/testsuite/TestSuite_vs120.vcxproj index 005b74cbf..88c1e251a 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj b/Zip/testsuite/TestSuite_x64_vs120.vcxproj index 2fd869eac..cf8b82e28 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - CppUnitd.lib;%(AdditionalDependencies) + PocoCppUnitd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - CppUnit.lib;%(AdditionalDependencies) + PocoCppUnit.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/src/CompressTest.cpp b/Zip/testsuite/src/CompressTest.cpp index d52124ce4..d14a4a959 100644 --- a/Zip/testsuite/src/CompressTest.cpp +++ b/Zip/testsuite/src/CompressTest.cpp @@ -17,8 +17,8 @@ #include "Poco/Zip/ZipManipulator.h" #include "Poco/File.h" #include "Poco/FileStream.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include #include #undef min diff --git a/Zip/testsuite/src/CompressTest.h b/Zip/testsuite/src/CompressTest.h index 2a7cba5a4..89f18db50 100644 --- a/Zip/testsuite/src/CompressTest.h +++ b/Zip/testsuite/src/CompressTest.h @@ -17,7 +17,7 @@ #include "Poco/Zip/Zip.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class CompressTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/Driver.cpp b/Zip/testsuite/src/Driver.cpp index f43e656bd..bd22ae67a 100644 --- a/Zip/testsuite/src/Driver.cpp +++ b/Zip/testsuite/src/Driver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ZipTestSuite.h" diff --git a/Zip/testsuite/src/PartialStreamTest.cpp b/Zip/testsuite/src/PartialStreamTest.cpp index bd98ad139..619472306 100644 --- a/Zip/testsuite/src/PartialStreamTest.cpp +++ b/Zip/testsuite/src/PartialStreamTest.cpp @@ -11,8 +11,8 @@ #include "PartialStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #include "Poco/Zip/PartialStream.h" #include diff --git a/Zip/testsuite/src/PartialStreamTest.h b/Zip/testsuite/src/PartialStreamTest.h index 29f7c3385..8f663ebc2 100644 --- a/Zip/testsuite/src/PartialStreamTest.h +++ b/Zip/testsuite/src/PartialStreamTest.h @@ -17,7 +17,7 @@ #include "Poco/Zip/Zip.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class PartialStreamTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/WinCEDriver.cpp b/Zip/testsuite/src/WinCEDriver.cpp index 23297e1b2..7c8e62f28 100644 --- a/Zip/testsuite/src/WinCEDriver.cpp +++ b/Zip/testsuite/src/WinCEDriver.cpp @@ -12,7 +12,7 @@ // -#include "CppUnit/TestRunner.h" +#include "Poco/CppUnit/TestRunner.h" #include "ZipTestSuite.h" #include diff --git a/Zip/testsuite/src/ZipTest.cpp b/Zip/testsuite/src/ZipTest.cpp index c73b5568c..5ef109286 100644 --- a/Zip/testsuite/src/ZipTest.cpp +++ b/Zip/testsuite/src/ZipTest.cpp @@ -23,8 +23,8 @@ #include "Poco/Path.h" #include "Poco/Delegate.h" #include "Poco/StreamCopier.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestCaller.h" +#include "Poco/CppUnit/TestSuite.h" #undef min #include #include diff --git a/Zip/testsuite/src/ZipTest.h b/Zip/testsuite/src/ZipTest.h index caf2fd30d..5e2e2b85f 100644 --- a/Zip/testsuite/src/ZipTest.h +++ b/Zip/testsuite/src/ZipTest.h @@ -18,7 +18,7 @@ #include "Poco/Zip/Zip.h" #include "Poco/Zip/ZipLocalFileHeader.h" -#include "CppUnit/TestCase.h" +#include "Poco/CppUnit/TestCase.h" class ZipTest: public CppUnit::TestCase diff --git a/Zip/testsuite/src/ZipTestSuite.h b/Zip/testsuite/src/ZipTestSuite.h index 62f645693..21454e54a 100644 --- a/Zip/testsuite/src/ZipTestSuite.h +++ b/Zip/testsuite/src/ZipTestSuite.h @@ -16,7 +16,7 @@ #define ZipTestSuite_INCLUDED -#include "CppUnit/TestSuite.h" +#include "Poco/CppUnit/TestSuite.h" class ZipTestSuite