test/TileCacheTests.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 8fb94e18272afb5db9a2ba9cb4eeb40380fabfb9
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Tue Nov 12 19:18:43 2019 +0530
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Tue Nov 12 17:50:17 2019 +0100
StringTokenizer replaced with tokenize in file `TileCacheTsts.cpp`
Change-Id: I1024329bf518795b819f19f497af70d2266ec7da
Reviewed-on: https://gerrit.libreoffice.org/82543
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 0f0195b10..88308165d 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1088,12 +1088,12 @@ void
TileCacheTests::checkTiles(std::shared_ptr<LOOLWebSocket>& socket, const st
std::istringstream istr(response.substr(8));
std::getline(istr, line);
- Poco::StringTokenizer tokens(line, " ",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
+ std::vector<std::string> tokens(LOOLProtocol::tokenize(line, ' '));
#if defined CPPUNIT_ASSERT_GREATEREQUAL
if (docType == "presentation")
- CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(7),
tokens.count()); // We have an extra field.
+ CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(7),
tokens.size()); // We have an extra field.
else
- CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(6),
tokens.count());
+ CPPUNIT_ASSERT_GREATEREQUAL(static_cast<size_t>(6), tokens.size());
#else
if (docType == "presentation")
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(7), tokens.count()); //
We have an extra field.
@@ -1198,7 +1198,7 @@ void
TileCacheTests::requestTiles(std::shared_ptr<LOOLWebSocket>& socket,
sendTextFrame(socket, text, name);
tile = assertResponseString(socket, "tile:", name);
// expected tile: part= width= height= tileposx= tileposy=
tilewidth= tileheight=
- Poco::StringTokenizer tokens(tile, " ",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
+ std::vector<std::string> tokens(LOOLProtocol::tokenize(tile, ' '));
CPPUNIT_ASSERT_EQUAL(std::string("tile:"), tokens[0]);
CPPUNIT_ASSERT_EQUAL(0,
std::stoi(tokens[1].substr(std::string("nviewid=").size())));
CPPUNIT_ASSERT_EQUAL(part,
std::stoi(tokens[2].substr(std::string("part=").size())));
@@ -1346,7 +1346,7 @@ void TileCacheTests::testTileProcessed()
++arrivedTile;
// Store tileID, so we can send it back
- Poco::StringTokenizer tokens(tile, " ",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
+ std::vector<std::string> tokens(LOOLProtocol::tokenize(tile, ' '));
std::string tileID = tokens[2].substr(std::string("part=").size())
+ ":" +
tokens[5].substr(std::string("tileposx=").size()) + ":" +
tokens[6].substr(std::string("tileposy=").size()) + ":" +
@@ -1394,7 +1394,7 @@ void TileCacheTests::testTileInvalidatedOutside()
// First wsd forwards the invalidation
std::string sInvalidate = assertResponseString(socket, "invalidatetiles:",
testname);
- Poco::StringTokenizer tokens(sInvalidate, " ",
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
+ std::vector<std::string> tokens(LOOLProtocol::tokenize(sInvalidate, ' '));
int y = std::stoi(tokens[3].substr(std::string("y=").size()));
int height = std::stoi(tokens[5].substr(std::string("height=").size()));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
