[Libreoffice-commits] online.git: test/httpwstest.cpp test/Makefile.am test/UnitClose.cpp
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Fri Dec 20 08:47:05 UTC 2019
test/Makefile.am | 4
test/UnitClose.cpp | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++
test/httpwstest.cpp | 156 ----------------------------------
3 files changed, 239 insertions(+), 156 deletions(-)
New commits:
commit 743edbc9e8d4df1e67c90f0823dc69bb72650f87
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Dec 20 09:04:17 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Dec 20 09:46:47 2019 +0100
Convert some closing tests to a new-style one
So that they are in-process, which means it's easier to debug when they
fail.
Change-Id: I5abaf6a5be4e21167fb1248c8c23dbc3b94c4303
Reviewed-on: https://gerrit.libreoffice.org/85573
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/test/Makefile.am b/test/Makefile.am
index 2c137f70b..6789e3d63 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -35,6 +35,7 @@ noinst_LTLIBRARIES = \
unit-cursor.la \
unit-calc.la \
unit-insert-delete.la \
+ unit-close.la \
unit-wopi-loadencoded.la unit-wopi-temp.la
MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
@@ -164,6 +165,8 @@ unit_calc_la_SOURCES = UnitCalc.cpp
unit_calc_la_LIBADD = $(CPPUNIT_LIBS)
unit_insert_delete_la_SOURCES = UnitInsertDelete.cpp
unit_insert_delete_la_LIBADD = $(CPPUNIT_LIBS)
+unit_close_la_SOURCES = UnitClose.cpp
+unit_close_la_LIBADD = $(CPPUNIT_LIBS)
if HAVE_LO_PATH
SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -197,6 +200,7 @@ TESTS = unit-copy-paste.la unit-typing.la unit-convert.la unit-prefork.la unit-t
unit-cursor.la \
unit-calc.la \
unit-insert-delete.la \
+ unit-close.la \
unit-wopi-loadencoded.la unit-wopi-temp.la
# TESTS = unit-client.la
# TESTS += unit-admin.la
diff --git a/test/UnitClose.cpp b/test/UnitClose.cpp
new file mode 100644
index 000000000..864ac9490
--- /dev/null
+++ b/test/UnitClose.cpp
@@ -0,0 +1,235 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <memory>
+#include <ostream>
+#include <set>
+#include <string>
+
+#include <Poco/Exception.h>
+#include <Poco/RegularExpression.h>
+#include <Poco/URI.h>
+#include <cppunit/TestAssert.h>
+
+#include <Png.hpp>
+#include <Unit.hpp>
+#include <helpers.hpp>
+
+// Include config.h last, so the test server URI is still HTTP, even in SSL builds.
+#include <config.h>
+
+class LOOLWebSocket;
+
+namespace
+{
+std::string getFontList(const std::string& message)
+{
+ Poco::JSON::Parser parser;
+ const Poco::Dynamic::Var result = parser.parse(message);
+ const auto& command = result.extract<Poco::JSON::Object::Ptr>();
+ std::string text = command->get("commandName").toString();
+ CPPUNIT_ASSERT_EQUAL(std::string(".uno:CharFontName"), text);
+ text = command->get("commandValues").toString();
+ return text;
+}
+}
+
+/// Test suite for closing, etc.
+class UnitClose : public UnitWSD
+{
+ TestResult testCloseAfterClose();
+ TestResult testFontList();
+ TestResult testGraphicInvalidate();
+ TestResult testAlertAllUsers();
+
+public:
+ void invokeTest() override;
+};
+
+UnitBase::TestResult UnitClose::testCloseAfterClose()
+{
+ const char* testname = "closeAfterClose ";
+ try
+ {
+ TST_LOG("Connecting and loading.");
+ Poco::URI uri(helpers::getTestServerURI());
+ std::shared_ptr<LOOLWebSocket> socket
+ = helpers::loadDocAndGetSocket("hello.odt", uri, testname);
+
+ // send normal socket shutdown
+ TST_LOG("Disconnecting.");
+ socket->shutdown();
+
+ // 5 seconds timeout
+ socket->setReceiveTimeout(5000000);
+
+ // receive close frame handshake
+ int bytes;
+ int flags;
+ char buffer[READ_BUFFER_SIZE];
+ do
+ {
+ bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
+ TST_LOG("Received [" << std::string(buffer, bytes) << "], flags: " << std::hex << flags
+ << std::dec);
+ } while (bytes > 0
+ && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK)
+ != Poco::Net::WebSocket::FRAME_OP_CLOSE);
+
+ TST_LOG("Received " << bytes << " bytes, flags: " << std::hex << flags << std::dec);
+
+ try
+ {
+ // no more messages is received.
+ bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
+ TST_LOG("Received " << bytes << " bytes, flags: " << std::hex << flags << std::dec);
+ CPPUNIT_ASSERT_EQUAL(0, bytes);
+ CPPUNIT_ASSERT_EQUAL(0, flags);
+ }
+ catch (const Poco::Exception& exc)
+ {
+ // This is not unexpected, since WSD will close the socket after
+ // echoing back the shutdown status code. However, if it doesn't
+ // we assert above that it doesn't send any more data.
+ TST_LOG("Error: " << exc.displayText());
+ }
+ }
+ catch (const Poco::Exception& exc)
+ {
+ CPPUNIT_FAIL(exc.displayText());
+ }
+ return TestResult::Ok;
+}
+
+UnitBase::TestResult UnitClose::testFontList()
+{
+ const char* testname = "fontList ";
+ try
+ {
+ // Load a document
+ Poco::URI uri(helpers::getTestServerURI());
+ std::shared_ptr<LOOLWebSocket> socket
+ = helpers::loadDocAndGetSocket("setclientpart.odp", uri, testname);
+
+ helpers::sendTextFrame(socket, "commandvalues command=.uno:CharFontName", testname);
+ const std::vector<char> response
+ = helpers::getResponseMessage(socket, "commandvalues:", testname);
+ CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as expected",
+ !response.empty());
+
+ std::stringstream streamResponse;
+ std::copy(response.begin() + std::string("commandvalues:").length() + 1, response.end(),
+ std::ostream_iterator<char>(streamResponse));
+ CPPUNIT_ASSERT(!getFontList(streamResponse.str()).empty());
+ }
+ catch (const Poco::Exception& exc)
+ {
+ CPPUNIT_FAIL(exc.displayText());
+ }
+ return TestResult::Ok;
+}
+
+UnitBase::TestResult UnitClose::testGraphicInvalidate()
+{
+ const char* testname = "graphicInvalidate ";
+ try
+ {
+ // Load a document.
+ Poco::URI uri(helpers::getTestServerURI());
+ std::shared_ptr<LOOLWebSocket> socket
+ = helpers::loadDocAndGetSocket("shape.ods", uri, testname);
+
+ // Send click message
+ helpers::sendTextFrame(
+ socket, "mouse type=buttondown x=1035 y=400 count=1 buttons=1 modifier=0", testname);
+ helpers::sendTextFrame(
+ socket, "mouse type=buttonup x=1035 y=400 count=1 buttons=1 modifier=0", testname);
+ helpers::getResponseString(socket, "graphicselection:", testname);
+
+ // Drag & drop graphic
+ helpers::sendTextFrame(
+ socket, "mouse type=buttondown x=1035 y=400 count=1 buttons=1 modifier=0", testname);
+ helpers::sendTextFrame(socket, "mouse type=move x=1035 y=450 count=1 buttons=1 modifier=0",
+ testname);
+ helpers::sendTextFrame(
+ socket, "mouse type=buttonup x=1035 y=450 count=1 buttons=1 modifier=0", testname);
+
+ const auto message = helpers::getResponseString(socket, "invalidatetiles:", testname);
+ CPPUNIT_ASSERT_MESSAGE("Drag & Drop graphic invalidate all tiles",
+ message.find("EMPTY") == std::string::npos);
+ }
+ catch (const Poco::Exception& exc)
+ {
+ CPPUNIT_FAIL(exc.displayText());
+ }
+ return TestResult::Ok;
+}
+
+UnitBase::TestResult UnitClose::testAlertAllUsers()
+{
+ // Load two documents, each in two sessions. Tell one session to fake a disk full
+ // situation. Expect to get the corresponding error back in all sessions.
+ static_assert(MAX_DOCUMENTS >= 2, "MAX_DOCUMENTS must be at least 2");
+ const char* testname = "alertAllUsers ";
+ try
+ {
+ std::shared_ptr<LOOLWebSocket> socket[4];
+
+ Poco::URI uri(helpers::getTestServerURI());
+ socket[0] = helpers::loadDocAndGetSocket("hello.odt", uri, testname);
+ socket[1] = helpers::loadDocAndGetSocket("Example.odt", uri, testname);
+
+ // Simulate disk full.
+ helpers::sendTextFrame(socket[0], "uno .uno:fakeDiskFull", testname);
+
+ // Assert that both clients get the error.
+ for (int i = 0; i < 2; i++)
+ {
+ const std::string response
+ = helpers::assertResponseString(socket[i], "error:", testname);
+ std::vector<std::string> tokens(LOOLProtocol::tokenize(response.substr(6), ' '));
+ std::string cmd;
+ LOOLProtocol::getTokenString(tokens, "cmd", cmd);
+ CPPUNIT_ASSERT_EQUAL(std::string("internal"), cmd);
+ std::string kind;
+ LOOLProtocol::getTokenString(tokens, "kind", kind);
+ CPPUNIT_ASSERT_EQUAL(std::string("diskfull"), kind);
+ }
+ }
+ catch (const Poco::Exception& exc)
+ {
+ CPPUNIT_FAIL(exc.displayText());
+ }
+ return TestResult::Ok;
+}
+
+void UnitClose::invokeTest()
+{
+ UnitBase::TestResult result = testCloseAfterClose();
+ if (result != TestResult::Ok)
+ exitTest(result);
+
+ result = testFontList();
+ if (result != TestResult::Ok)
+ exitTest(result);
+
+ result = testGraphicInvalidate();
+ if (result != TestResult::Ok)
+ exitTest(result);
+
+ result = testAlertAllUsers();
+ if (result != TestResult::Ok)
+ exitTest(result);
+
+ exitTest(TestResult::Ok);
+}
+
+UnitBase* unit_create_wsd(void) { return new UnitClose(); }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 5248664dd..3f90fabca 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -39,32 +39,22 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST_SUITE(HTTPWSTest);
- CPPUNIT_TEST(testCloseAfterClose);
CPPUNIT_TEST(testSaveOnDisconnect);
CPPUNIT_TEST(testSavePassiveOnDisconnect);
CPPUNIT_TEST(testReloadWhileDisconnecting);
CPPUNIT_TEST(testInactiveClient);
- CPPUNIT_TEST(testFontList);
- CPPUNIT_TEST(testGraphicInvalidate);
- CPPUNIT_TEST(testAlertAllUsers);
CPPUNIT_TEST(testViewInfoMsg);
CPPUNIT_TEST(testUndoConflict);
CPPUNIT_TEST_SUITE_END();
- void testCloseAfterClose();
void testSaveOnDisconnect();
void testSavePassiveOnDisconnect();
void testReloadWhileDisconnecting();
void testInactiveClient();
- void testFontList();
- void testGraphicInvalidate();
- void testAlertAllUsers();
void testViewInfoMsg();
void testUndoConflict();
- std::string getFontList(const std::string& message);
-
public:
HTTPWSTest()
: _uri(helpers::getTestServerURI())
@@ -101,57 +91,6 @@ public:
}
};
-void HTTPWSTest::testCloseAfterClose()
-{
- const char* testname = "closeAfterClose ";
- try
- {
- TST_LOG("Connecting and loading.");
- std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket("hello.odt", _uri, testname);
-
- // send normal socket shutdown
- TST_LOG("Disconnecting.");
- socket->shutdown();
-
- // 5 seconds timeout
- socket->setReceiveTimeout(5000000);
-
- // receive close frame handshake
- int bytes;
- int flags;
- char buffer[READ_BUFFER_SIZE];
- do
- {
- bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
- TST_LOG("Received [" << std::string(buffer, bytes) << "], flags: "<< std::hex << flags << std::dec);
- }
- while (bytes > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE);
-
- TST_LOG("Received " << bytes << " bytes, flags: "<< std::hex << flags << std::dec);
-
- try
- {
- // no more messages is received.
- bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
- TST_LOG("Received " << bytes << " bytes, flags: "<< std::hex << flags << std::dec);
- CPPUNIT_ASSERT_EQUAL(0, bytes);
- CPPUNIT_ASSERT_EQUAL(0, flags);
- }
- catch (const Poco::Exception& exc)
- {
- // This is not unexpected, since WSD will close the socket after
- // echoing back the shutdown status code. However, if it doesn't
- // we assert above that it doesn't send any more data.
- TST_LOG("Error: " << exc.displayText());
-
- }
- }
- catch (const Poco::Exception& exc)
- {
- CPPUNIT_FAIL(exc.displayText());
- }
-}
-
void HTTPWSTest::testSaveOnDisconnect()
{
const char* testname = "saveOnDisconnect ";
@@ -386,101 +325,6 @@ void HTTPWSTest::testInactiveClient()
}
}
-std::string HTTPWSTest::getFontList(const std::string& message)
-{
- Poco::JSON::Parser parser;
- const Poco::Dynamic::Var result = parser.parse(message);
- const auto& command = result.extract<Poco::JSON::Object::Ptr>();
- std::string text = command->get("commandName").toString();
- CPPUNIT_ASSERT_EQUAL(std::string(".uno:CharFontName"), text);
- text = command->get("commandValues").toString();
- return text;
-}
-
-void HTTPWSTest::testFontList()
-{
- const char* testname = "fontList ";
- try
- {
- // Load a document
- std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket("setclientpart.odp", _uri, testname);
-
- sendTextFrame(socket, "commandvalues command=.uno:CharFontName", testname);
- const std::vector<char> response = getResponseMessage(socket, "commandvalues:", testname);
- CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as expected", !response.empty());
-
- std::stringstream streamResponse;
- std::copy(response.begin() + std::string("commandvalues:").length() + 1, response.end(), std::ostream_iterator<char>(streamResponse));
- CPPUNIT_ASSERT(!getFontList(streamResponse.str()).empty());
- }
- catch (const Poco::Exception& exc)
- {
- CPPUNIT_FAIL(exc.displayText());
- }
-}
-
-void HTTPWSTest::testGraphicInvalidate()
-{
- const char* testname = "graphicInvalidate ";
- try
- {
- // Load a document.
- std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket("shape.ods", _uri, testname);
-
- // Send click message
- sendTextFrame(socket, "mouse type=buttondown x=1035 y=400 count=1 buttons=1 modifier=0", testname);
- sendTextFrame(socket, "mouse type=buttonup x=1035 y=400 count=1 buttons=1 modifier=0", testname);
- getResponseString(socket, "graphicselection:", testname);
-
- // Drag & drop graphic
- sendTextFrame(socket, "mouse type=buttondown x=1035 y=400 count=1 buttons=1 modifier=0", testname);
- sendTextFrame(socket, "mouse type=move x=1035 y=450 count=1 buttons=1 modifier=0", testname);
- sendTextFrame(socket, "mouse type=buttonup x=1035 y=450 count=1 buttons=1 modifier=0", testname);
-
- const auto message = getResponseString(socket, "invalidatetiles:", testname);
- CPPUNIT_ASSERT_MESSAGE("Drag & Drop graphic invalidate all tiles", message.find("EMPTY") == std::string::npos);
- }
- catch (const Poco::Exception& exc)
- {
- CPPUNIT_FAIL(exc.displayText());
- }
-}
-
-void HTTPWSTest::testAlertAllUsers()
-{
- // Load two documents, each in two sessions. Tell one session to fake a disk full
- // situation. Expect to get the corresponding error back in all sessions.
- static_assert(MAX_DOCUMENTS >= 2, "MAX_DOCUMENTS must be at least 2");
- const char* testname = "alertAllUsers ";
- try
- {
- std::shared_ptr<LOOLWebSocket> socket[4];
-
- socket[0] = loadDocAndGetSocket("hello.odt", _uri, testname);
- socket[1] = loadDocAndGetSocket("Example.odt", _uri, testname);
-
- // Simulate disk full.
- sendTextFrame(socket[0], "uno .uno:fakeDiskFull", testname);
-
- // Assert that both clients get the error.
- for (int i = 0; i < 2; i++)
- {
- const std::string response = assertResponseString(socket[i], "error:", testname);
- std::vector<std::string> tokens(LOOLProtocol::tokenize(response.substr(6), ' '));
- std::string cmd;
- LOOLProtocol::getTokenString(tokens, "cmd", cmd);
- CPPUNIT_ASSERT_EQUAL(std::string("internal"), cmd);
- std::string kind;
- LOOLProtocol::getTokenString(tokens, "kind", kind);
- CPPUNIT_ASSERT_EQUAL(std::string("diskfull"), kind);
- }
- }
- catch (const Poco::Exception& exc)
- {
- CPPUNIT_FAIL(exc.displayText());
- }
-}
-
void HTTPWSTest::testViewInfoMsg()
{
// Load 2 documents, cross-check the viewid received by each of them in their status message
More information about the Libreoffice-commits
mailing list