strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle properly "EMPTY" invalidatetiles message (T32137)

Browse source 
ChildSession::loKitCallback() may generate a message in the format
"invalidatetiles: EMPTY, 0". Handle it properly in tests.

Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
Change-Id: If8009be3c4ce031466ed304df7028848a8ab960f
This commit is contained in:
Luboš Luňák 2021-12-13 16:53:57 +01:00 committed by Andras Timar
parent f73df19d26
commit 1dfb6d3866
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
test/TileCacheTests.cpp
View file

@ -145,6 +145,8 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture
void checkBlackTile(std::stringstream& tile);
bool getPartFromInvalidateMessage(const std::string& message, int& part);
public:
TileCacheTests()
: _uri(helpers::getTestServerURI())
@ -184,6 +186,20 @@ public:
}
};
bool TileCacheTests::getPartFromInvalidateMessage(const std::string& message, int& part)
{
StringVector tokens = Util::tokenize(message);
if (tokens.size() == 2 && tokens.equals(1, "EMPTY"))
{
part = -1;
return true;
}
if (tokens.size() == 3 && tokens.equals(1, "EMPTY,"))
return COOLProtocol::stringToInteger(tokens[2], part);
return COOLProtocol::getTokenInteger(tokens, "part", part);
}
void TileCacheTests::testDesc()
{
TileDesc descA = TileDesc(0, 0, 256, 256, 0, 0, 3200, 3200, /* ignored in cache */ 0, 1234, 1, true);
@ -1034,7 +1050,7 @@ void TileCacheTests::testTileInvalidateWriterPage()
const auto res = assertResponseString(socket, "invalidatetiles:", testname);
int part = -1;
LOK_ASSERT_MESSAGE("No part# in invalidatetiles message.",
COOLProtocol::getTokenIntegerFromMessage(res, "part", part));
getPartFromInvalidateMessage(res, part));
LOK_ASSERT_EQUAL(0, part);
socket->asyncShutdown();
@ -1194,12 +1210,12 @@ void TileCacheTests::testTileInvalidatePartCalc()
const auto response1 = assertResponseString(socket1, "invalidatetiles:", testname1);
int value1;
COOLProtocol::getTokenIntegerFromMessage(response1, "part", value1);
getPartFromInvalidateMessage(response1, value1);
LOK_ASSERT_EQUAL(2, value1);
const auto response2 = assertResponseString(socket2, "invalidatetiles:", testname2);
int value2;
COOLProtocol::getTokenIntegerFromMessage(response2, "part", value2);
getPartFromInvalidateMessage(response2, value2);
LOK_ASSERT_EQUAL(5, value2);
}
@ -1243,12 +1259,12 @@ void TileCacheTests::testTileInvalidatePartImpress()
const auto response1 = assertResponseString(socket1, "invalidatetiles:", testname1);
int value1;
COOLProtocol::getTokenIntegerFromMessage(response1, "part", value1);
getPartFromInvalidateMessage(response1, value1);
LOK_ASSERT_EQUAL(2, value1);
const auto response2 = assertResponseString(socket2, "invalidatetiles:", testname2);
int value2;
COOLProtocol::getTokenIntegerFromMessage(response2, "part", value2);
getPartFromInvalidateMessage(response2, value2);
LOK_ASSERT_EQUAL(5, value2);
}

3
wsd/protocol.txt
View file

@ -463,6 +463,9 @@ invalidatetiles: part=<partNumber> x=<x> y=<y> width=<width> height=<height>
zoom level.
invalidatetiles: EMPTY
invalidatetiles: EMPTY, <partNumber>
Tells the client to invalidate all cached tiles.
pong rendercount=<num>