test/httpwstest.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-)
New commits: commit 74c4cf1161de04e2a2bd3072b8f902da1e05908b Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Tue Oct 29 09:36:25 2019 +0000 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Tue Oct 29 09:36:25 2019 +0000 Fix mis-merge around testLargePaste. Change-Id: I2a24219a54a9b454ef5c5de558046a9bcc993873 diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp index 45311e84e..d7a7b9100 100644 --- a/test/httpwstest.cpp +++ b/test/httpwstest.cpp @@ -768,40 +768,6 @@ void HTTPWSTest::testPasteBlank() } } -void HTTPWSTest::testLargePaste() -{ - const char* testname = "LargePaste "; - try - { - // Load a document and make it empty, then paste some text into it. - std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket("hello.odt", _uri, testname); - - deleteAll(socket, testname); - - // Paste some text into it. - std::ostringstream oss; - for (int i = 0; i < 1000; ++i) - { - oss << Util::encodeId(Util::rng::getNext(), 6); - } - - const std::string documentContents = oss.str(); - TST_LOG("Pasting " << documentContents.size() << " characters into document."); - sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\n" + documentContents, testname); - getResponseString(socket, "textselection:", testname, 1000); - - // Check if the server is still alive. - // This resulted first in a hang, as respose for the message never arrived, then a bit later in a Poco::TimeoutException. - const std::string selection = getAllText(socket, testname); - CPPUNIT_ASSERT_MESSAGE("Pasted text was either corrupted or couldn't be read back", - "textselectioncontent: " + documentContents == selection); - } - catch (const Poco::Exception& exc) - { - CPPUNIT_FAIL(exc.displayText()); - } -} - void HTTPWSTest::testInsertDelete() { const char* testname = "insertDelete "; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits