vcl/qa/cppunit/GraphicTest.cxx | 13 ++++++++++++-
vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 4 ++++
xmlsecurity/qa/unit/signing/signing.cxx | 4 ++++
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 49b7f93fa6f42935e074cb5f34da15255f79807a
Author: Noel Grandin <n...@peralex.com>
AuthorDate: Sun Dec 20 19:54:57 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 21 07:30:10 2020 +0100
disable some more tests for non-default-dpi
Change-Id: If5aecfb01685e2953fafdfc190054a28b9315bf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108054
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index c58ca7d650b4..4c6a1a6972dc 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -13,6 +13,7 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
+#include <test/bootstrapfixture.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -39,7 +40,7 @@ using namespace css;
namespace
{
-class GraphicTest : public CppUnit::TestFixture
+class GraphicTest : public test::BootstrapFixture
{
public:
~GraphicTest();
@@ -783,6 +784,11 @@ void
GraphicTest::testSwappingVectorGraphic_SVG_WithoutGfxLink()
void GraphicTest::testSwappingGraphicProperties_SVG_WithGfxLink()
{
+ // FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
+ if (!IsDefaultDPI())
+ return;
+
// We check that Graphic properties like MapMode, PrefSize are properly
// restored through a swap cycle
@@ -842,6 +848,11 @@ void
GraphicTest::testSwappingGraphicProperties_SVG_WithGfxLink()
void GraphicTest::testSwappingGraphicProperties_SVG_WithoutGfxLink()
{
+ // FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
+ if (!IsDefaultDPI())
+ return;
+
test::Directories aDirectories;
OUString aURL = aDirectories.getURLFromSrc(DATA_DIRECTORY) +
"SimpleExample.svg";
SvFileStream aStream(aURL, StreamMode::READ);
diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
index d94eb76aa5b3..11881bb09c00 100644
--- a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
+++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
@@ -74,6 +74,10 @@ void VclFilterIpdfTest::tearDown()
CPPUNIT_TEST_FIXTURE(VclFilterIpdfTest, testPDFAddVisibleSignatureLastPage)
{
+ // FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
+ if (!IsDefaultDPI())
+ return;
// Given: copy the test document to a temporary file, as it'll be modified.
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx
b/xmlsecurity/qa/unit/signing/signing.cxx
index 513ebcce6009..23d6dc9162dd 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -598,6 +598,10 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFNo)
#if HAVE_FEATURE_PDFIUM
CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature)
{
+ // FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
+ if (!IsDefaultDPI())
+ return;
// Given: copy the test document to a temporary file, as it'll be modified.
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
