strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused filterHandleRequest unit test hook.

Browse source 
Change-Id: Id1ff6005e28bf02eb9cad3c1609f9a8079640689
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90155
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks 2020-03-07 11:22:43 +00:00
parent 019f268ffd
commit 7eea5b85ab
6 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/Unit.hpp
View file

@ -201,15 +201,6 @@ public:
{
return false;
}
/// Intercept incoming requests, so unit tests can silently communicate
virtual bool filterHandleRequest(
TestRequest /* type */,
SocketDisposition & /* disposition */,
WebSocketHandler & /* handler */)
{
return false;
}
/// Child sent a message
virtual bool filterChildMessage(const std::vector<char>& /* payload */)
{

8
test/UnitFuzz.cpp
View file

@ -117,14 +117,6 @@ public:
return true;
}
virtual bool filterHandleRequest(
TestRequest /* type */,
SocketDisposition & /* disposition */,
WebSocketHandler & /* socket */) override
{
return false;
}
};
// Inside the forkit & kit processes

10
wsd/ClientSession.cpp
View file

@ -310,16 +310,6 @@ void ClientSession::handleClipboardRequest(DocumentBroker::ClipboardRequest
}
}
void ClientSession::handleIncomingMessage(SocketDisposition &disposition)
{
// LOG_TRC("***** ClientSession::handleIncomingMessage()");
if (UnitWSD::get().filterHandleRequest(
UnitWSD::TestRequest::Client, disposition, *this))
return;
Session::handleIncomingMessage(disposition);
}
bool ClientSession::_handleInput(const char *buffer, int length)
{
LOG_TRC(getName() << ": handling incoming [" << getAbbreviatedMessage(buffer, length) << "].");

2
wsd/ClientSession.hpp
View file

@ -40,8 +40,6 @@ public:
/// Lookup any session by id.
static std::shared_ptr<ClientSession> getById(const std::string &id);
void handleIncomingMessage(SocketDisposition &) override;
void setReadOnly() override;
enum SessionState {

5
wsd/LOOLWSD.cpp
View file

@ -1856,11 +1856,6 @@ private:
void handleIncomingMessage(SocketDisposition &disposition) override
{
// LOG_TRC("***** PrisonerRequestDispatcher::handleIncomingMessage()");
if (UnitWSD::get().filterHandleRequest(
UnitWSD::TestRequest::Prisoner, disposition, *this))
return;
if (_childProcess.lock())
{
// FIXME: inelegant etc. - derogate to websocket code

2
wsd/TestStubs.cpp
View file

@ -33,8 +33,6 @@ void ClientSession::dumpState(std::ostream& /*os*/) {}
void ClientSession::setReadOnly() {}
void ClientSession::handleIncomingMessage(SocketDisposition &) {}
bool ClientSession::_handleInput(const char* /*buffer*/, int /*length*/) { return false; }
int ClientSession::getPollEvents(std::chrono::steady_clock::time_point /* now */, int & /* timeoutMaxMs */) { return 0; }