loolwsd/test/data/calc_render.xls |binary
loolwsd/test/httpwstest.cpp | 18 +++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 82ca247aeaa3979a29d39eec49eccd4d8be878b2
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Oct 24 22:58:27 2016 -0400
loolwsd: updated calc_render.xls with more shapes and test marks
Change-Id: Ic78d872901266f204f3528313108a357685305de
Reviewed-on: https://gerrit.libreoffice.org/30414
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/test/data/calc_render.xls
b/loolwsd/test/data/calc_render.xls
index be80ea1..453a00a 100644
Binary files a/loolwsd/test/data/calc_render.xls and
b/loolwsd/test/data/calc_render.xls differ
commit 3e1e3e788a90ba363d4502ddf5a7c51ba7763c89
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Oct 24 22:54:07 2016 -0400
loolwsd: remove outdated comment
...and enable a fragile and broken rendering
test into a warning until a the rendering is
more stable/fixed.
Change-Id: Id6ed596ddb64d94af2d4b7d49c8f185ac6a8b4ff
Reviewed-on: https://gerrit.libreoffice.org/30413
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index b5aefcc..cafeabb 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -67,7 +67,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testBadLoad);
CPPUNIT_TEST(testReload);
CPPUNIT_TEST(testGetTextSelection);
- CPPUNIT_TEST(testSaveOnDisconnect); // Broken with multiview.
+ CPPUNIT_TEST(testSaveOnDisconnect);
CPPUNIT_TEST(testReloadWhileDisconnecting);
CPPUNIT_TEST(testExcelLoad);
CPPUNIT_TEST(testPaste);
@@ -83,9 +83,9 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testMaxColumn);
CPPUNIT_TEST(testMaxRow);
CPPUNIT_TEST(testInsertAnnotationWriter);
- CPPUNIT_TEST(testEditAnnotationWriter); // Broken with multiview.
+ CPPUNIT_TEST(testEditAnnotationWriter);
CPPUNIT_TEST(testInsertAnnotationCalc);
- CPPUNIT_TEST(testCalcEditRendering); // Broken with multiview.
+ CPPUNIT_TEST(testCalcEditRendering);
CPPUNIT_TEST(testFontList);
CPPUNIT_TEST(testStateUnoCommand);
CPPUNIT_TEST(testColumnRowResize);
@@ -1360,9 +1360,6 @@ void HTTPWSTest::testCalcEditRendering()
int minor = 0;
stream >> minor;
- if (true /* major > 5 || (major == 5 && minor >= 2) */)
- return;
-
const std::string firstLine = LOOLProtocol::getFirstLine(tile);
std::vector<char> res(tile.begin() + firstLine.size() + 1, tile.end());
std::stringstream streamRes;
@@ -1393,7 +1390,14 @@ void HTTPWSTest::testCalcEditRendering()
for (png_uint_32 itRow = 0; itRow < height; ++itRow)
{
const bool eq = std::equal(rowsExp[itRow], rowsExp[itRow] + rowBytes,
rows[itRow]);
- CPPUNIT_ASSERT_MESSAGE("Tile not rendered as expected @ row #" +
std::to_string(itRow), eq);
+ if (!eq)
+ {
+ // This is a very strict test that breaks often/easily due to
slight rendering
+ // differences. So for now just keep it informative only.
+ //CPPUNIT_ASSERT_MESSAGE("Tile not rendered as expected @ row #" +
std::to_string(itRow), eq);
+ std::cerr << "\nFAILURE: Tile not rendered as expected @ row #" <<
itRow << std::endl;
+ break;
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
