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

[Henry Castro]

 loolwsd/test/TileCacheTests.cpp |    1 +
 loolwsd/test/httpwstest.cpp     |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0f444af60d36a52398672665af276dac18eb76f2
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed May 11 01:22:57 2016 -0400

    loolwsd: test: update sending "status" message

diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index e271b29..da10783 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -330,6 +330,7 @@ void TileCacheTests::checkTiles(Poco::Net::WebSocket& socket, const std::string&
     std::string text;
 
     // check total slides 10
+    sendTextFrame(socket, "status");
     getResponseMessage(socket, "status:", response, false);
     CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty());
     {
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index e0548ee..de19f21 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -588,8 +588,8 @@ void HTTPWSTest::testExcelLoad()
         Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response);
 
         sendTextFrame(socket, "load url=" + documentURL);
-        sendTextFrame(socket, "status");
         CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket));
+        sendTextFrame(socket, "status");
 
         std::string status;
         int flags;
@@ -907,6 +907,7 @@ void HTTPWSTest::testInsertDelete()
 
         // check total slides 1
         std::cerr << "Expecting 1 slide." << std::endl;
+        sendTextFrame(socket, "status");
         getResponseMessage(socket, "status:", response, false);
         CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty());
         getPartHashCodes(response, parts);
@@ -1004,6 +1005,7 @@ void HTTPWSTest::testEditLock()
                 std::cerr << "First client loading." << std::endl;
                 auto socket = loadDocAndGetSocket(_uri, documentURL, true);
                 std::string editlock1;
+                sendTextFrame(socket, "status");
                 SocketProcessor("First", socket, [&](const std::string& msg)
                         {
                             if (msg.find("editlock") == 0)