[Libreoffice-commits] online.git: test/UnitOAuth.cpp test/UnitWOPI.cpp test/UnitWOPIDocumentConflict.cpp test/UnitWopiOwnertermination.cpp test/UnitWOPISaveAs.cpp test/UnitWOPIVersionRestore.cpp test/WopiTestServer.hpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 07:49:31 UTC 2018
test/UnitOAuth.cpp | 2 +-
test/UnitWOPI.cpp | 10 +++++-----
test/UnitWOPIDocumentConflict.cpp | 12 ++++++------
test/UnitWOPISaveAs.cpp | 6 +++---
test/UnitWOPIVersionRestore.cpp | 8 ++++----
test/UnitWopiOwnertermination.cpp | 8 ++++----
test/WopiTestServer.hpp | 12 +++++++++---
7 files changed, 32 insertions(+), 26 deletions(-)
New commits:
commit b773f11bdb7f8298e07d2e92f8d6989ff189f1da
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Dec 13 08:48:50 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Dec 13 08:49:09 2018 +0100
WopiTestServer: make members private
Change-Id: If042fab5b69faf7c7dff975a95810cb96d8f02b0
diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index fad7ad120..de3c3a582 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -101,7 +101,7 @@ public:
else
initWebsocket("/wopi/files/1?access_header=Authorization: Basic basic==");
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), testName);
SocketPoll::wakeupWorld();
if (_phase == Phase::LoadToken)
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
index 3e1542d9b..863dc4c13 100644
--- a/test/UnitWOPI.cpp
+++ b/test/UnitWOPI.cpp
@@ -87,8 +87,8 @@ public:
{
initWebsocket("/wopi/files/0?access_token=anything");
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save dontTerminateEdit=1 dontSaveIfUnmodified=0", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "save dontTerminateEdit=1 dontSaveIfUnmodified=0", testName);
_phase = Phase::Modify;
_savingPhase = SavingPhase::Unmodified;
@@ -97,15 +97,15 @@ public:
}
case Phase::Modify:
{
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
_phase = Phase::SaveModified;
break;
}
case Phase::SaveModified:
{
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save dontTerminateEdit=0 dontSaveIfUnmodified=0", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "save dontTerminateEdit=0 dontSaveIfUnmodified=0", testName);
_phase = Phase::Polling;
_savingPhase = SavingPhase::Modified;
diff --git a/test/UnitWOPIDocumentConflict.cpp b/test/UnitWOPIDocumentConflict.cpp
index 0b1cbb8e6..11bd42b5b 100644
--- a/test/UnitWOPIDocumentConflict.cpp
+++ b/test/UnitWOPIDocumentConflict.cpp
@@ -54,7 +54,7 @@ public:
{
// On second doc load, we should have the document in storage which
// was changed beneath us, not the one which we modified by pressing 'a'
- if (_fileContent != "Modified content in storage")
+ if (getFileContent() != "Modified content in storage")
exitTest(TestResult::Failed);
else
exitTest(TestResult::Ok);
@@ -68,7 +68,7 @@ public:
{
// we don't want to save current changes because doing so would
// overwrite the document which was changed underneath us
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "closedocument", _testName.c_str());
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "closedocument", _testName.c_str());
_phase = Phase::LoadNewDocument;
}
@@ -84,7 +84,7 @@ public:
initWebsocket("/wopi/files/0?access_token=anything");
_docLoaded = DocLoaded::Doc1;
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, _testName.c_str());
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), _testName.c_str());
_phase = Phase::ModifyAndChangeStorageDoc;
break;
@@ -92,8 +92,8 @@ public:
case Phase::ModifyAndChangeStorageDoc:
{
// modify the currently opened document; type 'a'
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=input char=97 key=0", _testName.c_str());
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=up char=0 key=512", _testName.c_str());
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", _testName.c_str());
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", _testName.c_str());
SocketPoll::wakeupWorld();
// ModifiedStatus=true is a bit slow; let's sleep and hope that
@@ -106,7 +106,7 @@ public:
// save the document; wsd should detect now that document has
// been changed underneath it and send us:
// "error: cmd=storage kind=documentconflict"
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "save", _testName.c_str());
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "save", _testName.c_str());
_phase = Phase::Polling;
diff --git a/test/UnitWOPISaveAs.cpp b/test/UnitWOPISaveAs.cpp
index 7d9be30f9..19c9d5d17 100644
--- a/test/UnitWOPISaveAs.cpp
+++ b/test/UnitWOPISaveAs.cpp
@@ -38,7 +38,7 @@ public:
// make sure it is a pdf - or at least that it is larger than what it
// used to be
- CPPUNIT_ASSERT(std::stoul(request.get("X-WOPI-Size")) > _fileContent.size());
+ CPPUNIT_ASSERT(std::stoul(request.get("X-WOPI-Size")) > getFileContent().size());
}
bool filterSendMessage(const char* data, const size_t len, const WSOpCode /* code */, const bool /* flush */, int& /*unitReturn*/) override
@@ -65,8 +65,8 @@ public:
{
initWebsocket("/wopi/files/0?access_token=anything");
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "saveas url=wopi:///jan/hole%C5%A1ovsk%C3%BD/hello%20world.pdf", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "saveas url=wopi:///jan/hole%C5%A1ovsk%C3%BD/hello%20world.pdf", testName);
SocketPoll::wakeupWorld();
_phase = Phase::Polling;
diff --git a/test/UnitWOPIVersionRestore.cpp b/test/UnitWOPIVersionRestore.cpp
index fb0c9400c..3ad8dab09 100644
--- a/test/UnitWOPIVersionRestore.cpp
+++ b/test/UnitWOPIVersionRestore.cpp
@@ -74,15 +74,15 @@ public:
{
initWebsocket("/wopi/files/0?access_token=anything");
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), testName);
_phase = Phase::Modify;
break;
}
case Phase::Modify:
{
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
_phase = Phase::VersionRestoreRequest;
SocketPoll::wakeupWorld();
@@ -91,7 +91,7 @@ public:
case Phase::VersionRestoreRequest:
{
// tell wsd that we are about to restore
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "versionrestore prerestore", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "versionrestore prerestore", testName);
_phase = Phase::Polling;
break;
}
diff --git a/test/UnitWopiOwnertermination.cpp b/test/UnitWopiOwnertermination.cpp
index 8ddb02a46..60be85588 100644
--- a/test/UnitWopiOwnertermination.cpp
+++ b/test/UnitWopiOwnertermination.cpp
@@ -52,15 +52,15 @@ public:
{
initWebsocket("/wopi/files/0?access_token=anything");
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), testName);
_phase = Phase::Modify;
break;
}
case Phase::Modify:
{
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", testName);
_phase = Phase::OwnerTermination;
SocketPoll::wakeupWorld();
@@ -69,7 +69,7 @@ public:
case Phase::OwnerTermination:
{
_phase = Phase::Polling;
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "closedocument", testName);
+ helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "closedocument", testName);
break;
}
case Phase::Polling:
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index cc951f9c6..1854b9c11 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -30,7 +30,7 @@ class WopiTestServer : public UnitWSD
DocChanged = 1010
};
-protected:
+private:
/// The WOPISrc URL.
std::string _wopiSrc;
@@ -43,6 +43,13 @@ protected:
/// Last modified time of the file
Poco::Timestamp _fileLastModifiedTime;
+protected:
+ const std::string& getWopiSrc() const { return _wopiSrc; }
+
+ const std::unique_ptr<UnitWebSocket>& getWs() const { return _ws; }
+
+ const std::string& getFileContent() const { return _fileContent; }
+
/// Sets the file content to a given value and update the last file modified time
void setFileContent(const std::string& fileContent)
{
@@ -52,8 +59,7 @@ protected:
public:
WopiTestServer(std::string fileContent = "Hello, world")
- : UnitWSD()
- , _fileContent(fileContent)
+ : _fileContent(std::move(fileContent))
{
}
More information about the Libreoffice-commits
mailing list