sc/qa/unit/pivottable_filters_test.cxx | 212 +++++++--------------------------
1 file changed, 50 insertions(+), 162 deletions(-)
New commits:
commit fa0d09541d451c14afa3de6e6173664827593f58
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Apr 11 11:53:09 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Apr 11 15:04:10 2023 +0200
CppunitTest_sc_pivottable_filters_test: use CPPUNIT_TEST_FIXTURE()
This suite is large enough so that avoiding the
declaration/registration/definition of each test manually saves a lot of
space.
Change-Id: I4e2786f11bc1c164a74d3f5a3795a2ddf289d65f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150222
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index 8e47c10dbf54..b9c92e252db5 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -39,116 +39,6 @@ class ScPivotTableFiltersTest : public ScModelTestBase
{
public:
ScPivotTableFiltersTest();
-
- // Import
- void testPivotTableBasicODS();
- void testPivotTableNamedRangeSourceODS();
- void testPivotTableSharedCacheGroupODS();
- void testGetPivotDataXLS();
- void testPivotTableSharedGroupXLSX();
- void testPivotTableSharedDateGroupXLSX(); // + export
- void testPivotTableSharedNestedDateGroupXLSX(); // + export
- void testPivotTableSharedNumGroupXLSX();
- void testPivotTableNoColumnsLayout();
- void testTdf112501();
-
- // Export
- void testPivotTableExportXLSX();
- void testPivotTableExportXLSXSingleDataField();
- void testPivotTableExportXLSXMultipleDataFields();
- void testPivotCacheExportXLSX();
- void testPivotTableXLSX();
- void testPivotTableTwoDataFieldsXLSX();
- void testPivotTableMedianODS();
- void testPivotTableRowHeaderXLS();
- void testPivotTableDoubleFieldFilter();
- void testPivotTableStringFieldFilter();
- void testPivotTableDateFieldFilter();
- void testPivotTableBoolFieldFilter();
- void testPivotTableRowColPageFieldFilter();
- void testPivotTableEmptyItem();
- void testPivotTablePageFieldFilter();
- void testPivotTableFirstHeaderRowXLSX();
- void testPivotTableDoubleFieldFilterXLSX();
- void testPivotTableStringFieldFilterXLSX();
- void testPivotTableDateFieldFilterXLSX();
- void testPivotTableBoolFieldFilterXLSX();
- void testPivotTableRowColPageFieldFilterXLSX();
- void testPivotTableErrorItemFilterXLSX();
- void testPivotTableErrorItemFilterXLSB();
- void testPivotTableErrorItem2FilterXLSX();
- void testPivotTableOutlineModeXLSX();
- void testPivotTableDuplicatedMemberFilterXLSX();
- void testPivotTableTabularModeXLSX();
- void testPivotTableDuplicateFields();
- void testTdf112106();
- void testTdf123923();
- void testTdf123939();
- void testTdf124651();
- void testTdf124736();
- void tesTtdf124772NumFmt();
- void testTdf124810();
- void testTdf124883();
- void testTdf125046();
- void testTdf125055();
- void testTdf125086();
- void testTdf73845();
-
- CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
-
- CPPUNIT_TEST(testPivotTableBasicODS);
- CPPUNIT_TEST(testPivotTableNamedRangeSourceODS);
- CPPUNIT_TEST(testPivotTableSharedCacheGroupODS);
- CPPUNIT_TEST(testGetPivotDataXLS);
- CPPUNIT_TEST(testPivotTableSharedGroupXLSX);
- CPPUNIT_TEST(testPivotTableSharedDateGroupXLSX);
- CPPUNIT_TEST(testPivotTableSharedNestedDateGroupXLSX);
- CPPUNIT_TEST(testPivotTableSharedNumGroupXLSX);
- CPPUNIT_TEST(testPivotTableNoColumnsLayout);
- CPPUNIT_TEST(testTdf112501);
-
- CPPUNIT_TEST(testPivotTableExportXLSX);
- CPPUNIT_TEST(testPivotTableExportXLSXSingleDataField);
- CPPUNIT_TEST(testPivotTableExportXLSXMultipleDataFields);
- CPPUNIT_TEST(testPivotCacheExportXLSX);
- CPPUNIT_TEST(testPivotTableXLSX);
- CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
- CPPUNIT_TEST(testPivotTableMedianODS);
- CPPUNIT_TEST(testPivotTableRowHeaderXLS);
- CPPUNIT_TEST(testPivotTableDoubleFieldFilter);
- CPPUNIT_TEST(testPivotTableStringFieldFilter);
- CPPUNIT_TEST(testPivotTableDateFieldFilter);
- CPPUNIT_TEST(testPivotTableBoolFieldFilter);
- CPPUNIT_TEST(testPivotTableRowColPageFieldFilter);
- CPPUNIT_TEST(testPivotTableEmptyItem);
- CPPUNIT_TEST(testPivotTablePageFieldFilter);
- CPPUNIT_TEST(testPivotTableFirstHeaderRowXLSX);
- CPPUNIT_TEST(testPivotTableDoubleFieldFilterXLSX);
- CPPUNIT_TEST(testPivotTableStringFieldFilterXLSX);
- CPPUNIT_TEST(testPivotTableDateFieldFilterXLSX);
- CPPUNIT_TEST(testPivotTableBoolFieldFilterXLSX);
- CPPUNIT_TEST(testPivotTableRowColPageFieldFilterXLSX);
- CPPUNIT_TEST(testPivotTableErrorItemFilterXLSX);
- CPPUNIT_TEST(testPivotTableErrorItemFilterXLSB);
- CPPUNIT_TEST(testPivotTableErrorItem2FilterXLSX);
- CPPUNIT_TEST(testPivotTableOutlineModeXLSX);
- CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX);
- CPPUNIT_TEST(testPivotTableTabularModeXLSX);
- CPPUNIT_TEST(testPivotTableDuplicateFields);
- CPPUNIT_TEST(testTdf112106);
- CPPUNIT_TEST(testTdf123923);
- CPPUNIT_TEST(testTdf123939);
- CPPUNIT_TEST(testTdf124651);
- CPPUNIT_TEST(testTdf124736);
- CPPUNIT_TEST(tesTtdf124772NumFmt);
- CPPUNIT_TEST(testTdf124810);
- CPPUNIT_TEST(testTdf124883);
- CPPUNIT_TEST(testTdf125046);
- CPPUNIT_TEST(testTdf125055);
- CPPUNIT_TEST(testTdf125086);
- CPPUNIT_TEST(testTdf73845);
-
- CPPUNIT_TEST_SUITE_END();
};
ScPivotTableFiltersTest::ScPivotTableFiltersTest()
@@ -177,7 +67,7 @@ bool hasDimension(const std::vector<const
ScDPSaveDimension*>& rDims, const OUSt
}
}
-void ScPivotTableFiltersTest::testPivotTableBasicODS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableBasicODS)
{
createScDoc("ods/pivot-table-basic.ods");
@@ -233,7 +123,7 @@ void ScPivotTableFiltersTest::testPivotTableBasicODS()
sal_uInt16(pDim->GetFunction()));
}
-void ScPivotTableFiltersTest::testPivotTableNamedRangeSourceODS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableNamedRangeSourceODS)
{
createScDoc("ods/pivot-table-named-range-source.ods");
@@ -284,7 +174,7 @@ bool checkVisiblePageFieldMember(const
ScDPSaveDimension::MemberList& rMembers,
}
}
-void ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableSharedCacheGroupODS)
{
createScDoc("ods/pivot-table-shared-cache-with-group.ods");
ScDocument* pDoc = getScDoc();
@@ -416,7 +306,7 @@ void
ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS()
CPPUNIT_ASSERT_MESSAGE("Pivot cache doesn't have an additional month
group.", bHasMonths);
}
-void ScPivotTableFiltersTest::testGetPivotDataXLS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testGetPivotDataXLS)
{
createScDoc("xls/pivot-getpivotdata.xls");
ScDocument* pDoc = getScDoc();
@@ -430,7 +320,7 @@ void ScPivotTableFiltersTest::testGetPivotDataXLS()
pDoc->GetValue(ScAddress(5, nRow, 1)));
}
-void ScPivotTableFiltersTest::testPivotTableSharedGroupXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableSharedGroupXLSX)
{
createScDoc("xlsx/pivot-table/shared-group-field.xlsx");
ScDocument* pDoc = getScDoc();
@@ -467,7 +357,7 @@ void
ScPivotTableFiltersTest::testPivotTableSharedGroupXLSX()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pCache->GetGroupFieldCount());
}
-void ScPivotTableFiltersTest::testPivotTableSharedDateGroupXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableSharedDateGroupXLSX)
{
auto testThis = [](ScDocument& rDoc) {
// Check whether right date labels are imported for both tables
@@ -507,7 +397,7 @@ void
ScPivotTableFiltersTest::testPivotTableSharedDateGroupXLSX()
testThis(*getScDoc());
}
-void ScPivotTableFiltersTest::testPivotTableSharedNestedDateGroupXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableSharedNestedDateGroupXLSX)
{
auto testThis = [](ScDocument& rDoc) {
// Check whether right date groups are imported for both tables
@@ -554,7 +444,7 @@ void
ScPivotTableFiltersTest::testPivotTableSharedNestedDateGroupXLSX()
testThis(*getScDoc());
}
-void ScPivotTableFiltersTest::testPivotTableSharedNumGroupXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableSharedNumGroupXLSX)
{
createScDoc("xlsx/pivot-table/shared-numgroup.xlsx");
ScDocument* pDoc = getScDoc();
@@ -588,7 +478,7 @@ void
ScPivotTableFiltersTest::testPivotTableSharedNumGroupXLSX()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(10), pCache->GetFieldCount());
}
-void ScPivotTableFiltersTest::testPivotTableNoColumnsLayout()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableNoColumnsLayout)
{
// tdf#113268 - Pivot table: Missing popup button after opening a pivot
table from ODS
createScDoc("ods/pivottable_no_columns_layout.ods");
@@ -615,7 +505,7 @@ void
ScPivotTableFiltersTest::testPivotTableNoColumnsLayout()
}
}
-void ScPivotTableFiltersTest::testTdf112501()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf112501)
{
createScDoc("xls/tdf112501.xls");
ScDocument* pDoc = getScDoc();
@@ -680,7 +570,7 @@ void ScPivotTableFiltersTest::testTdf112501()
}
}
-void ScPivotTableFiltersTest::testPivotTableExportXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableExportXLSX)
{
// tdf#89139: pivot table definition needs to list items, including hidden
@@ -697,7 +587,7 @@ void ScPivotTableFiltersTest::testPivotTableExportXLSX()
"h", "1");
}
-void ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableExportXLSXSingleDataField)
{
createScDoc("ods/tdf123421_1datafield.ods");
@@ -716,7 +606,7 @@ void
ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
assertXPath(pTable, "/x:pivotTableDefinition/x:colFields", 0);
}
-void ScPivotTableFiltersTest::testPivotTableExportXLSXMultipleDataFields()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableExportXLSXMultipleDataFields)
{
createScDoc("ods/tdf123421_2datafields.ods");
@@ -739,7 +629,7 @@ void
ScPivotTableFiltersTest::testPivotTableExportXLSXMultipleDataFields()
assertXPath(pTable, "/x:pivotTableDefinition/x:colFields/x:field", "x",
"-2");
}
-void ScPivotTableFiltersTest::testPivotCacheExportXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotCacheExportXLSX)
{
// tdf#89139 FILESAVE xlsx pivot table corrupted after save with LO and
re-open with MS Office
// MS Excel is very sensitive for proper values of fields:
@@ -985,7 +875,7 @@ void ScPivotTableFiltersTest::testPivotCacheExportXLSX()
"count", "1");
}
-void ScPivotTableFiltersTest::testPivotTableXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableXLSX)
{
struct
{
@@ -1120,7 +1010,7 @@ void ScPivotTableFiltersTest::testPivotTableXLSX()
CPPUNIT_ASSERT_MESSAGE("Reload check failed.", bCheck);
}
-void ScPivotTableFiltersTest::testPivotTableTwoDataFieldsXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableTwoDataFieldsXLSX)
{
struct
{
@@ -1239,7 +1129,7 @@ void
ScPivotTableFiltersTest::testPivotTableTwoDataFieldsXLSX()
CPPUNIT_ASSERT_MESSAGE("Reload check failed.", bCheck);
}
-void ScPivotTableFiltersTest::testPivotTableMedianODS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableMedianODS)
{
createScDoc("ods/pivot-table-median.ods");
@@ -1273,7 +1163,7 @@ void ScPivotTableFiltersTest::testPivotTableMedianODS()
sal_uInt16(pDim->GetFunction()));
}
-void ScPivotTableFiltersTest::testPivotTableRowHeaderXLS()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableRowHeaderXLS)
{
createScDoc("xls/pivot_row_header.xls");
ScDocument* pDoc = getScDoc();
@@ -1339,7 +1229,7 @@ void ScPivotTableFiltersTest::testPivotTableRowHeaderXLS()
}
}
-void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableDoubleFieldFilter)
{
createScDoc("xls/pivottable_double_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1437,7 +1327,7 @@ void
ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter()
}
}
-void ScPivotTableFiltersTest::testPivotTableStringFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableStringFieldFilter)
{
createScDoc("xls/pivottable_string_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1469,7 +1359,7 @@ void
ScPivotTableFiltersTest::testPivotTableStringFieldFilter()
CPPUNIT_ASSERT(pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableDateFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableDateFieldFilter)
{
createScDoc("xls/pivottable_date_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1556,7 +1446,7 @@ void
ScPivotTableFiltersTest::testPivotTableDateFieldFilter()
}
}
-void ScPivotTableFiltersTest::testPivotTableBoolFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableBoolFieldFilter)
{
createScDoc("xls/pivottable_bool_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1588,7 +1478,7 @@ void
ScPivotTableFiltersTest::testPivotTableBoolFieldFilter()
CPPUNIT_ASSERT(pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableRowColPageFieldFilter)
{
createScDoc("xls/pivottable_rowcolpage_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1694,7 +1584,7 @@ void
ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter()
}
}
-void ScPivotTableFiltersTest::testPivotTableEmptyItem()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableEmptyItem)
{
createScDoc("xls/pivottable_empty_item.xls");
ScDocument* pDoc = getScDoc();
@@ -1730,7 +1620,7 @@ void ScPivotTableFiltersTest::testPivotTableEmptyItem()
CPPUNIT_ASSERT(!pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTablePageFieldFilter()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTablePageFieldFilter)
{
createScDoc("xls/pivottable_page_field_filter.xls");
ScDocument* pDoc = getScDoc();
@@ -1831,7 +1721,7 @@ void
ScPivotTableFiltersTest::testPivotTablePageFieldFilter()
}
}
-void ScPivotTableFiltersTest::testPivotTableFirstHeaderRowXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableFirstHeaderRowXLSX)
{
// tdf#112733: We have different tables here, but have the same value as
firstHeaderRow
// The documentation is not clear about what firstHeaderRow actually
means, but MS Excel works on this way
@@ -1851,7 +1741,7 @@ void
ScPivotTableFiltersTest::testPivotTableFirstHeaderRowXLSX()
assertXPath(pTable, "/x:pivotTableDefinition/x:location",
"firstHeaderRow", "1");
}
-void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableDoubleFieldFilterXLSX)
{
createScDoc("xlsx/pivottable_double_field_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1949,7 +1839,7 @@ void
ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX()
}
}
-void ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableStringFieldFilterXLSX)
{
createScDoc("xlsx/pivottable_string_field_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1981,7 +1871,7 @@ void
ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX()
CPPUNIT_ASSERT(pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableDateFieldFilterXLSX)
{
createScDoc("xlsx/pivottable_date_field_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2053,7 +1943,7 @@ void
ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX()
}
}
-void ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableBoolFieldFilterXLSX)
{
createScDoc("xlsx/pivottable_bool_field_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2086,7 +1976,7 @@ void
ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX()
CPPUNIT_ASSERT(pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableRowColPageFieldFilterXLSX)
{
createScDoc("xlsx/pivottable_rowcolpage_field_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2190,7 +2080,7 @@ void
ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX()
}*/
}
-void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableErrorItemFilterXLSX)
{
createScDoc("xlsx/pivottable_error_item_filter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2217,7 +2107,7 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX()
CPPUNIT_ASSERT(!pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSB()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableErrorItemFilterXLSB)
{
createScDoc("xlsb/pivottable_error_item_filter.xlsb");
ScDocument* pDoc = getScDoc();
@@ -2238,7 +2128,7 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSB()
CPPUNIT_ASSERT(!pMember->GetIsVisible());
}
-void ScPivotTableFiltersTest::testPivotTableErrorItem2FilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableErrorItem2FilterXLSX)
{
createScDoc("xlsx/tdf122471.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2262,7 +2152,7 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItem2FilterXLSX()
CPPUNIT_ASSERT_EQUAL(size_t(21), rMembers.size());
}
-void ScPivotTableFiltersTest::testPivotTableOutlineModeXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableOutlineModeXLSX)
{
createScDoc("xlsx/pivottable_outline_mode.xlsx");
@@ -2278,7 +2168,7 @@ void
ScPivotTableFiltersTest::testPivotTableOutlineModeXLSX()
assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]", "compact", "0");
}
-void ScPivotTableFiltersTest::testPivotTableDuplicatedMemberFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest,
testPivotTableDuplicatedMemberFilterXLSX)
{
createScDoc("xlsx/pivottable_duplicated_member_filter.xlsx");
@@ -2293,7 +2183,7 @@ void
ScPivotTableFiltersTest::testPivotTableDuplicatedMemberFilterXLSX()
"21");
}
-void ScPivotTableFiltersTest::testPivotTableTabularModeXLSX()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableTabularModeXLSX)
{
createScDoc("xlsx/pivottable_tabular_mode.xlsx");
@@ -2310,7 +2200,7 @@ void
ScPivotTableFiltersTest::testPivotTableTabularModeXLSX()
assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]", "outline", "0");
}
-void ScPivotTableFiltersTest::testPivotTableDuplicateFields()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testPivotTableDuplicateFields)
{
createScDoc("ods/caseinsensitive-duplicate-fields.ods");
@@ -2331,7 +2221,7 @@ void
ScPivotTableFiltersTest::testPivotTableDuplicateFields()
"Method3");
}
-void ScPivotTableFiltersTest::testTdf112106()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf112106)
{
createScDoc("xlsx/tdf112106.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2356,7 +2246,7 @@ void ScPivotTableFiltersTest::testTdf112106()
CPPUNIT_ASSERT_EQUAL(ScResId(STR_PIVOT_DATA), (*pLayoutName));
}
-void ScPivotTableFiltersTest::testTdf123923()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf123923)
{
// tdf#123923: Excel fails when it finds "Err:504" instead of "#REF!" in
pivot table cache
@@ -2370,7 +2260,7 @@ void ScPivotTableFiltersTest::testTdf123923()
"v", "#REF!");
}
-void ScPivotTableFiltersTest::testTdf123939()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf123939)
{
// tdf#123939: Excel warns on containsMixedTypes="1" if sharedItems has
only strings and errors
@@ -2393,7 +2283,7 @@ void ScPivotTableFiltersTest::testTdf123939()
"containsMixedTypes", "1");
}
-void ScPivotTableFiltersTest::testTdf124651()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf124651)
{
createScDoc("ods/tdf124651_simplePivotTable.ods");
@@ -2406,7 +2296,7 @@ void ScPivotTableFiltersTest::testTdf124651()
assertXPath(pDoc, "/x:pivotTableDefinition/x:dataFields/x:dataField",
"name", "Sum - num");
}
-void ScPivotTableFiltersTest::testTdf124736()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf124736)
{
createScDoc("xlsx/pivot-table/shared-dategroup.xlsx");
@@ -2456,7 +2346,7 @@ void ScPivotTableFiltersTest::testTdf124736()
"t", "default");
}
-void ScPivotTableFiltersTest::tesTtdf124772NumFmt()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf124772NumFmt)
{
createScDoc("ods/pivot-table-num-fmt.ods");
@@ -2477,7 +2367,7 @@ void ScPivotTableFiltersTest::tesTtdf124772NumFmt()
"formatCode", "\\$#,##0");
}
-void ScPivotTableFiltersTest::testTdf124810()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf124810)
{
{
// First, test that we roundtrip existing pivot table style
information from XLSX.
@@ -2518,7 +2408,7 @@ void ScPivotTableFiltersTest::testTdf124810()
}
}
-void ScPivotTableFiltersTest::testTdf124883()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf124883)
{
createScDoc("xlsx/pivot-table/two-data-fields.xlsx");
@@ -2533,7 +2423,7 @@ void ScPivotTableFiltersTest::testTdf124883()
"Count of Value2");
}
-void ScPivotTableFiltersTest::testTdf125046()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf125046)
{
createScDoc("xlsx/pivottable_long_text.xlsx");
@@ -2544,7 +2434,7 @@ void ScPivotTableFiltersTest::testTdf125046()
"longText", "1");
}
-void ScPivotTableFiltersTest::testTdf125055()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf125055)
{
createScDoc("xlsx/pivottable_1s_difference.xlsx");
@@ -2579,7 +2469,7 @@ void ScPivotTableFiltersTest::testTdf125055()
pDoc,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[2]/x:sharedItems", "m"));
}
-void ScPivotTableFiltersTest::testTdf125086()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf125086)
{
createScDoc("ods/pivottable_fieldInRowsAndData.ods");
@@ -2591,7 +2481,7 @@ void ScPivotTableFiltersTest::testTdf125086()
assertXPath(pDoc, "/x:pivotTableDefinition/x:pivotFields/x:pivotField[2]",
"dataField", "1");
}
-void ScPivotTableFiltersTest::testTdf73845()
+CPPUNIT_TEST_FIXTURE(ScPivotTableFiltersTest, testTdf73845)
{
// Query filter is set for individual pivot table in this ODS document.
// This test checks the query filter is restored for ByEmpty and
ByNonEmpty query.
@@ -2627,8 +2517,6 @@ void ScPivotTableFiltersTest::testTdf73845()
}
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
