loolwsd/test/TileCacheTests.cpp | 16 ----------------
loolwsd/test/httpwstest.cpp | 1 +
2 files changed, 1 insertion(+), 16 deletions(-)
New commits:
commit fd1412c03cc3348a86b8b42910094d403e4f8a97
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon May 9 23:58:13 2016 -0400
loolwsd: test fixes to match latest changes
Change-Id: I6e972a8b6b77728885b56f520355ed30aff4b197
Reviewed-on: https://gerrit.libreoffice.org/24820
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index 3fa077d..0c9a84a 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -352,14 +352,6 @@ void TileCacheTests::checkTiles(Poco::Net::WebSocket&
socket, const std::string&
if (docType == "presentation")
{
- // first full invalidation
- getResponseMessage(socket, "invalidatetiles:", response, true);
- CPPUNIT_ASSERT_MESSAGE("did not receive a invalidatetiles: message as
expected", !response.empty());
- {
- Poco::StringTokenizer tokens(response, ":",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
- CPPUNIT_ASSERT_EQUAL(std::string("EMPTY"), tokens[0]);
- }
-
// request tiles
requestTiles(socket, currentPart, docWidth, docHeight);
}
@@ -376,14 +368,6 @@ void TileCacheTests::checkTiles(Poco::Net::WebSocket&
socket, const std::string&
text = Poco::format("setclientpart part=%d", it);
std::cout << text << std::endl;
sendTextFrame(socket, text);
-
- // get full invalidation
- getResponseMessage(socket, "invalidatetiles:", response, true);
- CPPUNIT_ASSERT_MESSAGE("did not receive a invalidatetiles: message
as expected", !response.empty());
- {
- Poco::StringTokenizer tokens(response, ":",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
- CPPUNIT_ASSERT_EQUAL(std::string("EMPTY"), tokens[0]);
- }
requestTiles(socket, it, docWidth, docHeight);
}
currentPart = it;
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 9432fb7..f14afdc 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1180,6 +1180,7 @@ void HTTPWSTest::testInactiveClient()
{
const auto token = LOOLProtocol::getFirstToken(msg);
CPPUNIT_ASSERT_MESSAGE("unexpected message: " + msg,
+ token == "setpart:" ||
token == "textselection:" ||
token == "textselectionstart:" ||
token == "textselectionend:" ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
