sc/qa/unit/subsequent_filters_test2.cxx | 475 +++++++-------------------------
1 file changed, 114 insertions(+), 361 deletions(-)
New commits:
commit f07b4c242c8768b8a361d0aa551ba2e0c2d8eed2
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Feb 22 14:30:41 2023 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Feb 22 14:47:34 2023 +0000
CppunitTest_sc_subsequent_filters_test2: 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: I95b689d9f4af2d7865009c7313df294b143ce4af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147469
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx
b/sc/qa/unit/subsequent_filters_test2.cxx
index 56e5e85ecdf6..231efa018d50 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -69,251 +69,6 @@ class ScFiltersTest2 : public ScModelTestBase
{
public:
ScFiltersTest2();
-
- void testMiscRowHeights();
- void testOptimalHeightReset();
- void testCustomNumFormatHybridCellODS();
- void testTdf121040();
- void testTdf118086();
- void testTdf118624();
- void testTdf124454();
-
- void testPrintRangeODS();
- void testOutlineODS();
-
- void testColumnStyleXLSX();
- void testColumnStyleAutoFilterXLSX();
-
- void testSharedFormulaHorizontalXLS();
- void testSharedFormulaWrappedRefsXLS();
- void testSharedFormulaBIFF5();
- void testSharedFormulaXLSB();
- void testSharedFormulaXLS();
- void testSharedFormulaColumnLabelsODS();
- void testSharedFormulaColumnRowLabelsODS();
- void testExternalRefCacheXLSX();
- void testExternalRefCacheODS();
- void testHybridSharedStringODS();
- void testCopyMergedNumberFormats();
- void testVBAUserFunctionXLSM();
- void testEmbeddedImageXLS();
- void testErrorOnExternalReferences();
- void testTdf145054();
- void testTdf84762();
- void testTdf44076();
- void testEditEngStrikeThroughXLSX();
- void testRefStringXLSX();
- void testHiddenSheetsXLSX();
- void testRelFormulaValidationXLS();
- void testTdf130132();
- void testTdf133327();
- void testColumnStyle2XLSX();
- void testAutofilterXLSX();
-
- void testBnc762542();
-
- void testTdf136364();
- void testTdf103734();
- void testTdf126116();
- void testTdf144209();
- void testTdf98844();
- void testTdf100458();
- void testTdf118561();
- void testTdf125099();
- void testTdf134455();
- void testTdf119533();
- void testTdf127982();
- void testTdf109409();
- void testTdf132105();
- void testTdf131424();
- void testTdf100709XLSX();
- void testTdf97598XLSX();
- void testTdf110440XLSX();
- void testTdf83672XLSX();
-
- void testCondFormatXLSB();
- void testPageScalingXLSX();
- void testActiveXCheckboxXLSX();
- void testTdf60673();
- void testtdf120301_xmlSpaceParsingXLSX();
- void testUnicodeFileNameGnumeric();
- void testCondFormatFormulaListenerXLSX();
-
- void testMergedCellsXLSXML();
- void testBackgroundColorStandardXLSXML();
- void testTdf131536();
- void testTdf130583();
- void testTdf85617();
- void testTdf134234();
- void testTdf42481();
- void testNamedExpressionsXLSXML();
- void testEmptyRowsXLSXML();
- void testBorderDirectionsXLSXML();
- void testBorderColorsXLSXML();
- void testHiddenRowsColumnsXLSXML();
- void testColumnWidthRowHeightXLSXML();
- void testCharacterSetXLSXML();
- void testWrapAndShrinkXLSXML();
- void testTdf137091();
- void testTdf141495();
- void testTdf70455();
- void testTdf62268();
- void testTdf137453();
- void testTdf112780();
- void testTdf72470();
- void testTdf35636();
- void testTdf98481();
- void testTdf115022();
- void testVBAMacroFunctionODS();
- void testAutoheight2Rows();
- void testXLSDefColWidth();
- void testTdf148423();
- void testTdf152053();
- void testPreviewMissingObjLink();
- void testShapeRotationImport();
- void testShapeDisplacementOnRotationImport();
- void testTextBoxBodyUpright();
- void testTextBoxBodyRotateAngle();
- void testTextLengthDataValidityXLSX();
- void testDeleteCircles();
- void testDrawCircleInMergeCells();
- void testDeleteCirclesInRowAndCol();
- void testTdf129940();
- void testTdf119190();
- void testTdf139612();
- void testTdf144740();
- void testTdf146722();
- void testTdf147014();
- void testTdf139763ShapeAnchor();
- void testAutofilterNamedRangesXLSX();
- void testInvalidBareBiff5();
- void testTooManyColsRows();
- void testTdf83671_SmartArt_import();
- void testTdf83671_SmartArt_import2();
- void testTdf151818_SmartArtFontColor();
-
- CPPUNIT_TEST_SUITE(ScFiltersTest2);
-
- CPPUNIT_TEST(testMiscRowHeights);
- CPPUNIT_TEST(testOptimalHeightReset);
- CPPUNIT_TEST(testCustomNumFormatHybridCellODS);
- CPPUNIT_TEST(testTdf121040);
- CPPUNIT_TEST(testTdf118086);
- CPPUNIT_TEST(testTdf118624);
- CPPUNIT_TEST(testTdf124454);
- CPPUNIT_TEST(testPrintRangeODS);
- CPPUNIT_TEST(testOutlineODS);
- CPPUNIT_TEST(testColumnStyleXLSX);
- CPPUNIT_TEST(testColumnStyleAutoFilterXLSX);
- CPPUNIT_TEST(testSharedFormulaHorizontalXLS);
- CPPUNIT_TEST(testSharedFormulaWrappedRefsXLS);
- CPPUNIT_TEST(testSharedFormulaBIFF5);
- CPPUNIT_TEST(testSharedFormulaXLSB);
- CPPUNIT_TEST(testSharedFormulaXLS);
- CPPUNIT_TEST(testSharedFormulaColumnLabelsODS);
- CPPUNIT_TEST(testSharedFormulaColumnRowLabelsODS);
- CPPUNIT_TEST(testExternalRefCacheXLSX);
- CPPUNIT_TEST(testExternalRefCacheODS);
- CPPUNIT_TEST(testHybridSharedStringODS);
- CPPUNIT_TEST(testCopyMergedNumberFormats);
- CPPUNIT_TEST(testVBAUserFunctionXLSM);
- CPPUNIT_TEST(testEmbeddedImageXLS);
- CPPUNIT_TEST(testErrorOnExternalReferences);
- CPPUNIT_TEST(testTdf145054);
- CPPUNIT_TEST(testTdf84762);
- CPPUNIT_TEST(testTdf44076);
- CPPUNIT_TEST(testEditEngStrikeThroughXLSX);
- CPPUNIT_TEST(testRefStringXLSX);
- CPPUNIT_TEST(testRelFormulaValidationXLS);
- CPPUNIT_TEST(testTdf130132);
- CPPUNIT_TEST(testTdf133327);
- CPPUNIT_TEST(testColumnStyle2XLSX);
- CPPUNIT_TEST(testAutofilterXLSX);
-
- CPPUNIT_TEST(testBnc762542);
-
- CPPUNIT_TEST(testHiddenSheetsXLSX);
-
- CPPUNIT_TEST(testTdf136364);
- CPPUNIT_TEST(testTdf103734);
- CPPUNIT_TEST(testTdf126116);
- CPPUNIT_TEST(testTdf144209);
- CPPUNIT_TEST(testTdf98844);
- CPPUNIT_TEST(testTdf100458);
- CPPUNIT_TEST(testTdf118561);
- CPPUNIT_TEST(testTdf125099);
- CPPUNIT_TEST(testTdf134455);
- CPPUNIT_TEST(testTdf119533);
- CPPUNIT_TEST(testTdf127982);
- CPPUNIT_TEST(testTdf109409);
- CPPUNIT_TEST(testTdf132105);
- CPPUNIT_TEST(testTdf131424);
- CPPUNIT_TEST(testTdf100709XLSX);
- CPPUNIT_TEST(testTdf97598XLSX);
- CPPUNIT_TEST(testTdf110440XLSX);
- CPPUNIT_TEST(testTdf83672XLSX);
-
- CPPUNIT_TEST(testCondFormatXLSB);
- CPPUNIT_TEST(testPageScalingXLSX);
- CPPUNIT_TEST(testActiveXCheckboxXLSX);
- CPPUNIT_TEST(testTdf60673);
- CPPUNIT_TEST(testtdf120301_xmlSpaceParsingXLSX);
- CPPUNIT_TEST(testUnicodeFileNameGnumeric);
- CPPUNIT_TEST(testMergedCellsXLSXML);
- CPPUNIT_TEST(testBackgroundColorStandardXLSXML);
- CPPUNIT_TEST(testTdf131536);
- CPPUNIT_TEST(testTdf130583);
- CPPUNIT_TEST(testTdf85617);
- CPPUNIT_TEST(testTdf134234);
- CPPUNIT_TEST(testTdf42481);
- CPPUNIT_TEST(testNamedExpressionsXLSXML);
- CPPUNIT_TEST(testEmptyRowsXLSXML);
- CPPUNIT_TEST(testBorderDirectionsXLSXML);
- CPPUNIT_TEST(testBorderColorsXLSXML);
- CPPUNIT_TEST(testHiddenRowsColumnsXLSXML);
- CPPUNIT_TEST(testColumnWidthRowHeightXLSXML);
- CPPUNIT_TEST(testCharacterSetXLSXML);
- CPPUNIT_TEST(testWrapAndShrinkXLSXML);
- CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
- CPPUNIT_TEST(testTdf137091);
- CPPUNIT_TEST(testTdf141495);
- CPPUNIT_TEST(testTdf70455);
- CPPUNIT_TEST(testTdf62268);
- CPPUNIT_TEST(testTdf137453);
- CPPUNIT_TEST(testTdf112780);
- CPPUNIT_TEST(testTdf72470);
- CPPUNIT_TEST(testTdf35636);
- CPPUNIT_TEST(testTdf98481);
- CPPUNIT_TEST(testTdf115022);
- CPPUNIT_TEST(testVBAMacroFunctionODS);
- CPPUNIT_TEST(testAutoheight2Rows);
- CPPUNIT_TEST(testXLSDefColWidth);
- CPPUNIT_TEST(testTdf148423);
- CPPUNIT_TEST(testTdf152053);
- CPPUNIT_TEST(testPreviewMissingObjLink);
- CPPUNIT_TEST(testShapeRotationImport);
- CPPUNIT_TEST(testShapeDisplacementOnRotationImport);
- CPPUNIT_TEST(testTextBoxBodyUpright);
- CPPUNIT_TEST(testTextBoxBodyRotateAngle);
- CPPUNIT_TEST(testTextLengthDataValidityXLSX);
- CPPUNIT_TEST(testDeleteCircles);
- CPPUNIT_TEST(testDrawCircleInMergeCells);
- CPPUNIT_TEST(testDeleteCirclesInRowAndCol);
- CPPUNIT_TEST(testTdf129940);
- CPPUNIT_TEST(testTdf119190);
- CPPUNIT_TEST(testTdf139612);
- CPPUNIT_TEST(testTdf144740);
- CPPUNIT_TEST(testTdf146722);
- CPPUNIT_TEST(testTdf147014);
- CPPUNIT_TEST(testTdf139763ShapeAnchor);
- CPPUNIT_TEST(testAutofilterNamedRangesXLSX);
- CPPUNIT_TEST(testInvalidBareBiff5);
- CPPUNIT_TEST(testTooManyColsRows);
- CPPUNIT_TEST(testTdf83671_SmartArt_import);
- CPPUNIT_TEST(testTdf83671_SmartArt_import2);
- CPPUNIT_TEST(testTdf151818_SmartArtFontColor);
-
- CPPUNIT_TEST_SUITE_END();
};
ScFiltersTest2::ScFiltersTest2()
@@ -321,7 +76,7 @@ ScFiltersTest2::ScFiltersTest2()
{
}
-void ScFiltersTest2::testMiscRowHeights()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testMiscRowHeights)
{
// FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
// non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
@@ -362,7 +117,7 @@ void ScFiltersTest2::testMiscRowHeights()
// what we want to test here is that when cell contents are deleted
// and the optimal flag is set for that row that the row is actually resized
-void ScFiltersTest2::testOptimalHeightReset()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testOptimalHeightReset)
{
// FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
// non-default DPI; or (2) unit tests on Windows are made to use svp VCL
plugin.
@@ -402,7 +157,7 @@ void ScFiltersTest2::testOptimalHeightReset()
CPPUNIT_ASSERT_EQUAL(nOptimalHeight, nHeight);
}
-void ScFiltersTest2::testCustomNumFormatHybridCellODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testCustomNumFormatHybridCellODS)
{
createScDoc("ods/custom-numfmt-hybrid-cell.ods");
ScDocument* pDoc = getScDoc();
@@ -431,7 +186,7 @@ void ScFiltersTest2::testCustomNumFormatHybridCellODS()
CPPUNIT_ASSERT_EQUAL(FormulaError::NONE, pFC->GetErrCode());
}
-void ScFiltersTest2::testTdf121040()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf121040)
{
createScDoc("ods/tdf121040.ods");
@@ -446,7 +201,7 @@ void ScFiltersTest2::testTdf121040()
}
}
-void ScFiltersTest2::testTdf118086()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf118086)
{
createScDoc("ods/tdf118086.ods");
@@ -462,7 +217,7 @@ void ScFiltersTest2::testTdf118086()
CPPUNIT_ASSERT_EQUAL(sal_uInt16(256), pDoc->GetRowHeight(2,
static_cast<SCTAB>(2), false));
}
-void ScFiltersTest2::testTdf118624()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf118624)
{
createScDoc("ods/tdf118624.ods");
@@ -473,7 +228,7 @@ void ScFiltersTest2::testTdf118624()
!= pDoc->GetString(ScAddress(0, 1, 0)));
}
-void ScFiltersTest2::testTdf124454()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf124454)
{
createScDoc("ods/tdf124454.ods");
@@ -486,7 +241,7 @@ void ScFiltersTest2::testTdf124454()
CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(3, 0, 0)));
}
-void ScFiltersTest2::testPrintRangeODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testPrintRangeODS)
{
createScDoc("ods/print-range.ods");
ScDocument* pDoc = getScDoc();
@@ -499,7 +254,7 @@ void ScFiltersTest2::testPrintRangeODS()
CPPUNIT_ASSERT_EQUAL(ScRange(0, 2, 0, 0, 4, 0), *pRange);
}
-void ScFiltersTest2::testOutlineODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testOutlineODS)
{
createScDoc("ods/outline.ods");
ScDocument* pDoc = getScDoc();
@@ -549,7 +304,7 @@ void ScFiltersTest2::testOutlineODS()
}
}
-void ScFiltersTest2::testColumnStyleXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testColumnStyleXLSX)
{
createScDoc("xlsx/column-style.xlsx");
ScDocument* pDoc = getScDoc();
@@ -567,7 +322,7 @@ void ScFiltersTest2::testColumnStyleXLSX()
CPPUNIT_ASSERT(!rAttrNew.GetProtection());
}
-void ScFiltersTest2::testColumnStyleAutoFilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testColumnStyleAutoFilterXLSX)
{
createScDoc("xlsx/column-style-autofilter.xlsx");
ScDocument* pDoc = getScDoc();
@@ -579,7 +334,7 @@ void ScFiltersTest2::testColumnStyleAutoFilterXLSX()
CPPUNIT_ASSERT(!rAttr.HasAutoFilter());
}
-void ScFiltersTest2::testSharedFormulaHorizontalXLS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaHorizontalXLS)
{
createScDoc("xls/shared-formula/horizontal.xls");
ScDocument* pDoc = getScDoc();
@@ -619,7 +374,7 @@ void ScFiltersTest2::testSharedFormulaHorizontalXLS()
CPPUNIT_ASSERT_EQUAL(OUString("MW"), pDoc->GetString(aPos));
}
-void ScFiltersTest2::testSharedFormulaWrappedRefsXLS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaWrappedRefsXLS)
{
createScDoc("xls/shared-formula/wrapped-refs.xls");
ScDocument* pDoc = getScDoc();
@@ -644,7 +399,7 @@ void ScFiltersTest2::testSharedFormulaWrappedRefsXLS()
CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(4), pFC->GetSharedLength());
}
-void ScFiltersTest2::testSharedFormulaBIFF5()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaBIFF5)
{
createScDoc("xls/shared-formula/biff5.xls");
ScDocument* pDoc = getScDoc();
@@ -657,7 +412,7 @@ void ScFiltersTest2::testSharedFormulaBIFF5()
CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(371), pFC->GetSharedLength());
}
-void ScFiltersTest2::testSharedFormulaXLSB()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaXLSB)
{
createScDoc("xlsb/shared_formula.xlsb");
ScDocument* pDoc = getScDoc();
@@ -675,7 +430,7 @@ void ScFiltersTest2::testSharedFormulaXLSB()
}
}
-void ScFiltersTest2::testSharedFormulaXLS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaXLS)
{
{
// fdo#80091
@@ -757,7 +512,7 @@ void ScFiltersTest2::testSharedFormulaXLS()
}
}
-void ScFiltersTest2::testSharedFormulaColumnLabelsODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaColumnLabelsODS)
{
createScDoc("ods/shared-formula/column-labels.ods");
@@ -783,7 +538,7 @@ void ScFiltersTest2::testSharedFormulaColumnLabelsODS()
CPPUNIT_ASSERT_EQUAL(5.0, pDoc->GetValue(ScAddress(4, 5, 0)));
}
-void ScFiltersTest2::testSharedFormulaColumnRowLabelsODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSharedFormulaColumnRowLabelsODS)
{
createScDoc("ods/shared-formula/column-row-labels.ods");
@@ -818,7 +573,7 @@ void ScFiltersTest2::testSharedFormulaColumnRowLabelsODS()
aCheckFunc(1, 6); // B7:D9
}
-void ScFiltersTest2::testExternalRefCacheXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testExternalRefCacheXLSX)
{
createScDoc("xlsx/external-refs.xlsx");
ScDocument* pDoc = getScDoc();
@@ -830,7 +585,7 @@ void ScFiltersTest2::testExternalRefCacheXLSX()
CPPUNIT_ASSERT_EQUAL(OUString("Charlie"), pDoc->GetString(ScAddress(0, 3,
0)));
}
-void ScFiltersTest2::testExternalRefCacheODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testExternalRefCacheODS)
{
createScDoc("ods/external-ref-cache.ods");
@@ -848,7 +603,7 @@ void ScFiltersTest2::testExternalRefCacheODS()
true,
pDoc->GetExternalRefManager()->hasCellExternalReference(ScAddress(0, 6, 0)));
}
-void ScFiltersTest2::testHybridSharedStringODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testHybridSharedStringODS)
{
createScDoc("ods/hybrid-shared-string.ods");
@@ -858,7 +613,7 @@ void ScFiltersTest2::testHybridSharedStringODS()
CPPUNIT_ASSERT_EQUAL(2.0, pDoc->GetValue(ScAddress(0, 1, 0)));
}
-void ScFiltersTest2::testCopyMergedNumberFormats()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testCopyMergedNumberFormats)
{
createScDoc("ods/copy-merged-number-formats.ods");
ScDocument* pDoc = getScDoc();
@@ -878,7 +633,7 @@ void ScFiltersTest2::testCopyMergedNumberFormats()
CPPUNIT_ASSERT_EQUAL(aStrD1, aCopyDoc.GetString(ScAddress(3, 0, 0)));
}
-void ScFiltersTest2::testVBAUserFunctionXLSM()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testVBAUserFunctionXLSM)
{
createScDoc("xlsm/vba-user-function.xlsm");
ScDocument* pDoc = getScDoc();
@@ -900,7 +655,7 @@ void ScFiltersTest2::testVBAUserFunctionXLSM()
CPPUNIT_ASSERT_EQUAL(42.0, pDoc->GetValue(ScAddress(0, 0, 0)));
}
-void ScFiltersTest2::testEmbeddedImageXLS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testEmbeddedImageXLS)
{
// The document has one embedded image on the first sheet. Make sure it's
// imported properly.
@@ -923,7 +678,7 @@ void ScFiltersTest2::testEmbeddedImageXLS()
!aBMP.IsEmpty());
}
-void ScFiltersTest2::testErrorOnExternalReferences()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testErrorOnExternalReferences)
{
createScDoc();
@@ -941,7 +696,7 @@ void ScFiltersTest2::testErrorOnExternalReferences()
pDoc->GetFormula(0, 0, 0));
}
-void ScFiltersTest2::testTdf145054()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf145054)
{
createScDoc("xlsx/tdf145054.xlsx");
@@ -957,7 +712,7 @@ void ScFiltersTest2::testTdf145054()
CPPUNIT_ASSERT(pDBData);
}
-void ScFiltersTest2::testTdf84762()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf84762)
{
createScDoc();
@@ -990,7 +745,7 @@ void ScFiltersTest2::testTdf84762()
}
}
-void ScFiltersTest2::testTdf44076()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf44076)
{
createScDoc();
@@ -1001,7 +756,7 @@ void ScFiltersTest2::testTdf44076()
CPPUNIT_ASSERT_EQUAL(-2.0, pDoc->GetValue(ScAddress(0, 0, 0)));
}
-void ScFiltersTest2::testEditEngStrikeThroughXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testEditEngStrikeThroughXLSX)
{
createScDoc("xlsx/strike-through.xlsx");
@@ -1031,7 +786,7 @@ void ScFiltersTest2::testEditEngStrikeThroughXLSX()
}
}
-void ScFiltersTest2::testRefStringXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testRefStringXLSX)
{
createScDoc("xlsx/ref_string.xlsx");
@@ -1044,7 +799,7 @@ void ScFiltersTest2::testRefStringXLSX()
CPPUNIT_ASSERT_EQUAL(formula::FormulaGrammar::CONV_XL_A1,
rCalcConfig.meStringRefAddressSyntax);
}
-void ScFiltersTest2::testTdf130132()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf130132)
{
createScDoc("ods/tdf130132.ods");
@@ -1060,7 +815,7 @@ void ScFiltersTest2::testTdf130132()
}
}
-void ScFiltersTest2::testTdf133327()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf133327)
{
createScDoc("ods/tdf133327.ods");
@@ -1078,7 +833,7 @@ void ScFiltersTest2::testTdf133327()
CPPUNIT_ASSERT_EQUAL(Color(255, 255, 0), rColor);
}
-void ScFiltersTest2::testColumnStyle2XLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testColumnStyle2XLSX)
{
createScDoc("xlsx/column_style.xlsx");
@@ -1113,7 +868,7 @@ void ScFiltersTest2::testColumnStyle2XLSX()
}
}
-void ScFiltersTest2::testTdf110440XLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf110440XLSX)
{
createScDoc("xlsx/tdf110440.xlsx");
@@ -1129,7 +884,7 @@ void ScFiltersTest2::testTdf110440XLSX()
CPPUNIT_ASSERT(!bVisible);
}
-void ScFiltersTest2::testBnc762542()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testBnc762542)
{
createScDoc("xlsx/bnc762542.xlsx");
@@ -1153,7 +908,7 @@ void ScFiltersTest2::testBnc762542()
}
}
-void ScFiltersTest2::testHiddenSheetsXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testHiddenSheetsXLSX)
{
createScDoc("xlsx/hidden_sheets.xlsx");
@@ -1163,7 +918,7 @@ void ScFiltersTest2::testHiddenSheetsXLSX()
CPPUNIT_ASSERT_EQUAL_MESSAGE("3rd sheet should be hidden", false,
pDoc->IsVisible(2));
}
-void ScFiltersTest2::testAutofilterXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testAutofilterXLSX)
{
createScDoc("xlsx/autofilter.xlsx");
@@ -1191,7 +946,7 @@ void checkValidationFormula(const ScAddress& rPos, const
ScDocument& rDoc,
}
}
-void ScFiltersTest2::testRelFormulaValidationXLS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testRelFormulaValidationXLS)
{
createScDoc("xls/validation.xls");
@@ -1201,7 +956,7 @@ void ScFiltersTest2::testRelFormulaValidationXLS()
checkValidationFormula(ScAddress(5, 8, 0), *pDoc, "D7");
}
-void ScFiltersTest2::testTdf136364()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf136364)
{
createScDoc("xlsx/tdf136364.xlsx");
@@ -1221,7 +976,7 @@ void ScFiltersTest2::testTdf136364()
CPPUNIT_ASSERT_EQUAL(12.0, pDoc->GetValue(ScAddress(4, 1, 0)));
}
-void ScFiltersTest2::testTdf103734()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf103734)
{
createScDoc("ods/tdf103734.ods");
ScDocument* pDoc = getScDoc();
@@ -1230,7 +985,7 @@ void ScFiltersTest2::testTdf103734()
CPPUNIT_ASSERT_EQUAL(OUString("#N/A"), pDoc->GetString(ScAddress(2, 0,
0)));
}
-void ScFiltersTest2::testTdf126116()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf126116)
{
createScDoc("fods/tdf126116.fods");
ScDocument* pDoc = getScDoc();
@@ -1249,7 +1004,7 @@ void ScFiltersTest2::testTdf126116()
CPPUNIT_ASSERT_EQUAL(OUString("MM/DD/YY"), rFormatStr);
}
-void ScFiltersTest2::testTdf144209()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf144209)
{
createScDoc("ods/tdf144209.ods");
ScDocument* pDoc = getScDoc();
@@ -1265,7 +1020,7 @@ void ScFiltersTest2::testTdf144209()
CPPUNIT_ASSERT_EQUAL(OUString("AA 33263342642.5385"),
pDoc->GetString(ScAddress(0, 0, 0)));
}
-void ScFiltersTest2::testTdf98844()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf98844)
{
createScDoc("ods/tdf98844.ods");
ScDocument* pDoc = getScDoc();
@@ -1282,7 +1037,7 @@ void ScFiltersTest2::testTdf98844()
CPPUNIT_ASSERT_EQUAL(48.0, pDoc->GetValue(ScAddress(0, 8, 0)));
}
-void ScFiltersTest2::testTdf100458()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf100458)
{
createScDoc("ods/tdf100458_lost_zero_value.ods");
ScDocument* pDoc = getScDoc();
@@ -1291,7 +1046,7 @@ void ScFiltersTest2::testTdf100458()
CPPUNIT_ASSERT(!pDoc->HasStringData(0, 0, 0));
}
-void ScFiltersTest2::testTdf118561()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf118561)
{
createScDoc("ods/tdf118561.ods");
ScDocument* pDoc = getScDoc();
@@ -1307,7 +1062,7 @@ void ScFiltersTest2::testTdf118561()
CPPUNIT_ASSERT_EQUAL(OUString("hat"), pDoc->GetString(ScAddress(6, 1, 1)));
}
-void ScFiltersTest2::testTdf125099()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf125099)
{
createScDoc("ods/tdf125099.ods");
ScDocument* pDoc = getScDoc();
@@ -1326,7 +1081,7 @@ void ScFiltersTest2::testTdf125099()
CPPUNIT_ASSERT_EQUAL(OUString("03:24:00"), pDoc->GetString(ScAddress(0, 1,
0)));
}
-void ScFiltersTest2::testTdf134455()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf134455)
{
createScDoc("xlsx/tdf134455.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1341,7 +1096,7 @@ void ScFiltersTest2::testTdf134455()
CPPUNIT_ASSERT_EQUAL(OUString("04:00"), pDoc->GetString(ScAddress(3, 8,
0)));
}
-void ScFiltersTest2::testTdf119533()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf119533)
{
createScDoc("ods/tdf119533.ods");
ScDocument* pDoc = getScDoc();
@@ -1357,7 +1112,7 @@ void ScFiltersTest2::testTdf119533()
CPPUNIT_ASSERT_EQUAL(OUString("9.5"), pDoc->GetString(ScAddress(5, 0, 0)));
}
-void ScFiltersTest2::testTdf127982()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf127982)
{
createScDoc("ods/tdf127982.ods");
ScDocument* pDoc = getScDoc();
@@ -1377,7 +1132,7 @@ void ScFiltersTest2::testTdf127982()
CPPUNIT_ASSERT_EQUAL(OUString("R7"), pDoc->GetString(ScAddress(4, 7, 0)));
}
-void ScFiltersTest2::testTdf109409()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf109409)
{
createScDoc("ods/tdf109409.ods");
ScDocument* pDoc = getScDoc();
@@ -1403,7 +1158,7 @@ void ScFiltersTest2::testTdf109409()
CPPUNIT_ASSERT_EQUAL(OUString("A1B1A2B2A3B3"),
pDoc->GetString(ScAddress(6, 5, 0)));
}
-void ScFiltersTest2::testTdf132105()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf132105)
{
createScDoc("ods/tdf132105.ods");
ScDocument* pDoc = getScDoc();
@@ -1428,7 +1183,7 @@ void ScFiltersTest2::testTdf132105()
CPPUNIT_ASSERT_EQUAL(OUString("0"), pDoc->GetString(ScAddress(1, 4, 0)));
}
-void ScFiltersTest2::testTdf131424()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf131424)
{
createScDoc("xlsx/tdf131424.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1440,7 +1195,7 @@ void ScFiltersTest2::testTdf131424()
CPPUNIT_ASSERT_EQUAL(104.0, pDoc->GetValue(ScAddress(2, 4, 0)));
}
-void ScFiltersTest2::testTdf100709XLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf100709XLSX)
{
createScDoc("xlsx/tdf100709.xlsx");
@@ -1451,7 +1206,7 @@ void ScFiltersTest2::testTdf100709XLSX()
pDoc->GetString(0, 74, 0));
}
-void ScFiltersTest2::testTdf97598XLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf97598XLSX)
{
createScDoc("xlsx/tdf97598_scenarios.xlsx");
@@ -1460,7 +1215,7 @@ void ScFiltersTest2::testTdf97598XLSX()
CPPUNIT_ASSERT_EQUAL(OUString("Cell A1"), aStr);
}
-void ScFiltersTest2::testTdf83672XLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf83672XLSX)
{
createScDoc("xlsx/tdf83672.xlsx");
uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
@@ -1473,7 +1228,7 @@ void ScFiltersTest2::testTdf83672XLSX()
CPPUNIT_ASSERT(nRotate != 0);
}
-void ScFiltersTest2::testUnicodeFileNameGnumeric()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testUnicodeFileNameGnumeric)
{
// Mapping the LO-internal URL
// <file:///.../sc/qa/unit/data/gnumeric/t%C3%A4%C3%9Ft.gnumeric> to the
@@ -1486,7 +1241,7 @@ void ScFiltersTest2::testUnicodeFileNameGnumeric()
loadFromURL(u"gnumeric/t\u00E4\u00DFt.gnumeric");
}
-void ScFiltersTest2::testMergedCellsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testMergedCellsXLSXML)
{
createScDoc("xml/merged-cells.xml");
ScDocument* pDoc = getScDoc();
@@ -1517,7 +1272,7 @@ void ScFiltersTest2::testMergedCellsXLSXML()
CPPUNIT_ASSERT_EQUAL(ScRange(2, 2, 0, 5, 5, 0), aMergedRange);
}
-void ScFiltersTest2::testBackgroundColorStandardXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testBackgroundColorStandardXLSXML)
{
createScDoc("xml/background-color-standard.xml");
ScDocument* pDoc = getScDoc();
@@ -1560,7 +1315,7 @@ void ScFiltersTest2::testBackgroundColorStandardXLSXML()
}
}
-void ScFiltersTest2::testTdf131536()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf131536)
{
createScDoc("xlsx/tdf131536.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1583,7 +1338,7 @@ void ScFiltersTest2::testTdf131536()
pDoc->GetFormula(4, 9, 0));
}
-void ScFiltersTest2::testTdf130583()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf130583)
{
createScDoc("ods/tdf130583.ods");
ScDocument* pDoc = getScDoc();
@@ -1602,7 +1357,7 @@ void ScFiltersTest2::testTdf130583()
CPPUNIT_ASSERT_EQUAL(OUString("#N/A"), pDoc->GetString(ScAddress(4, 4,
0)));
}
-void ScFiltersTest2::testTdf85617()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf85617)
{
createScDoc("xlsx/tdf85617.xlsx");
ScDocument* pDoc = getScDoc();
@@ -1612,7 +1367,7 @@ void ScFiltersTest2::testTdf85617()
CPPUNIT_ASSERT_EQUAL(4.5, pDoc->GetValue(aPos));
}
-void ScFiltersTest2::testTdf134234()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf134234)
{
createScDoc("ods/tdf134234.ods");
ScDocument* pDoc = getScDoc();
@@ -1625,7 +1380,7 @@ void ScFiltersTest2::testTdf134234()
static_cast<sal_uInt32>(pDoc->GetValue(ScAddress(3,
0, 1))));
}
-void ScFiltersTest2::testTdf42481()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf42481)
{
createScDoc("ods/tdf42481.ods");
ScDocument* pDoc = getScDoc();
@@ -1639,7 +1394,7 @@ void ScFiltersTest2::testTdf42481()
CPPUNIT_ASSERT_EQUAL(OUString("14"), pDoc->GetString(ScAddress(3, 11, 0)));
}
-void ScFiltersTest2::testNamedExpressionsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testNamedExpressionsXLSXML)
{
{
// global named expressions
@@ -1694,7 +1449,7 @@ void ScFiltersTest2::testNamedExpressionsXLSXML()
}
}
-void ScFiltersTest2::testEmptyRowsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testEmptyRowsXLSXML)
{
createScDoc("xml/empty-rows.xml");
ScDocument* pDoc = getScDoc();
@@ -1725,7 +1480,7 @@ void ScFiltersTest2::testEmptyRowsXLSXML()
pDoc->GetFormula(aPos.Col(), aPos.Row(), aPos.Tab()));
}
-void ScFiltersTest2::testBorderDirectionsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testBorderDirectionsXLSXML)
{
createScDoc("xml/border-directions.xml");
ScDocument* pDoc = getScDoc();
@@ -1811,7 +1566,7 @@ void ScFiltersTest2::testBorderDirectionsXLSXML()
}
}
-void ScFiltersTest2::testBorderColorsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testBorderColorsXLSXML)
{
createScDoc("xml/border-colors.xml");
ScDocument* pDoc = getScDoc();
@@ -1865,7 +1620,7 @@ void ScFiltersTest2::testBorderColorsXLSXML()
CPPUNIT_ASSERT_EQUAL(Color(0, 176, 240), pLine->GetColor()); // light blue
}
-void ScFiltersTest2::testHiddenRowsColumnsXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testHiddenRowsColumnsXLSXML)
{
createScDoc("xml/hidden-rows-columns.xml");
ScDocument* pDoc = getScDoc();
@@ -1914,7 +1669,7 @@ void ScFiltersTest2::testHiddenRowsColumnsXLSXML()
}
}
-void ScFiltersTest2::testColumnWidthRowHeightXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testColumnWidthRowHeightXLSXML)
{
createScDoc("xml/column-width-row-height.xml");
ScDocument* pDoc = getScDoc();
@@ -1960,7 +1715,7 @@ void ScFiltersTest2::testColumnWidthRowHeightXLSXML()
}
}
-void ScFiltersTest2::testCharacterSetXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testCharacterSetXLSXML)
{
createScDoc("xml/character-set.xml");
ScDocument* pDoc = getScDoc();
@@ -1988,7 +1743,7 @@ void ScFiltersTest2::testCharacterSetXLSXML()
CPPUNIT_ASSERT_EQUAL(aExpected, aVal);
}
-void ScFiltersTest2::testWrapAndShrinkXLSXML()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testWrapAndShrinkXLSXML)
{
createScDoc("xml/wrap-and-shrink.xml");
ScDocument* pDoc = getScDoc();
@@ -2020,7 +1775,7 @@ void ScFiltersTest2::testWrapAndShrinkXLSXML()
}
}
-void ScFiltersTest2::testCondFormatXLSB()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testCondFormatXLSB)
{
createScDoc("xlsb/cond_format.xlsb");
@@ -2034,7 +1789,7 @@ void ScFiltersTest2::testCondFormatXLSB()
CPPUNIT_ASSERT_EQUAL(size_t(1), pFormat->size());
}
-void ScFiltersTest2::testPageScalingXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testPageScalingXLSX)
{
createScDoc("xlsx/page_scale.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2049,7 +1804,7 @@ void ScFiltersTest2::testPageScalingXLSX()
CPPUNIT_ASSERT_EQUAL(sal_uInt16(90), nVal);
}
-void ScFiltersTest2::testActiveXCheckboxXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testActiveXCheckboxXLSX)
{
createScDoc("xlsx/activex_checkbox.xlsx");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
@@ -2087,7 +1842,7 @@ void ScFiltersTest2::testActiveXCheckboxXLSX()
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), nState);
}
-void ScFiltersTest2::testTdf60673()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf60673)
{
createScDoc("xlsx/tdf60673.xlsx");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
@@ -2110,7 +1865,7 @@ void ScFiltersTest2::testTdf60673()
CPPUNIT_ASSERT_EQUAL(OUString(u"PL: ĄŚŻŹĆŃŁÓĘ"), sLabel);
}
-void ScFiltersTest2::testtdf120301_xmlSpaceParsingXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testtdf120301_xmlSpaceParsingXLSX)
{
createScDoc("xlsx/tdf120301_xmlSpaceParsing.xlsx");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
@@ -2148,7 +1903,7 @@ struct PaintListener : public SfxListener
};
}
-void ScFiltersTest2::testCondFormatFormulaListenerXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testCondFormatFormulaListenerXLSX)
{
createScDoc("xlsx/cond_format_formula_listener.xlsx");
ScDocShell* pDocSh = getScDocShell();
@@ -2167,7 +1922,7 @@ void ScFiltersTest2::testCondFormatFormulaListenerXLSX()
CPPUNIT_ASSERT(aListener.mbCalled);
}
-void ScFiltersTest2::testTdf137091()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf137091)
{
// Set the system locale to Turkish
SvtSysLocaleOptions aOptions;
@@ -2188,7 +1943,7 @@ void ScFiltersTest2::testTdf137091()
CPPUNIT_ASSERT_EQUAL(OUString("28/4"), pDoc->GetString(ScAddress(2, 1,
0)));
}
-void ScFiltersTest2::testTdf141495()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf141495)
{
// Set the system locale to Turkish
SvtSysLocaleOptions aOptions;
@@ -2212,7 +1967,7 @@ void ScFiltersTest2::testTdf141495()
CPPUNIT_ASSERT_EQUAL(OUString("44926"), pDoc->GetString(ScAddress(11, 6,
0)));
}
-void ScFiltersTest2::testTdf70455()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf70455)
{
createScDoc("xlsx/tdf70455.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2223,7 +1978,7 @@ void ScFiltersTest2::testTdf70455()
CPPUNIT_ASSERT_EQUAL(OUString(u"€780.00"), pDoc->GetString(ScAddress(7, 7,
0)));
}
-void ScFiltersTest2::testTdf62268()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf62268)
{
createScDoc("ods/tdf62268.ods");
ScDocument* pDoc = getScDoc();
@@ -2236,7 +1991,7 @@ void ScFiltersTest2::testTdf62268()
CPPUNIT_ASSERT_LESSEQUAL(19, abs(1905 - nHeight));
}
-void ScFiltersTest2::testTdf137453()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf137453)
{
createScDoc("ods/tdf137453.ods");
@@ -2248,7 +2003,7 @@ void ScFiltersTest2::testTdf137453()
CPPUNIT_ASSERT_EQUAL(OUString("3333333333/100"),
pDoc->GetString(ScAddress(0, 0, 0)));
}
-void ScFiltersTest2::testTdf112780()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf112780)
{
createScDoc("ods/tdf112780.ods");
@@ -2263,7 +2018,7 @@ void ScFiltersTest2::testTdf112780()
CPPUNIT_ASSERT_EQUAL(OUString("=G6+J6+M6"), aFormula);
}
-void ScFiltersTest2::testTdf72470()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf72470)
{
// Without the fix in place, this test would have hung
@@ -2275,7 +2030,7 @@ void ScFiltersTest2::testTdf72470()
CPPUNIT_ASSERT_EQUAL(OUString(u"أسمي walid"), pDoc->GetString(ScAddress(0,
1, 0)));
}
-void ScFiltersTest2::testTdf35636()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf35636)
{
createScDoc("ods/tdf35636.ods");
@@ -2286,7 +2041,7 @@ void ScFiltersTest2::testTdf35636()
CPPUNIT_ASSERT_EQUAL(50.0, pDoc->GetValue(ScAddress(1, 4, 0)));
}
-void ScFiltersTest2::testTdf98481()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf98481)
{
createScDoc("xlsx/tdf98481.xlsx");
@@ -2303,7 +2058,7 @@ void ScFiltersTest2::testTdf98481()
CPPUNIT_ASSERT_EQUAL(3.0, pDoc->GetValue(ScAddress(3, 4, 0)));
}
-void ScFiltersTest2::testTdf115022()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf115022)
{
createScDoc("xlsx/tdf115022.xlsx");
@@ -2320,7 +2075,7 @@ void ScFiltersTest2::testTdf115022()
CPPUNIT_ASSERT_EQUAL(6.0, pDoc->GetValue(ScAddress(1, 8, 0)));
}
-void ScFiltersTest2::testVBAMacroFunctionODS()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testVBAMacroFunctionODS)
{
createScDoc("ods/vba_macro_functions.ods");
ScDocument* pDoc = getScDoc();
@@ -2330,7 +2085,7 @@ void ScFiltersTest2::testVBAMacroFunctionODS()
CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, pDoc->GetValue(2, 0, 0), 1e-6);
}
-void ScFiltersTest2::testAutoheight2Rows()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testAutoheight2Rows)
{
createScDoc("ods/autoheight2rows.ods");
ScDocument* pDoc = getScDoc();
@@ -2349,7 +2104,7 @@ void ScFiltersTest2::testAutoheight2Rows()
abs(nHeight2 - nHeight5) < 10);
}
-void ScFiltersTest2::testXLSDefColWidth()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testXLSDefColWidth)
{
// XLS has only 256 columns; but on import, we need to set default width
to all above that limit
createScDoc("xls/chartx.xls");
@@ -2360,7 +2115,7 @@ void ScFiltersTest2::testXLSDefColWidth()
CPPUNIT_ASSERT_EQUAL(1005, nWidth);
}
-void ScFiltersTest2::testTdf148423()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf148423)
{
createScDoc("csv/tdf148423.csv");
ScDocument* pDoc = getScDoc();
@@ -2373,7 +2128,7 @@ void ScFiltersTest2::testTdf148423()
CPPUNIT_ASSERT_EQUAL(32880, nWidth);
}
-void ScFiltersTest2::testTdf152053()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf152053)
{
createScDoc("csv/tdf152053.csv");
ScDocument* pDoc = getScDoc();
@@ -2386,7 +2141,7 @@ void ScFiltersTest2::testTdf152053()
CPPUNIT_ASSERT_EQUAL(1162, nWidth);
}
-void ScFiltersTest2::testPreviewMissingObjLink()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testPreviewMissingObjLink)
{
createScDoc("ods/keep-preview-missing-obj-link.ods");
@@ -2401,7 +2156,7 @@ void ScFiltersTest2::testPreviewMissingObjLink()
"the ole object links to a missing file, but we should retain its
preview", pGraphic);
}
-void ScFiltersTest2::testShapeRotationImport()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testShapeRotationImport)
{
if (!IsDefaultDPI())
return;
@@ -2449,7 +2204,7 @@ void ScFiltersTest2::testShapeRotationImport()
}
}
-void ScFiltersTest2::testShapeDisplacementOnRotationImport()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testShapeDisplacementOnRotationImport)
{
// tdf#135918 shape is displaced on rotation if it is placed next to the
sheets upper/left edges
createScDoc("xlsx/testShapeDisplacementOnRotationImport.xlsx");
@@ -2466,7 +2221,7 @@ void
ScFiltersTest2::testShapeDisplacementOnRotationImport()
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRectangle.Y);
}
-void ScFiltersTest2::testTextBoxBodyUpright()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTextBoxBodyUpright)
{
// tdf#106197 We should import the "upright" attribute of txBody.
createScDoc("xlsx/tdf106197_import_upright.xlsx");
@@ -2510,7 +2265,7 @@ void ScFiltersTest2::testTextBoxBodyUpright()
CPPUNIT_ASSERT_EQUAL(sal_Int32(90), nAngle);
}
-void ScFiltersTest2::testTextBoxBodyRotateAngle()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTextBoxBodyRotateAngle)
{
createScDoc("xlsx/tdf141644.xlsx");
@@ -2527,7 +2282,7 @@ void ScFiltersTest2::testTextBoxBodyRotateAngle()
CPPUNIT_ASSERT_EQUAL(sal_Int16(text::WritingMode2::BT_LR), eWritingMode);
}
-void ScFiltersTest2::testTextLengthDataValidityXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTextLengthDataValidityXLSX)
{
createScDoc("xlsx/textLengthDataValidity.xlsx");
@@ -2562,7 +2317,7 @@ void ScFiltersTest2::testTextLengthDataValidityXLSX()
CPPUNIT_ASSERT_EQUAL(true, bValidA4);
}
-void ScFiltersTest2::testDeleteCircles()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testDeleteCircles)
{
createScDoc("xlsx/testDeleteCircles.xlsx");
@@ -2598,7 +2353,7 @@ void ScFiltersTest2::testDeleteCircles()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pPage->GetObjCount());
}
-void ScFiltersTest2::testDrawCircleInMergeCells()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testDrawCircleInMergeCells)
{
createScDoc("xlsx/testDrawCircleInMergeCells.xlsx");
@@ -2662,7 +2417,7 @@ void ScFiltersTest2::testDrawCircleInMergeCells()
CPPUNIT_ASSERT_EQUAL(aEndRecalcCell1.Y(), aEndRecalcCircle.Y());
}
-void ScFiltersTest2::testDeleteCirclesInRowAndCol()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testDeleteCirclesInRowAndCol)
{
createScDoc("ods/deleteCirclesInRowAndCol.ods");
@@ -2688,7 +2443,7 @@ void ScFiltersTest2::testDeleteCirclesInRowAndCol()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pPage->GetObjCount());
}
-void ScFiltersTest2::testTdf129940()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf129940)
{
// Test pure span elements inside text:ruby-base
createScDoc("ods/tdf129940.ods");
@@ -2704,7 +2459,7 @@ void ScFiltersTest2::testTdf129940()
CPPUNIT_ASSERT_EQUAL(OUString(u"注音符號"), aStr);
}
-void ScFiltersTest2::testTdf119190()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf119190)
{
createScDoc("xlsx/tdf119190.xlsx");
ScDocument* pDoc = getScDoc();
@@ -2717,7 +2472,7 @@ void ScFiltersTest2::testTdf119190()
CPPUNIT_ASSERT_EQUAL(true, pNote->IsCaptionShown());
}
-void ScFiltersTest2::testTdf139612()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf139612)
{
createScDoc("ods/tdf139612.ods");
ScDocument* pDoc = getScDoc();
@@ -2731,7 +2486,7 @@ void ScFiltersTest2::testTdf139612()
CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(1, 15, 0)));
}
-void ScFiltersTest2::testTdf144740()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf144740)
{
createScDoc("ods/tdf144740.ods");
ScDocument* pDoc = getScDoc();
@@ -2742,7 +2497,7 @@ void ScFiltersTest2::testTdf144740()
CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(1, 0, 0)));
}
-void ScFiltersTest2::testTdf146722()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf146722)
{
createScDoc("ods/tdf146722.ods");
ScDocument* pDoc = getScDoc();
@@ -2753,7 +2508,7 @@ void ScFiltersTest2::testTdf146722()
CPPUNIT_ASSERT_EQUAL(3.0, pDoc->GetValue(ScAddress(1, 2, 0)));
}
-void ScFiltersTest2::testTdf147014()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf147014)
{
createScDoc("xlsx/tdf147014.xlsx");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
@@ -2765,7 +2520,7 @@ void ScFiltersTest2::testTdf147014()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape not imported",
static_cast<sal_Int32>(1), xIA->getCount());
}
-void ScFiltersTest2::testTdf139763ShapeAnchor()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf139763ShapeAnchor)
{
createScDoc("xlsx/tdf139763ShapeAnchor.xlsx");
@@ -2793,7 +2548,7 @@ void ScFiltersTest2::testTdf139763ShapeAnchor()
!ScDrawLayer::IsResizeWithCell(*pObj));
}
-void ScFiltersTest2::testAutofilterNamedRangesXLSX()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testAutofilterNamedRangesXLSX)
{
createScDoc("xlsx/autofilternamedrange.xlsx");
@@ -2811,7 +2566,7 @@ void ScFiltersTest2::testAutofilterNamedRangesXLSX()
CPPUNIT_ASSERT_EQUAL(OUString(), aPosStr);
}
-void ScFiltersTest2::testInvalidBareBiff5()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testInvalidBareBiff5)
{
createScDoc("xls/tdf144732.xls");
ScDocument* pDoc = getScDoc();
@@ -2908,7 +2663,7 @@ void ScFiltersTest2::testInvalidBareBiff5()
CPPUNIT_ASSERT_EQUAL(OUString(), pDoc->GetString(aPos));
}
-void ScFiltersTest2::testTooManyColsRows()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTooManyColsRows)
{
// The intentionally doc has cells beyond our MAXROW/MAXCOL, so there
// should be a warning on load.
@@ -2930,7 +2685,7 @@ void ScFiltersTest2::testTooManyColsRows()
|| pMedium->GetWarningError() ==
SCWARN_IMPORT_COLUMN_OVERFLOW);
}
-void ScFiltersTest2::testTdf83671_SmartArt_import()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf83671_SmartArt_import)
{
// The example doc contains a diagram (SmartArt). Such should be imported
as group object.
// Error was, that the background shape had size zero and the diagram
shapes where missing.
@@ -2972,7 +2727,7 @@ void ScFiltersTest2::testTdf83671_SmartArt_import()
}
}
-void ScFiltersTest2::testTdf83671_SmartArt_import2()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf83671_SmartArt_import2)
{
// The example doc contains a diagram (SmartArt). Such should be imported
as group object.
// With conversion enabled, the group contains only a graphic. Error was,
that the shape
@@ -3016,7 +2771,7 @@ void ScFiltersTest2::testTdf83671_SmartArt_import2()
}
}
-void ScFiltersTest2::testTdf151818_SmartArtFontColor()
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf151818_SmartArtFontColor)
{
// The document contains a SmartArt where the color for the texts in the
shapes is given by
// the theme.
@@ -3069,8 +2824,6 @@ void ScFiltersTest2::testTdf151818_SmartArtFontColor()
}
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest2);
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
