emfio/qa/cppunit/emf/EmfImportTest.cxx | 5 +
sc/qa/extras/macros-test.cxx | 11 ---
sc/qa/unit/subsequent_export-test.cxx | 17 +---
sw/qa/core/macros-test.cxx | 90 ++++++++------------------
sw/qa/extras/layout/layout.cxx | 2
sw/qa/extras/odfexport/odfexport.cxx | 4 -
sw/qa/extras/odfimport/odfimport.cxx | 5 -
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 3
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 4 -
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 10 --
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2
sw/qa/extras/rtfexport/rtfexport2.cxx | 4 -
sw/qa/extras/uiwriter/uiwriter.cxx | 62 ++++++++++-------
sw/qa/extras/ww8export/ww8export.cxx | 2
vcl/qa/cppunit/FontFeatureTest.cxx | 8 --
vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 45 +++----------
vcl/qa/cppunit/complextext.cxx | 37 +++-------
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 45 +++++--------
vcl/qa/cppunit/timer.cxx | 7 --
19 files changed, 118 insertions(+), 245 deletions(-)
New commits:
commit 3f7e8ddea89f6340cd18b5b34f5a7c5f503962be
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Jun 25 19:56:13 2019 +0000
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Jul 5 20:05:59 2019 +0200
Enable many more unit tests on all archs
This depends on commit "Make font-based unit test depend on instdir
fonts, not that it's sure that this really fixes the problem, as its
origin is really unknown.
It especially enables all the font-based tests I could find on all
archs. Same for many more test where I couldn't see any reason they
don't work generally. To get rid of even more ifdefs, it moves these
from the class to the functions, so there is actually just one needed
for any test. As a result some few tests run but do nothing.
There is still some problem with embedded fonts on MacOS and with
delayed graphics loading on Windows, so these ifdefs are kept.
Change-Id: I63f8424e9debda6cbf3e5777c93245e09f8eb0f2
Reviewed-on: https://gerrit.libreoffice.org/74719
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 30add1aec73f..94b4f6acd11f 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -8,6 +8,7 @@
*/
#include <sal/config.h>
+#include <config_features.h>
#include <test/bootstrapfixture.hxx>
#include <test/xmltesttools.hxx>
@@ -95,6 +96,7 @@ void Test::testWorking()
void Test::TestDrawString()
{
+#if HAVE_MORE_FONTS
// This unit checks for a correct import of an EMF+ file with only one
DrawString Record
// Since the text is undecorated the optimal choice is a simpletextportion
primitive
@@ -112,10 +114,12 @@ void Test::TestDrawString()
assertXPath(pDocument,
"/primitive2D/metafile/transform/transform/textsimpleportion", "text", "TEST");
assertXPath(pDocument,
"/primitive2D/metafile/transform/transform/textsimpleportion", "fontcolor",
"#000000");
assertXPath(pDocument,
"/primitive2D/metafile/transform/transform/textsimpleportion", "familyname",
"CALIBRI");
+#endif
}
void Test::TestDrawStringTransparent()
{
+#if HAVE_MORE_FONTS
// This unit checks for a correct import of an EMF+ file with one
DrawString Record with transparency
// first, get the sequence of primitives and dump it
@@ -133,6 +137,7 @@ void Test::TestDrawStringTransparent()
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
"text", "Transparent Text");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
"fontcolor", "#0000ff");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
"familyname", "ARIAL");
+#endif
}
void Test::TestDrawLine()
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index de71456f1b79..475320d470f9 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -38,29 +38,22 @@ class ScMacrosTest : public UnoApiTest
public:
ScMacrosTest();
-#if !defined MACOSX
void testStarBasic();
void testVba();
void testMSP();
void testPasswordProtectedStarBasic();
void testRowColumn();
-#endif
+
CPPUNIT_TEST_SUITE(ScMacrosTest);
-#if !defined(MACOSX)
- //enable this test if you want to play with star basic macros in unit tests
- //works but does nothing useful yet
CPPUNIT_TEST(testStarBasic);
CPPUNIT_TEST(testMSP);
CPPUNIT_TEST(testVba);
CPPUNIT_TEST(testPasswordProtectedStarBasic);
CPPUNIT_TEST(testRowColumn);
-#endif
CPPUNIT_TEST_SUITE_END();
};
-#if !defined MACOSX
-
// I suppose you could say this test doesn't really belong here, OTOH
// we need a full document to run the test ( it related originally to an
// imported Excel VBA macro ) It's convenient and fast to unit test
@@ -389,8 +382,6 @@ void ScMacrosTest::testRowColumn()
pDocSh->DoClose();
}
-#endif
-
ScMacrosTest::ScMacrosTest()
: UnoApiTest("/sc/qa/extras/testdocuments")
{
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 06eaf398407f..462320794754 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -165,18 +165,14 @@ public:
void testCustomXml();
-#if !defined _WIN32
void testRelativePathsODS();
-#endif
void testSheetProtectionODS();
void testSwappedOutImageExport();
void testLinkedGraphicRT();
void testImageWithSpecialID();
-#if !defined _WIN32
void testSupBookVirtualPathXLS();
-#endif
void testAbsNamedRangeHTML();
void testSheetLocalRangeNameXLS();
void testRelativeNamedExpressionsXLS();
@@ -298,13 +294,9 @@ public:
CPPUNIT_TEST(testCeilingFloorXLS);
CPPUNIT_TEST(testCeilingFloorODS);
CPPUNIT_TEST(testCustomXml);
-#if !defined(_WIN32)
CPPUNIT_TEST(testRelativePathsODS);
-#endif
CPPUNIT_TEST(testSheetProtectionODS);
-#if !defined(_WIN32)
CPPUNIT_TEST(testSupBookVirtualPathXLS);
-#endif
CPPUNIT_TEST(testSwappedOutImageExport);
CPPUNIT_TEST(testLinkedGraphicRT);
CPPUNIT_TEST(testImageWithSpecialID);
@@ -3081,7 +3073,6 @@ void ScExportTest::testCustomXml()
CPPUNIT_ASSERT(pStream);
}
-#if !defined _WIN32
void ScExportTest::testRelativePathsODS()
{
ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS);
@@ -3094,7 +3085,6 @@ void ScExportTest::testRelativePathsODS()
// make sure that the URL is relative
CPPUNIT_ASSERT(aURL.startsWith(".."));
}
-#endif
namespace {
@@ -3222,7 +3212,6 @@ void ScExportTest::tearDown()
test::BootstrapFixture::tearDown();
}
-#if !defined _WIN32
void ScExportTest::testSupBookVirtualPathXLS()
{
ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS);
@@ -3234,11 +3223,13 @@ void ScExportTest::testSupBookVirtualPathXLS()
ScDocument& rDoc = xDocSh->GetDocument();
+#ifdef _WIN32
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0,0,0),
"'file:///C:/home/timar/Documents/external.xls'#$Sheet1.A1", "Wrong SupBook
VirtualPath URL");
+#else
ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0,0,0),
"'file:///home/timar/Documents/external.xls'#$Sheet1.A1", "Wrong SupBook
VirtualPath URL");
-
+#endif
xDocSh->DoClose();
}
-#endif
void ScExportTest::testLinkedGraphicRT()
{
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 69b4adea4de0..b93b7e9deafa 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -11,20 +11,26 @@
#include <unotest/macros_test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/SearchAlgorithms2.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/document/XEmbeddedScripts.hpp>
+#include <com/sun/star/drawing/XControlShape.hpp>
+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/drawing/XShapeGrouper.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/form/XForm.hpp>
+#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/document/XEmbeddedScripts.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <i18nutil/searchopt.hxx>
#include <comphelper/processfactory.hxx>
@@ -60,36 +66,24 @@ public:
virtual void setUp() override;
virtual void tearDown() override;
- //void testStarBasic();
-#if !defined(MACOSX) && !defined(_WIN32)
void testVba();
-#endif
void testBookmarkDeleteAndJoin();
void testBookmarkDeleteTdf90816();
-#if 0
void testControlShapeGrouping();
-#endif
void testFdo55289();
void testFdo68983();
void testFdo87530();
void testFindReplace();
+
CPPUNIT_TEST_SUITE(SwMacrosTest);
-#if !defined(MACOSX) && !defined(_WIN32)
- //enable this test if you want to play with star basic macros in unit tests
- //works but does nothing useful yet
- //CPPUNIT_TEST(testStarBasic);
CPPUNIT_TEST(testVba);
-#endif
CPPUNIT_TEST(testBookmarkDeleteAndJoin);
CPPUNIT_TEST(testBookmarkDeleteTdf90816);
-#if 0
CPPUNIT_TEST(testControlShapeGrouping);
-#endif
CPPUNIT_TEST(testFdo55289);
CPPUNIT_TEST(testFdo68983);
CPPUNIT_TEST(testFdo87530);
CPPUNIT_TEST(testFindReplace);
-
CPPUNIT_TEST_SUITE_END();
private:
@@ -106,36 +100,6 @@ void SwMacrosTest::createFileURL(const OUString&
aFileBase, const OUString& aFil
rFilePath = aBuffer.makeStringAndClear();
}
-#if 0
-
-void SwMacrosTest::testStarBasic()
-{
- const OUString aFileNameBase("StarBasic.");
- OUString aFileExtension(aFileFormats[0].pName,
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
- OUString aFileName;
- createFileURL(aFileNameBase, aFileExtension, aFileName);
- uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
-
- CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
-
- OUString
aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
- String sUrl = aURL;
- Any aRet;
- Sequence< sal_Int16 > aOutParamIndex;
- Sequence< Any > aOutParam;
- Sequence< uno::Any > aParams;
-
- SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
-
- CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
-
- pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet,
aOutParamIndex,aOutParam);
- pFoundShell->DoClose();
-}
-
-#endif
-
-#if !defined(MACOSX) && !defined(_WIN32)
void SwMacrosTest::testVba()
{
TestMacroInfo testInfo[] = {
@@ -165,12 +129,10 @@ void SwMacrosTest::testVba()
SfxObjectShell::CallXScript(xComponent, sUrl, aParams, aRet,
aOutParamIndex,aOutParam);
OUString aStringRes;
aRet >>= aStringRes;
- std::cout << "value of Ret " << aStringRes << std::endl;
- //CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK"
);
+ // CPPUNIT_ASSERT_EQUAL(OUString("OK"), aStringRes);
pFoundShell->DoClose();
}
}
-#endif
void SwMacrosTest::testBookmarkDeleteAndJoin()
{
@@ -242,7 +204,6 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
CPPUNIT_ASSERT_EQUAL((*iter)->GetOtherMarkPos(), *aPaM.End());
}
-#if 0
void SwMacrosTest::testControlShapeGrouping()
{
OUString aFileName;
@@ -309,10 +270,11 @@ void SwMacrosTest::testControlShapeGrouping()
uno::Reference<container::XIndexAccess> xGroupIC(xGroup, UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
+#if 0
CPPUNIT_ASSERT(xDateShape->getControl().is());
- CPPUNIT_ASSERT(xDateShape->getControl() == xDateControlModel);
+ CPPUNIT_ASSERT_EQUAL(xDateShape->getControl(), xDateControlModel);
CPPUNIT_ASSERT(xTimeShape->getControl().is());
- CPPUNIT_ASSERT(xTimeShape->getControl() == xTimeControlModel);
+ CPPUNIT_ASSERT_EQUAL(xTimeShape->getControl(), xTimeControlModel);
{
uno::Reference< uno::XInterface > xDI;
@@ -320,14 +282,14 @@ void SwMacrosTest::testControlShapeGrouping()
CPPUNIT_ASSERT(xDI.is());
uno::Reference< drawing::XControlShape > xDS(xDI, UNO_QUERY);
CPPUNIT_ASSERT(xDS.is());
- CPPUNIT_ASSERT(xDS->getControl() == xDateControlModel);
+ CPPUNIT_ASSERT_EQUAL(xDS->getControl(), xDateControlModel);
uno::Reference< uno::XInterface > xTI;
xGroupIC->getByIndex(1) >>= xTI;
CPPUNIT_ASSERT(xTI.is());
uno::Reference< drawing::XControlShape > xTS(xTI, UNO_QUERY);
CPPUNIT_ASSERT(xTS.is());
- CPPUNIT_ASSERT(xTS->getControl() == xTimeControlModel);
+ CPPUNIT_ASSERT_EQUAL(xTS->getControl(), xTimeControlModel);
}
{
uno::Reference< uno::XInterface > xDI;
@@ -335,18 +297,22 @@ void SwMacrosTest::testControlShapeGrouping()
CPPUNIT_ASSERT(xDI.is());
uno::Reference< drawing::XControlShape > xDS(xDI, UNO_QUERY);
CPPUNIT_ASSERT(xDS.is());
- CPPUNIT_ASSERT(xDS->getControl() == xDateControlModel);
+ CPPUNIT_ASSERT_EQUAL(xDS->getControl(), xDateControlModel);
uno::Reference< uno::XInterface > xTI;
xShapesIC->getByIndex(1) >>= xTI;
CPPUNIT_ASSERT(xTI.is());
uno::Reference< drawing::XControlShape > xTS(xTI, UNO_QUERY);
CPPUNIT_ASSERT(xTS.is());
- CPPUNIT_ASSERT(xTS->getControl() == xTimeControlModel);
+ CPPUNIT_ASSERT_EQUAL(xTS->getControl(), xTimeControlModel);
}
-}
#endif
+ // close
+ Reference<util::XCloseable> xDocCloseable(xComponent, UNO_QUERY_THROW);
+ xDocCloseable->close(false);
+}
+
void SwMacrosTest::testFdo55289()
{
SwDoc *const pDoc = new SwDoc;
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 325c0ef49e64..b1e11c05e754 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2865,7 +2865,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testBtlrCell)
// doc model).
assertXPath(pXmlDoc, "//font[1]", "orientation", "900");
-#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with actual == 2662
for some reason.
+#ifndef MACOSX // macOS fails with x == 2662 for some reason.
// Without the accompanying fix in place, this test would have failed with
'Expected: 1915;
// Actual : 1756', i.e. the AAA1 text was too close to the left cell
border due to an ascent vs
// descent mismatch when calculating the baseline offset of the text
portion.
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 4c17893e2310..0d7253924d50 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -11,7 +11,6 @@
#include <swmodeltestbase.hxx>
#include <config_features.h>
-#if !defined(MACOSX)
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
@@ -1978,7 +1977,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype,
"image-mimetype.odt")
DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt")
{
-#if !defined(WNT)
+#if !defined(MACOSX)
// Test that font style/weight of embedded fonts is exposed.
// Test file is a normal ODT, except EmbedFonts is set to true in
settings.xml.
if (xmlDocPtr pXmlDoc = parseExport("content.xml"))
@@ -2229,7 +2228,6 @@ DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
assertXPathContent(pXmlDoc2,
"//config:config-item[@config:name='VisibleAreaWidth']", "4515");
assertXPathContent(pXmlDoc2,
"//config:config-item[@config:name='VisibleAreaHeight']", "1354");
}
-#endif
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index ac8d7aedb45f..cf55296e0555 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -583,7 +583,6 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
CPPUNIT_ASSERT(!pContentNode->FindTableNode());
}
}
-#if !defined(_WIN32)
DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
{
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
@@ -608,11 +607,9 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
// Previously copy&paste failed to copy the table in case it was the
document-starting one.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
-#if !defined(MACOSX) && !defined(LIBO_HEADLESS) // FIXME
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
-#endif
}
-#endif //WNT
+
DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
{
// The test doc is special in that it starts with a table and it also has
a footnote.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 731fcd11cb67..529f1dfaca0e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -797,11 +797,8 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark.docx")
sal_Int32 nDifference = 5150 - nHeight;
std::stringstream ss;
ss << "Difference: " << nDifference << " TotalHeight: " << nHeight;
-#ifndef _WIN32
- // FIXME why does this sometimes fail?
CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference <= 4);
CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference >= -4);
-#endif
}
DECLARE_OOXMLEXPORT_TEST(testWatermarkTrim, "tdf114308.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 2f7955c6c41e..c9bbb812cd8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -32,8 +32,6 @@
#include <string>
-#if !defined(_WIN32)
-
class Test : public SwModelTestBase
{
public:
@@ -1114,8 +1112,6 @@ DECLARE_OOXMLEXPORT_TEST(testBnc837302, "bnc837302.docx")
CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(xParagraph, 1),
"RedlineType"));
}
-#endif
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 5a2176aa8253..bddb9323ac2f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -24,8 +24,6 @@
#include <com/sun/star/style/BreakType.hpp>
#include <ftninfo.hxx>
-#if !defined(_WIN32)
-
class Test : public SwModelTestBase
{
public:
@@ -697,8 +695,6 @@ DECLARE_OOXMLEXPORT_TEST(testParaAutoSpacing,
"para-auto-spacing.docx")
DECLARE_OOXMLEXPORT_TEST(testGIFImageCrop, "test_GIF_ImageCrop.docx")
{
- // FIXME why does this fail on Mac?
-#if !defined(MACOSX)
uno::Reference<drawing::XShape> image = getShape(1);
uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY);
css::text::GraphicCrop aGraphicCropStruct;
@@ -709,13 +705,10 @@ DECLARE_OOXMLEXPORT_TEST(testGIFImageCrop,
"test_GIF_ImageCrop.docx")
CPPUNIT_ASSERT_EQUAL( sal_Int32( 3651 ), aGraphicCropStruct.Right );
CPPUNIT_ASSERT_EQUAL( sal_Int32( 953 ), aGraphicCropStruct.Top );
CPPUNIT_ASSERT_EQUAL( sal_Int32( 1244 ), aGraphicCropStruct.Bottom );
-#endif
}
DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop, "test_PNG_ImageCrop.docx")
{
- // FIXME why does this fail on Mac?
-#if !defined(MACOSX)
/* The problem was image cropping information was not getting saved
* after roundtrip.
* Check for presence of cropping parameters in exported file.
@@ -730,7 +723,6 @@ DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop,
"test_PNG_ImageCrop.docx")
CPPUNIT_ASSERT_EQUAL( sal_Int32( 1111 ), aGraphicCropStruct.Right );
CPPUNIT_ASSERT_EQUAL( sal_Int32( 1164 ), aGraphicCropStruct.Top );
CPPUNIT_ASSERT_EQUAL( sal_Int32( 635 ), aGraphicCropStruct.Bottom );
-#endif
}
DECLARE_OOXMLEXPORT_TEST(testTdf41542_imagePadding,
"tdf41542_imagePadding.odt")
@@ -979,8 +971,6 @@
DECLARE_OOXMLEXPORT_TEST(testFileOpenInputOutputError,"floatingtbl_with_formula.
assertXPathContent(pXmlDoc,
"//w:tbl/w:tr/w:tc[2]/w:p/m:oMath/m:sSubSup/m:e/m:r/m:t", u"\u03C3");
}
-#endif
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 1bba64ee0ccf..a99d2e2c6ad7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1111,7 +1111,6 @@ DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
#ifndef MACOSX /* Retina-related rounding roundtrip error
* hard to smooth out due to the use of string compare
* instead of number */
-#if !defined(_WIN32)
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x",
"2351");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y",
"3171");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x",
"1695");
@@ -1119,7 +1118,6 @@ DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x",
"1695");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y",
"1701");
#endif
-#endif
}
DECLARE_OOXMLEXPORT_TEST(testTdf92335, "tdf92335.docx")
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx
b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 282af9bafa97..f7bad9211af7 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -616,8 +616,6 @@ DECLARE_RTFEXPORT_TEST(testCopyPastePageStyle,
"copypaste-pagestyle.rtf")
getProperty<sal_Int32>(xPropertySet, "Width")); //
Was letter, i.e. 21590
}
-#if !defined(_WIN32)
-
DECLARE_RTFEXPORT_TEST(testCopyPasteFootnote, "copypaste-footnote.rtf")
{
// The RTF import did not handle the case when the position wasn't the
main document XText, but something different, e.g. a footnote.
@@ -645,8 +643,6 @@ DECLARE_RTFEXPORT_TEST(testFdo63428, "hello.rtf")
getProperty<OUString>(getRun(getParagraph(1), 4),
"TextPortionType"));
}
-#endif
-
DECLARE_RTFEXPORT_TEST(testFdo69384, "fdo69384-paste.rtf")
{
// Ensure non-default style is loaded
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 2a318026c14f..d09783cebb8b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -249,9 +249,7 @@ public:
void testUnicodeNotationToggle();
void testTextTableCellNames();
void testShapeAnchorUndo();
-#if HAVE_FEATURE_UI
void testDde();
-#endif
void testDocModState();
void testTdf94804();
void testTdf34957();
@@ -259,9 +257,7 @@ public:
void testTdf89720();
void testTdf88986();
void testTdf87922();
-#if HAVE_MORE_FONTS
void testTdf77014();
-#endif
void testTdf92648();
void testTdf103978_backgroundTextShape();
void testTdf96515();
@@ -297,9 +293,7 @@ public:
void testTdf104425();
void testTdf104814();
void testTdf66405();
-#if HAVE_MORE_FONTS
void testTdf35021_tabOverMarginDemo();
-#endif
void testTdf106701_tabOverMarginAutotab();
void testTdf104492();
void testTdf107025();
@@ -320,7 +314,6 @@ public:
void testCreateDocxAnnotation();
void testTdf107976();
void testTdf108524();
-#if HAVE_MORE_FONTS
void testTableInSection();
void testTableInNestedSection();
void testTableInSectionInTable();
@@ -335,7 +328,6 @@ public:
void testTdf113287();
void testTdf113445();
void testTdf113686();
-#endif
void testFontEmbedding();
void testLinesInSectionInTable();
void testParagraphOfTextRange();
@@ -457,9 +449,7 @@ public:
CPPUNIT_TEST(testUnicodeNotationToggle);
CPPUNIT_TEST(testTextTableCellNames);
CPPUNIT_TEST(testShapeAnchorUndo);
-#if HAVE_FEATURE_UI
CPPUNIT_TEST(testDde);
-#endif
CPPUNIT_TEST(testDocModState);
CPPUNIT_TEST(testTdf94804);
CPPUNIT_TEST(testTdf34957);
@@ -467,9 +457,7 @@ public:
CPPUNIT_TEST(testTdf89720);
CPPUNIT_TEST(testTdf88986);
CPPUNIT_TEST(testTdf87922);
-#if HAVE_MORE_FONTS
CPPUNIT_TEST(testTdf77014);
-#endif
CPPUNIT_TEST(testTdf92648);
CPPUNIT_TEST(testTdf103978_backgroundTextShape);
CPPUNIT_TEST(testTdf96515);
@@ -505,9 +493,7 @@ public:
CPPUNIT_TEST(testTdf104425);
CPPUNIT_TEST(testTdf104814);
CPPUNIT_TEST(testTdf66405);
-#if HAVE_MORE_FONTS
CPPUNIT_TEST(testTdf35021_tabOverMarginDemo);
-#endif
CPPUNIT_TEST(testTdf106701_tabOverMarginAutotab);
CPPUNIT_TEST(testTdf104492);
CPPUNIT_TEST(testTdf107025);
@@ -528,7 +514,6 @@ public:
CPPUNIT_TEST(testCreateDocxAnnotation);
CPPUNIT_TEST(testTdf107976);
CPPUNIT_TEST(testTdf108524);
-#if HAVE_MORE_FONTS
CPPUNIT_TEST(testTableInSection);
CPPUNIT_TEST(testTableInNestedSection);
CPPUNIT_TEST(testTableInSectionInTable);
@@ -544,7 +529,6 @@ public:
CPPUNIT_TEST(testTdf113445);
CPPUNIT_TEST(testTdf113686);
CPPUNIT_TEST(testFontEmbedding);
-#endif
CPPUNIT_TEST(testLinesInSectionInTable);
CPPUNIT_TEST(testParagraphOfTextRange);
CPPUNIT_TEST(testTdf99689TableOfContents);
@@ -4041,9 +4025,10 @@ static void lcl_dispatchCommand(const
uno::Reference<lang::XComponent>& xCompone
xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0,
rPropertyValues);
}
-#if HAVE_FEATURE_UI
+
void SwUiWriterTest::testDde()
{
+#if HAVE_FEATURE_UI
// Type asdf and copy it.
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -4064,8 +4049,9 @@ void SwUiWriterTest::testDde()
const uno::Reference< text::XTextRange > xField = getRun(getParagraph(1),
1);
CPPUNIT_ASSERT_EQUAL(OUString("TextField"), getProperty<OUString>(xField,
"TextPortionType"));
CPPUNIT_ASSERT(xField->getString().endsWith("asdf"));
-}
#endif
+}
+
//IdleTask class to add a low priority Idle task
class IdleTask
{
@@ -4209,7 +4195,6 @@ void SwUiWriterTest::testTdf89954()
void SwUiWriterTest::testTdf89720()
{
-#ifndef MACOSX
SwDoc* pDoc = createDoc("tdf89720.odt");
SwView* pView = pDoc->GetDocShell()->GetView();
SwPostItMgr* pPostItMgr = pView->GetPostItMgr();
@@ -4220,7 +4205,6 @@ void SwUiWriterTest::testTdf89720()
// resulting in unexpected dark color.
CPPUNIT_ASSERT(!pItem->pPostIt->TextRange());
}
-#endif
}
void SwUiWriterTest::testTdf88986()
@@ -4321,9 +4305,11 @@ class PortionHandler : public SwPortionHandler
mPortionItems.emplace_back("finish", 0, PortionType::NONE);
}
};
+#endif
void SwUiWriterTest::testTdf77014()
{
+#if HAVE_MORE_FONTS
// The problem described in the bug tdf#77014 is that the input
// field text ("ThisIsAllOneWord") is broken up on linebreak, but
// it should be in one piece (like normal text).
@@ -4467,8 +4453,8 @@ void SwUiWriterTest::testTdf77014()
rPortionItem = aHandler.mPortionItems[7];
CPPUNIT_ASSERT_EQUAL(OUString("finish"), rPortionItem.msItemType);
}
-}
#endif
+}
void SwUiWriterTest::testTdf92648()
{
@@ -5560,9 +5546,9 @@ void SwUiWriterTest::testTdf66405()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nBottomMargin);
}
-#if HAVE_MORE_FONTS
void SwUiWriterTest::testTdf35021_tabOverMarginDemo()
{
+#if HAVE_MORE_FONTS
createDoc("tdf35021_tabOverMarginDemo.doc");
calcLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
@@ -5580,8 +5566,8 @@ void SwUiWriterTest::testTdf35021_tabOverMarginDemo()
// decimal tab was 266
nWidth = getXPath(pXmlDoc, "//Text[@nType='PortionType::TabDecimal']",
"nWidth").toInt32();
CPPUNIT_ASSERT_MESSAGE("Decimal Tab width is ~4096", nMargin < nWidth);
-}
#endif
+}
void SwUiWriterTest::testTdf106701_tabOverMarginAutotab()
{
@@ -6069,10 +6055,9 @@ void SwUiWriterTest::testLinesInSectionInTable()
assertXPath(pXmlDoc, "/root/page[2]/body/tab/row/cell/section", 1);
}
-#if HAVE_MORE_FONTS
void SwUiWriterTest::testLinesMoveBackwardsInSectionInTable()
{
-#ifndef MACOSX
+#if HAVE_MORE_FONTS
// Assert that paragraph "4" is on page 1 and "5" is on page 2.
SwDoc* pDoc = createDoc("lines-in-section-in-table.odt");
xmlDocPtr pXmlDoc = parseLayoutDump();
@@ -6101,6 +6086,7 @@ void
SwUiWriterTest::testLinesMoveBackwardsInSectionInTable()
void SwUiWriterTest::testTableInSection()
{
+#if HAVE_MORE_FONTS
// The document has a section, containing a table that spans over 2 pages.
createDoc("table-in-sect.odt");
xmlDocPtr pXmlDoc = parseLayoutDump();
@@ -6110,10 +6096,12 @@ void SwUiWriterTest::testTableInSection()
// Assert that on both pages the section contains 2 cells.
assertXPath(pXmlDoc, "/root/page[1]/body/section/tab/row/cell", 2);
assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/row/cell", 2);
+#endif
}
void SwUiWriterTest::testTableInNestedSection()
{
+#if HAVE_MORE_FONTS
// The document has a nested section, containing a table that spans over 2
pages.
// This crashed the layout.
createDoc("rhbz739252-3.odt");
@@ -6121,10 +6109,12 @@ void SwUiWriterTest::testTableInNestedSection()
// Make sure the table is inside a section and spans over 2 pages.
assertXPath(pXmlDoc, "//page[1]//section/tab", 1);
assertXPath(pXmlDoc, "//page[2]//section/tab", 1);
+#endif
}
void SwUiWriterTest::testTdf112741()
{
+#if HAVE_MORE_FONTS
createDoc("tdf112741.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
// This was 5 pages.
@@ -6134,18 +6124,22 @@ void SwUiWriterTest::testTdf112741()
// This failed, 3rd page contained no sections.
assertXPath(pXmlDoc, "//page[3]/body/tab/row/cell/tab/row/cell/section",
1);
assertXPath(pXmlDoc, "//page[4]/body/tab/row/cell/tab/row/cell/section",
1);
+#endif
}
void SwUiWriterTest::testTdf112860()
{
+#if HAVE_MORE_FONTS
// The document has a split section inside a nested table, and also a table
// in the footer.
// This crashed the layout.
createDoc("tdf112860.fodt");
+#endif
}
void SwUiWriterTest::testTdf113287()
{
+#if HAVE_MORE_FONTS
createDoc("tdf113287.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "//page", 2);
@@ -6154,10 +6148,12 @@ void SwUiWriterTest::testTdf113287()
// Make sure section frame is inside the cell frame.
// Expected greater than 4593, was only 3714.
CPPUNIT_ASSERT_GREATER(nCellTop, nSectionTop);
+#endif
}
void SwUiWriterTest::testTdf113445()
{
+#if HAVE_MORE_FONTS
// Force multiple-page view.
SwDoc* pDoc = createDoc("tdf113445.fodt");
SwDocShell* pDocShell = pDoc->GetDocShell();
@@ -6189,10 +6185,12 @@ void SwUiWriterTest::testTdf113445()
// Also check if the two cells in the same row have the same top position.
// This was 4818, expected only 1672.
CPPUNIT_ASSERT_EQUAL(nCell3Top, nCell4Top);
+#endif
}
void SwUiWriterTest::testTdf113686()
{
+#if HAVE_MORE_FONTS
SwDoc* pDoc = createDoc("tdf113686.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page", 2);
@@ -6215,26 +6213,32 @@ void SwUiWriterTest::testTdf113686()
pXmlDoc = parseLayoutDump();
// This was still 2, content from 2nd page was not moved.
assertXPath(pXmlDoc, "/root/page", 1);
+#endif
}
void SwUiWriterTest::testTableInSectionInTable()
{
+#if HAVE_MORE_FONTS
// The document has a table, containing a section, containing a nested
// table.
// This crashed the layout.
createDoc("i95698.odt");
+#endif
}
void SwUiWriterTest::testSectionInTableInTable()
{
+#if HAVE_MORE_FONTS
// The document has a nested table, containing a multi-line section at a
// page boundary.
// This crashed the layout later in SwFrame::IsFootnoteAllowed().
createDoc("tdf112109.fodt");
+#endif
}
void SwUiWriterTest::testSectionInTableInTable2()
{
+#if HAVE_MORE_FONTS
createDoc("split-section-in-nested-table.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
sal_uInt32 nSection1 = getXPath(pXmlDoc,
"//page[1]//body/tab/row/cell/tab/row/cell/section", "id").toUInt32();
@@ -6246,10 +6250,12 @@ void SwUiWriterTest::testSectionInTableInTable2()
// Make sure that the first's follow and the second's precede is correct.
CPPUNIT_ASSERT_EQUAL(nSection2, nSection1Follow);
CPPUNIT_ASSERT_EQUAL(nSection1, nSection2Precede);
+#endif
}
void SwUiWriterTest::testSectionInTableInTable3()
{
+#if HAVE_MORE_FONTS
createDoc("tdf113153.fodt");
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -6278,10 +6284,12 @@ void SwUiWriterTest::testSectionInTableInTable3()
CPPUNIT_ASSERT_EQUAL(nTable1, nTable2Precede);
CPPUNIT_ASSERT_EQUAL(nTable3, nTable2Follow);
CPPUNIT_ASSERT_EQUAL(nTable2, nTable3Precede);
+#endif
}
void SwUiWriterTest::testSectionInTableInTable4()
{
+#if HAVE_MORE_FONTS
SwDoc* pDoc = createDoc("tdf113520.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page", 3);
@@ -6313,10 +6321,12 @@ void SwUiWriterTest::testSectionInTableInTable4()
sal_uInt32 nTable2Precede = getXPath(pXmlDoc, "//page[2]//body/tab",
"precede").toUInt32();
CPPUNIT_ASSERT_EQUAL(nTable2, nTable1Follow);
CPPUNIT_ASSERT_EQUAL(nTable1, nTable2Precede);
+#endif
}
void SwUiWriterTest::testTdf112160()
{
+#if HAVE_MORE_FONTS
// Assert that the A2 cell is on page 1.
SwDoc* pDoc = createDoc("tdf112160.fodt");
xmlDocPtr pXmlDoc = parseLayoutDump();
@@ -6336,8 +6346,8 @@ void SwUiWriterTest::testTdf112160()
sal_uInt32 nD2CellNode = getXPath(pXmlDoc,
"/root/page[1]/body/tab/row[2]/cell[last()]/section/txt[last()]",
"txtNodeIndex").toUInt32();
// This was Table1.C2, Table1.D2 was moved to the next page, unexpected.
CPPUNIT_ASSERT_EQUAL(OUString("Table1.D2"),
pDoc->GetNodes()[nD2CellNode]->GetTextNode()->GetText());
-}
#endif
+}
void SwUiWriterTest::testTdf114536()
{
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index fbc504cb5d97..2aee73518377 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1288,7 +1288,6 @@ DECLARE_WW8EXPORT_TEST(testCommentExport,
"comment-export.odt")
}
}
-#if !defined(MACOSX) && !defined(_WIN32)
#if HAVE_MORE_FONTS
DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
{
@@ -1297,7 +1296,6 @@ DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
CPPUNIT_ASSERT_EQUAL( OUString("Row 1"),
parseDump("/root/page[6]/body/tab[1]/row[2]/cell[1]/txt[1]") );
}
#endif
-#endif
DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins,
"tdf76349_textboxMargins.doc")
{
diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx
b/vcl/qa/cppunit/FontFeatureTest.cxx
index eba092140450..79ec3c158fbe 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -66,8 +66,6 @@ void FontFeatureTest::testGetFontFeatures()
}
}
-#if !defined(_WIN32)
- // periodically fails on windows tinderbox like tb77 with a value of 27
CPPUNIT_ASSERT_EQUAL(size_t(53), rDefaultFontFeatures.size());
OUString aExpectedFeaturesString = "c2sc case dlig fina frac hlig liga
lnum "
@@ -78,15 +76,10 @@ void FontFeatureTest::testGetFontFeatures()
"frsp grkn hang lng minu nfsp name quot
"
"texm thou vari caps ligc ";
- // periodically fails on windows tinderbox like tb72 with a missing "ss02"
CPPUNIT_ASSERT_EQUAL(aExpectedFeaturesString, aFeaturesString);
// Check C2SC feature
{
- // periodically fails on the Windows tb72 tinderbox with
- // equality assertion failed
- //- Expected: 1664250723
- //- Actual : 1684826471
vcl::font::Feature& rFeature = rDefaultFontFeatures[0];
CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("c2sc"),
rFeature.m_aID.m_aFeatureCode);
@@ -98,7 +91,6 @@ void FontFeatureTest::testGetFontFeatures()
CPPUNIT_ASSERT_EQUAL(size_t(0),
rFracFeatureDefinition.getEnumParameters().size());
}
-#endif
// Check FRAC feature
{
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index a6b91561ea60..5ff3468655cc 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -19,42 +19,20 @@
class IconThemeSelectorTest : public CppUnit::TestFixture
{
#ifndef _WIN32 //default theme on Windows is Colibre independently from any
desktop environment
- void
- BreezeIsReturnedForKde5Desktop();
-
- void
- ElementaryIsReturnedForGnomeDesktop();
-
- void
- ThemeIsOverriddenByPreferredTheme();
-
- void
- ThemeIsOverriddenByHighContrastMode();
-
- void
- NotInstalledThemeDoesNotOverride();
-
- void
- InstalledThemeIsFound();
-
- void
- FirstThemeIsReturnedIfRequestedThemeIsNotFound();
-
- void
- FallbackThemeIsReturnedForEmptyInput();
-
- void
- DifferentPreferredThemesAreInequal();
-
- void
- DifferentHighContrastModesAreInequal();
-
- static std::vector<vcl::IconThemeInfo>
- GetFakeInstalledThemes();
+ void BreezeIsReturnedForKde5Desktop();
+ void ElementaryIsReturnedForGnomeDesktop();
+ void ThemeIsOverriddenByPreferredTheme();
+ void ThemeIsOverriddenByHighContrastMode();
+ void NotInstalledThemeDoesNotOverride();
+ void InstalledThemeIsFound();
+ void FirstThemeIsReturnedIfRequestedThemeIsNotFound();
+ void FallbackThemeIsReturnedForEmptyInput();
+ void DifferentPreferredThemesAreInequal();
+ void DifferentHighContrastModesAreInequal();
+ static std::vector<vcl::IconThemeInfo> GetFakeInstalledThemes();
#endif
// Adds code needed to register the test suite
-
CPPUNIT_TEST_SUITE(IconThemeSelectorTest);
#ifndef _WIN32
@@ -71,7 +49,6 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
#endif
// End of test suite definition
-
CPPUNIT_TEST_SUITE_END();
};
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 2bc296b047fa..d3cdc230c0bc 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -11,10 +11,11 @@
#include <ostream>
#include <vector>
-#if !defined(_WIN32) && HAVE_MORE_FONTS
+
+#if HAVE_MORE_FONTS
+// must be declared before inclusion of test/bootstrapfixture.hxx
static std::ostream& operator<<(std::ostream& rStream, const
std::vector<long>& rVec);
#endif
-
#include <test/bootstrapfixture.hxx>
#include <vcl/wrkwin.hxx>
@@ -23,7 +24,7 @@ static std::ostream& operator<<(std::ostream& rStream, const
std::vector<long>&
#include <sallayout.hxx>
#include <salgdi.hxx>
-#if !defined(_WIN32) && HAVE_MORE_FONTS
+#if HAVE_MORE_FONTS
static std::ostream& operator<<(std::ostream& rStream, const
std::vector<long>& rVec)
{
rStream << "{ ";
@@ -40,29 +41,21 @@ class VclComplexTextTest : public test::BootstrapFixture
public:
VclComplexTextTest() : BootstrapFixture(true, false) {}
-#if HAVE_MORE_FONTS
/// Play with font measuring etc.
void testArabic();
void testKashida();
-#endif
-#if defined(_WIN32)
void testTdf95650(); // Windows-only issue
-#endif
CPPUNIT_TEST_SUITE(VclComplexTextTest);
-#if HAVE_MORE_FONTS
CPPUNIT_TEST(testArabic);
CPPUNIT_TEST(testKashida);
-#endif
-#if defined(_WIN32)
CPPUNIT_TEST(testTdf95650);
-#endif
CPPUNIT_TEST_SUITE_END();
};
-#if HAVE_MORE_FONTS
void VclComplexTextTest::testArabic()
{
+#if HAVE_MORE_FONTS
const unsigned char pOneTwoThreeUTF8[] = {
0xd9, 0x88, 0xd8, 0xa7, 0xd8, 0xad, 0xd9, 0x90,
0xd8, 0xaf, 0xd9, 0x92, 0x20, 0xd8, 0xa5, 0xd8,
@@ -82,8 +75,6 @@ void VclComplexTextTest::testArabic()
pOutDev->SetFont( aFont );
// absolute character widths AKA text array.
-#if !defined(_WIN32)
- // FIXME: fails on some windows tinderboxes
std::vector<long> aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0);
@@ -99,14 +90,13 @@ void VclComplexTextTest::testArabic()
CPPUNIT_ASSERT_EQUAL(14L, pOutDev->GetTextHeight());
// exact bounding rectangle, not essentially the same as text width/height
-#if defined(MACOSX)
- // FIXME: fails on some Linux tinderboxes, might be a FreeType issue.
tools::Rectangle aBoundRect, aTestRect( 0, 1, 71, 15 );
pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree);
CPPUNIT_ASSERT_EQUAL(aTestRect, aBoundRect);
-#endif
-#endif
+#if 0
+ // FIXME: This seems to be wishful thinking, GetTextRect() does not take
+ // rotation into account.
// normal orientation
tools::Rectangle aInput;
@@ -119,21 +109,18 @@ void VclComplexTextTest::testArabic()
tools::Rectangle aRectRot = pOutDev->GetTextRect( aInput, aOneTwoThree );
// Check that we did do the rotation ...
-#if 0
- // FIXME: This seems to be wishful thinking, GetTextRect() does not take
- // rotation into account.
fprintf( stderr, "%ld %ld %ld %ld\n",
aRect.GetWidth(), aRect.GetHeight(),
aRectRot.GetWidth(), aRectRot.GetHeight() );
CPPUNIT_ASSERT( aRectRot.GetWidth() == aRect.GetHeight() );
CPPUNIT_ASSERT( aRectRot.GetHeight() == aRect.GetWidth() );
-#else
- (void)aRect; (void)aRectRot;
+#endif
#endif
}
void VclComplexTextTest::testKashida()
{
+#if HAVE_MORE_FONTS
// Cache the glyph list of some Arabic text.
ScopedVclPtrInstance<VirtualDevice> pOutputDevice;
auto aText
@@ -155,10 +142,9 @@ void VclComplexTextTest::testKashida()
// Without the accompanying fix in place, this test would have failed with
'assertion failed'.
// The kashida justification flag was lost when going via the glyph cache.
CPPUNIT_ASSERT(aLayoutArgs.mnFlags & SalLayoutFlags::KashidaJustification);
-}
#endif
+}
-#if defined(_WIN32)
void VclComplexTextTest::testTdf95650()
{
const sal_Unicode pTxt[] = {
@@ -176,7 +162,6 @@ void VclComplexTextTest::testTdf95650()
// Check that the following executes without failing assertion
pOutDev->ImplLayout(aTxt, 9, 1, Point(), 0, nullptr,
SalLayoutFlags::BiDiRtl);
}
-#endif
CPPUNIT_TEST_SUITE_REGISTRATION(VclComplexTextTest);
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 39c69808451b..89c9745ccb3c 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -108,7 +108,6 @@ public:
void testTdf99680_2();
void testTdf108963();
void testTdf118244_radioButtonGroup();
-#if HAVE_MORE_FONTS
/// Test writing ToUnicode CMAP for LTR ligatures.
void testTdf115117_1();
/// Text extracting LTR text with ligatures.
@@ -123,7 +122,6 @@ public:
void testTdf66597_2();
/// Test writing ActualText for LTR many to one glyph to Unicode mapping.
void testTdf66597_3();
-#endif
void testTdf109143();
void testTdf105954();
void testTdf106702();
@@ -151,7 +149,6 @@ public:
CPPUNIT_TEST(testTdf99680_2);
CPPUNIT_TEST(testTdf108963);
CPPUNIT_TEST(testTdf118244_radioButtonGroup);
-#if HAVE_MORE_FONTS
CPPUNIT_TEST(testTdf115117_1);
CPPUNIT_TEST(testTdf115117_1a);
CPPUNIT_TEST(testTdf115117_2);
@@ -159,7 +156,6 @@ public:
CPPUNIT_TEST(testTdf66597_1);
CPPUNIT_TEST(testTdf66597_2);
CPPUNIT_TEST(testTdf66597_3);
-#endif
CPPUNIT_TEST(testTdf109143);
CPPUNIT_TEST(testTdf105954);
CPPUNIT_TEST(testTdf106702);
@@ -368,8 +364,8 @@ void PdfExportTest::testTdf107868()
{
// No need to run it on Windows, since it would use GDI printing, and not
trigger PDF export
// which is the intent of the test.
- // FIXME: Why does this fail on macOS?
-#if !defined MACOSX && !defined _WIN32
+#if !defined _WIN32
+
// Import the bugdoc and print to PDF.
OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"tdf107868.odt";
mxComponent = loadFromDesktop(aURL);
@@ -620,10 +616,10 @@ void PdfExportTest::testTdf106972Pdf17()
void PdfExportTest::testSofthyphenPos()
{
- // No need to run it on Windows, since it would use GDI printing, and not
- // trigger PDF export which is the intent of the test.
- // FIXME: Why does this fail on macOS?
-#if !defined MACOSX && !defined _WIN32
+ // No need to run it on Windows, since it would use GDI printing, and not
trigger PDF export
+ // which is the intent of the test.
+#if !defined _WIN32
+
// Import the bugdoc and print to PDF.
OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"softhyphen_pdf.odt";
mxComponent = loadFromDesktop(aURL);
@@ -886,8 +882,6 @@ void PdfExportTest::testTdf108963()
PageHolder pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0));
CPPUNIT_ASSERT(pPdfPage.get());
- // FIXME: strangely this fails on some Win systems after a pdfium update,
expected: 793.7; actual: 793
-#if !defined _WIN32
// Test page size (28x15.75 cm, was 1/100th mm off, tdf#112690)
// bad: MediaBox[0 0 793.672440944882 446.428346456693]
// good: MediaBox[0 0 793.700787401575 446.456692913386]
@@ -953,7 +947,6 @@ void PdfExportTest::testTdf108963()
}
CPPUNIT_ASSERT_EQUAL(1, nYellowPathCount);
-#endif
}
void PdfExportTest::testTdf118244_radioButtonGroup()
@@ -993,13 +986,11 @@ void PdfExportTest::testTdf118244_radioButtonGroup()
CPPUNIT_ASSERT_EQUAL_MESSAGE("# of radio groups", sal_uInt32(3),
nRadioGroups);
}
-#if HAVE_MORE_FONTS
// This requires Carlito font, if it is missing the test will most likely
// fail.
void PdfExportTest::testTdf115117_1()
{
-// keeps failing on the windows tinderboxen
-#if !defined _WIN32
+#if HAVE_MORE_FONTS
vcl::filter::PDFDocument aDocument;
load("tdf115117-1.odt", aDocument);
@@ -1055,13 +1046,14 @@ void PdfExportTest::testTdf115117_1()
const char* pEnd = pStart + aObjectStream.GetSize();
auto it = std::search(pStart, pEnd, aCmap.getStr(), aCmap.getStr() +
aCmap.getLength());
CPPUNIT_ASSERT(it != pEnd);
-#endif // if !defined _WIN32
+#endif
}
// This requires DejaVu Sans font, if it is missing the test will most likely
// fail.
void PdfExportTest::testTdf115117_2()
{
+#if HAVE_MORE_FONTS
// See the comments in testTdf115117_1() for explanation.
vcl::filter::PDFDocument aDocument;
@@ -1107,10 +1099,12 @@ void PdfExportTest::testTdf115117_2()
const char* pEnd = pStart + aObjectStream.GetSize();
auto it = std::search(pStart, pEnd, aCmap.getStr(), aCmap.getStr() +
aCmap.getLength());
CPPUNIT_ASSERT(it != pEnd);
+#endif
}
void PdfExportTest::testTdf115117_1a()
{
+#if HAVE_MORE_FONTS
// Import the bugdoc and export as PDF.
OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"tdf115117-1.odt";
mxComponent = loadFromDesktop(aURL);
@@ -1148,10 +1142,12 @@ void PdfExportTest::testTdf115117_1a()
aChars[i] = FPDFText_GetUnicode(pPdfTextPage, i);
OUString aActualText(aChars.data(), aChars.size());
CPPUNIT_ASSERT_EQUAL(aExpectedText, aActualText);
+#endif
}
void PdfExportTest::testTdf115117_2a()
{
+#if HAVE_MORE_FONTS
// See the comments in testTdf115117_1a() for explanation.
// Import the bugdoc and export as PDF.
@@ -1188,13 +1184,13 @@ void PdfExportTest::testTdf115117_2a()
aChars[i] = FPDFText_GetUnicode(pPdfTextPage, i);
OUString aActualText(aChars.data(), aChars.size());
CPPUNIT_ASSERT_EQUAL(aExpectedText, aActualText);
+#endif
}
-// This requires Amiri font, if it is missing the test will fail.
void PdfExportTest::testTdf66597_1()
{
- // FIXME: Fallback font is used on Windows for some reason.
-#if !defined _WIN32
+#if HAVE_MORE_FONTS
+ // This requires Amiri font, if it is missing the test will fail.
vcl::filter::PDFDocument aDocument;
load("tdf66597-1.odt", aDocument);
@@ -1284,8 +1280,7 @@ void PdfExportTest::testTdf66597_1()
// This requires Reem Kufi font, if it is missing the test will fail.
void PdfExportTest::testTdf66597_2()
{
- // FIXME: Fallback font is used on Windows for some reason.
-#if !defined _WIN32
+#if HAVE_MORE_FONTS
vcl::filter::PDFDocument aDocument;
load("tdf66597-2.odt", aDocument);
@@ -1381,8 +1376,7 @@ void PdfExportTest::testTdf66597_2()
// This requires Gentium Basic font, if it is missing the test will fail.
void PdfExportTest::testTdf66597_3()
{
- // fails on some of the windows tinderboxes
-#if !defined _WIN32
+#if HAVE_MORE_FONTS
vcl::filter::PDFDocument aDocument;
load("tdf66597-3.odt", aDocument);
@@ -1458,9 +1452,8 @@ void PdfExportTest::testTdf66597_3()
}
CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of ActualText entries does not
match!", static_cast<size_t>(4), nCount);
}
-#endif // __WIN32
-}
#endif
+}
void PdfExportTest::testTdf105954()
{
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 65797845575f..90705d26ec19 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -55,9 +55,7 @@ public:
TimerTest() : BootstrapFixture(true, false) {}
void testIdle();
-#ifndef _WIN32
void testIdleMainloop();
-#endif
#ifdef TEST_WATCHDOG
void testWatchdog();
#endif
@@ -76,9 +74,7 @@ public:
CPPUNIT_TEST_SUITE(TimerTest);
CPPUNIT_TEST(testIdle);
-#ifndef _WIN32
CPPUNIT_TEST(testIdleMainloop);
-#endif
#ifdef TEST_WATCHDOG
CPPUNIT_TEST(testWatchdog);
#endif
@@ -133,8 +129,6 @@ void TimerTest::testIdle()
CPPUNIT_ASSERT_MESSAGE("idle triggered", bTriggered);
}
-#ifndef _WIN32
-// tdf#91727
void TimerTest::testIdleMainloop()
{
bool bTriggered = false;
@@ -152,7 +146,6 @@ void TimerTest::testIdleMainloop()
}
CPPUNIT_ASSERT_MESSAGE("mainloop idle triggered", bTriggered);
}
-#endif
class TimerBool : public Timer
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
