[Libreoffice-commits] online.git: loolwsd/test

[Ashod Nakashian]

 loolwsd/test/TileCacheTests.cpp |    2 +-
 loolwsd/test/helpers.hpp        |    4 ++--
 loolwsd/test/httpwstest.cpp     |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5158818d82fb1a806f5021dece8712a6b1e1334f
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Aug 30 18:19:05 2016 -0400

    loolwsd: getDocSize -> parseDocSize
    
    Change-Id: I82ee96d6fde8d8c379547d05d7bbb8213a474a4f
    Reviewed-on: https://gerrit.libreoffice.org/28522
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index c8679c9..982af03 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -343,7 +343,7 @@ void TileCacheTests::testLoad12ods()
         sendTextFrame(socket, "status");
         getResponseMessage(socket, "status:", response, false);
         CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty());
-        getDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId);
+        parseDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId);
 
         checkBlackTiles(socket, docSheet, docWidth, docWidth);
     }
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index 75bd9d7..0a7d003 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -444,8 +444,8 @@ void SocketProcessor(const std::string& name,
 }
 
 inline
-void getDocSize(const std::string& message, const std::string& type,
-                int& part, int& parts, int& width, int& height, int& viewid)
+void parseDocSize(const std::string& message, const std::string& type,
+                  int& part, int& parts, int& width, int& height, int& viewid)
 {
     Poco::StringTokenizer tokens(message, " ", Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(6), tokens.count());
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index c167547..1dae4c3 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1370,7 +1370,7 @@ void HTTPWSTest::testLimitCursor( std::function<void(const std::shared_ptr<Poco:
     sendTextFrame(socket, "status");
     getResponseMessage(socket, "status:", response, false);
     CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty());
-    getDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId);
+    parseDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId);
 
     // Send an arrow key to initialize the CellCursor, otherwise we get "EMPTY".
     sendTextFrame(socket, "key type=input char=0 key=1027");
@@ -1389,7 +1389,7 @@ void HTTPWSTest::testLimitCursor( std::function<void(const std::shared_ptr<Poco:
     // filter messages, and expect to receive new document size
     getResponseMessage(socket, "status:", response, false);
     CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty());
-    getDocSize(response, "spreadsheet", newSheet, newSheets, newWidth, newHeight, docViewId);
+    parseDocSize(response, "spreadsheet", newSheet, newSheets, newWidth, newHeight, docViewId);
 
     CPPUNIT_ASSERT_EQUAL(docSheets, newSheets);
     CPPUNIT_ASSERT_EQUAL(docSheet, newSheet);