From 2a75ef1ce370310a06b30de34799c0cb39f6bfea Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Sat, 14 Nov 2015 15:35:18 +0100
Subject: [PATCH 334/398] CppunitTest_sw_tiledrendering: replace various ifdefs
 with a single condition

LOK is Linux-only at the moment, don't bother with disabling each and
every unit test on Mac/Windows for now.

Change-Id: I2ff1ed47251c16ec6a8d43138789480d95ea720e
(cherry picked from commit 18dfcbb11a05b7e702dc2161df9db8386a7ca34b)
---
 sw/Module_sw.mk                                |  7 +++++-
 sw/qa/extras/tiledrendering/tiledrendering.cxx | 34 +-------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 13453b5beb10..80b1ffb85e14 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -68,11 +68,16 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_odfexport \
     CppunitTest_sw_odfimport \
     CppunitTest_sw_uiwriter \
-    CppunitTest_sw_tiledrendering \
     CppunitTest_sw_mailmerge \
     CppunitTest_sw_globalfilter \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Module_add_slowcheck_targets,sw,\
+    CppunitTest_sw_tiledrendering \
+))
+endif
+
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_filters_test \
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 4598c50e5842..9f85fe8e1290 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -150,18 +150,6 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
 
 void SwTiledRenderingTest::testRegisterCallback()
 {
-#ifdef MACOSX
-    // For some reason this particular test requires window system access on OS X.
-
-    // Without window system access, we do get a number of "<<<WARNING>>>
-    // AquaSalGraphics::CheckContext() FAILED!!!!" [sic] and " <Warning>: CGSConnectionByID: 0 is
-    // not a valid connection ID" warnings while running the other tests, too, but they still
-    // succeed.
-
-    if (!vcl::IsWindowSystemAvailable())
-        return;
-#endif
-
     SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
     pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
@@ -170,13 +158,8 @@ void SwTiledRenderingTest::testRegisterCallback()
 
     // Check that the top left 256x256px tile would be invalidated.
     CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
-#if !defined(WNT) && !defined(MACOSX)
     Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 DPI.
-    // FIXME - fails on Windows since about cbd48230bb3a90c4c485fa33123c6653234e02e9
-    // [plus minus few commits maybe]
-    // Also on OS X. But is tiled rendering even supposed to work on Windows and OS X?
     CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft));
-#endif
 }
 
 void SwTiledRenderingTest::testPostKeyEvent()
@@ -290,9 +273,7 @@ void SwTiledRenderingTest::testSetGraphicSelection()
     Rectangle aShapeAfter = pObject->GetSnapRect();
     // Check that a resize happened, but aspect ratio is not kept.
     CPPUNIT_ASSERT_EQUAL(aShapeBefore.getWidth(), aShapeAfter.getWidth());
-#if !defined(MACOSX) // FIXME
     CPPUNIT_ASSERT_EQUAL(aShapeBefore.getHeight() + 1000, aShapeAfter.getHeight());
-#endif
 }
 
 void SwTiledRenderingTest::testResetSelection()
@@ -322,7 +303,6 @@ void SwTiledRenderingTest::testResetSelection()
     CPPUNIT_ASSERT(!pWrtShell->IsSelFrmMode());
 }
 
-#if !(defined WNT || defined MACOSX)
 void lcl_search(bool bBackward)
 {
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
@@ -332,11 +312,9 @@ void lcl_search(bool bBackward)
     }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
 }
-#endif
 
 void SwTiledRenderingTest::testSearch()
 {
-#if !defined(WNT) && !defined(MACOSX)
     comphelper::LibreOfficeKit::setActive();
 
     SwXTextDocument* pXTextDocument = createDoc("search.odt");
@@ -377,12 +355,10 @@ void SwTiledRenderingTest::testSearch()
     CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
 
     comphelper::LibreOfficeKit::setActive(false);
-#endif
 }
 
 void SwTiledRenderingTest::testSearchViewArea()
 {
-#if !defined(WNT) && !defined(MACOSX)
     SwXTextDocument* pXTextDocument = createDoc("search.odt");
     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
     // Go to the second page, 1-based.
@@ -404,12 +380,10 @@ void SwTiledRenderingTest::testSearchViewArea()
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This was just "Heading", i.e. SwView::SearchAndWrap() did not search from only the top of the second page.
     CPPUNIT_ASSERT_EQUAL(OUString("Heading on second page"), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
-#endif
 }
 
 void SwTiledRenderingTest::testSearchTextFrame()
 {
-#if !defined(WNT) && !defined(MACOSX)
     comphelper::LibreOfficeKit::setActive();
 
     SwXTextDocument* pXTextDocument = createDoc("search.odt");
@@ -424,12 +398,10 @@ void SwTiledRenderingTest::testSearchTextFrame()
     CPPUNIT_ASSERT(!m_aTextSelection.isEmpty());
 
     comphelper::LibreOfficeKit::setActive(false);
-#endif
 }
 
 void SwTiledRenderingTest::testSearchTextFrameWrapAround()
 {
-#if !defined(WNT) && !defined(MACOSX)
     SwXTextDocument* pXTextDocument = createDoc("search.odt");
     pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
     uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
@@ -442,12 +414,10 @@ void SwTiledRenderingTest::testSearchTextFrameWrapAround()
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This failed, i.e. the second time 'not found' was reported, instead of wrapping around.
     CPPUNIT_ASSERT(m_bFound);
-#endif
 }
 
 void SwTiledRenderingTest::testDocumentSizeChanged()
 {
-#if !defined(WNT) && !defined(MACOSX)
     // Get the current document size.
     SwXTextDocument* pXTextDocument = createDoc("2-pages.odt");
     pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
@@ -462,12 +432,10 @@ void SwTiledRenderingTest::testDocumentSizeChanged()
     CPPUNIT_ASSERT_EQUAL(aSize.getWidth(), m_aDocumentSize.getWidth());
     // Document height should be smaller now.
     CPPUNIT_ASSERT(aSize.getHeight() > m_aDocumentSize.getHeight());
-#endif
 }
 
 void SwTiledRenderingTest::testSearchAll()
 {
-#if !defined(WNT) && !defined(MACOSX)
     comphelper::LibreOfficeKit::setActive();
 
     SwXTextDocument* pXTextDocument = createDoc("search.odt");
@@ -485,8 +453,8 @@ void SwTiledRenderingTest::testSearchAll()
     CPPUNIT_ASSERT_EQUAL(0, m_aSearchResultPart[0]);
 
     comphelper::LibreOfficeKit::setActive(false);
-#endif
 }
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
-- 
2.12.0