chart2/qa/extras/chart2export.cxx | 18 ++++++------ dbaccess/qa/unit/hsqldb.cxx | 1 sc/qa/extras/scannotationobj.cxx | 4 +- sc/qa/extras/scannotationsobj.cxx | 4 +- sc/qa/extras/sccellrangeobj.cxx | 4 +- sc/qa/extras/scdatabaserangeobj.cxx | 4 +- sc/qa/extras/scdatapilotfieldobj.cxx | 4 +- sc/qa/extras/scdatapilottableobj.cxx | 4 +- sc/qa/extras/sceditfieldobj-cell.cxx | 4 +- sc/qa/extras/sceditfieldobj-header.cxx | 4 +- sc/qa/extras/scmodelobj.cxx | 4 +- sc/qa/extras/scnamedrangeobj.cxx | 4 +- sc/qa/extras/scnamedrangesobj.cxx | 4 +- sc/qa/extras/scoutlineobj.cxx | 4 +- sc/qa/extras/sctablesheetobj.cxx | 4 +- sc/qa/extras/sctablesheetsobj.cxx | 4 +- sc/qa/unit/opencl-test.cxx | 3 +- sc/qa/unit/subsequent_export-test.cxx | 2 + sc/qa/unit/subsequent_filters-test.cxx | 46 ++++++++++++++++----------------- sw/qa/core/macros-test.cxx | 3 -- 20 files changed, 64 insertions(+), 65 deletions(-)
New commits: commit c21f2497c6339f0c456e4a0dae24962bfbb5eda3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 15 16:08:06 2014 +0200 Clean up function declarations and enable some forgotten(?) tests Change-Id: I0e0d05a5b226b5c59798345f402f8a7724d2689a diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 36d6e17..00933c8 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -112,8 +112,8 @@ void ScAnnontationObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index ab8d142..49874b1 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -95,8 +95,8 @@ void ScAnnontationsObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationsObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 91292bd..59d9986 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -126,8 +126,8 @@ void ScCellRangeObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 9ed261b..6665ea9 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -85,8 +85,8 @@ void ScDatabaseRangeObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index da8957e..df28860 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -101,8 +101,8 @@ void ScDataPilotFieldObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index f5c1ebf..d210691 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -155,8 +155,8 @@ void ScDataPilotTableObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 49a2583..39ea41c 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -191,8 +191,8 @@ void ScEditFieldObj_Cell::testEditFieldProperties() CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj_Cell); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index b596b8c..47ec24c 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -145,8 +145,8 @@ uno::Reference<text::XTextRange> ScEditFieldObj_Header::getTextRange() CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj_Header); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index ef12e33..65b2ee0 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -71,8 +71,8 @@ void ScModelObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScModelObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index cb17c6c..9ceb7db 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -109,8 +109,8 @@ void ScNamedRangeObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index f1a20c8..948c3fd 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -87,8 +87,8 @@ void ScNamedRangesObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 476a2c0..51d7d28 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -86,8 +86,8 @@ void ScOutlineObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScOutlineObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index 22d2cde..89e8218 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -72,8 +72,8 @@ uno::Reference< uno::XInterface > ScTableSheetObj::init() CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index 58c505c..8db4a5d 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -109,8 +109,8 @@ void ScTableSheetsObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index ae4cbf6..9ac41a2 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -220,7 +220,7 @@ public: void testStatisticalFormulaBinomDist(); void testStatisticalFormulaVarP(); void testMathFormulaCeil(); - void testMathFormulaKombin(); + // void testMathFormulaKombin(); void testStatisticalFormulaDevSq(); void testStatisticalFormulaStDev(); void testStatisticalFormulaSlope(); @@ -496,6 +496,7 @@ public: CPPUNIT_TEST(testMathFormulaIsOdd); CPPUNIT_TEST(testMathFormulaFact); CPPUNIT_TEST(testStatisticalFormulaMaxa); + CPPUNIT_TEST(testStatisticalFormulaMina); CPPUNIT_TEST(testStatisticalFormulaCountA); CPPUNIT_TEST(testStatisticalFormulaAverageA); CPPUNIT_TEST(testStatisticalFormulaVarA); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 50151e9..2ed1eaa 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -102,6 +102,8 @@ public: CPPUNIT_TEST(testConditionalFormatExportXLSX); CPPUNIT_TEST(testColorScaleExportODS); CPPUNIT_TEST(testColorScaleExportXLSX); + CPPUNIT_TEST(testDataBarExportODS); + CPPUNIT_TEST(testDataBarExportXLSX); CPPUNIT_TEST(testMiscRowHeightExport); CPPUNIT_TEST(testNamedRangeBugfdo62729); CPPUNIT_TEST(testRichTextExportODS); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 2ad313d..437b2ac 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -100,8 +100,8 @@ public: void testDatabaseRangesXLS(); void testDatabaseRangesXLSX(); void testFormatsODS(); - void testFormatsXLS(); - void testFormatsXLSX(); + // void testFormatsXLS(); + // void testFormatsXLSX(); void testMatrixODS(); void testMatrixXLS(); void testBorderODS(); @@ -796,27 +796,27 @@ void ScFiltersTest::testFormatsODS() xDocSh->DoClose(); } -void ScFiltersTest::testFormatsXLS() -{ - ScDocShellRef xDocSh = loadDoc("formats.", XLS); - xDocSh->DoHardRecalc(true); - - ScDocument* pDoc = xDocSh->GetDocument(); - - testFormats(this, pDoc, XLS); - xDocSh->DoClose(); -} - -void ScFiltersTest::testFormatsXLSX() -{ - ScDocShellRef xDocSh = loadDoc("formats.", XLSX); - xDocSh->DoHardRecalc(true); - - ScDocument* pDoc = xDocSh->GetDocument(); - - testFormats(this, pDoc, XLSX); - xDocSh->DoClose(); -} +// void ScFiltersTest::testFormatsXLS() +// { +// ScDocShellRef xDocSh = loadDoc("formats.", XLS); +// xDocSh->DoHardRecalc(true); +// +// ScDocument* pDoc = xDocSh->GetDocument(); +// +// testFormats(this, pDoc, XLS); +// xDocSh->DoClose(); +// } + +// void ScFiltersTest::testFormatsXLSX() +// { +// ScDocShellRef xDocSh = loadDoc("formats.", XLSX); +// xDocSh->DoHardRecalc(true); +// +// ScDocument* pDoc = xDocSh->GetDocument(); +// +// testFormats(this, pDoc, XLSX); +// xDocSh->DoClose(); +// } void ScFiltersTest::testMatrixODS() { commit 0cc8a2bb7e6606a58c2c9c52c92b86e7903f8496 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 15 16:07:10 2014 +0200 Remove dead code Change-Id: I6034174b2273def43d176c3f463c1161757c8f70 diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 221f681..9e9ed6f 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -51,9 +51,6 @@ class SwMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest public: SwMacrosTest(); - SwDocShellRef load(const OUString &rFilter, const OUString &rURL, - const OUString &rUserData, const OUString& rTypeName, sal_uLong nFormatType=0); - void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp() SAL_OVERRIDE; commit b6a79b2c429d49d1b04ad6e20a5c97c2ced1be39 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 15 16:06:49 2014 +0200 Remove dead code Change-Id: I46ca823d4bfd6ccdb47ce4b4bb793ec81bcc35d9 diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx index 5ac7b45..69c822c 100644 --- a/dbaccess/qa/unit/hsqldb.cxx +++ b/dbaccess/qa/unit/hsqldb.cxx @@ -26,7 +26,6 @@ class HSQLDBTest { public: void testEmptyDBConnection(); - void testIntegerDatabase(); CPPUNIT_TEST_SUITE(HSQLDBTest); CPPUNIT_TEST(testEmptyDBConnection); commit 50b450d754def608dcacfd4408b40cd2967c674c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 15 16:06:21 2014 +0200 Fully comment out commented-out test Change-Id: I23b42998c72f190addb75a4b9e624f0c3c948f8f diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b0cda22..bc1dcd3 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -43,7 +43,7 @@ public: void testUpDownBars(); void testDoughnutChart(); void testDisplayUnits(); - void testFdo74115WallGradientFill(); + // void testFdo74115WallGradientFill(); void testFdo74115WallBitmapFill(); void testBarChartRotation(); void testShapeFollowedByChart(); @@ -574,14 +574,14 @@ void Chart2ExportTest::testDisplayUnits() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit", "val", "billions"); } -void Chart2ExportTest::testFdo74115WallGradientFill() -{ - load("/chart2/qa/extras/data/docx/", "fdo74115_WallGradientFill.docx"); - xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"); -} +// void Chart2ExportTest::testFdo74115WallGradientFill() +// { +// load("/chart2/qa/extras/data/docx/", "fdo74115_WallGradientFill.docx"); +// xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); +// CPPUNIT_ASSERT(pXmlDoc); +// +// assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"); +// } void Chart2ExportTest::testFdo74115WallBitmapFill() { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits