[Libreoffice-commits] online.git: test/httpwstest.cpp test/TileCacheTests.cpp

[Miklos Vajna (via logerrit)]

 test/TileCacheTests.cpp |    4 ++--
 test/httpwstest.cpp     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1b27ed045d11a26edd67395769e70c9a49fc0fcd
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Aug 22 09:06:02 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Aug 22 09:06:02 2019 +0200

    Fix TileCacheTests::testClientPartImpress()
    
    After commit 8e118889cbabc279d7cf6746576330816f0e562c (wsd: leaflet:
    support statusupdate: messages to sync clients, 2019-08-17), which added
    a new hiddenparts= key, but forgot to adapt tests accordingly.
    
    Change-Id: Ia5baefff37b88f5b173d65ae80a126f94b420cb0

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index d6577f50a..ef8c1e4c5 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1041,9 +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);
-        CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(6), tokens.count());
+        CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(6), tokens.count());
 
-        // Expected format is something like 'type= parts= current= width= height='.
+        // Expected format is something like 'type= parts= current= width= height= [hiddenparts=]'.
         const std::string text = tokens[0].substr(type.size());
         totalParts = std::stoi(tokens[1].substr(parts.size()));
         currentPart = std::stoi(tokens[2].substr(current.size()));
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 898d1b169..e9c66a8cd 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1513,9 +1513,9 @@ void HTTPWSTest::getPartHashCodes(const std::string& testname,
 
     TST_LOG("Reading parts from [" << response << "].");
 
-    // Expected format is something like 'type= parts= current= width= height= viewid='.
+    // 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);
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(6), tokens.count());
+    CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(7), tokens.count());
 
     const std::string type = tokens[0].substr(std::string("type=").size());
     CPPUNIT_ASSERT_MESSAGE("Expected presentation or spreadsheet type to read part names/codes.",