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

[Miklos Vajna (via logerrit)]

 test/httpwstest.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 773080eb7400117c45f01553bf5f955ae2537da8
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Aug 2 09:35:20 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Aug 2 09:35:20 2019 +0200

    Fix failing HTTPWSTest::testInactiveClient()
    
    It seems to me that in this case the test was poor, if other
    invalidation types are expected, then this one should be fine, too.
    
    Change-Id: Iae7597eef081acdfb5d6f9152747204a71bd2b66

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 3c36380fc..898d1b169 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1389,6 +1389,9 @@ void HTTPWSTest::testInactiveClient()
         SocketProcessor("Second ", socket2, [&](const std::string& msg)
                 {
                     const auto token = LOOLProtocol::getFirstToken(msg);
+                    // 'window:' is e.g. 'window: {"id":"4","action":"invalidate","rectangle":"0, 0,
+                    // 0, 0"}', which is probably fine, given that other invalidations are also
+                    // expected.
                     CPPUNIT_ASSERT_MESSAGE("unexpected message: " + msg,
                                             token == "cursorvisible:" ||
                                             token == "graphicselection:" ||
@@ -1405,7 +1408,8 @@ void HTTPWSTest::testInactiveClient()
                                             token == "viewcursorvisible:" ||
                                             token == "viewinfo:" ||
                                             token == "editor:" ||
-                                            token == "context:");
+                                            token == "context:" ||
+                                            token == "window:");
 
                     // End when we get state changed.
                     return (token != "statechanged:");