diff options
Diffstat (limited to 'test/UnitAdmin.cpp')
| -rw-r--r-- | test/UnitAdmin.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/UnitAdmin.cpp b/test/UnitAdmin.cpp index 66caa77899..469d0d0a52 100644 --- a/test/UnitAdmin.cpp +++ b/test/UnitAdmin.cpp @@ -26,7 +26,7 @@ #include <Util.hpp> #include <helpers.hpp> -#define UNIT_URI "/loolwsd/unit-admin" +#define UNIT_URI "/coolwsd/unit-admin" using Poco::Net::HTTPBasicCredentials; using Poco::Net::HTTPCookie; @@ -42,14 +42,14 @@ private: std::string _jwtCookie; bool _isTestRunning = false; const Poco::URI _uri; - std::shared_ptr<LOOLWebSocket> _adminWs; + std::shared_ptr<COOLWebSocket> _adminWs; typedef TestResult (UnitAdmin::*AdminTest)(void); std::vector<AdminTest> _tests; - std::shared_ptr<LOOLWebSocket> _docWs1; - std::shared_ptr<LOOLWebSocket> _docWs2; - std::shared_ptr<LOOLWebSocket> _docWs3; + std::shared_ptr<COOLWebSocket> _docWs1; + std::shared_ptr<COOLWebSocket> _docWs2; + std::shared_ptr<COOLWebSocket> _docWs3; int _docPid1; int _docPid2; int _docPid3; @@ -128,7 +128,7 @@ private: HTTPRequest request(HTTPRequest::HTTP_GET, "/cool/adminws/"); std::unique_ptr<HTTPClientSession> session(UnitHTTP::createSession()); - _adminWs = std::make_shared<LOOLWebSocket>(*session, request, response); + _adminWs = std::make_shared<COOLWebSocket>(*session, request, response); const std::string testMessage = "documents"; std::unique_lock<std::mutex> lock(_messageReceivedMutex); _messageReceived.clear(); @@ -159,7 +159,7 @@ private: HTTPRequest request(HTTPRequest::HTTP_GET, "/cool/adminws/"); std::unique_ptr<HTTPClientSession> session(UnitHTTP::createSession()); - _adminWs = std::make_shared<LOOLWebSocket>(*session, request, response); + _adminWs = std::make_shared<COOLWebSocket>(*session, request, response); const std::string testMessage = "auth jwt=incorrectJWT"; std::unique_lock<std::mutex> lock(_messageReceivedMutex); _messageReceived.clear(); @@ -190,7 +190,7 @@ private: HTTPRequest request(HTTPRequest::HTTP_GET, "/cool/adminws/"); std::unique_ptr<HTTPClientSession> session(UnitHTTP::createSession()); - _adminWs = std::make_shared<LOOLWebSocket>(*session, request, response); + _adminWs = std::make_shared<COOLWebSocket>(*session, request, response); const std::string authMessage = "auth jwt=" + _jwtCookie; _adminWs->sendFrame(authMessage.data(), authMessage.size()); @@ -213,7 +213,7 @@ private: std::unique_lock<std::mutex> lock(_messageReceivedMutex); _messageReceived.clear(); - _docWs1 = std::make_shared<LOOLWebSocket>(*session1, request1, response1); + _docWs1 = std::make_shared<COOLWebSocket>(*session1, request1, response1); _docWs1->sendFrame(loadMessage1.data(), loadMessage1.size()); if (_messageReceivedCV.wait_for(lock, std::chrono::milliseconds(_messageTimeoutMilliSeconds)) == std::cv_status::timeout) { @@ -241,7 +241,7 @@ private: // Open another view of same document lock.lock(); // lock _messageReceivedMutex _messageReceived.clear(); - _docWs2 = std::make_shared<LOOLWebSocket>(*session2, request1, response1); + _docWs2 = std::make_shared<COOLWebSocket>(*session2, request1, response1); _docWs2->sendFrame(loadMessage1.data(), loadMessage1.size()); if (_messageReceivedCV.wait_for(lock, std::chrono::milliseconds(_messageTimeoutMilliSeconds)) == std::cv_status::timeout) { @@ -276,7 +276,7 @@ private: lock.lock(); // lock _messageReceivedMutex _messageReceived.clear(); - _docWs3 = std::make_shared<LOOLWebSocket>(*session3, request2, response2); + _docWs3 = std::make_shared<COOLWebSocket>(*session3, request2, response2); _docWs3->sendFrame(loadMessage2.data(), loadMessage2.size()); if (_messageReceivedCV.wait_for(lock, std::chrono::milliseconds(_messageTimeoutMilliSeconds)) == std::cv_status::timeout) { |