sc/qa/unit/SparklineImportExportTest.cxx | 6 ------
sc/qa/unit/SparklineTest.cxx | 6 ------
sc/qa/unit/bugfix-test.cxx | 11 -----------
sc/qa/unit/chart2dataprovider.cxx | 7 -------
sc/qa/unit/copy_paste_test.cxx | 7 -------
sc/qa/unit/dataproviders_test.cxx | 7 -------
sc/qa/unit/filters-test.cxx | 5 ++---
sc/qa/unit/helper/qahelper.cxx | 6 ++++++
sc/qa/unit/helper/qahelper.hxx | 2 ++
sc/qa/unit/jumbosheets-test.cxx | 5 ++---
sc/qa/unit/opencl-test.cxx | 4 +---
sc/qa/unit/pivottable_filters_test.cxx | 7 -------
sc/qa/unit/subsequent_export_test.cxx | 7 -------
sc/qa/unit/subsequent_export_test2.cxx | 7 -------
sc/qa/unit/subsequent_filters_test.cxx | 7 -------
sc/qa/unit/subsequent_filters_test2.cxx | 7 -------
16 files changed, 13 insertions(+), 88 deletions(-)
New commits:
commit 27de384c31d3225e02857db1b5e0215a5c1f3467
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Oct 17 16:35:57 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 17 20:02:48 2022 +0200
ScBootstrapFixture: factor out tearDown
Change-Id: I3dbced70b7341807451d66d8e70ed61edb44592b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141464
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
index b87eecd5eb03..83c429d07ddd 100644
--- a/sc/qa/unit/SparklineImportExportTest.cxx
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -37,12 +37,6 @@ public:
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
- virtual void tearDown() override
- {
- uno::Reference<lang::XComponent>(m_xCalcComponent,
uno::UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
- }
-
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathContextPtr)
override
{
XmlTestTools::registerOOXMLNamespaces(pXmlXPathContextPtr);
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/SparklineTest.cxx
index b70bb6a22e3f..a45d34eb7a8d 100644
--- a/sc/qa/unit/SparklineTest.cxx
+++ b/sc/qa/unit/SparklineTest.cxx
@@ -40,12 +40,6 @@ public:
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
- virtual void tearDown() override
- {
- uno::Reference<lang::XComponent>(m_xCalcComponent,
uno::UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
- }
-
void testAddSparkline();
void testClearContentSprkline();
void testCopyPasteSparkline();
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index a1dc7b27c46a..e6bf6264f225 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -40,7 +40,6 @@ public:
ScFiltersTest();
virtual void setUp() override;
- virtual void tearDown() override;
void testTdf137576_Measureline();
void testTdf137216_HideCol();
@@ -761,16 +760,6 @@ void ScFiltersTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScFiltersTest::tearDown()
-{
- uno::Reference< lang::XComponent > xComp(m_xCalcComponent, uno::UNO_QUERY);
- if (xComp)
- xComp->dispose();
- m_xCalcComponent.clear();
-
- test::BootstrapFixture::tearDown();
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/chart2dataprovider.cxx
b/sc/qa/unit/chart2dataprovider.cxx
index 8bf955d41252..c7ba774c36fa 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -29,7 +29,6 @@ public:
ScChart2DataProviderTest();
virtual void setUp() override;
- virtual void tearDown() override;
void testHeaderExpansion();
@@ -104,12 +103,6 @@ void ScChart2DataProviderTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScChart2DataProviderTest::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScChart2DataProviderTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 91d54cdd06f9..93db3020fdfa 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -38,7 +38,6 @@ public:
ScCopyPasteTest();
virtual void setUp() override;
- virtual void tearDown() override;
void testCopyPasteXLS();
void testTdf84411();
@@ -841,12 +840,6 @@ void ScCopyPasteTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScCopyPasteTest::tearDown()
-{
- uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW
)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScCopyPasteTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/dataproviders_test.cxx
b/sc/qa/unit/dataproviders_test.cxx
index 5f3aa7ddc51f..19947bea5923 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -28,7 +28,6 @@ public:
ScDataProvidersTest();
virtual void setUp() override;
- virtual void tearDown() override;
void testCSVImport();
void testDataLargerThanDB();
@@ -253,12 +252,6 @@ void ScDataProvidersTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScDataProvidersTest::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScDataProvidersTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 13f8662c50c2..1e4e904f79b3 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -918,9 +918,6 @@ void ScFiltersTest::setUp()
void ScFiltersTest::tearDown()
{
- uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW
)->dispose();
- test::BootstrapFixture::tearDown();
-
// one test sets this configuration option; make sure we return it back
ScInputOptions aInputOption = SC_MOD()->GetInputOptions();
if (mbUpdateReferenceOnSort != aInputOption.GetSortRefUpdate())
@@ -928,6 +925,8 @@ void ScFiltersTest::tearDown()
aInputOption.SetSortRefUpdate(mbUpdateReferenceOnSort);
SC_MOD()->SetInputOptions(aInputOption);
}
+
+ ScBootstrapFixture::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest);
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 7c1266312ac4..578e143a2f73 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -911,6 +911,12 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam
const * aTestValues, unsi
}
}
+void ScBootstrapFixture::tearDown()
+{
+ uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW
)->dispose();
+ test::BootstrapFixture::tearDown();
+}
+
std::string to_std_string(const OUString& rStr)
{
return std::string(rStr.toUtf8().getStr());
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index cf1257301d12..bc99a59953a3 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -230,6 +230,8 @@ public:
std::shared_ptr<utl::TempFileNamed> exportTo(ScDocShell& rShell, sal_Int32
nFormat, bool bValidate = true);
void miscRowHeightsTest( TestParam const * aTestValues, unsigned int
numElems );
+
+ virtual void tearDown() override;
};
#define ASSERT_DOUBLES_EQUAL( expected, result ) \
diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx
index be39878118c6..216adc6d99c0 100644
--- a/sc/qa/unit/jumbosheets-test.cxx
+++ b/sc/qa/unit/jumbosheets-test.cxx
@@ -400,12 +400,11 @@ void ScJumboSheetsTest::setUp()
void ScJumboSheetsTest::tearDown()
{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-
ScDefaultsOptions aDefaultsOption = SC_MOD()->GetDefaultsOptions();
aDefaultsOption.SetInitJumboSheets(false);
SC_MOD()->SetDefaultsOptions(aDefaultsOption);
+
+ ScBootstrapFixture::tearDown();
}
void ScJumboSheetsTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 81ed7bb57f18..beac92b2ddd5 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -4737,9 +4737,7 @@ void ScOpenCLTest::tearDown()
xDocShRes.clear();
}
- uno::Reference< lang::XComponent >
- ( m_xCalcComponent, UNO_QUERY_THROW )->dispose();
- test::BootstrapFixture::tearDown();
+ ScBootstrapFixture::tearDown();
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScOpenCLTest);
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index 3136966f2d34..49aac0d12311 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -45,7 +45,6 @@ public:
ScPivotTableFiltersTest();
virtual void setUp() override;
- virtual void tearDown() override;
// Import
void testPivotTableBasicODS();
@@ -174,12 +173,6 @@ void ScPivotTableFiltersTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScPivotTableFiltersTest::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
void ScPivotTableFiltersTest::registerNamespaces(xmlXPathContextPtr&
pXmlXPathCtx)
{
XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
diff --git a/sc/qa/unit/subsequent_export_test.cxx
b/sc/qa/unit/subsequent_export_test.cxx
index c78d94d925f4..37013c019208 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -67,7 +67,6 @@ public:
ScExportTest();
virtual void setUp() override;
- virtual void tearDown() override;
void test();
void testDefaultFontHeight();
@@ -3793,12 +3792,6 @@ void ScExportTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScExportTest::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
void ScExportTest::testSupBookVirtualPathXLS()
{
ScDocShellRef xShell = loadDoc(u"external-ref.", FORMAT_XLS);
diff --git a/sc/qa/unit/subsequent_export_test2.cxx
b/sc/qa/unit/subsequent_export_test2.cxx
index ebc915a0aa96..c7ea867ad32e 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -66,7 +66,6 @@ public:
ScExportTest2();
virtual void setUp() override;
- virtual void tearDown() override;
void testMatrixMultiplicationXLSX();
void testTdf121260();
@@ -338,12 +337,6 @@ void ScExportTest2::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScExportTest2::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
void ScExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
{
XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
diff --git a/sc/qa/unit/subsequent_filters_test.cxx
b/sc/qa/unit/subsequent_filters_test.cxx
index 96f1229e3268..3897b1077cf2 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -71,7 +71,6 @@ public:
ScFiltersTest();
virtual void setUp() override;
- virtual void tearDown() override;
//ods, xls, xlsx filter tests
void testCondFormatOperatorsSameRangeXLSX();
@@ -3097,12 +3096,6 @@ void ScFiltersTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScFiltersTest::tearDown()
-{
- uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW
)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx
b/sc/qa/unit/subsequent_filters_test2.cxx
index c11946da4a98..5ff13d891d43 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -70,7 +70,6 @@ public:
ScFiltersTest2();
virtual void setUp() override;
- virtual void tearDown() override;
void testMiscRowHeights();
void testOptimalHeightReset();
@@ -324,12 +323,6 @@ void ScFiltersTest2::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScFiltersTest2::tearDown()
-{
- uno::Reference<lang::XComponent>(m_xCalcComponent,
UNO_QUERY_THROW)->dispose();
- test::BootstrapFixture::tearDown();
-}
-
void ScFiltersTest2::testMiscRowHeights()
{
// FIXME: the DPI check should be removed when either (1) the test is
fixed to work with
