loolwsd/test/httpcrashtest.cpp | 2 +-
loolwsd/test/httpwstest.cpp | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a805b06874fe8a65c77dedea9a60a2f4278eea8a
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Aug 15 07:28:39 2016 -0400
loolwsd: fix unittest regressions
Change-Id: I502c87a2c6eb3d34c0e137c774c1c77bec8f50d9
Reviewed-on: https://gerrit.libreoffice.org/28144
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/test/httpcrashtest.cpp b/loolwsd/test/httpcrashtest.cpp
index 4955afe..f65a351 100644
--- a/loolwsd/test/httpcrashtest.cpp
+++ b/loolwsd/test/httpcrashtest.cpp
@@ -141,7 +141,7 @@ void HTTPCrashTest::testBarren()
if (msg.find(prefix) == 0)
{
const auto status = msg.substr(prefix.length());
- CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1
current=0 width=12808 height=16408"), status);
+ CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1
current=0 width=12808 height=16408 viewid=0"), status);
return false;
}
else if (msg.find("Service") == 0)
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 0888b90..df97acd 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1176,7 +1176,10 @@ void HTTPWSTest::testInactiveClient()
token == "statechanged:" ||
token == "graphicselection:" ||
token == "cursorvisible:" ||
- token == "editlock:");
+ token == "editlock:" ||
+ token == "addview:" ||
+ token == "remview:" ||
+ token == "remallviews:");
// End when we get state changed.
return (token != "statechanged:");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
