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

loolwsd: formatting

Browse source 
Change-Id: Id71a073c026ddea484fcb7da7d674109f3778c7c
Reviewed-on: https://gerrit.libreoffice.org/25346
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-05-22 18:47:04 -04:00 committed by Ashod Nakashian
parent 157386e3bc
commit dcfa259b4e
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
loolwsd/test/httpwstest.cpp
View file

@ -1351,7 +1351,6 @@ void HTTPWSTest::testLimitCursor( std::function<void(const std::shared_ptr<Poco:
checkhandler(docWidth, docHeight, newWidth, newHeight);
}
CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSTest);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
loolwsd/test/integration-http-server.cpp
View file

@ -151,7 +151,8 @@ void HTTPServerTest::testLoleafletPost()
CPPUNIT_ASSERT(html.find(_uri.getHost()) != std::string::npos);
}
namespace {
namespace
{
void assertHTTPFilesExist(const Poco::URI& uri, Poco::RegularExpression& expr, const std::string& html, const std::string& mimetype = std::string())
{
@ -167,8 +168,7 @@ void assertHTTPFilesExist(const Poco::URI& uri, Poco::RegularExpression& expr, c
{
std::string scriptString(uriScript.toString());
// ignore the branding bits, it's not an error when they are not
// present
// ignore the branding bits, it's not an error when they aren't present.
if (scriptString.find("/branding.") != std::string::npos)
continue;