diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj index 0b29fa6c7..7c89a0e7f 100644 --- a/CppUnit/CppUnit_vs140.vcxproj +++ b/CppUnit/CppUnit_vs140.vcxproj @@ -158,18 +158,18 @@ <_ProjectFileVersion>14.0.25420.1 - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt ..\bin\ @@ -242,13 +242,13 @@ true - ..\bin\PocoCppUnitd.dll + ..\bin\CppUnitd.dll true true - ..\bin\PocoCppUnitd.pdb + ..\bin\CppUnitd.pdb ..\lib;%(AdditionalLibraryDirectories) Console - ..\lib\PocoCppUnitd.lib + ..\lib\CppUnitd.lib MachineX86 @@ -274,14 +274,14 @@ true - ..\bin\PocoCppUnit.dll + ..\bin\CppUnit.dll true false ..\lib;%(AdditionalLibraryDirectories) Console true true - ..\lib\PocoCppUnit.lib + ..\lib\CppUnit.lib MachineX86 @@ -298,14 +298,14 @@ true true - ..\lib\PocoCppUnitmtd.pdb + ..\lib\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmtd.lib + ..\lib\CppUnitmtd.lib @@ -330,7 +330,7 @@ true - ..\lib\PocoCppUnitmt.lib + ..\lib\CppUnitmt.lib @@ -346,14 +346,14 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmdd.lib + ..\lib\CppUnitmdd.lib @@ -372,14 +372,14 @@ true true - ..\lib\PocoCppUnitmd.pdb + ..\lib\CppUnitmd.pdb Level3 Default true - ..\lib\PocoCppUnitmd.lib + ..\lib\CppUnitmd.lib @@ -401,13 +401,13 @@ true - ..\bin64\PocoCppUnit64d.dll + ..\bin64\CppUnit64d.dll true true - ..\bin64\PocoCppUnit64d.pdb + ..\bin64\CppUnit64d.pdb ..\lib64;%(AdditionalLibraryDirectories) Console - ..\lib64\PocoCppUnitd.lib + ..\lib64\CppUnitd.lib MachineX64 @@ -433,14 +433,14 @@ true - ..\bin64\PocoCppUnit64.dll + ..\bin64\CppUnit64.dll true false ..\lib64;%(AdditionalLibraryDirectories) Console true true - ..\lib64\PocoCppUnit.lib + ..\lib64\CppUnit.lib MachineX64 @@ -457,14 +457,14 @@ true true - ..\lib64\PocoCppUnitmtd.pdb + ..\lib64\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\CppUnitmtd.lib @@ -489,7 +489,7 @@ true - ..\lib64\PocoCppUnitmt.lib + ..\lib64\CppUnitmt.lib @@ -505,14 +505,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\CppUnitmdd.lib @@ -537,7 +537,7 @@ true - ..\lib64\PocoCppUnitmd.lib + ..\lib64\CppUnitmd.lib diff --git a/CppUnit/CppUnit_vs150.vcxproj b/CppUnit/CppUnit_vs150.vcxproj index b54940dc6..62ffeb695 100644 --- a/CppUnit/CppUnit_vs150.vcxproj +++ b/CppUnit/CppUnit_vs150.vcxproj @@ -158,18 +158,18 @@ <_ProjectFileVersion>15.0.28307.799 - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt ..\bin\ @@ -242,13 +242,13 @@ true - ..\bin\PocoCppUnitd.dll + ..\bin\CppUnitd.dll true true - ..\bin\PocoCppUnitd.pdb + ..\bin\CppUnitd.pdb ..\lib;%(AdditionalLibraryDirectories) Console - ..\lib\PocoCppUnitd.lib + ..\lib\CppUnitd.lib MachineX86 @@ -274,14 +274,14 @@ true - ..\bin\PocoCppUnit.dll + ..\bin\CppUnit.dll true false ..\lib;%(AdditionalLibraryDirectories) Console true true - ..\lib\PocoCppUnit.lib + ..\lib\CppUnit.lib MachineX86 @@ -298,14 +298,14 @@ true true - ..\lib\PocoCppUnitmtd.pdb + ..\lib\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmtd.lib + ..\lib\CppUnitmtd.lib @@ -330,7 +330,7 @@ true - ..\lib\PocoCppUnitmt.lib + ..\lib\CppUnitmt.lib @@ -346,14 +346,14 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmdd.lib + ..\lib\CppUnitmdd.lib @@ -372,14 +372,14 @@ true true - ..\lib\PocoCppUnitmd.pdb + ..\lib\CppUnitmd.pdb Level3 Default true - ..\lib\PocoCppUnitmd.lib + ..\lib\CppUnitmd.lib @@ -401,13 +401,13 @@ true - ..\bin64\PocoCppUnit64d.dll + ..\bin64\CppUnit64d.dll true true - ..\bin64\PocoCppUnit64d.pdb + ..\bin64\CppUnit64d.pdb ..\lib64;%(AdditionalLibraryDirectories) Console - ..\lib64\PocoCppUnitd.lib + ..\lib64\CppUnitd.lib MachineX64 @@ -433,14 +433,14 @@ true - ..\bin64\PocoCppUnit64.dll + ..\bin64\CppUnit64.dll true false ..\lib64;%(AdditionalLibraryDirectories) Console true true - ..\lib64\PocoCppUnit.lib + ..\lib64\CppUnit.lib MachineX64 @@ -457,14 +457,14 @@ true true - ..\lib64\PocoCppUnitmtd.pdb + ..\lib64\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\CppUnitmtd.lib @@ -489,7 +489,7 @@ true - ..\lib64\PocoCppUnitmt.lib + ..\lib64\CppUnitmt.lib @@ -505,14 +505,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\CppUnitmdd.lib @@ -537,7 +537,7 @@ true - ..\lib64\PocoCppUnitmd.lib + ..\lib64\CppUnitmd.lib diff --git a/CppUnit/CppUnit_vs160.vcxproj b/CppUnit/CppUnit_vs160.vcxproj index ceb4a839d..65c8a8131 100644 --- a/CppUnit/CppUnit_vs160.vcxproj +++ b/CppUnit/CppUnit_vs160.vcxproj @@ -158,18 +158,18 @@ <_ProjectFileVersion>15.0.28307.799 - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt - PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd - PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt + CppUnitd + CppUnitmdd + CppUnitmtd + CppUnit + CppUnitmd + CppUnitmt ..\bin\ @@ -242,13 +242,13 @@ true - ..\bin\PocoCppUnitd.dll + ..\bin\CppUnitd.dll true true - ..\bin\PocoCppUnitd.pdb + ..\bin\CppUnitd.pdb ..\lib;%(AdditionalLibraryDirectories) Console - ..\lib\PocoCppUnitd.lib + ..\lib\CppUnitd.lib MachineX86 @@ -274,14 +274,14 @@ true - ..\bin\PocoCppUnit.dll + ..\bin\CppUnit.dll true false ..\lib;%(AdditionalLibraryDirectories) Console true true - ..\lib\PocoCppUnit.lib + ..\lib\CppUnit.lib MachineX86 @@ -298,14 +298,14 @@ true true - ..\lib\PocoCppUnitmtd.pdb + ..\lib\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmtd.lib + ..\lib\CppUnitmtd.lib @@ -330,7 +330,7 @@ true - ..\lib\PocoCppUnitmt.lib + ..\lib\CppUnitmt.lib @@ -346,14 +346,14 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib\PocoCppUnitmdd.lib + ..\lib\CppUnitmdd.lib @@ -372,14 +372,14 @@ true true - ..\lib\PocoCppUnitmd.pdb + ..\lib\CppUnitmd.pdb Level3 Default true - ..\lib\PocoCppUnitmd.lib + ..\lib\CppUnitmd.lib @@ -401,13 +401,13 @@ true - ..\bin64\PocoCppUnit64d.dll + ..\bin64\CppUnit64d.dll true true - ..\bin64\PocoCppUnit64d.pdb + ..\bin64\CppUnit64d.pdb ..\lib64;%(AdditionalLibraryDirectories) Console - ..\lib64\PocoCppUnitd.lib + ..\lib64\CppUnitd.lib MachineX64 @@ -433,14 +433,14 @@ true - ..\bin64\PocoCppUnit64.dll + ..\bin64\CppUnit64.dll true false ..\lib64;%(AdditionalLibraryDirectories) Console true true - ..\lib64\PocoCppUnit.lib + ..\lib64\CppUnit.lib MachineX64 @@ -457,14 +457,14 @@ true true - ..\lib64\PocoCppUnitmtd.pdb + ..\lib64\CppUnitmtd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\CppUnitmtd.lib @@ -489,7 +489,7 @@ true - ..\lib64\PocoCppUnitmt.lib + ..\lib64\CppUnitmt.lib @@ -505,14 +505,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\CppUnitmdd.pdb Level3 ProgramDatabase Default true - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\CppUnitmdd.lib @@ -537,7 +537,7 @@ true - ..\lib64\PocoCppUnitmd.lib + ..\lib64\CppUnitmd.lib diff --git a/Data/PostgreSQL/testsuite/src/Driver.cpp b/Data/PostgreSQL/testsuite/src/Driver.cpp index daaab006f..586112d12 100644 --- a/Data/PostgreSQL/testsuite/src/Driver.cpp +++ b/Data/PostgreSQL/testsuite/src/Driver.cpp @@ -10,7 +10,7 @@ // -#include "Poco/CppUnit/TestRunner.h" +#include "CppUnit/TestRunner.h" #include "PostgreSQLTestSuite.h" diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp index ccee2221e..df5978688 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp @@ -9,8 +9,8 @@ #include "PostgreSQLTest.h" -#include "Poco/CppUnit/TestCaller.h" -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" #include "Poco/Environment.h" #include "Poco/String.h" #include "Poco/Format.h" @@ -107,7 +107,7 @@ void PostgreSQLTest::testConnectNoDB() dbConnString += " user=" + getUser(); dbConnString += " password=" + getPass(); dbConnString += " port=" + getPort(); - + try { std::cout << "Attempting to Connect to [" << dbConnString << "] without database: " << std::endl; @@ -127,7 +127,7 @@ void PostgreSQLTest::testConnectNoDB() std::cout << ex.displayText() << std::endl; } } - + void PostgreSQLTest::testPostgreSQLOIDs() { if (!_pSession) fail ("Test not available."); @@ -203,7 +203,7 @@ void PostgreSQLTest::testPostgreSQLOIDs() "uuidcol uuid," "xmlcol xml" ")"; - + Oid OIDArray[] = { 1042, 20, @@ -275,7 +275,7 @@ void PostgreSQLTest::testPostgreSQLOIDs() 2950, 142 }; - + _pExecutor->oidPostgreSQLTest(getHost(), getUser(), getPass(), getBase(), getPort(), tableCreateString.c_str(), OIDArray); } @@ -393,7 +393,7 @@ void PostgreSQLTest::testLimitOnce() recreateIntsTable(); _pExecutor->limitOnce(); - + } @@ -604,7 +604,7 @@ void PostgreSQLTest::testDateTime() void PostgreSQLTest::testBLOB() { if (!_pSession) fail ("Test not available."); - + recreatePersonBLOBTable(); _pExecutor->blob(); @@ -830,7 +830,7 @@ void PostgreSQLTest::testTupleWithNullable() Info info(0, std::string("Address"), 10); *_pSession << "INSERT INTO NullableStringTest VALUES($1, $2, $3)", use(info), now; - + info.set<0>(info.get<0>()++); info.set<1>(null); *_pSession << "INSERT INTO NullableStringTest VALUES($1, $2, $3)", use(info), now; diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h index 956c90bec..6546ae4cf 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.h @@ -17,7 +17,7 @@ #include "Poco/Data/PostgreSQL/PostgreSQL.h" #include "Poco/Data/Session.h" #include "Poco/SharedPtr.h" -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" #include "SQLExecutor.h" @@ -94,7 +94,7 @@ public: void testNullableInt(); void testNullableString(); void testTupleWithNullable(); - + void testSessionTransaction(); void testTransaction(); diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTestSuite.h b/Data/PostgreSQL/testsuite/src/PostgreSQLTestSuite.h index 3c8eab90a..c7741dc4a 100644 --- a/Data/PostgreSQL/testsuite/src/PostgreSQLTestSuite.h +++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTestSuite.h @@ -12,7 +12,7 @@ #define PostgreSQLTestSuite_INCLUDED -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestSuite.h" class PostgreSQLTestSuite { diff --git a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp index f3c9ed122..c1444b38b 100644 --- a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp +++ b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp @@ -8,7 +8,7 @@ // -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" #include "SQLExecutor.h" #include "Poco/String.h" #include "Poco/ByteOrder.h" @@ -229,7 +229,7 @@ void SQLExecutor::oidPostgreSQLTest(std::string host, std::string user, std::str wasErrorEncountered = true; break; } - + } PQclear(pResult); @@ -277,7 +277,7 @@ void SQLExecutor::barebonePostgreSQLTest(std::string host, std::string user, std pConnection = PQconnectdb(connectionString.c_str()); assertTrue (PQstatus(pConnection) == CONNECTION_OK); - + PGresult * pResult = 0; std::string sql = "DROP TABLE IF EXISTS Test"; @@ -477,7 +477,7 @@ void SQLExecutor::simpleAccess() } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } @@ -739,7 +739,7 @@ void SQLExecutor::insertSingleBulkVec() { std::string funct = "insertSingleBulkVec()"; std::vector data; - + for (int x = 0; x < 100; ++x) data.push_back(x); @@ -1128,7 +1128,7 @@ void SQLExecutor::multiMapComplex() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - + try { *_pSession << "INSERT INTO Person VALUES ($1,$2,$3,$4)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } @@ -1454,7 +1454,7 @@ void SQLExecutor::dateTime() std::string firstName("Simpson"); std::string address("Springfield"); DateTime birthday(1980, 4, 1, 5, 45, 12); - + int count = 0; try { *_pSession << "INSERT INTO Person VALUES ($1,$2,$3,$4)", use(lastName), use(firstName), use(address), use(birthday), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } @@ -1463,14 +1463,14 @@ void SQLExecutor::dateTime() catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (count == 1); - + DateTime bd; assertTrue (bd != birthday); try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (bd == birthday); - + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); } @@ -1482,7 +1482,7 @@ void SQLExecutor::date() std::string firstName("Simpson"); std::string address("Springfield"); Date birthday(1980, 4, 1); - + int count = 0; try { *_pSession << "INSERT INTO Person VALUES ($1,$2,$3,$4)", use(lastName), use(firstName), use(address), use(birthday), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } @@ -1491,14 +1491,14 @@ void SQLExecutor::date() catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (count == 1); - + Date bd; assertTrue (bd != birthday); try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (bd == birthday); - + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); } @@ -1510,7 +1510,7 @@ void SQLExecutor::time() std::string firstName("Simpson"); std::string address("Springfield"); Time birthday(1, 2, 3); - + int count = 0; try { *_pSession << "INSERT INTO Person VALUES ($1,$2,$3,$4)", use(lastName), use(firstName), use(address), use(birthday), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } @@ -1519,14 +1519,14 @@ void SQLExecutor::time() catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (count == 1); - + Time bd; assertTrue (bd != birthday); try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (bd == birthday); - + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); } @@ -1769,7 +1769,7 @@ void SQLExecutor::internalExtraction() void SQLExecutor::doNull() { std::string funct = "null()"; - + *_pSession << "INSERT INTO Vectors VALUES ($1, $2, $3)", use(Poco::Data::Keywords::null), use(Poco::Data::Keywords::null), @@ -1814,10 +1814,10 @@ void SQLExecutor::setTransactionIsolation(Session& session, Poco::UInt32 ti) { Transaction t(session, false); t.setIsolation(ti); - + assertTrue (ti == t.getIsolation()); assertTrue (t.isIsolation(ti)); - + assertTrue (ti == session.getTransactionIsolation()); assertTrue (session.isTransactionIsolation(ti)); } @@ -1983,11 +1983,11 @@ void SQLExecutor::transaction(const std::string& connect) Transaction trans((*_pSession)); assertTrue (trans.isActive()); assertTrue (_pSession->isTransaction()); - + try { (*_pSession) << "INSERT INTO Person VALUES ($1,$2,$3,$4)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - + assertTrue (_pSession->isTransaction()); assertTrue (trans.isActive()); @@ -2079,7 +2079,7 @@ void SQLExecutor::transaction(const std::string& connect) assertTrue (0 == count); trans.execute(sql); - + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assertTrue (2 == locCount); diff --git a/Foundation/testsuite/src/OrderedContainersTest.cpp b/Foundation/testsuite/src/OrderedContainersTest.cpp index 9f0fdf449..2e1415768 100644 --- a/Foundation/testsuite/src/OrderedContainersTest.cpp +++ b/Foundation/testsuite/src/OrderedContainersTest.cpp @@ -9,8 +9,8 @@ #include "OrderedContainersTest.h" -#include "Poco/CppUnit/TestCaller.h" -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" #include "Poco/Exception.h" #ifdef POCO_COMPILER_MSVC diff --git a/Foundation/testsuite/src/OrderedContainersTest.h b/Foundation/testsuite/src/OrderedContainersTest.h index 5fb2ac6fe..36da98632 100644 --- a/Foundation/testsuite/src/OrderedContainersTest.h +++ b/Foundation/testsuite/src/OrderedContainersTest.h @@ -12,7 +12,7 @@ #include "Poco/Foundation.h" -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" #include "Poco/OrderedMap.h" #include "Poco/OrderedSet.h" #include "ordered_map_util.h" @@ -298,7 +298,7 @@ private: } assertEquals(set.size(), nb_values); - for(std::size_t i = 0; i < nb_values; i++) + for(std::size_t i = 0; i < nb_values; i++) { const std::size_t insert_val = (i%2 == 0)?i:nb_values + i; std::tie(it, inserted) = set.insert(utils::get_key(insert_val)); diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 603a89192..540fed6a0 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -9,8 +9,8 @@ #include "StringTest.h" -#include "Poco/CppUnit/TestCaller.h" -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestCaller.h" +#include "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 5ddc910fb..a4a8eaec6 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -15,7 +15,7 @@ #include "Poco/Foundation.h" -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" #include "Poco/NumericString.h" #include "Poco/MemoryStream.h" #include "Poco/NumberFormatter.h" @@ -75,10 +75,10 @@ private: T result = 0; if (123 <= std::numeric_limits::max()) assertTrue (Poco::strToInt("123", result, 10)); assertTrue (result == 123); - + assertTrue (Poco::strToInt("0", result, 10)); assertTrue (result == 0); assertTrue (Poco::strToInt("000", result, 10)); assertTrue (result == 0); - + if (std::numeric_limits::is_signed && (-123 > std::numeric_limits::min())) { assertTrue (Poco::strToInt("-123", result, 10)); assertTrue (result == -123); } if (0x123 < std::numeric_limits::max()) @@ -91,7 +91,7 @@ private: { assertTrue (Poco::strToInt("123", result, 010)); assertTrue (result == 0123); } if (0123 < std::numeric_limits::max()) { assertTrue (Poco::strToInt("0123", result, 010)); assertTrue (result == 0123); } - + assertTrue (Poco::strToInt("0", result, 010)); assertTrue (result == 0); assertTrue (Poco::strToInt("000", result, 010)); assertTrue (result == 0); } diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp index 453b6687f..eeb47c423 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp @@ -9,8 +9,8 @@ #include "WebSocketTest.h" -#include "Poco/CppUnit/TestCaller.h" -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestCaller.h" +#include "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 abdbf476e..87d943da7 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h @@ -15,7 +15,7 @@ #include "Poco/Net/Net.h" -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.cpp b/NetSSL_Win/testsuite/src/WebSocketTest.cpp index 572ebe92f..21fedf777 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_Win/testsuite/src/WebSocketTest.cpp @@ -9,8 +9,8 @@ #include "WebSocketTest.h" -#include "Poco/CppUnit/TestCaller.h" -#include "Poco/CppUnit/TestSuite.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" #include "Poco/Net/WebSocket.h" #include "Poco/Net/SocketStream.h" #include "Poco/Net/HTTPSClientSession.h" @@ -82,7 +82,7 @@ namespace private: std::size_t _bufSize; }; - + class WebSocketRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory { public: @@ -116,9 +116,9 @@ void WebSocketTest::testWebSocket() Poco::Net::SecureServerSocket ss(0); Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory, ss, new Poco::Net::HTTPServerParams); server.start(); - + Poco::Thread::sleep(200); - + HTTPSClientSession cs("127.0.0.1", ss.address().port()); HTTPRequest request(HTTPRequest::HTTP_GET, "/ws"); HTTPResponse response; @@ -159,19 +159,19 @@ void WebSocketTest::testWebSocket() assertTrue (n == payload.size()); assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0); assertTrue (flags == WebSocket::FRAME_TEXT); - + payload = "Hello, universe!"; ws.sendFrame(payload.data(), (int) payload.size(), WebSocket::FRAME_BINARY); n = ws.receiveFrame(buffer, sizeof(buffer), flags); assertTrue (n == payload.size()); assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0); - assertTrue (flags == WebSocket::FRAME_BINARY); - + assertTrue (flags == WebSocket::FRAME_BINARY); + ws.shutdown(); n = ws.receiveFrame(buffer, sizeof(buffer), flags); assertTrue (n == 2); assertTrue ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE); - + server.stop(); } @@ -183,9 +183,9 @@ void WebSocketTest::testWebSocketLarge() Poco::Net::SecureServerSocket ss(0); Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory(msgSize), ss, new Poco::Net::HTTPServerParams); server.start(); - + Poco::Thread::sleep(200); - + HTTPSClientSession cs("127.0.0.1", ss.address().port()); HTTPRequest request(HTTPRequest::HTTP_GET, "/ws"); HTTPResponse response; diff --git a/NetSSL_Win/testsuite/src/WebSocketTest.h b/NetSSL_Win/testsuite/src/WebSocketTest.h index abdbf476e..87d943da7 100644 --- a/NetSSL_Win/testsuite/src/WebSocketTest.h +++ b/NetSSL_Win/testsuite/src/WebSocketTest.h @@ -15,7 +15,7 @@ #include "Poco/Net/Net.h" -#include "Poco/CppUnit/TestCase.h" +#include "CppUnit/TestCase.h" class WebSocketTest: public CppUnit::TestCase