sw: move tests in ooxmlimport to ooxmlimport2.

To avoid using -bigobj on Windows.

Change-Id: I3115fc01a0802c4b40219bb6f7ea934df81706ed
Reviewed-on: https://gerrit.libreoffice.org/53769
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>

2 files changed, 201 insertions, 160 deletions

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7b60b191df67..4743cbc8afed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1440,166 +1440,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108995, "xml_space.docx")
                          paragraph->getString());
 }
 
-DECLARE_OOXMLIMPORT_TEST(testTdf108545_embeddedDocxIcon, "tdf108545_embeddedDocxIcon.docx")
-{
-    uno::Reference<document::XEmbeddedObjectSupplier2> xSupplier(getShape(1), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(embed::Aspects::MSOLE_ICON, xSupplier->getAspect());
-}
-
-
-DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx")
-{
-    // Table was imported into a text frame which led to a one page document
-    // Originally the table takes two pages, so Writer should import it accordingly.
-    CPPUNIT_ASSERT_EQUAL(getPages(), 2);
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx")
-{
-    // sectPr element that is child element of body must be the last child. However, Word accepts it
-    // in wrong places, and we should do the same (bug-to-bug compatibility) without creating extra sections.
-    CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Misplaced body-level sectPr's create extra sections!", 2, getPages());
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf109524, "tdf109524.docx")
-{
-    uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
-    uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
-    // The table should have a small width (just to hold the short text in its single cell).
-    // Until it's correctly implemented, we assign it 100% relative width.
-    // Previously, the table (without explicitly set width) had huge actual width
-    // and extended far outside of page's right border.
-    CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xTables->getByIndex(0), "IsWidthRelative"));
-    CPPUNIT_ASSERT_EQUAL(sal_Int16(100), getProperty<sal_Int16>(xTables->getByIndex(0), "RelativeWidth"));
-}
-
-DECLARE_OOXMLIMPORT_TEST(testGroupShapeFontName, "groupshape-fontname.docx")
-{
-    // Font names inside a group shape were not imported
-    uno::Reference<container::XIndexAccess> xGroup(getShape(1), uno::UNO_QUERY);
-    uno::Reference<text::XText> xText = uno::Reference<text::XTextRange>(xGroup->getByIndex(1), uno::UNO_QUERY)->getText();
-
-    CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontName"));
-    CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontNameComplex"));
-    CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontNameAsian"));
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf111550, "tdf111550.docx")
-{
-    // The test document has following ill-formed structure:
-    //
-    //    <w:tbl>
-    //        ...
-    //        <w:tr>
-    //            <w:tc>
-    //                <w:p>
-    //                    <w:r>
-    //                        <w:t>[outer:A2]</w:t>
-    //                        <w:br w:type="textWrapping"/>
-    //                    </w:r>
-    //                    <w:tbl>
-    //                        <w:tr>
-    //                            <w:tc>
-    //                                <w:p>
-    //                                    <w:r>
-    //                                        <w:t>[inner:A1]</w:t>
-    //                                    </w:r>
-    //                                </w:p>
-    //                            </w:tc>
-    //                        </w:tr>
-    //                    </w:tbl>
-    //                </w:p>
-    //            </w:tc>
-    //        </w:tr>
-    //    </w:tbl>
-    //
-    // i.e., a <w:tbl> as direct child of <w:p> inside another table.
-    // Word accepts that illegal OOXML, and treats it as equal to
-    //
-    //    <w:tbl>
-    //        ...
-    //        <w:tr>
-    //            <w:tc>
-    //                <w:tbl>
-    //                    <w:tr>
-    //                        <w:tc>
-    //                            <w:p>
-    //                                <w:r>
-    //                                    <w:t>[outer:A2]</w:t>
-    //                                    <w:br w:type="textWrapping"/>
-    //                                </w:r>
-    //                                <w:r>
-    //                                    <w:t>[inner:A1]</w:t>
-    //                                </w:r>
-    //                            </w:p>
-    //                        </w:tc>
-    //                    </w:tr>
-    //                </w:tbl>
-    //            </w:tc>
-    //        </w:tr>
-    //    </w:tbl>
-    //
-    // i.e., moves all contents of the outer paragraph into the inner table's first paragraph.
-
-    CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
-
-    uno::Reference<text::XTextContent> outerTable = getParagraphOrTable(1);
-    getCell(outerTable, "A1", "[outer:A1]");
-    uno::Reference<text::XText> cellA2(getCell(outerTable, "A2"), uno::UNO_QUERY_THROW);
-    uno::Reference<text::XTextContent> innerTable = getParagraphOrTable(1, cellA2);
-    getCell(innerTable, "A1", "[outer:A2]\n[inner:A1]");
-}
-
-
-DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
-{
-    uno::Reference<text::XTextRange> xParagraph = getParagraph(1);
-    uno::Reference<text::XTextRange> xText = getRun(xParagraph, 2, "kick the bucket");
-
-    // Ensure that hyperlink text color is not blue (0x0000ff), but default (-1)
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Hyperlink color should be black!",
-        sal_Int32(-1), getProperty<sal_Int32>(xText, "CharColor"));
-}
-
-
-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
-{
-    // the position of the flying text frame should be off page
-    // 30624 below its anchor
-    OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
-    CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
-
-}
-
-// DOCX: Textbox wrap differs in MSO and LO
-// Both should layout text regardless of existing text box
-// and as result only one page should be generated.
-DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx")
-{
-    CPPUNIT_ASSERT_EQUAL(getPages(), 1);
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
-{
-    OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
-    CPPUNIT_ASSERT_EQUAL( OUString("1696"), aTop );
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf114217, "tdf114217.docx")
-{
-    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
-    uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
-    // This was 1, multi-page table was imported as a floating one.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), xDrawPage->getCount());
-}
-
-DECLARE_OOXMLIMPORT_TEST(testTdf116486, "tdf116486.docx")
-{
-    OUString aTop = parseDump("/root/page/body/txt/Special", "nHeight");
-    CPPUNIT_ASSERT_EQUAL( OUString("4006"), aTop );
-}
-
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
new file mode 100644
index 000000000000..eb3b42a31387
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -0,0 +1,201 @@
+/* -*- 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 <memory>
+#include <config_test.h>
+
+#ifdef MACOSX
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#include <premac.h>
+#include <AppKit/AppKit.h>
+#include <postmac.h>
+#endif
+
+#include <swmodeltestbase.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
+
+class Test : public SwModelTestBase
+{
+public:
+    Test()
+        : SwModelTestBase("/sw/qa/extras/ooxmlimport/data/", "Office Open XML Text")
+    {
+    }
+};
+
+DECLARE_OOXMLIMPORT_TEST(testTdf108545_embeddedDocxIcon, "tdf108545_embeddedDocxIcon.docx")
+{
+    uno::Reference<document::XEmbeddedObjectSupplier2> xSupplier(getShape(1), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(embed::Aspects::MSOLE_ICON, xSupplier->getAspect());
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx")
+{
+    // Table was imported into a text frame which led to a one page document
+    // Originally the table takes two pages, so Writer should import it accordingly.
+    CPPUNIT_ASSERT_EQUAL(getPages(), 2);
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx")
+{
+    // sectPr element that is child element of body must be the last child. However, Word accepts it
+    // in wrong places, and we should do the same (bug-to-bug compatibility) without creating extra sections.
+    CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Misplaced body-level sectPr's create extra sections!", 2,
+                                 getPages());
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf109524, "tdf109524.docx")
+{
+    uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(),
+                                                    uno::UNO_QUERY);
+    // The table should have a small width (just to hold the short text in its single cell).
+    // Until it's correctly implemented, we assign it 100% relative width.
+    // Previously, the table (without explicitly set width) had huge actual width
+    // and extended far outside of page's right border.
+    CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xTables->getByIndex(0), "IsWidthRelative"));
+    CPPUNIT_ASSERT_EQUAL(sal_Int16(100),
+                         getProperty<sal_Int16>(xTables->getByIndex(0), "RelativeWidth"));
+}
+
+DECLARE_OOXMLIMPORT_TEST(testGroupShapeFontName, "groupshape-fontname.docx")
+{
+    // Font names inside a group shape were not imported
+    uno::Reference<container::XIndexAccess> xGroup(getShape(1), uno::UNO_QUERY);
+    uno::Reference<text::XText> xText
+        = uno::Reference<text::XTextRange>(xGroup->getByIndex(1), uno::UNO_QUERY)->getText();
+
+    CPPUNIT_ASSERT_EQUAL(
+        OUString("Calibri"),
+        getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontName"));
+    CPPUNIT_ASSERT_EQUAL(
+        OUString("Calibri"),
+        getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontNameComplex"));
+    CPPUNIT_ASSERT_EQUAL(
+        OUString(""),
+        getProperty<OUString>(getRun(getParagraphOfText(1, xText), 1), "CharFontNameAsian"));
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf111550, "tdf111550.docx")
+{
+    // The test document has following ill-formed structure:
+    //
+    //    <w:tbl>
+    //        ...
+    //        <w:tr>
+    //            <w:tc>
+    //                <w:p>
+    //                    <w:r>
+    //                        <w:t>[outer:A2]</w:t>
+    //                        <w:br w:type="textWrapping"/>
+    //                    </w:r>
+    //                    <w:tbl>
+    //                        <w:tr>
+    //                            <w:tc>
+    //                                <w:p>
+    //                                    <w:r>
+    //                                        <w:t>[inner:A1]</w:t>
+    //                                    </w:r>
+    //                                </w:p>
+    //                            </w:tc>
+    //                        </w:tr>
+    //                    </w:tbl>
+    //                </w:p>
+    //            </w:tc>
+    //        </w:tr>
+    //    </w:tbl>
+    //
+    // i.e., a <w:tbl> as direct child of <w:p> inside another table.
+    // Word accepts that illegal OOXML, and treats it as equal to
+    //
+    //    <w:tbl>
+    //        ...
+    //        <w:tr>
+    //            <w:tc>
+    //                <w:tbl>
+    //                    <w:tr>
+    //                        <w:tc>
+    //                            <w:p>
+    //                                <w:r>
+    //                                    <w:t>[outer:A2]</w:t>
+    //                                    <w:br w:type="textWrapping"/>
+    //                                </w:r>
+    //                                <w:r>
+    //                                    <w:t>[inner:A1]</w:t>
+    //                                </w:r>
+    //                            </w:p>
+    //                        </w:tc>
+    //                    </w:tr>
+    //                </w:tbl>
+    //            </w:tc>
+    //        </w:tr>
+    //    </w:tbl>
+    //
+    // i.e., moves all contents of the outer paragraph into the inner table's first paragraph.
+
+    CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+
+    uno::Reference<text::XTextContent> outerTable = getParagraphOrTable(1);
+    getCell(outerTable, "A1", "[outer:A1]");
+    uno::Reference<text::XText> cellA2(getCell(outerTable, "A2"), uno::UNO_QUERY_THROW);
+    uno::Reference<text::XTextContent> innerTable = getParagraphOrTable(1, cellA2);
+    getCell(innerTable, "A1", "[outer:A2]\n[inner:A1]");
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
+{
+    uno::Reference<text::XTextRange> xParagraph = getParagraph(1);
+    uno::Reference<text::XTextRange> xText = getRun(xParagraph, 2, "kick the bucket");
+
+    // Ensure that hyperlink text color is not blue (0x0000ff), but default (-1)
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Hyperlink color should be black!", sal_Int32(-1),
+                                 getProperty<sal_Int32>(xText, "CharColor"));
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
+{
+    // the position of the flying text frame should be off page
+    // 30624 below its anchor
+    OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
+    CPPUNIT_ASSERT_EQUAL(OUString("30624"), aTop);
+}
+
+// DOCX: Textbox wrap differs in MSO and LO
+// Both should layout text regardless of existing text box
+// and as result only one page should be generated.
+DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") { CPPUNIT_ASSERT_EQUAL(getPages(), 1); }
+
+DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
+{
+    OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
+    CPPUNIT_ASSERT_EQUAL(OUString("1696"), aTop);
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf114217, "tdf114217.docx")
+{
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
+    // This was 1, multi-page table was imported as a floating one.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), xDrawPage->getCount());
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf116486, "tdf116486.docx")
+{
+    OUString aTop = parseDump("/root/page/body/txt/Special", "nHeight");
+    CPPUNIT_ASSERT_EQUAL(OUString("4006"), aTop);
+}
+
+// tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */