generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-07 09:48:04 +01:00
Code Issues Projects Releases Wiki Activity

fix(CppUnit): CppUnit notEqualsMessage causing compile errors #3615

Browse Source
This commit is contained in:
Alex Fabijanic 2022-05-29 11:46:33 -05:00
parent a17a7bf027
commit 980cd0273b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CppUnit/include/CppUnit/TestCase.h
View File

@ -124,7 +124,9 @@ protected:
long data2LineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER, long data2LineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME); const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
template <typename T1, typename T2> template <typename T1, typename T2,
typename = typename std::enable_if<std::is_arithmetic<T1>::value, T1>::type,
typename = typename std::enable_if<std::is_arithmetic<T2>::value, T2>::type>
void assertEquals(T1 expected, void assertEquals(T1 expected,
T2 actual, T2 actual,
long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER, long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,

6
Util/testsuite/src/WinServiceTest.cpp
View File

@ -44,9 +44,9 @@ void WinServiceTest::testServiceReturnsFailureActionConfigured()
auto failureActions = spoolerService.getFailureActions(); auto failureActions = spoolerService.getFailureActions();
assertEqual(3, static_cast<int>(failureActions.size())); assertEqual(3, static_cast<int>(failureActions.size()));
assertEqual(WinService::SVC_RESTART, failureActions[0]); assertTrue(WinService::SVC_RESTART == failureActions[0]);
assertEqual(WinService::SVC_RESTART, failureActions[1]); assertTrue(WinService::SVC_RESTART == failureActions[1]);
assertEqual(WinService::SVC_NONE, failureActions[2]); assertTrue(WinService::SVC_NONE == failureActions[2]);
} }