From 4edbaa38af4025564c0154985705c2785b7ff345 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Fri, 18 Jul 2014 11:30:07 -0400
Subject: bnc#885548: Add test for import / export of revisions for xlsx.

It's the same test as with the xls variant.

Change-Id: Ice3d3c34213cc521e2782ef0f98d28d135c72fbe
---
 .../xlsx/track-changes/simple-cell-changes.xlsx    | Bin 0 -> 15414 bytes
 sc/qa/unit/subsequent_export-test.cxx              |  28 +++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100755 sc/qa/unit/data/xlsx/track-changes/simple-cell-changes.xlsx

diff --git a/sc/qa/unit/data/xlsx/track-changes/simple-cell-changes.xlsx b/sc/qa/unit/data/xlsx/track-changes/simple-cell-changes.xlsx
new file mode 100755
index 000000000000..29e80276b7aa
Binary files /dev/null and b/sc/qa/unit/data/xlsx/track-changes/simple-cell-changes.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 270c7dc2965d..f91a2deee71f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -93,7 +93,7 @@ public:
 
     void testCellBordersXLS();
     void testCellBordersXLSX();
-    void testTrackChangesSimpleXLS();
+    void testTrackChangesSimpleXLSX();
     void testSheetTabColorsXLSX();
 
     void testSharedFormulaExportXLS();
@@ -132,7 +132,7 @@ public:
     CPPUNIT_TEST(testSheetProtectionXLSX);
     CPPUNIT_TEST(testCellBordersXLS);
     CPPUNIT_TEST(testCellBordersXLSX);
-    CPPUNIT_TEST(testTrackChangesSimpleXLS);
+    CPPUNIT_TEST(testTrackChangesSimpleXLSX);
     CPPUNIT_TEST(testSheetTabColorsXLSX);
     CPPUNIT_TEST(testSharedFormulaExportXLS);
     CPPUNIT_TEST(testSharedFormulaExportXLSX);
@@ -1327,7 +1327,7 @@ OUString toString( const ScBigRange& rRange )
     return aBuf.makeStringAndClear();
 }
 
-void ScExportTest::testTrackChangesSimpleXLS()
+void ScExportTest::testTrackChangesSimpleXLSX()
 {
     struct CheckItem
     {
@@ -1450,17 +1450,19 @@ void ScExportTest::testTrackChangesSimpleXLS()
 
     } aTest;
 
+    // First, test the xls variant.
+
     ScDocShellRef xDocSh = loadDoc("track-changes/simple-cell-changes.", XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument* pDoc = &xDocSh->GetDocument();
     bool bGood = aTest.check(*pDoc);
-    CPPUNIT_ASSERT_MESSAGE("Initial check failed.", bGood);
+    CPPUNIT_ASSERT_MESSAGE("Initial check failed (xls).", bGood);
 
     ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLS);
     xDocSh->DoClose();
     pDoc = &xDocSh2->GetDocument();
     bGood = aTest.check(*pDoc);
-    CPPUNIT_ASSERT_MESSAGE("Check after reload failed.", bGood);
+    CPPUNIT_ASSERT_MESSAGE("Check after reload failed (xls).", bGood);
 
     // fdo#81445 : Check the blank value string to make sure it's "<empty>".
     ScChangeTrack* pCT = pDoc->GetChangeTrack();
@@ -1472,6 +1474,22 @@ void ScExportTest::testTrackChangesSimpleXLS()
     CPPUNIT_ASSERT_EQUAL(OUString("Cell B2 changed from '<empty>' to '1'"), aDesc);
 
     xDocSh2->DoClose();
+
+    // Now, test the xlsx variant the same way.
+
+    xDocSh = loadDoc("track-changes/simple-cell-changes.", XLSX);
+    CPPUNIT_ASSERT(xDocSh.Is());
+    pDoc = &xDocSh->GetDocument();
+    aTest.check(*pDoc);
+    CPPUNIT_ASSERT_MESSAGE("Initial check failed (xlsx).", bGood);
+
+    xDocSh2 = saveAndReload(xDocSh, XLSX);
+    xDocSh->DoClose();
+    pDoc = &xDocSh2->GetDocument();
+    bGood = aTest.check(*pDoc);
+    CPPUNIT_ASSERT_MESSAGE("Check after reload failed (xlsx).", bGood);
+
+    xDocSh2->DoClose();
 }
 
 void ScExportTest::testSheetTabColorsXLSX()
-- 
cgit