[Libreoffice-commits] core.git: sd/CppunitTest_sd_shape_import_export_tests.mk sd/qa

[Xisco Fauli (via logerrit)]

 sd/CppunitTest_sd_shape_import_export_tests.mk |    1 
 sd/qa/unit/ShapeImportExportTest.cxx           |   29 ++++++++++---------------
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit 3c83a90f5873cc046d5b73c9fa8c968641f19325
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Oct 28 14:11:33 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Oct 28 16:18:47 2022 +0200

    CppunitTest_sd_shape_import_export_tests: inherit from UnoApiTest
    
    Change-Id: I7b5599574553e87345bf4ab09aeb2003d071eced
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141977
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sd/CppunitTest_sd_shape_import_export_tests.mk 
b/sd/CppunitTest_sd_shape_import_export_tests.mk
index 7209eba11c66..1172a82906ab 100644
--- a/sd/CppunitTest_sd_shape_import_export_tests.mk
+++ b/sd/CppunitTest_sd_shape_import_export_tests.mk
@@ -52,6 +52,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sd_shape_import_export_tests, \
     sd \
     sfx \
     sot \
+    subsequenttest \
     svl \
     svt \
     svx \
diff --git a/sd/qa/unit/ShapeImportExportTest.cxx 
b/sd/qa/unit/ShapeImportExportTest.cxx
index 186aafa4a267..1b5ff45ca859 100644
--- a/sd/qa/unit/ShapeImportExportTest.cxx
+++ b/sd/qa/unit/ShapeImportExportTest.cxx
@@ -19,9 +19,14 @@
 using namespace css;
 
 /// Shape / SdrObject import and export tests
-class ShapeImportExportTest : public SdModelTestBaseXML
+class ShapeImportExportTest : public SdUnoApiTestXml
 {
 public:
+    ShapeImportExportTest()
+        : SdUnoApiTestXml("/sd/qa/unit/data/")
+    {
+    }
+
     void testTextDistancesOOXML();
     void testTextDistancesOOXML_LargerThanTextAreaSpecialCase();
     void testTextDistancesOOXML_Export();
@@ -56,10 +61,9 @@ SdrObject* searchObject(SdrPage const* pPage, 
std::u16string_view rName)
 /* Test text distances (insets) */
 void ShapeImportExportTest::testTextDistancesOOXML()
 {
-    ::sd::DrawDocShellRef xDocShell
-        = 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/TextDistancesInsets1.pptx"),
 PPTX);
+    loadFromURL(u"TextDistancesInsets1.pptx");
 
-    SdrPage const* pPage = GetPage(1, xDocShell);
+    SdrPage const* pPage = GetPage(1);
     // Bottom Margin = 4cm
     {
         std::array<std::u16string_view, 3> aObjectDesc = {
@@ -161,17 +165,14 @@ void ShapeImportExportTest::testTextDistancesOOXML()
             CPPUNIT_ASSERT_EQUAL(tools::Long(-1292), 
pTextObj->GetTextLowerDistance());
         }
     }
-
-    xDocShell->DoClose();
 }
 
 /* Test text distances (insets) variants where top+bottom margin > text area*/
 void 
ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase()
 {
-    ::sd::DrawDocShellRef xDocShell
-        = 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/TextDistancesInsets2.pptx"),
 PPTX);
+    loadFromURL(u"TextDistancesInsets2.pptx");
 
-    SdrPage const* pPage = GetPage(1, xDocShell);
+    SdrPage const* pPage = GetPage(1);
 
     // Top/Bottom 0cm/3cm, 1cm/4cm, 4cm/7cm - all should be converted to the 
same value in LO
     {
@@ -252,20 +253,14 @@ void 
ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
             CPPUNIT_ASSERT_EQUAL(tools::Long(-792), 
pTextObj->GetTextLowerDistance());
         }
     }
-
-    xDocShell->DoClose();
 }
 
 /* Test export of text distances (insets) - conversion back of special case */
 void ShapeImportExportTest::testTextDistancesOOXML_Export()
 {
-    ::sd::DrawDocShellRef xDocShell
-        = 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/TextDistancesInsets3.pptx"),
 PPTX);
-
-    utl::TempFileNamed aTempFile;
-    xDocShell = saveAndReload(xDocShell.get(), PPTX, &aTempFile);
-    xDocShell->DoClose();
+    loadFromURL(u"TextDistancesInsets3.pptx");
 
+    utl::TempFileNamed aTempFile = save("Impress Office Open XML");
     xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "ppt/slides/slide1.xml");
     CPPUNIT_ASSERT(pXmlDoc);