sd/qa/unit/PNGExportTests.cxx | 74 ++++++++++++++++++++++++++++++++++----
sd/qa/unit/data/odg/tdf126319.odg |binary
2 files changed, 67 insertions(+), 7 deletions(-)
New commits:
commit fd2f6282cb898f4a356ea8acf3dd1129f09fc1e1
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Feb 2 18:45:29 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Feb 8 16:44:07 2022 +0100
tdf#126319: sd_png_export_tests: Add unittest
Change-Id: I36cdd81fcb70d5383519c22b92a3d6366b719b8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129380
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/qa/unit/PNGExportTests.cxx b/sd/qa/unit/PNGExportTests.cxx
index 72f37c968e53..471c9d2b5760 100644
--- a/sd/qa/unit/PNGExportTests.cxx
+++ b/sd/qa/unit/PNGExportTests.cxx
@@ -47,14 +47,14 @@ void SdPNGExportTest::tearDown()
test::BootstrapFixture::tearDown();
}
-static void assertColorsAreSimilar(const BitmapColor& expected, const
BitmapColor& actual,
- int nDelta)
+static void assertColorsAreSimilar(const std::string& message, const
BitmapColor& expected,
+ const BitmapColor& actual, int nDelta)
{
// Check that the two colors match or are reasonably similar.
if (expected.GetColorError(actual) <= nDelta)
return;
- CPPUNIT_ASSERT_EQUAL(expected, actual);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(message, expected, actual);
}
CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf105998)
@@ -99,12 +99,12 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf105998)
const Color aColorTop = pReadAccess->GetColor(0, nX);
const Color aColorBottom = pReadAccess->GetColor(aSize.Height() -
1, nX);
- assertColorsAreSimilar(COL_LIGHTRED, aColorTop, 5);
+ assertColorsAreSimilar("Incorrect top border", COL_LIGHTRED,
aColorTop, 5);
// Without the fix in place, this test would have failed with
// - Expected: Color: R:255 G:0 B:0 A:0
// - Actual : Color: R:9 G:9 B:9 A:0
- assertColorsAreSimilar(COL_LIGHTRED, aColorBottom, 5);
+ assertColorsAreSimilar("Incorrect bottom border", COL_LIGHTRED,
aColorBottom, 5);
}
for (tools::Long nY = 1; nY < aSize.Height() - 1; ++nY)
@@ -112,8 +112,68 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf105998)
const Color aColorLeft = pReadAccess->GetColor(nY, 0);
const Color aColorRight = pReadAccess->GetColor(nY, aSize.Width()
- 1);
- assertColorsAreSimilar(COL_LIGHTRED, aColorLeft, 5);
- assertColorsAreSimilar(COL_LIGHTRED, aColorRight, 5);
+ assertColorsAreSimilar("Incorrect left border", COL_LIGHTRED,
aColorLeft, 5);
+ assertColorsAreSimilar("Incorrect right border", COL_LIGHTRED,
aColorRight, 5);
+ }
+ }
+}
+
+CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf126319)
+{
+ mxComponent
+ =
loadFromDesktop(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/tdf126319.odg"));
+ uno::Reference<uno::XComponentContext> xContext = getComponentContext();
+ CPPUNIT_ASSERT(xContext.is());
+ uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter
+ = drawing::GraphicExportFilter::create(xContext);
+
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+
+ uno::Sequence<beans::PropertyValue> aDescriptor{
+ comphelper::makePropertyValue("URL", aTempFile.GetURL()),
+ comphelper::makePropertyValue("FilterName", OUString("PNG"))
+ };
+
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPage>
xPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+ uno::Reference<lang::XComponent> xShape(xPage->getByIndex(0),
uno::UNO_QUERY);
+ xGraphicExporter->setSourceDocument(xShape);
+ xGraphicExporter->filter(aDescriptor);
+
+ SvFileStream aFileStream(aTempFile.GetURL(), StreamMode::READ);
+ vcl::PngImageReader aPNGReader(aFileStream);
+ BitmapEx aBMPEx = aPNGReader.read();
+
+ // make sure only the shape is exported
+ Size aSize = aBMPEx.GetSizePixel();
+ CPPUNIT_ASSERT_EQUAL(Size(295, 134), aSize);
+
+ // Check all borders are red or similar. Ignore the corners
+ Bitmap aBMP = aBMPEx.GetBitmap();
+ {
+ Bitmap::ScopedReadAccess pReadAccess(aBMP);
+ for (tools::Long nX = 2; nX < aSize.Width() - 2; ++nX)
+ {
+ const Color aColorTop = pReadAccess->GetColor(0, nX);
+ const Color aColorBottom = pReadAccess->GetColor(aSize.Height() -
2, nX);
+
+ assertColorsAreSimilar("Incorrect top border", COL_LIGHTRED,
aColorTop, 5);
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: Color: R:255 G:0 B:0 A:0
+ // - Actual : Color: R:77 G:0 B:0 A:0
+ assertColorsAreSimilar("Incorrect bottom border", COL_LIGHTRED,
aColorBottom, 5);
+ }
+
+ for (tools::Long nY = 2; nY < aSize.Height() - 2; ++nY)
+ {
+ const Color aColorLeft = pReadAccess->GetColor(nY, 0);
+ const Color aColorRight = pReadAccess->GetColor(nY, aSize.Width()
- 2);
+
+ assertColorsAreSimilar("Incorrect left border", COL_LIGHTRED,
aColorLeft, 5);
+ assertColorsAreSimilar("Incorrect right border", COL_LIGHTRED,
aColorRight, 5);
}
}
}
diff --git a/sd/qa/unit/data/odg/tdf126319.odg
b/sd/qa/unit/data/odg/tdf126319.odg
new file mode 100644
index 000000000000..71bfde547027
Binary files /dev/null and b/sd/qa/unit/data/odg/tdf126319.odg differ
