summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-12-08 00:06:36 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-12-08 14:52:14 +0100
commit60912747087f37f919875677478dbad8165047c6 (patch)
treedd959bb82ac2d32f9adba8523344b6ee8f654cf1 /sw/qa/extras
parent9215ab03476f56f626f926702208f62b9bf2e16d (diff)
test for document merge
Change-Id: Ic6d10a611d9e9351eb9403e1405ec7b17293e816
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/uiwriter/data/merge-change1.odtbin0 -> 12057 bytes
-rw-r--r--sw/qa/extras/uiwriter/data/merge-change2.odtbin0 -> 12300 bytes
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx31
3 files changed, 31 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/merge-change1.odt b/sw/qa/extras/uiwriter/data/merge-change1.odt
new file mode 100644
index 000000000000..02bd488a1a08
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/merge-change1.odt
Binary files differ
diff --git a/sw/qa/extras/uiwriter/data/merge-change2.odt b/sw/qa/extras/uiwriter/data/merge-change2.odt
new file mode 100644
index 000000000000..3644f8149fe8
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/merge-change2.odt
Binary files differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 73529832bd37..4229877085f7 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -62,6 +62,7 @@ public:
void testFdo85554();
void testAutoCorr();
void testFdo87005();
+ void testMergeDoc();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -87,6 +88,7 @@ public:
CPPUNIT_TEST(testFdo85554);
CPPUNIT_TEST(testAutoCorr);
CPPUNIT_TEST(testFdo87005);
+ CPPUNIT_TEST(testMergeDoc);
CPPUNIT_TEST_SUITE_END();
@@ -631,6 +633,35 @@ void SwUiWriterTest::testFdo87005()
assertXPath(pXmlDoc, "//Special[@nType='POR_FLY']", 2);
}
+void SwUiWriterTest::testMergeDoc()
+{
+ SwDoc* const pDoc1(createDoc("merge-change1.odt"));
+
+ auto xDoc2Component(loadFromDesktop(
+ getURLFromSrc(DATA_DIRECTORY) + OUString("merge-change2.odt"),
+ "com.sun.star.text.TextDocument"));
+ auto pxDoc2Document(
+ dynamic_cast<SwXTextDocument *>(xDoc2Component.get()));
+ CPPUNIT_ASSERT(pxDoc2Document);
+ SwDoc* const pDoc2(pxDoc2Document->GetDocShell()->GetDoc());
+
+ SwEditShell* const pEditShell(pDoc1->GetEditShell());
+ pEditShell->MergeDoc(*pDoc2);
+
+ // accept all redlines
+ while(pEditShell->GetRedlineCount())
+ pEditShell->AcceptRedline(0);
+
+ CPPUNIT_ASSERT_EQUAL(7, getParagraphs());
+ getParagraph(1, "Para One: Two Three Four Five");
+ getParagraph(2, "Para Two: One Three Four Five");
+ getParagraph(3, "Para Three: One Two Four Five");
+ getParagraph(4, "Para Four: One Two Three Four Five");
+ getParagraph(5, "Para Six: One Three Four Five");
+ getParagraph(6, "");
+ getParagraph(7, "");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();