From c469e786be9345fc76e5cc62fd23dd317db53c02 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 22 Mar 2024 13:15:00 +0200 Subject: skip more tests on hi-dpi windows Change-Id: I41368325959e69f016289d8e43775e05087f1be5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165159 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/qa/extras/htmlexport/htmlexport.cxx | 12 ++++++++++++ sw/qa/extras/htmlimport/htmlimport.cxx | 8 ++++++++ sw/qa/extras/uiwriter/uiwriter8.cxx | 4 ++++ 3 files changed, 24 insertions(+) (limited to 'sw') diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 54b803fc6fbb..b26bf2eb7415 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -687,6 +687,10 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfOleData) CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfOleImg) { + // 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; auto verify = [this]() { uno::Reference xSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xObjects(xSupplier->getEmbeddedObjects(), @@ -1836,6 +1840,10 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedPNGShapeAsOLE) CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNG) { + // 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 a document with a shape: createSwDoc(); uno::Reference xFactory(mxComponent, uno::UNO_QUERY); @@ -1917,6 +1925,10 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testJson) CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNGCustomDPI) { + // 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 a document with a shape: createSwDoc(); uno::Reference xFactory(mxComponent, uno::UNO_QUERY); diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index 10a886c27388..e0859b872f91 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -367,6 +367,10 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testReqIfTable) CPPUNIT_TEST_FIXTURE(HtmlImportTest, testImageSize) { + // 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; createSwWebDoc("image-size.html"); awt::Size aSize = getShape(1)->getSize(); OutputDevice* pDevice = Application::GetDefaultDevice(); @@ -381,6 +385,10 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testImageSize) CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTdf142781) { + // 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; createSwWebDoc("tdf142781.html"); OutputDevice* pDevice = Application::GetDefaultDevice(); Size aPixelSize(672, 480); diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 278c593b754d..ff06611b46fd 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -742,6 +742,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf145584) CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152575) { + // 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; std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get(); if (!pPDFium) return; -- cgit