[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - test/httpwstest.cpp test/TileCacheTests.cpp

[Libreoffice Gerrit user]

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

New commits:
commit 41341c62ab45435aeb19cc8aa8571680c6500a28
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed May 1 21:54:45 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri May 3 13:57:22 2019 +0200

    Adapt test for new hiddenparts field.
    
    Change-Id: Id2173a38167b97327d0735dfe2a8c88e2dcc4bc7
    Reviewed-on: https://gerrit.libreoffice.org/71639
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 3b1954a8b..f730fd2f9 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1031,7 +1031,10 @@ 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());
+        if (docType == "presentation") // extra hiddenparts="..."
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(7), tokens.count());
+        else
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(6), tokens.count());
 
         // Expected format is something like 'type= parts= current= width= height='.
         const std::string text = tokens[0].substr(type.size());
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index b2ba3ed70..1a9a94430 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1465,9 +1465,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_EQUAL(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.",