[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/kotext-changetracking-boemann]
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-09-08 10:05:45
Message-ID: 20110908100545.28E32A607A () git ! kde ! org
[Download RAW message or body]

Git commit aee1f0f4ea42e33017a8e36d74b1cdf50c4ba466 by Ganesh Paramasivam.
Committed on 08/09/2011 at 12:05.
Pushed by ganeshp into branch 'kotext-changetracking-boemann'.

Fixing unit test failures

M  +4    -6    libs/kotext/opendocument/tests/TestChangeTracking.cpp
M  +1    -1    libs/kotext/opendocument/tests/TestChangeTracking.h
M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-column/added-column-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-row/added-row-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-table/added-table-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-column/deleted-column-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-row/deleted-row-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-table/deleted-table-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-addition/para-split-by-table-tracked.odt
 M  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-and-text/split-para-tracked.odt


http://commits.kde.org/calligra/aee1f0f4ea42e33017a8e36d74b1cdf50c4ba466

diff --git a/libs/kotext/opendocument/tests/TestChangeTracking.cpp \
b/libs/kotext/opendocument/tests/TestChangeTracking.cpp index c1275e8..2fbdff0 100644
--- a/libs/kotext/opendocument/tests/TestChangeTracking.cpp
+++ b/libs/kotext/opendocument/tests/TestChangeTracking.cpp
@@ -103,6 +103,7 @@ QTextDocument *TestChangeTracking::documentFromOdt(const QString \
&odt, const QSt  
     KoStyleManager *styleManager = new KoStyleManager;
     KoChangeTracker *changeTracker = new KoChangeTracker;
+    KoInlineTextObjectManager *inlineTextObjectManager = new \
KoInlineTextObjectManager;  if (changeFormat == "DeltaXML")
         changeTracker->setSaveFormat(KoChangeTracker::DELTAXML);
     else
@@ -116,7 +117,7 @@ QTextDocument *TestChangeTracking::documentFromOdt(const QString \
                &odt, const QSt
     shapeLoadingContext.addSharedData(KOTEXT_SHARED_LOADING_ID, \
textSharedLoadingData);  
     QTextDocument *document = new QTextDocument;
-    KoTextDocument(document).setInlineTextObjectManager(new \
KoInlineTextObjectManager()); // required while saving +    \
KoTextDocument(document).setInlineTextObjectManager(inlineTextObjectManager); // \
required while saving  KoTextDocument(document).setStyleManager(styleManager);
     KoTextDocument(document).setChangeTracker(changeTracker);
 
@@ -128,7 +129,7 @@ QTextDocument *TestChangeTracking::documentFromOdt(const QString \
&odt, const QSt  return document;
 }
 
-QString TestChangeTracking::documentToOdt(QTextDocument *document)
+QString TestChangeTracking::documentToOdt(const QString &testCase, QTextDocument \
*document)  {
     QString odt("test.odt");
     if (QFile::exists(odt))
@@ -181,9 +182,6 @@ QString TestChangeTracking::documentToOdt(QTextDocument \
*document)  }
 
     // Setup layout and managers just like kotext
-    KoTextDocument(document).setInlineTextObjectManager(new \
                KoInlineTextObjectManager()); // required while saving
-    KoStyleManager *styleManager = new KoStyleManager;
-    KoTextDocument(document).setStyleManager(styleManager);
     KoTextDocument(document).setTextEditor(new KoTextEditor(document));
 
     KoTextWriter::saveOdf(context, 0, document, 0, -1);
@@ -228,7 +226,7 @@ void TestChangeTracking::testChangeTracking()
     testFileName.prepend(QString(FILES_DATA_DIR));
 
     QTextDocument *originalDocument = documentFromOdt(testFileName, changeFormat);
-    QString roundTripFileName = documentToOdt(originalDocument);
+    QString roundTripFileName = documentToOdt(testcase, originalDocument);
 
     QVERIFY(verifyContentXml(testFileName, roundTripFileName));
 }
diff --git a/libs/kotext/opendocument/tests/TestChangeTracking.h \
b/libs/kotext/opendocument/tests/TestChangeTracking.h index adcc15b..f85a5a2 100644
--- a/libs/kotext/opendocument/tests/TestChangeTracking.h
+++ b/libs/kotext/opendocument/tests/TestChangeTracking.h
@@ -44,7 +44,7 @@ private:
 
 private:
     QTextDocument *documentFromOdt(const QString &odt, const QString &changeFormat);
-    QString documentToOdt(QTextDocument *);
+    QString documentToOdt(const QString &testCase, QTextDocument *);
     KComponentData *componentData;
 };
 
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-column/added-column-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-column/added-column-tracked.odt
 index 470edc4..69a8e7e 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-column/added-column-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-column/added-column-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-row/added-row-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-row/added-row-tracked.odt
 index 635fb67..f62b2b9 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-row/added-row-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-row/added-row-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-table/added-table-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-table/added-table-tracked.odt
 index 2d5b51b..4ae7444 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-table/added-table-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/added-table/added-table-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-column/deleted-column-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-column/deleted-column-tracked.odt
 index d0fc65e..f6fd106 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-column/deleted-column-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-column/deleted-column-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-row/deleted-row-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-row/deleted-row-tracked.odt
 index b78aa7c..c5a47ed 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-row/deleted-row-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-row/deleted-row-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-table/deleted-table-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-table/deleted-table-tracked.odt
 index c7cf783..a41c8eb 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-table/deleted-table-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/tables/deleted-table/deleted-table-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-addition/para-split-by-table-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-addition/para-split-by-table-tracked.odt
 index b203f68..f27f745 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-addition/para-split-by-table-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-addition/para-split-by-table-tracked.odt \
                differ
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-and-text/split-para-tracked.odt \
b/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-and-text/split-para-tracked.odt
 index b59c568..2c0b16e 100755
Binary files a/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-and-text/split-para-tracked.odt \
and b/libs/kotext/opendocument/tests/data/ChangeTracking/text/split-paragraph-by-table-and-text/split-para-tracked.odt \
differ


[prev in list] [next in list] [prev in thread] [next in thread]