dev/null |binary sc/qa/unit/data/xlsx/pivot-table/shared-group-field.xlsx |binary sc/qa/unit/subsequent_filters-test.cxx | 17 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 3d9231dd4945dcd6c3d53ba11152049d382b975f Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Tue Sep 27 22:11:18 2016 -0400 Add a bit more checking on the internal pivot table states. Change-Id: I8be8f510cecab8ec8aa07f2f81795bbfdf727a26 diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 7f8b614..8ef4a8c 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -2070,7 +2070,6 @@ void ScFiltersTest::testPivotTableSharedGroupXLSX() ScDocShellRef xDocSh = loadDoc("pivot-table/shared-group-field.", FORMAT_XLSX); CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); ScDocument& rDoc = xDocSh->GetDocument(); - rDoc.CalcAll(); // Check whether right group names are imported for both tables // First table @@ -2089,6 +2088,20 @@ void ScFiltersTest::testPivotTableSharedGroupXLSX() CPPUNIT_ASSERT_EQUAL(OUString("17"), rDoc.GetString(ScAddress(0,16,0))); CPPUNIT_ASSERT_EQUAL(OUString("18"), rDoc.GetString(ScAddress(0,17,0))); + // There should be exactly 2 pivot tables and 1 cache. + ScDPCollection* pDPs = rDoc.GetDPCollection(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), pDPs->GetCount()); + + ScDPCollection::SheetCaches& rSheetCaches = pDPs->GetSheetCaches(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rSheetCaches.size()); + + const ScDPCache* pCache = rSheetCaches.getExistingCache(ScRange(0,0,1,13,18,1)); + CPPUNIT_ASSERT_MESSAGE("Pivot cache is expected for A1:N19 on the second sheet.", pCache); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(14), pCache->GetFieldCount()); + + // TODO : Look into this and find out why it fails. + // CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pCache->GetGroupFieldCount()); + xDocSh->DoClose(); } commit 57d925dede88d870a20f6ec469a26bf6961658ce Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Tue Sep 27 21:18:22 2016 -0400 Let's keep the naming style of test document consistent. Change-Id: Ib832509bc4c4daa5eddb9a8e1a341a5892436455 diff --git a/sc/qa/unit/data/xlsx/pivot-table/shared_group.xlsx b/sc/qa/unit/data/xlsx/pivot-table/shared-group-field.xlsx similarity index 100% rename from sc/qa/unit/data/xlsx/pivot-table/shared_group.xlsx rename to sc/qa/unit/data/xlsx/pivot-table/shared-group-field.xlsx diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 3195fa8..7f8b614 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -2067,7 +2067,7 @@ void ScFiltersTest::testGetPivotDataXLS() void ScFiltersTest::testPivotTableSharedGroupXLSX() { - ScDocShellRef xDocSh = loadDoc("pivot-table/shared_group.", FORMAT_XLSX); + ScDocShellRef xDocSh = loadDoc("pivot-table/shared-group-field.", FORMAT_XLSX); CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits