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

[Ashod Nakashian]

 loolwsd/test/helpers.hpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 40f23677eec2ee5b12d3299412244df0091727c7
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Tue Sep 20 22:28:35 2016 -0400

    loolwsd: assume loading new view in unittests by default
    
    ...and prepare to removing view/non-view flags.
    
    Change-Id: I464a71fa0e73abc577644170cb17309e5c8c252f
    Reviewed-on: https://gerrit.libreoffice.org/29127
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index 415e098..ddb571f 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -104,7 +104,7 @@ void sendTextFrame(const 
std::shared_ptr<Poco::Net::WebSocket>& socket, const st
 }
 
 inline
-bool isDocumentLoaded(Poco::Net::WebSocket& ws, const std::string& name = "", 
bool isView = false)
+bool isDocumentLoaded(Poco::Net::WebSocket& ws, const std::string& name = "", 
bool isView = true)
 {
     bool isLoaded = false;
     try
@@ -156,7 +156,7 @@ bool isDocumentLoaded(Poco::Net::WebSocket& ws, const 
std::string& name = "", bo
 }
 
 inline
-bool isDocumentLoaded(std::shared_ptr<Poco::Net::WebSocket>& ws, const 
std::string& name = "", bool isView = false)
+bool isDocumentLoaded(std::shared_ptr<Poco::Net::WebSocket>& ws, const 
std::string& name = "", bool isView = true)
 {
     return isDocumentLoaded(*ws, name, isView);
 }
@@ -356,7 +356,7 @@ std::string assertResponseLine(T& ws, const std::string& 
prefix, const std::stri
 template <typename T>
 std::string assertNotInResponse(T& ws, const std::string& prefix, const 
std::string name = "")
 {
-    const auto res = getResponseLine(ws, prefix, name, 3000);
+    const auto res = getResponseLine(ws, prefix, name, 2000);
     CPPUNIT_ASSERT_MESSAGE("Did not expect getting message [" + res + "].", 
res.empty());
     return res;
 }
@@ -395,7 +395,7 @@ connectLOKit(const Poco::URI& uri,
 }
 
 inline
-std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const Poco::URI& 
uri, const std::string& documentURL, const std::string& name = "", bool isView 
= false)
+std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const Poco::URI& 
uri, const std::string& documentURL, const std::string& name = "", bool isView 
= true)
 {
     try
     {
@@ -420,7 +420,7 @@ std::shared_ptr<Poco::Net::WebSocket> 
loadDocAndGetSocket(const Poco::URI& uri,
 }
 
 inline
-std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const std::string& 
docFilename, const Poco::URI& uri, const std::string& name = "", bool isView = 
false)
+std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const std::string& 
docFilename, const Poco::URI& uri, const std::string& name = "", bool isView = 
true)
 {
     try
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits