test/httpwstest.cpp | 27 ---------------------------
1 file changed, 27 deletions(-)
New commits:
commit 4e43c5bbaf574af5206ecebae87a5e91225edf64
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Nov 13 09:02:54 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Nov 13 09:03:09 2019 +0100
test: remove duplicate HTTPWSTest::testPaste()
This was originally moved in commit
b97789eb76b63ea2b2fe073a9a4fbd918719a98b (Convert paste testcase to a
new-style one, 2019-10-18), then
194db8ed45e1bd47a94c5b7a23a9add0a4c0eb39 (test: improve stability of a
number of tests, 2019-10-12) restored a duplicate of this, probably due
to a mismerge.
Change-Id: Ie76266ddb85c58bb2370640025b91af980656908
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 92276cd46..8f00a4e8e 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -71,7 +71,6 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testSavePassiveOnDisconnect);
CPPUNIT_TEST(testReloadWhileDisconnecting);
CPPUNIT_TEST(testExcelLoad);
- CPPUNIT_TEST(testPaste);
CPPUNIT_TEST(testPasteBlank);
CPPUNIT_TEST(testInsertDelete);
CPPUNIT_TEST(testSlideShow);
@@ -110,7 +109,6 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testSavePassiveOnDisconnect();
void testReloadWhileDisconnecting();
void testExcelLoad();
- void testPaste();
void testPasteBlank();
void testInsertDelete();
void testSlideShow();
@@ -654,31 +652,6 @@ void HTTPWSTest::testExcelLoad()
}
}
-void HTTPWSTest::testPaste()
-{
- const char* testname = "paste ";
-
- // Load a document and make it empty, then paste some text into it.
- std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket("hello.odt",
_uri, testname);
-
- for (int i = 0; i < 5; ++i)
- {
- const std::string text = std::to_string(i + 1) +
"_sh9le[;\"CFD7U[#B+_nW=$kXgx{sv9QE#\"l1y\"hr_" +
Util::encodeId(Util::rng::getNext());
- TST_LOG("Pasting text #" << i + 1 << ": " << text);
-
- // Always delete everything to have an empty doc.
- deleteAll(socket, testname);
-
- // Paste some text into it.
- sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\n" +
text, testname);
- const std::string expected = "textselectioncontent: " + text;
-
- // Check if the document contains the pasted text.
- const std::string selection = getAllText(socket, testname);
- CPPUNIT_ASSERT_EQUAL(expected, selection);
- }
-}
-
void HTTPWSTest::testPasteBlank()
{
const char* testname = "pasteBlank ";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
