wsd: test: remove inherited logic from UnitWOPIDocumentConflict

Change-Id: I433d0aaa661ad607fc029a52989d806e8364d037
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>

2 files changed, 11 insertions, 234 deletions

diff --git a/test/UnitWOPIDocumentConflict.cpp b/test/UnitWOPIDocumentConflict.cpp
index e6c93d14c5..a7923e8a55 100644
--- a/test/UnitWOPIDocumentConflict.cpp
+++ b/test/UnitWOPIDocumentConflict.cpp
@@ -23,242 +23,18 @@
 
 class UnitWOPIDocumentConflict : public WOPIUploadConflictCommon
 {
-protected:
-    STATES_ENUM(Phase, _phase, Load, WaitLoadStatus, WaitModifiedStatus, WaitDocClose);
-    STATES_ENUM(Scenario, _scenario, Disconnect, SaveDiscard, CloseDiscard, SaveOverwrite, VerifyOverwrite);
+    using WOPIUploadConflictCommon::Phase;
+    using WOPIUploadConflictCommon::Scenario;
 
-    static constexpr auto OriginalDocContent = "Original contents";
-    static constexpr auto ModifiedOriginalDocContent = "\ufeffaOriginal contents\n";
-    static constexpr auto ConflictingDocContent = "Modified in-storage contents";
+    using WOPIUploadConflictCommon::ConflictingDocContent;
+    using WOPIUploadConflictCommon::ModifiedOriginalDocContent;
+    using WOPIUploadConflictCommon::OriginalDocContent;
 
 public:
     UnitWOPIDocumentConflict()
         : WOPIUploadConflictCommon("UnitWOPIDocumentConflict", OriginalDocContent)
-        , _phase(Phase::Load)
-        , _scenario(Scenario::Disconnect)
     {
     }
-
-    void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/) override
-    {
-        LOG_TST("Testing " << toString(_scenario));
-        LOK_ASSERT_STATE(_phase, Phase::WaitLoadStatus);
-
-        // Note: the expected contents for each scenario
-        // is the result of the *previous* phase!
-        std::string expectedContents;
-        switch (_scenario)
-        {
-            case Scenario::Disconnect:
-                expectedContents = OriginalDocContent;
-                break;
-            case Scenario::SaveDiscard:
-                expectedContents = ConflictingDocContent;
-                break;
-            case Scenario::CloseDiscard:
-            case Scenario::SaveOverwrite:
-                LOK_ASSERT_EQUAL_MESSAGE("Unexpected contents in storage",
-                                         std::string(ConflictingDocContent), getFileContent());
-                setFileContent(OriginalDocContent); // Reset to test overwriting.
-                expectedContents = OriginalDocContent;
-                break;
-            case Scenario::VerifyOverwrite:
-                expectedContents = ModifiedOriginalDocContent;
-                break;
-        }
-
-        LOK_ASSERT_EQUAL_MESSAGE("Unexpected contents in storage", expectedContents,
-                                 getFileContent());
-    }
-
-    std::unique_ptr<http::Response>
-    assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) override
-    {
-        LOG_TST("Testing " << toString(_scenario));
-        LOK_ASSERT_STATE(_phase, Phase::WaitDocClose);
-
-        switch (_scenario)
-        {
-            case Scenario::Disconnect:
-            case Scenario::SaveDiscard:
-            case Scenario::CloseDiscard:
-            case Scenario::VerifyOverwrite:
-                LOK_ASSERT_FAIL("Unexpectedly overwritting the document in storage");
-                break;
-            case Scenario::SaveOverwrite:
-                LOK_ASSERT_EQUAL_MESSAGE("Unexpected contents in storage",
-                                         std::string(ModifiedOriginalDocContent), getFileContent());
-                LOG_TST("Closing the document to verify its contents after reloading");
-                WSD_CMD("closedocument");
-                break;
-        }
-
-        return nullptr;
-    }
-
-    bool onDocumentLoaded(const std::string& message) override
-    {
-        LOG_TST("Testing " << toString(_scenario) << ": [" << message << ']');
-        LOK_ASSERT_STATE(_phase, Phase::WaitLoadStatus);
-
-        if (_scenario != Scenario::VerifyOverwrite)
-        {
-            LOG_TST("Modifying the document");
-            TRANSITION_STATE(_phase, Phase::WaitModifiedStatus);
-
-            // modify the currently opened document; type 'a'
-            WSD_CMD("key type=input char=97 key=0");
-            WSD_CMD("key type=up char=0 key=512");
-        }
-        else
-        {
-            LOG_TST("Closing the document to finish testing");
-            TRANSITION_STATE_MSG(_phase, Phase::WaitDocClose, "Skipping modifications");
-            WSD_CMD("closedocument");
-        }
-
-        return true;
-    }
-
-    bool onDocumentModified(const std::string& message) override
-    {
-        LOG_TST("Testing " << toString(_scenario) << ": [" << message << ']');
-        LOK_ASSERT_STATE(_phase, Phase::WaitModifiedStatus);
-
-        // Change the underlying document in storage.
-        LOG_TST("Changing document contents in storage");
-        setFileContent(ConflictingDocContent);
-
-        TRANSITION_STATE(_phase, Phase::WaitDocClose);
-
-        switch (_scenario)
-        {
-            case Scenario::Disconnect:
-                LOG_TST("Disconnecting");
-                deleteSocketAt(0);
-                break;
-            case Scenario::SaveDiscard:
-            case Scenario::SaveOverwrite:
-                // Save the document; wsd should detect now that document has
-                // been changed underneath it and send us:
-                // "error: cmd=storage kind=documentconflict"
-                LOG_TST("Saving the document");
-                WSD_CMD("save dontTerminateEdit=0 dontSaveIfUnmodified=0");
-                break;
-            case Scenario::CloseDiscard:
-                // Close the document; wsd should detect now that document has
-                // been changed underneath it and send us:
-                // "error: cmd=storage kind=documentconflict"
-                LOG_TST("Closing the document");
-                WSD_CMD("closedocument");
-                break;
-            case Scenario::VerifyOverwrite:
-                LOK_ASSERT_FAIL("Unexpected modification in " + toString(_scenario));
-                break;
-        }
-
-        return true;
-    }
-
-    bool onDocumentError(const std::string& message) override
-    {
-        LOG_TST("Testing " << toString(_scenario) << ": [" << message << ']');
-        LOK_ASSERT_STATE(_phase, Phase::WaitDocClose);
-
-        LOK_ASSERT_MESSAGE("Expect only documentconflict errors",
-                           message == "error: cmd=storage kind=documentconflict");
-
-        switch (_scenario)
-        {
-            case Scenario::Disconnect:
-                LOK_ASSERT_FAIL("We can't possibly get anything after disconnecting");
-                break;
-            case Scenario::SaveDiscard:
-            case Scenario::CloseDiscard:
-                LOG_TST("Discarding own changes via closedocument");
-                WSD_CMD("closedocument");
-                break;
-            case Scenario::SaveOverwrite:
-                LOG_TST("Overwriting with own version via savetostorage");
-                WSD_CMD("savetostorage force=1");
-                break;
-            case Scenario::VerifyOverwrite:
-                LOK_ASSERT_FAIL("Unexpected error in " + toString(_scenario));
-                break;
-        }
-
-        return true;
-    }
-
-    // Called when we have modified document data at exit.
-    void fail(const std::string& reason) override
-    {
-        // We expect this to happen only with the disonnection test,
-        // because only in that case there is no user input.
-        LOK_ASSERT_MESSAGE("Expected reason to be 'Unsaved data detected'",
-                           Util::startsWith(reason, "Unsaved data detected"));
-        LOK_ASSERT_MESSAGE("Expected to be in Phase::WaitDocClose but was " + toString(_phase),
-                           _phase == Phase::WaitDocClose);
-        LOK_ASSERT_MESSAGE("Expected to be in Scenario::Disconnect but was " + toString(_scenario),
-                           _scenario == Scenario::Disconnect);
-    }
-
-    // Wait for clean unloading.
-    void onDocBrokerDestroy(const std::string& docKey) override
-    {
-        LOG_TST("Testing " << toString(_scenario) << " with dockey [" << docKey << "] closed.");
-        LOK_ASSERT_STATE(_phase, Phase::WaitDocClose);
-
-        switch (_scenario)
-        {
-            case Scenario::Disconnect:
-                TRANSITION_STATE(_scenario, Scenario::SaveDiscard);
-                break;
-            case Scenario::SaveDiscard:
-                TRANSITION_STATE(_scenario, Scenario::CloseDiscard);
-                break;
-            case Scenario::CloseDiscard:
-                TRANSITION_STATE(_scenario, Scenario::SaveOverwrite);
-                break;
-            case Scenario::SaveOverwrite:
-                TRANSITION_STATE(_scenario, Scenario::VerifyOverwrite);
-                break;
-            case Scenario::VerifyOverwrite:
-                passTest("Finished all test scenarios without issues");
-                break;
-        }
-
-        TRANSITION_STATE(_phase, Phase::Load);
-    }
-
-    void invokeWSDTest() override
-    {
-        switch (_phase)
-        {
-            case Phase::Load:
-            {
-                LOG_TST("Loading the document for " << toString(_scenario));
-
-                TRANSITION_STATE(_phase, Phase::WaitLoadStatus);
-
-                initWebsocket("/wopi/files/0?access_token=anything");
-                WSD_CMD("load url=" + getWopiSrc());
-            }
-            break;
-            case Phase::WaitLoadStatus:
-            {
-            }
-            break;
-            case Phase::WaitModifiedStatus:
-            {
-            }
-            break;
-            case Phase::WaitDocClose:
-            {
-            }
-            break;
-        }
-    }
 };
 
 UnitBase* unit_create_wsd(void) { return new UnitWOPIDocumentConflict(); }
