strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loolwsd: unittest cleanups

Browse source 
Change-Id: Ic383915012ac1c254960d976cc89d3f7c1a2cb02
Reviewed-on: https://gerrit.libreoffice.org/28440
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-08-28 12:25:40 -04:00 committed by Ashod Nakashian
parent f87edc7367
commit 03921a0769
2 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
loolwsd/test/helpers.hpp
View file

@ -82,9 +82,9 @@ std::vector<char> readDataFromFile(std::unique_ptr<std::fstream>& file)
}
inline
void getDocumentPathAndURL(const char* document, std::string& documentPath, std::string& documentURL)
void getDocumentPathAndURL(const std::string& docFilename, std::string& documentPath, std::string& documentURL)
{
documentPath = Util::getTempFilePath(TDOC, document);
documentPath = Util::getTempFilePath(TDOC, docFilename);
documentURL = "lool/ws/file://" + Poco::Path(documentPath).makeAbsolute().toString();
std::cerr << "Test file: " << documentPath << std::endl;
@ -388,6 +388,24 @@ std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const Poco::URI& uri,
return nullptr;
}
inline
std::shared_ptr<Poco::Net::WebSocket> loadDocAndGetSocket(const std::string& docFilename, const Poco::URI& uri, const std::string& name = "", bool isView = false)
{
try
{
std::string documentPath, documentURL;
getDocumentPathAndURL(docFilename, documentPath, documentURL);
return loadDocAndGetSocket(uri, documentURL, name, isView);
}
catch (const Poco::Exception& exc)
{
CPPUNIT_FAIL(exc.displayText());
}
// Really couldn't reach here, but the compiler doesn't know any better.
return nullptr;
}
inline
void SocketProcessor(const std::string& name,
const std::shared_ptr<Poco::Net::WebSocket>& socket,

52
loolwsd/test/httpwstest.cpp
View file

@ -1438,11 +1438,9 @@ void HTTPWSTest::testLimitCursor( std::function<void(const std::shared_ptr<Poco:
void HTTPWSTest::testInsertAnnotationWriter()
{
std::string documentPath, documentURL;
getDocumentPathAndURL("hello.odt", documentPath, documentURL);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL);
auto socket = loadDocAndGetSocket(_uri, documentURL);
const auto testname = "insertAnnotationWriter ";
const std::string docFilename = "hello.odt";
auto socket = loadDocAndGetSocket(docFilename, _uri, testname);
// Insert comment.
sendTextFrame(socket, "uno .uno:InsertAnnotation");
@ -1490,7 +1488,7 @@ void HTTPWSTest::testInsertAnnotationWriter()
// Close and reopen the same document and test again.
socket->shutdown();
std::cerr << "Reloading " << std::endl;
socket = loadDocAndGetSocket(_uri, documentURL);
socket = loadDocAndGetSocket(docFilename, _uri, testname);
// Confirm that the text is in the comment and not doc body.
// Click in the body.
@ -1520,11 +1518,9 @@ void HTTPWSTest::testInsertAnnotationWriter()
void HTTPWSTest::testEditAnnotationWriter()
{
std::string documentPath, documentURL;
getDocumentPathAndURL("with_comment.odt", documentPath, documentURL);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL);
auto socket = loadDocAndGetSocket(_uri, documentURL);
const auto testname = "editAnnotationWriter ";
const std::string docFilename = "with_comment.odt";
auto socket = loadDocAndGetSocket(docFilename, _uri, testname);
// Click in the body.
sendTextFrame(socket, "mouse type=buttondown x=1600 y=1600 count=1 buttons=1 modifier=0");
@ -1532,7 +1528,7 @@ void HTTPWSTest::testEditAnnotationWriter()
// Read body text.
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
auto res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
auto res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"), res);
// Confirm that the comment is intact.
@ -1540,20 +1536,20 @@ void HTTPWSTest::testEditAnnotationWriter()
sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1 buttons=1 modifier=0");
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: blah blah xyz"), res);
// Can we still edit the coment?
sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nand now for something completely different");
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for something completely different"), res);
// Close and reopen the same document and test again.
socket->shutdown();
std::cerr << "Reloading " << std::endl;
socket = loadDocAndGetSocket(_uri, documentURL);
socket = loadDocAndGetSocket(docFilename, _uri, testname);
// Confirm that the text is in the comment and not doc body.
// Click in the body.
@ -1562,7 +1558,7 @@ void HTTPWSTest::testEditAnnotationWriter()
// Read body text.
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"), res);
// Confirm that the comment is still intact.
@ -1570,24 +1566,21 @@ void HTTPWSTest::testEditAnnotationWriter()
sendTextFrame(socket, "mouse type=buttonup x=13855 y=1893 count=1 buttons=1 modifier=0");
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: and now for something completely different"), res);
// Can we still edit the coment?
sendTextFrame(socket, "paste mimetype=text/plain;charset=utf-8\nnew text different");
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationWriter ");
res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: new text different"), res);
}
void HTTPWSTest::testInsertAnnotationCalc()
{
std::string documentPath, documentURL;
getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL);
auto socket = loadDocAndGetSocket(_uri, documentURL);
const auto testname = "insertAnnotationCalc ";
auto socket = loadDocAndGetSocket("setclientpart.ods", _uri, testname);
// Insert comment.
sendTextFrame(socket, "uno .uno:InsertAnnotation");
@ -1598,17 +1591,14 @@ void HTTPWSTest::testInsertAnnotationCalc()
// Read it back.
sendTextFrame(socket, "uno .uno:SelectAll");
sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8");
auto res = getResponseLine(socket, "textselectioncontent:", "insertAnnotationCalc ");
auto res = getResponseLine(socket, "textselectioncontent:", testname);
CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: aaa bbb ccc"), res);
}
void HTTPWSTest::testCalcEditRendering()
{
std::string documentPath, documentURL;
getDocumentPathAndURL("calc_render.xls", documentPath, documentURL);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL);
auto socket = loadDocAndGetSocket(_uri, documentURL);
const auto testname = "calcEditRendering ";
auto socket = loadDocAndGetSocket("calc_render.xls", _uri, testname);
const std::string x = "5000";
const std::string y = "5";
@ -1617,12 +1607,12 @@ void HTTPWSTest::testCalcEditRendering()
sendTextFrame(socket, "key type=input char=98 key=0");
sendTextFrame(socket, "key type=input char=99 key=0");
assertResponseLine(socket, "cellformula: abc", "calcEditRendering ");
assertResponseLine(socket, "cellformula: abc", testname);
const auto req = "tilecombine part=0 width=512 height=512 tileposx=3840 tileposy=0 tilewidth=7680 tileheight=7680";
sendTextFrame(socket, req);
const auto tile = getResponseMessage(socket, "tile:", "calcEditRendering ");
const auto tile = getResponseMessage(socket, "tile:", testname);
std::cout << "size: " << tile.size() << std::endl;
// Return early for now when on LO >= 5.2.