[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/TileCacheTests.cpp

[Ashod Nakashian]

 test/TileCacheTests.cpp |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f69365eb0de6513fed9a6ffa74899e28175e8737
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 7 11:03:10 2017 -0400

    wsd: correct the name of testDisconnectMultiView in output
    
    Change-Id: Ibfcee83825bf8f48e635d93061bf4fd1306a95fc
    Reviewed-on: https://gerrit.libreoffice.org/37371
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 7633525904083bc427590834a4aa309f84bb32cc)
    Reviewed-on: https://gerrit.libreoffice.org/37411
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 227f7adb..16577b3f 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -354,19 +354,19 @@ void TileCacheTests::testCancelTilesMultiView()
 void TileCacheTests::testDisconnectMultiView()
 {
     std::string documentPath, documentURL;
-    getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL, "cancelTilesMultiView ");
+    getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL, "disconnectMultiView ");
 
     const size_t repeat = 4;
     for (size_t j = 1; j <= repeat; ++j)
     {
-        std::cerr << "cancelTilesMultiView try #" << j << std::endl;
+        std::cerr << "disconnectMultiView try #" << j << std::endl;
 
         // Wait to clear previous sessions.
         countLoolKitProcesses(InitialLoolKitCount);
 
         // Request a huge tile, and cancel immediately.
-        auto socket1 = loadDocAndGetSocket(_uri, documentURL, "cancelTilesMultiView-1 ");
-        auto socket2 = loadDocAndGetSocket(_uri, documentURL, "cancelTilesMultiView-2 ", true);
+        auto socket1 = loadDocAndGetSocket(_uri, documentURL, "disconnectMultiView-1 ");
+        auto socket2 = loadDocAndGetSocket(_uri, documentURL, "disconnectMultiView-2 ", true);
 
         sendTextFrame(socket1, "tilecombine part=0 width=256 height=256 tileposx=0,3840,7680,11520,0,3840,7680,11520 tileposy=0,0,0,0,3840,3840,3840,3840 tilewidth=3840 tileheight=3840", "cancelTilesMultiView-1 ");
         sendTextFrame(socket2, "tilecombine part=0 width=256 height=256 tileposx=0,3840,7680,0 tileposy=0,0,0,22520 tilewidth=3840 tileheight=3840", "cancelTilesMultiView-2 ");
@@ -375,11 +375,11 @@ void TileCacheTests::testDisconnectMultiView()
 
         for (auto i = 0; i < 4; ++i)
         {
-            getTileMessage(*socket2, "cancelTilesMultiView-2 ");
+            getTileMessage(*socket2, "disconnectMultiView-2 ");
         }
 
         // Should never get more than 4 tiles on socket2.
-        const auto res2 = getResponseString(socket2, "tile:", "cancelTilesMultiView-2 ", 500);
+        const auto res2 = getResponseString(socket2, "tile:", "disconnectMultiView-2 ", 500);
     }
 }