diff --git a/test/UnitWOPISaveOnExit.cpp b/test/UnitWOPISaveOnExit.cpp
index ec5cf0431e..d445d3fa0b 100644
--- a/test/UnitWOPISaveOnExit.cpp
+++ b/test/UnitWOPISaveOnExit.cpp
@@ -26,9 +26,9 @@ class UnitWOPISaveOnExit : public WOPIUploadConflictCommon
     using WOPIUploadConflictCommon::Phase;
     using WOPIUploadConflictCommon::Scenario;
 
-    using WOPIUploadConflictCommon::OriginalDocContent;
-    using WOPIUploadConflictCommon::ModifiedOriginalDocContent;
     using WOPIUploadConflictCommon::ConflictingDocContent;
+    using WOPIUploadConflictCommon::ModifiedOriginalDocContent;
+    using WOPIUploadConflictCommon::OriginalDocContent;
 
 public:
     UnitWOPISaveOnExit()
@@ -36,14 +36,14 @@ public:
     {
     }
 
-    void configure(Poco::Util::LayeredConfiguration& config)
+    void configure(Poco::Util::LayeredConfiguration& config) override
     {
         WopiTestServer::configure(config);
 
         config.setBool("per_document.always_save_on_exit", true);
     }
 
-    void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/)
+    void assertGetFileRequest(const Poco::Net::HTTPRequest& /*request*/) override
     {
         LOG_TST("Testing " << toString(_scenario));
         LOK_ASSERT_STATE(_phase, Phase::WaitLoadStatus);
@@ -75,7 +75,8 @@ public:
                                  getFileContent());
     }
 
-    std::unique_ptr<http::Response> assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/)
+    std::unique_ptr<http::Response>
+    assertPutFileRequest(const Poco::Net::HTTPRequest& /*request*/) override
     {
         LOG_TST("Testing " << toString(_scenario));
         LOK_ASSERT_STATE(_phase, Phase::WaitDocClose);