split sw_rtfexport and sw_rtfexport2 tests up

which takes it from 18m to 15m for me.

Change-Id: If5a6ee84fe7c651a1a66b95cb6ece0a73f3664dd
Reviewed-on: https://gerrit.libreoffice.org/66391
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sw/CppunitTest_sw_rtfexport4.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_rtfexport4))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_rtfexport4, \
+    sw/qa/extras/rtfexport/rtfexport4 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport4, \
+    comphelper \
+    cppu \
+	cppuhelper \
+    sal \
+    sfx \
+	sw \
+    test \
+    unotest \
+	utl \
+	tl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_rtfexport4,\
+	boost_headers \
+    libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/source/core/inc \
+	-I$(SRCDIR)/sw/qa/extras/inc \
+    $$(INCLUDE) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport4,\
+	-bigobj \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_api,sw_rtfexport4,\
+	udkapi \
+	offapi \
+	oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_rtfexport4))
+$(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport4))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport4,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport4))
+
+# vim: set noet sw=4 ts=4:

sw/CppunitTest_sw_rtfexport5.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_rtfexport5))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_rtfexport5, \
+    sw/qa/extras/rtfexport/rtfexport5 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport5, \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nlangtag \
+    sal \
+    sfx \
+    sw \
+    test \
+    unotest \
+    utl \
+    vcl \
+    tl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_rtfexport5,\
+    boost_headers \
+    libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_rtfexport5,\
+    -I$(SRCDIR)/sw/inc \
+    -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/qa/extras/inc \
+    $$(INCLUDE) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport5,\
+    -bigobj \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_api,sw_rtfexport5,\
+	udkapi \
+	offapi \
+	oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_rtfexport5))
+$(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport5))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport5,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport5))
+
+# vim: set noet sw=4 ts=4:

sw/Module_sw.mk

@@ -55,6 +55,11 @@ $(eval $(call gb_Module_add_check_targets,sw,\
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
 		CppunitTest_sw_uwriter) \
+    CppunitTest_sw_rtfexport \
+    CppunitTest_sw_rtfexport2 \
+    CppunitTest_sw_rtfexport3 \
+    CppunitTest_sw_rtfexport4 \
+    CppunitTest_sw_rtfexport5 \
     CppunitTest_sw_docbookexport \
     CppunitTest_sw_fodfexport \
     CppunitTest_sw_htmlexport \
@@ -85,9 +90,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_ww8export2 \
     CppunitTest_sw_ww8export3 \
     CppunitTest_sw_ww8import \
-    CppunitTest_sw_rtfexport \
-    CppunitTest_sw_rtfexport2 \
-    CppunitTest_sw_rtfexport3 \
     CppunitTest_sw_rtfimport \
     CppunitTest_sw_odfexport \
     CppunitTest_sw_odfimport \

sw/qa/extras/rtfexport/rtfexport.cxx

@@ -878,72 +878,6 @@ DECLARE_RTFEXPORT_TEST(testFdo82858, "fdo82858.docx")
                          getProperty<table::BorderLine2>(getShape(1), "TopBorder").LineStyle);
 }
 
-DECLARE_RTFEXPORT_TEST(testCjklist12, "cjklist12.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_HALFWIDTH_JA, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist13, "cjklist13.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_HALFWIDTH_JA, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist16, "cjklist16.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_TRADITIONAL_JA, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist20, "cjklist20.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_FULLWIDTH_JA, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist21, "cjklist21.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_FULLWIDTH_JA, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist24, "cjklist24.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_SYLLABLE_KO, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist25, "cjklist25.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_JAMO_KO, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist30, "cjklist30.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::TIAN_GAN_ZH, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist31, "cjklist31.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::DI_ZI_ZH, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat);
-}
-
-DECLARE_RTFEXPORT_TEST(testCjklist38, "cjklist38.rtf")
-{
-    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
-    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH, numFormat);
-}
-
 DECLARE_RTFEXPORT_TEST(testTdf104936, "tdf104936.rtf")
 {
     uno::Reference<text::XTextRange> xShape1(getShape(1), uno::UNO_QUERY);

sw/qa/extras/rtfexport/rtfexport4.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <swmodeltestbase.hxx>
+
+#include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/awt/XBitmap.hpp>
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <com/sun/star/style/PageStyleLayout.hpp>
+#include <com/sun/star/table/BorderLine2.hpp>
+#include <com/sun/star/table/ShadowFormat.hpp>
+#include <com/sun/star/text/FontEmphasis.hpp>
+#include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/text/TableColumnSeparator.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <com/sun/star/text/XFootnotesSupplier.hpp>
+#include <com/sun/star/text/XPageCursor.hpp>
+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
+#include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/view/XViewSettingsSupplier.hpp>
+#include <com/sun/star/text/RubyAdjust.hpp>
+#include <com/sun/star/text/RubyPosition.hpp>
+#include <com/sun/star/text/XTextColumns.hpp>
+#include <com/sun/star/text/HoriOrientation.hpp>
+
+/**
+  Split these tests into their own file because they are really really slow
+*/
+
+class Test : public SwModelTestBase
+{
+public:
+    Test()
+        : SwModelTestBase("/sw/qa/extras/rtfexport/data/", "Rich Text Format")
+    {
+    }
+};
+
+DECLARE_RTFEXPORT_TEST(testCjklist12, "cjklist12.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_HALFWIDTH_JA, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist13, "cjklist13.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_HALFWIDTH_JA, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist16, "cjklist16.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_TRADITIONAL_JA, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist20, "cjklist20.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_FULLWIDTH_JA, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist21, "cjklist21.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_FULLWIDTH_JA, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist24, "cjklist24.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_SYLLABLE_KO, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist25, "cjklist25.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_JAMO_KO, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist30, "cjklist30.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::TIAN_GAN_ZH, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist31, "cjklist31.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::DI_ZI_ZH, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat);
+}
+
+DECLARE_RTFEXPORT_TEST(testCjklist38, "cjklist38.rtf")
+{
+    sal_Int16 numFormat = getNumberingTypeOfParagraph(1);
+    CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH, numFormat);
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */