From 2f758cdd01a998292a93091f951ad96668139a5b Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 25 Jul 2016 11:47:25 +0200
Subject: move parseExport to SdExportTest base class

Change-Id: I20cc59e21aa1b99d8cee5a9f60c0703e9c457187
---
 sd/CppunitTest_sd_import_tests.mk  |  5 ++++-
 sd/CppunitTest_sd_misc_tests.mk    |  5 ++++-
 sd/qa/unit/export-tests-ooxml1.cxx |  6 +-----
 sd/qa/unit/export-tests-ooxml2.cxx | 21 +--------------------
 sd/qa/unit/export-tests.cxx        | 21 +--------------------
 sd/qa/unit/sdmodeltestbase.hxx     | 30 +++++++++++++++++++++++++++++-
 6 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index a2a295651132..0440e3dc7250 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -11,7 +11,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sd_import_tests))
 
-$(eval $(call gb_CppunitTest_use_external,sd_import_tests,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,sd_import_tests,\
+	boost_headers \
+	libxml2 \
+))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \
     sd/qa/unit/import-tests \
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index 8c9cfa631c3c..fd6250b3bf72 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -11,7 +11,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sd_misc_tests))
 
-$(eval $(call gb_CppunitTest_use_external,sd_misc_tests,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,sd_misc_tests,\
+	boost_headers \
+	libxml2 \
+))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_misc_tests, \
     sd/qa/unit/misc-tests \
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index 14d29d971ba1..402f03b254b3 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -9,8 +9,6 @@
 #include <officecfg/Office/Common.hxx>
 #include "sdmodeltestbase.hxx"
 #include "Outliner.hxx"
-#include <test/xmltesttools.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/editobj.hxx>
@@ -40,7 +38,6 @@
 #include <svx/xflclit.hxx>
 #include <animations/animationnodehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vcl/opengl/OpenGLWrapper.hxx>
@@ -67,7 +64,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
@@ -81,7 +77,7 @@
 using namespace css;
 using namespace css::animations;
 
-class SdOOXMLExportTest1 : public SdModelTestBase, public XmlTestTools
+class SdOOXMLExportTest1 : public SdModelTestBaseXML
 {
 public:
     void testFdo90607();
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 83eecaa9082f..78050171a8fd 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -9,8 +9,6 @@
 #include <officecfg/Office/Common.hxx>
 #include "sdmodeltestbase.hxx"
 #include "Outliner.hxx"
-#include <test/xmltesttools.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/editobj.hxx>
@@ -40,7 +38,6 @@
 #include <svx/xflclit.hxx>
 #include <animations/animationnodehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vcl/opengl/OpenGLWrapper.hxx>
@@ -67,7 +64,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
@@ -81,7 +77,7 @@
 using namespace css;
 using namespace css::animations;
 
-class SdOOXMLExportTest2 : public SdModelTestBase, public XmlTestTools
+class SdOOXMLExportTest2 : public SdModelTestBaseXML
 {
 public:
     void testTdf93883();
@@ -158,21 +154,6 @@ public:
         }
     }
 
-    xmlDocPtr parseExport(utl::TempFile & rTempFile, OUString const& rStreamName)
-    {
-        OUString const url(rTempFile.GetURL());
-        uno::Reference<packages::zip::XZipFileAccess2> const xZipNames(
-            packages::zip::ZipFileAccess::createWithURL(
-                comphelper::getComponentContext(m_xSFactory), url));
-        uno::Reference<io::XInputStream> const xInputStream(
-            xZipNames->getByName(rStreamName), uno::UNO_QUERY);
-        std::unique_ptr<SvStream> const pStream(
-            utl::UcbStreamHelper::CreateStream(xInputStream, true));
-        xmlDocPtr const pXmlDoc = parseXmlStream(pStream.get());
-        pXmlDoc->name = reinterpret_cast<char *>(xmlStrdup(
-            reinterpret_cast<xmlChar const *>(OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr())));
-        return pXmlDoc;
-    }
 };
 
 void SdOOXMLExportTest2::testTdf93883()
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index d24daa7f14f5..5ecb651313d9 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -9,8 +9,6 @@
 #include <officecfg/Office/Common.hxx>
 #include "sdmodeltestbase.hxx"
 #include "Outliner.hxx"
-#include <test/xmltesttools.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/editobj.hxx>
@@ -40,7 +38,6 @@
 #include <svx/xflclit.hxx>
 #include <animations/animationnodehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vcl/opengl/OpenGLWrapper.hxx>
@@ -67,7 +64,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
@@ -82,7 +78,7 @@
 using namespace css;
 using namespace css::animations;
 
-class SdExportTest : public SdModelTestBase, public XmlTestTools
+class SdExportTest : public SdModelTestBaseXML
 {
 public:
     void testN821567();
@@ -138,21 +134,6 @@ public:
         }
     }
 
-    xmlDocPtr parseExport(utl::TempFile & rTempFile, OUString const& rStreamName)
-    {
-        OUString const url(rTempFile.GetURL());
-        uno::Reference<packages::zip::XZipFileAccess2> const xZipNames(
-            packages::zip::ZipFileAccess::createWithURL(
-                comphelper::getComponentContext(m_xSFactory), url));
-        uno::Reference<io::XInputStream> const xInputStream(
-            xZipNames->getByName(rStreamName), uno::UNO_QUERY);
-        std::unique_ptr<SvStream> const pStream(
-            utl::UcbStreamHelper::CreateStream(xInputStream, true));
-        xmlDocPtr const pXmlDoc = parseXmlStream(pStream.get());
-        pXmlDoc->name = reinterpret_cast<char *>(xmlStrdup(
-            reinterpret_cast<xmlChar const *>(OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr())));
-        return pXmlDoc;
-    }
 };
 
 void SdExportTest::testN821567()
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index c4dcc80feb9b..33b63ebf5557 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -12,14 +12,17 @@
 
 #include <test/bootstrapfixture.hxx>
 #include <test/xmldiff.hxx>
+#include <test/xmltesttools.hxx>
 
 #include <unotest/filters-test.hxx>
 #include <unotest/macros_test.hxx>
 
 #include "drawdoc.hxx"
 #include "../source/ui/inc/DrawDocShell.hxx"
-#include "unotools/tempfile.hxx"
+#include <unotools/tempfile.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <tools/color.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <rtl/strbuf.hxx>
 #include <sfx2/docfile.hxx>
@@ -27,6 +30,7 @@
 #include <svl/itemset.hxx>
 
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <drawinglayer/XShapeDumper.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 
@@ -358,6 +362,30 @@ protected:
         xPropSet->getPropertyValue("TextField") >>= xField;
         return xField;
     }
+
+};
+
+class SdModelTestBaseXML
+    : public SdModelTestBase, public XmlTestTools
+{
+
+public:
+    xmlDocPtr parseExport(utl::TempFile & rTempFile, OUString const& rStreamName)
+    {
+        OUString const url(rTempFile.GetURL());
+        uno::Reference<packages::zip::XZipFileAccess2> const xZipNames(
+            packages::zip::ZipFileAccess::createWithURL(
+                comphelper::getComponentContext(m_xSFactory), url));
+        uno::Reference<io::XInputStream> const xInputStream(
+            xZipNames->getByName(rStreamName), uno::UNO_QUERY);
+        std::unique_ptr<SvStream> const pStream(
+            utl::UcbStreamHelper::CreateStream(xInputStream, true));
+        xmlDocPtr const pXmlDoc = parseXmlStream(pStream.get());
+        pXmlDoc->name = reinterpret_cast<char *>(xmlStrdup(
+            reinterpret_cast<xmlChar const *>(OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr())));
+        return pXmlDoc;
+    }
+
 };
 
 CPPUNIT_NS_BEGIN
-- 
cgit