loolwsd/test/httpwstest.cpp | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 2f12308ca211d597b012159cf41f9bba16542b3e
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 19 13:09:35 2016 +0300
Presumably a graphicviewselection: message is OK, too
Fixes the testInactiveClient unit test.
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index abadbb4..14ecd3d 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1020,6 +1020,7 @@ void HTTPWSTest::testInactiveClient()
token == "cursorvisible:" ||
token == "editlock:" ||
token == "graphicselection:" ||
+ token == "graphicviewselection:" ||
token == "invalidatecursor:" ||
token == "invalidatetiles:" ||
token == "invalidateviewcursor:" ||
commit 1febbe72ae9f152ed7a37341392f880ebdcce93b
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 19 13:09:12 2016 +0300
Sort lines for sanity
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 37e03ec..abadbb4 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1016,21 +1016,21 @@ void HTTPWSTest::testInactiveClient()
{
const auto token = LOOLProtocol::getFirstToken(msg);
CPPUNIT_ASSERT_MESSAGE("unexpected message: " + msg,
- token == "setpart:" ||
- token == "textselection:" ||
- token == "textselectionstart:" ||
- token == "textselectionend:" ||
- token == "invalidatetiles:" ||
- token == "invalidatecursor:" ||
- token == "statechanged:" ||
- token == "graphicselection:" ||
+ token == "addview:" ||
token == "cursorvisible:" ||
token == "editlock:" ||
- token == "addview:" ||
- token == "remview:" ||
+ token == "graphicselection:" ||
+ token == "invalidatecursor:" ||
+ token == "invalidatetiles:" ||
+ token == "invalidateviewcursor:" ||
token == "remallviews:" ||
+ token == "remview:" ||
+ token == "setpart:" ||
+ token == "statechanged:" ||
+ token == "textselection:" ||
+ token == "textselectionend:" ||
+ token == "textselectionstart:" ||
token == "textviewselection:" ||
- token == "invalidateviewcursor:" ||
token == "viewcursorvisible:");
// End when we get state changed.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
