mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CppunitTest_sc_tiledrendering: replace ifdefs with a single makefile condition

Browse Source 
Change-Id: I1dded11e0572dee7cd917a1aa8c2e2ca53b81d84
Reviewed-on: https://gerrit.libreoffice.org/26849
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-07-01 12:00:44 +02:00
parent 4c917dbf99
commit 8e3451c096
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sc/Module_sc.mk
View File

@@ -47,9 +47,14 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_rangelst_test \ CppunitTest_sc_rangelst_test \
CppunitTest_sc_mark_test \ CppunitTest_sc_mark_test \
CppunitTest_sc_core \ CppunitTest_sc_core \
CppunitTest_sc_tiledrendering \
)) ))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_tiledrendering \
))
endif
$(eval $(call gb_Module_add_slowcheck_targets,sc, \ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_condformats \ CppunitTest_sc_condformats \
CppunitTest_sc_new_cond_format_api \ CppunitTest_sc_new_cond_format_api \

15
sc/qa/unit/tiledrendering/tiledrendering.cxx
View File

@@ -36,9 +36,7 @@
using namespace css; using namespace css;
#if !defined(WNT) && !defined(MACOSX)
static const char* DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/"; static const char* DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/";
#endif
class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools
{ {
@@ -47,44 +45,34 @@ public:
virtual void setUp() SAL_OVERRIDE; virtual void setUp() SAL_OVERRIDE;
virtual void tearDown() SAL_OVERRIDE; virtual void tearDown() SAL_OVERRIDE;
#if !defined(WNT) && !defined(MACOSX)
void testRowColumnSelections(); void testRowColumnSelections();
void testSortAscendingDescending(); void testSortAscendingDescending();
void testPartHash(); void testPartHash();
void testDocumentSize(); void testDocumentSize();
void testEmptyColumnSelection(); void testEmptyColumnSelection();
#endif
CPPUNIT_TEST_SUITE(ScTiledRenderingTest); CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
#if !defined(WNT) && !defined(MACOSX)
CPPUNIT_TEST(testRowColumnSelections); CPPUNIT_TEST(testRowColumnSelections);
CPPUNIT_TEST(testSortAscendingDescending); CPPUNIT_TEST(testSortAscendingDescending);
CPPUNIT_TEST(testPartHash); CPPUNIT_TEST(testPartHash);
CPPUNIT_TEST(testDocumentSize); CPPUNIT_TEST(testDocumentSize);
CPPUNIT_TEST(testEmptyColumnSelection); CPPUNIT_TEST(testEmptyColumnSelection);
#endif
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
#if !defined(WNT) && !defined(MACOSX)
ScModelObj* createDoc(const char* pName); ScModelObj* createDoc(const char* pName);
static void callback(int nType, const char* pPayload, void* pData); static void callback(int nType, const char* pPayload, void* pData);
void callbackImpl(int nType, const char* pPayload); void callbackImpl(int nType, const char* pPayload);
/// document size changed callback. /// document size changed callback.
osl::Condition m_aDocSizeCondition; osl::Condition m_aDocSizeCondition;
#endif
uno::Reference<lang::XComponent> mxComponent; uno::Reference<lang::XComponent> mxComponent;
#if !defined(WNT) && !defined(MACOSX)
// TODO various test-related members - when needed // TODO various test-related members - when needed
#endif
}; };
ScTiledRenderingTest::ScTiledRenderingTest() ScTiledRenderingTest::ScTiledRenderingTest()
#if !defined(WNT) && !defined(MACOSX)
// TODO various test-related members - when needed // TODO various test-related members - when needed
#endif
{ {
} }
@@ -103,7 +91,6 @@ void ScTiledRenderingTest::tearDown()
test::BootstrapFixture::tearDown(); test::BootstrapFixture::tearDown();
} }
#if !defined(WNT) && !defined(MACOSX)
ScModelObj* ScTiledRenderingTest::createDoc(const char* pName) ScModelObj* ScTiledRenderingTest::createDoc(const char* pName)
{ {
if (mxComponent.is()) if (mxComponent.is())
@@ -360,8 +347,6 @@ void ScTiledRenderingTest::testEmptyColumnSelection()
comphelper::LibreOfficeKit::setActive(false); comphelper::LibreOfficeKit::setActive(false);
} }
#endif
CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest); CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();