add to each calc export test name the export format

Change-Id: I182826a224859a07fa264f3404aa2bef7013de3a
Reviewed-on: https://gerrit.libreoffice.org/31992
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2016-12-10 06:20:35 +01:00
parent 9c66ac2869
commit b29ae3dace

View File

@@ -89,7 +89,7 @@ public:
ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const OUString&, const OUString&, SfxFilterFlags ); ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const OUString&, const OUString&, SfxFilterFlags );
void test(); void test();
void testPasswordExport(); void testPasswordExportODS();
void testConditionalFormatExportODS(); void testConditionalFormatExportODS();
void testConditionalFormatExportXLSX(); void testConditionalFormatExportXLSX();
void testColorScaleExportODS(); void testColorScaleExportODS();
@@ -100,7 +100,7 @@ public:
void testMiscRowHeightExport(); void testMiscRowHeightExport();
void testNamedRangeBugfdo62729(); void testNamedRangeBugfdo62729();
void testRichTextExportODS(); void testRichTextExportODS();
void testRichTextCellFormat(); void testRichTextCellFormatXLSX();
void testFormulaRefSheetNameODS(); void testFormulaRefSheetNameODS();
void testCellValuesExportODS(); void testCellValuesExportODS();
@@ -144,53 +144,53 @@ public:
void testCeilingFloorODS(); void testCeilingFloorODS();
#if !defined _WIN32 #if !defined _WIN32
void testRelativePaths(); void testRelativePathsODS();
#endif #endif
void testSheetProtection(); void testSheetProtectionODS();
void testPivotTableXLSX(); void testPivotTableXLSX();
void testPivotTableTwoDataFieldsXLSX(); void testPivotTableTwoDataFieldsXLSX();
void testPivotTableMedian(); void testPivotTableMedianODS();
void testSwappedOutImageExport(); void testSwappedOutImageExport();
void testLinkedGraphicRT(); void testLinkedGraphicRT();
void testImageWithSpecialID(); void testImageWithSpecialID();
#if !defined _WIN32 #if !defined _WIN32
void testSupBookVirtualPath(); void testSupBookVirtualPathXLS();
#endif #endif
void testSheetLocalRangeNameXLS(); void testSheetLocalRangeNameXLS();
void testSheetTextBoxHyperlink(); void testSheetTextBoxHyperlinkXLSX();
void testFontSize(); void testFontSizeXLSX();
void testSheetCharacterKerningSpace(); void testSheetCharacterKerningSpaceXLSX();
void testSheetCondensedCharacterSpace(); void testSheetCondensedCharacterSpaceXLSX();
void testTextUnderlineColor(); void testTextUnderlineColorXLSX();
void testSheetRunParagraphProperty(); void testSheetRunParagraphPropertyXLSX();
void testHiddenShape(); void testHiddenShapeXLSX();
void testHyperlinkXLSX(); void testHyperlinkXLSX();
void testMoveCellAnchoredShapes(); void testMoveCellAnchoredShapesODS();
void testMatrixMultiplication(); void testMatrixMultiplicationXLSX();
void testPreserveTextWhitespaceXLSX(); void testPreserveTextWhitespaceXLSX();
void testPreserveTextWhitespace2XLSX(); void testPreserveTextWhitespace2XLSX();
void testTextDirection(); void testTextDirectionXLSX();
void testRefStringXLSX(); void testRefStringXLSX();
void testRefStringConfigXLSX(); void testRefStringConfigXLSX();
void testRefStringUnspecified(); void testRefStringUnspecified();
void testHeaderImage(); void testHeaderImageODS();
void testTdf88657(); void testTdf88657ODS();
void testEscapeCharInNumberFormatXLSX(); void testEscapeCharInNumberFormatXLSX();
void testNatNumInNumberFormatXLSX(); void testNatNumInNumberFormatXLSX();
void testExponentWithoutSignFormatXLSX(); void testExponentWithoutSignFormatXLSX();
void testExtendedLCID(); void testExtendedLCIDXLSX();
void testHiddenRepeatedRowsODS(); void testHiddenRepeatedRowsODS();
void testHyperlinkTargetFrameODS(); void testHyperlinkTargetFrameODS();
CPPUNIT_TEST_SUITE(ScExportTest); CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test); CPPUNIT_TEST(test);
CPPUNIT_TEST(testPasswordExport); CPPUNIT_TEST(testPasswordExportODS);
CPPUNIT_TEST(testConditionalFormatExportODS); CPPUNIT_TEST(testConditionalFormatExportODS);
CPPUNIT_TEST(testConditionalFormatExportXLSX); CPPUNIT_TEST(testConditionalFormatExportXLSX);
CPPUNIT_TEST(testColorScaleExportODS); CPPUNIT_TEST(testColorScaleExportODS);
@@ -201,7 +201,7 @@ public:
CPPUNIT_TEST(testMiscRowHeightExport); CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729); CPPUNIT_TEST(testNamedRangeBugfdo62729);
CPPUNIT_TEST(testRichTextExportODS); CPPUNIT_TEST(testRichTextExportODS);
CPPUNIT_TEST(testRichTextCellFormat); CPPUNIT_TEST(testRichTextCellFormatXLSX);
CPPUNIT_TEST(testFormulaRefSheetNameODS); CPPUNIT_TEST(testFormulaRefSheetNameODS);
CPPUNIT_TEST(testCellValuesExportODS); CPPUNIT_TEST(testCellValuesExportODS);
CPPUNIT_TEST(testCellNoteExportODS); CPPUNIT_TEST(testCellNoteExportODS);
@@ -236,14 +236,14 @@ public:
CPPUNIT_TEST(testCeilingFloorXLS); CPPUNIT_TEST(testCeilingFloorXLS);
CPPUNIT_TEST(testCeilingFloorODS); CPPUNIT_TEST(testCeilingFloorODS);
#if !defined(_WIN32) #if !defined(_WIN32)
CPPUNIT_TEST(testRelativePaths); CPPUNIT_TEST(testRelativePathsODS);
#endif #endif
CPPUNIT_TEST(testSheetProtection); CPPUNIT_TEST(testSheetProtectionODS);
CPPUNIT_TEST(testPivotTableXLSX); CPPUNIT_TEST(testPivotTableXLSX);
CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX); CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
CPPUNIT_TEST(testPivotTableMedian); CPPUNIT_TEST(testPivotTableMedianODS);
#if !defined(_WIN32) #if !defined(_WIN32)
CPPUNIT_TEST(testSupBookVirtualPath); CPPUNIT_TEST(testSupBookVirtualPathXLS);
#endif #endif
CPPUNIT_TEST(testSwappedOutImageExport); CPPUNIT_TEST(testSwappedOutImageExport);
CPPUNIT_TEST(testLinkedGraphicRT); CPPUNIT_TEST(testLinkedGraphicRT);
@@ -251,28 +251,28 @@ public:
CPPUNIT_TEST(testPreserveTextWhitespaceXLSX); CPPUNIT_TEST(testPreserveTextWhitespaceXLSX);
CPPUNIT_TEST(testPreserveTextWhitespace2XLSX); CPPUNIT_TEST(testPreserveTextWhitespace2XLSX);
CPPUNIT_TEST(testSheetLocalRangeNameXLS); CPPUNIT_TEST(testSheetLocalRangeNameXLS);
CPPUNIT_TEST(testSheetTextBoxHyperlink); CPPUNIT_TEST(testSheetTextBoxHyperlinkXLSX);
CPPUNIT_TEST(testFontSize); CPPUNIT_TEST(testFontSizeXLSX);
CPPUNIT_TEST(testSheetCharacterKerningSpace); CPPUNIT_TEST(testSheetCharacterKerningSpaceXLSX);
CPPUNIT_TEST(testSheetCondensedCharacterSpace); CPPUNIT_TEST(testSheetCondensedCharacterSpaceXLSX);
CPPUNIT_TEST(testTextUnderlineColor); CPPUNIT_TEST(testTextUnderlineColorXLSX);
CPPUNIT_TEST(testSheetRunParagraphProperty); CPPUNIT_TEST(testSheetRunParagraphPropertyXLSX);
CPPUNIT_TEST(testHiddenShape); CPPUNIT_TEST(testHiddenShapeXLSX);
CPPUNIT_TEST(testHyperlinkXLSX); CPPUNIT_TEST(testHyperlinkXLSX);
CPPUNIT_TEST(testMoveCellAnchoredShapes); CPPUNIT_TEST(testMoveCellAnchoredShapesODS);
CPPUNIT_TEST(testMatrixMultiplication); CPPUNIT_TEST(testMatrixMultiplicationXLSX);
CPPUNIT_TEST(testTextDirection); CPPUNIT_TEST(testTextDirectionXLSX);
CPPUNIT_TEST(testRefStringXLSX); CPPUNIT_TEST(testRefStringXLSX);
CPPUNIT_TEST(testRefStringConfigXLSX); CPPUNIT_TEST(testRefStringConfigXLSX);
CPPUNIT_TEST(testRefStringUnspecified); CPPUNIT_TEST(testRefStringUnspecified);
CPPUNIT_TEST(testHeaderImage); CPPUNIT_TEST(testHeaderImageODS);
CPPUNIT_TEST(testTdf88657); CPPUNIT_TEST(testTdf88657ODS);
CPPUNIT_TEST(testEscapeCharInNumberFormatXLSX); CPPUNIT_TEST(testEscapeCharInNumberFormatXLSX);
CPPUNIT_TEST(testNatNumInNumberFormatXLSX); CPPUNIT_TEST(testNatNumInNumberFormatXLSX);
CPPUNIT_TEST(testExponentWithoutSignFormatXLSX); CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);
CPPUNIT_TEST(testExtendedLCID); CPPUNIT_TEST(testExtendedLCIDXLSX);
CPPUNIT_TEST(testHiddenRepeatedRowsODS); CPPUNIT_TEST(testHiddenRepeatedRowsODS);
CPPUNIT_TEST(testHyperlinkTargetFrameODS); CPPUNIT_TEST(testHyperlinkTargetFrameODS);
@@ -370,7 +370,7 @@ void ScExportTest::test()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testPasswordExport() void ScExportTest::testPasswordExportODS()
{ {
ScDocShell* pShell = new ScDocShell( ScDocShell* pShell = new ScDocShell(
SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::EMBEDDED_OBJECT |
@@ -1539,7 +1539,7 @@ void ScExportTest::testRichTextExportODS()
xNewDocSh3->DoClose(); xNewDocSh3->DoClose();
} }
void ScExportTest::testRichTextCellFormat() void ScExportTest::testRichTextCellFormatXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("cellformat.", FORMAT_XLS); ScDocShellRef xDocSh = loadDoc("cellformat.", FORMAT_XLS);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -2712,7 +2712,7 @@ void ScExportTest::testCeilingFloorODS()
} }
#if !defined _WIN32 #if !defined _WIN32
void ScExportTest::testRelativePaths() void ScExportTest::testRelativePathsODS()
{ {
ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -2739,7 +2739,7 @@ void testSheetProtection_Impl(ScDocument& rDoc)
} }
void ScExportTest::testSheetProtection() void ScExportTest::testSheetProtectionODS()
{ {
ScDocShellRef xDocSh = loadDoc("sheet-protection.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("sheet-protection.", FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -3016,7 +3016,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX()
xDocSh2->DoClose(); xDocSh2->DoClose();
} }
void ScExportTest::testPivotTableMedian() void ScExportTest::testPivotTableMedianODS()
{ {
ScDocShellRef xDocSh = loadDoc("pivot-table-median.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("pivot-table-median.", FORMAT_ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.Is()); CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.Is());
@@ -3154,7 +3154,7 @@ void ScExportTest::tearDown()
} }
#if !defined _WIN32 #if !defined _WIN32
void ScExportTest::testSupBookVirtualPath() void ScExportTest::testSupBookVirtualPathXLS()
{ {
ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS); ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3307,7 +3307,7 @@ void ScExportTest::testSheetLocalRangeNameXLS()
xDocSh2->DoClose(); xDocSh2->DoClose();
} }
void ScExportTest::testSheetTextBoxHyperlink() void ScExportTest::testSheetTextBoxHyperlinkXLSX()
{ {
ScDocShellRef xShell = loadDoc("textbox-hyperlink.", FORMAT_XLSX); ScDocShellRef xShell = loadDoc("textbox-hyperlink.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3323,7 +3323,7 @@ void ScExportTest::testSheetTextBoxHyperlink()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testFontSize() void ScExportTest::testFontSizeXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX); ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -3336,7 +3336,7 @@ void ScExportTest::testFontSize()
CPPUNIT_ASSERT_EQUAL(OUString("1800"), fontSize); CPPUNIT_ASSERT_EQUAL(OUString("1800"), fontSize);
} }
void ScExportTest::testSheetCharacterKerningSpace() void ScExportTest::testSheetCharacterKerningSpaceXLSX()
{ {
ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", FORMAT_XLSX); ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3356,7 +3356,7 @@ void ScExportTest::testSheetCharacterKerningSpace()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testSheetCondensedCharacterSpace() void ScExportTest::testSheetCondensedCharacterSpaceXLSX()
{ {
ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", FORMAT_XLSX); ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3376,7 +3376,7 @@ void ScExportTest::testSheetCondensedCharacterSpace()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testTextUnderlineColor() void ScExportTest::testTextUnderlineColorXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX); ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX);
@@ -3390,7 +3390,7 @@ void ScExportTest::testTextUnderlineColor()
CPPUNIT_ASSERT_EQUAL(OUString("ff0000"), color); CPPUNIT_ASSERT_EQUAL(OUString("ff0000"), color);
} }
void ScExportTest::testSheetRunParagraphProperty() void ScExportTest::testSheetRunParagraphPropertyXLSX()
{ {
ScDocShellRef xShell = loadDoc("TextColor.", FORMAT_XLSX); ScDocShellRef xShell = loadDoc("TextColor.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3433,7 +3433,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testHiddenShape() void ScExportTest::testHiddenShapeXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX); ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -3442,6 +3442,7 @@ void ScExportTest::testHiddenShape()
CPPUNIT_ASSERT(pDoc); CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:nvSpPr/xdr:cNvPr", "hidden", "1"); assertXPath(pDoc, "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:nvSpPr/xdr:cNvPr", "hidden", "1");
} }
void ScExportTest::testHyperlinkXLSX() void ScExportTest::testHyperlinkXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX); ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX);
@@ -3452,7 +3453,7 @@ void ScExportTest::testHyperlinkXLSX()
assertXPath(pDoc, "/r:Relationships/r:Relationship", "Target", "#Sheet2!A1"); assertXPath(pDoc, "/r:Relationships/r:Relationship", "Target", "#Sheet2!A1");
} }
void ScExportTest::testMoveCellAnchoredShapes() void ScExportTest::testMoveCellAnchoredShapesODS()
{ {
ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", FORMAT_ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.Is()); CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.Is());
@@ -3615,7 +3616,7 @@ void ScExportTest::testMoveCellAnchoredShapes()
xDocSh2->DoClose(); xDocSh2->DoClose();
} }
void ScExportTest::testMatrixMultiplication() void ScExportTest::testMatrixMultiplicationXLSX()
{ {
ScDocShellRef xShell = loadDoc("matrix-multiplication.", FORMAT_XLSX); ScDocShellRef xShell = loadDoc("matrix-multiplication.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is()); CPPUNIT_ASSERT(xShell.Is());
@@ -3728,7 +3729,7 @@ void ScExportTest::testRefStringUnspecified()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testHeaderImage() void ScExportTest::testHeaderImageODS()
{ {
// Graphic as header background was lost on export. // Graphic as header background was lost on export.
ScDocShellRef xShell = loadDoc("header-image.", FORMAT_ODS); ScDocShellRef xShell = loadDoc("header-image.", FORMAT_ODS);
@@ -3743,7 +3744,7 @@ void ScExportTest::testHeaderImage()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testTextDirection() void ScExportTest::testTextDirectionXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("writingMode.", FORMAT_XLSX); ScDocShellRef xDocSh = loadDoc("writingMode.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -3755,7 +3756,7 @@ void ScExportTest::testTextDirection()
assertXPath(pDoc, "/x:styleSheet/x:cellXfs/x:xf[3]/x:alignment", "readingOrder", "2");//RTL assertXPath(pDoc, "/x:styleSheet/x:cellXfs/x:xf[3]/x:alignment", "readingOrder", "2");//RTL
} }
void ScExportTest::testTdf88657() void ScExportTest::testTdf88657ODS()
{ {
ScDocShellRef xDocSh = loadDoc("tdf88657.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("tdf88657.", FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.Is()); CPPUNIT_ASSERT(xDocSh.Is());
@@ -3841,7 +3842,7 @@ void ScExportTest::testExponentWithoutSignFormatXLSX()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScExportTest::testExtendedLCID() void ScExportTest::testExtendedLCIDXLSX()
{ {
ScDocShellRef xDocSh = loadDoc("tdf36038_ExtendedLCID.", FORMAT_ODS); ScDocShellRef xDocSh = loadDoc("tdf36038_ExtendedLCID.", FORMAT_ODS);
CPPUNIT_ASSERT( xDocSh.Is() ); CPPUNIT_ASSERT( xDocSh.Is() );