test/TileCacheTests.cpp | 2 ++ test/httpwstest.cpp | 2 ++ 2 files changed, 4 insertions(+)
New commits: commit 69140fcdbbbca3fc3288d096b9a857d52b660b53 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Thu Sep 5 23:02:18 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Thu Sep 5 23:02:18 2019 +0200 CPPUNIT_ASSERT_GREATEREQUAL is not available in cppunit of older distros Change-Id: I37001791e05df9a55c25b48fff3bbe5d6bd050e2 diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp index 48f664131..42a9b5f2c 100644 --- a/test/TileCacheTests.cpp +++ b/test/TileCacheTests.cpp @@ -1041,7 +1041,9 @@ void TileCacheTests::checkTiles(std::shared_ptr<LOOLWebSocket>& socket, const st std::getline(istr, line); Poco::StringTokenizer tokens(line, " ", Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM); +#if defined CPPUNIT_ASSERT_GREATEREQUAL CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(6), tokens.count()); +#endif // Expected format is something like 'type= parts= current= width= height= [hiddenparts=]'. const std::string text = tokens[0].substr(type.size()); diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp index e9c66a8cd..523972fd0 100644 --- a/test/httpwstest.cpp +++ b/test/httpwstest.cpp @@ -1515,7 +1515,9 @@ void HTTPWSTest::getPartHashCodes(const std::string& testname, // Expected format is something like 'type= parts= current= width= height= viewid= [hiddenparts=]'. Poco::StringTokenizer tokens(line, " ", Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM); +#if defined CPPUNIT_ASSERT_GREATEREQUAL CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(7), tokens.count()); +#endif const std::string type = tokens[0].substr(std::string("type=").size()); CPPUNIT_ASSERT_MESSAGE("Expected presentation or spreadsheet type to read part names/codes.", _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits