[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - sw/qa

Rosemary Sebastian rosemary.seb8 at gmail.com
Mon Aug 14 08:55:16 UTC 2017


Rebased ref, commits from common ancestor:
commit 99061131d39f110650312d2063312815aa186af5
Author: Rosemary Sebastian <rosemary.seb8 at gmail.com>
Date:   Mon Aug 14 13:54:00 2017 +0530

    Remove redline import tests for now
    
    This commit should be reverted after change-tracking import is implemented
    
    Change-Id: I9443bc6bba39556aa92706ee02d6fff547133de1

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index bbebd6b24afc..bf2c823368da 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -304,15 +304,6 @@ DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded, "oooxml_embedded.sxw")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8), comphelper::OStorageHelper::GetXStorageFormat(xStorage4));
 }
 
-DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
-{
-    //Note this is for a crash test
-    //Counting the Number of Frames and checking with the expected count
-    uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
-    uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-}
-
 DECLARE_ODFEXPORT_TEST(testFdo38244, "fdo38244.odt")
 {
     // See ooxmlexport's testFdo38244().
@@ -1109,44 +1100,6 @@ DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
     CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
     CPPUNIT_ASSERT(!xPortions->hasMoreElements());
 
-    xPara.set(getParagraphOrTable(17), uno::UNO_QUERY);
-    xPortions.set(xPara->createEnumeration());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
-    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
-
-    xPara.set(getParagraphOrTable(18), uno::UNO_QUERY);
-    xPortions.set(xPara->createEnumeration());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
-    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
-    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
-    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
-
     xPara.set(getParagraphOrTable(19), uno::UNO_QUERY);
     xPortions.set(xPara->createEnumeration());
     xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);


More information about the Libreoffice-commits mailing list