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

loolwsd: fix -Werror=shadow

Browse source
This commit is contained in:
Henry Castro 2016-05-05 14:53:34 -04:00
parent 1643938a8e
commit e03d4f7b77
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
loolwsd/test/httpwstest.cpp
View file

@ -1107,12 +1107,6 @@ void HTTPWSTest::testSlideShow()
{
try
{
const std::string jail = "jail=";
const std::string dir = "dir=";
const std::string name = "name=";
const std::string port = "port=";
const std::string id = "id=";
// Load a document
std::string documentPath, documentURL;
std::string response;
@ -1144,18 +1138,17 @@ void HTTPWSTest::testSlideShow()
const std::string path = "/" + jail + "/" + dir + "/" + name + "?mime_type=image/svg%2Bxml";
std::unique_ptr<Poco::Net::HTTPClientSession> session(helpers::createSession(_uri));
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, path);
session->sendRequest(request);
Poco::Net::HTTPResponse response;
session->receiveResponse(response);
CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTP_OK, response.getStatus());
CPPUNIT_ASSERT_EQUAL(std::string("image/svg+xml"), response.getContentType());
Poco::Net::HTTPRequest requestSVG(Poco::Net::HTTPRequest::HTTP_GET, path);
session->sendRequest(requestSVG);
Poco::Net::HTTPResponse responseSVG;
session->receiveResponse(responseSVG);
CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTP_OK, responseSVG.getStatus());
CPPUNIT_ASSERT_EQUAL(std::string("image/svg+xml"), responseSVG.getContentType());
}
socket.shutdown();
Util::removeFile(documentPath);
}
}
catch (const Poco::Exception& exc)
{
CPPUNIT_FAIL(exc.displayText());