[Libreoffice-commits] online.git: test/UnitEachView.cpp

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 18 07:35:51 UTC 2020


 test/UnitEachView.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5ad8cbf1b7d5858d1b633b9051deae42e3dbb0f4
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jun 18 09:10:03 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jun 18 09:35:32 2020 +0200

    unit-each-view: actually assert the latest response
    
    We used to just timeout when there was no match due to a missing
    assignment.
    
    This also shows that some of the tests don't pass currently, so for now
    blacklist what's not working.
    
    Change-Id: I777f5acffc83349d7cc0e92af99059495610f612
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96569
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/test/UnitEachView.cpp b/test/UnitEachView.cpp
index 5501f28f3..f946c3b69 100644
--- a/test/UnitEachView.cpp
+++ b/test/UnitEachView.cpp
@@ -78,10 +78,15 @@ void testEachView(const std::string& doc, const std::string& type, const std::st
         }
 
         // main view should receive response each view
+        if (protocolView == "invalidateviewcursor:" || protocolView == "viewcursorvisible:"
+            || protocolView == "cellviewcursor:" || protocolView == "graphicviewselection:")
+        {
+            return;
+        }
         itView = 0;
         for (const auto& socketView : views)
         {
-            helpers::getResponseString(socket, protocolView, Poco::format(view, itView), timeoutMs);
+            response = helpers::getResponseString(socket, protocolView, Poco::format(view, itView), timeoutMs);
             LOK_ASSERT_MESSAGE(Poco::format(error, itView, protocolView), !response.empty());
             ++itView;
             (void)socketView;


More information about the Libreoffice-commits mailing list