[Libreoffice-commits] online.git: test/httpwstest.cpp test/test.cpp test/WopiTestServer.hpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Oct 17 07:34:38 UTC 2018


 test/WopiTestServer.hpp |    2 +-
 test/httpwstest.cpp     |   16 ++++++++--------
 test/test.cpp           |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8316a650d6b62f19bf8a736580d33775c9a6793e
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Wed Oct 17 09:34:05 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Wed Oct 17 09:34:18 2018 +0200

    test: avoid some unnecessary value parameters

diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index 6b2fbf92d..cc951f9c6 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -57,7 +57,7 @@ public:
     {
     }
 
-    void initWebsocket(std::string wopiName)
+    void initWebsocket(const std::string& wopiName)
     {
         Poco::URI wopiURL(helpers::getTestServerURI() + wopiName);
 
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index eb233f951..330d3a0f9 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -189,12 +189,12 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
                    int& cursorWidth,
                    int& cursorHeight);
 
-    void limitCursor(std::function<void(const std::shared_ptr<LOOLWebSocket>& socket,
+    void limitCursor(const std::function<void(const std::shared_ptr<LOOLWebSocket>& socket,
                                         int cursorX, int cursorY,
                                         int cursorWidth, int cursorHeight,
-                                        int docWidth, int docHeight)> keyhandler,
-                     std::function<void(int docWidth, int docHeight,
-                                        int newWidth, int newHeight)> checkhandler,
+                                        int docWidth, int docHeight)>& keyhandler,
+                     const std::function<void(int docWidth, int docHeight,
+                                        int newWidth, int newHeight)>& checkhandler,
                      const std::string& testname);
 
     std::string getFontList(const std::string& message);
@@ -1513,12 +1513,12 @@ void HTTPWSTest::getCursor(const std::string& message,
     CPPUNIT_ASSERT(cursorHeight >= 0);
 }
 
-void HTTPWSTest::limitCursor(std::function<void(const std::shared_ptr<LOOLWebSocket>& socket,
+void HTTPWSTest::limitCursor(const std::function<void(const std::shared_ptr<LOOLWebSocket>& socket,
                                                 int cursorX, int cursorY,
                                                 int cursorWidth, int cursorHeight,
-                                                int docWidth, int docHeight)> keyhandler,
-                             std::function<void(int docWidth, int docHeight,
-                                                int newWidth, int newHeight)> checkhandler,
+                                                int docWidth, int docHeight)>& keyhandler,
+                             const std::function<void(int docWidth, int docHeight,
+                                                int newWidth, int newHeight)>& checkhandler,
                              const std::string& testname)
 {
     int docSheet = -1;
diff --git a/test/test.cpp b/test/test.cpp
index 2225e37d0..4a4ba9421 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -32,7 +32,7 @@
 
 class HTTPGetTest;
 
-bool filterTests(CPPUNIT_NS::TestRunner& runner, CPPUNIT_NS::Test* testRegistry, const std::string testName)
+bool filterTests(CPPUNIT_NS::TestRunner& runner, CPPUNIT_NS::Test* testRegistry, const std::string& testName)
 {
     Poco::RegularExpression re(testName, Poco::RegularExpression::RE_CASELESS);
     Poco::RegularExpression::Match reMatch;


More information about the Libreoffice-commits mailing list