From b38f58a3f959b5e36813f8c2d88bdb2baf03a1b9 Mon Sep 17 00:00:00 2001 From: Chirag Manwani Date: Mon, 7 Mar 2016 20:09:01 +0530 Subject: tdf#97703 Removed empty setUp/tearDown methods Change-Id: Ia62de30ae94bdae87cd5109c44eab40af4d020e5 Reviewed-on: https://gerrit.libreoffice.org/22985 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- basegfx/test/basegfx2d.cxx | 8 ------- basegfx/test/boxclipper.cxx | 4 ---- basegfx/test/clipstate.cxx | 3 --- configmgr/qa/unit/test.cxx | 5 ----- filter/source/svg/test/parsertest.cxx | 6 ----- sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 8 ------- sal/qa/osl/file/osl_File.cxx | 4 ---- sal/qa/rtl/locale/rtl_locale.cxx | 24 -------------------- sal/qa/rtl/process/rtl_Process.cxx | 17 -------------- sal/qa/rtl/random/rtl_random.cxx | 36 ------------------------------ sal/qa/rtl/textenc/rtl_tencinfo.cxx | 21 ----------------- sal/qa/rtl/uuid/rtl_Uuid.cxx | 18 --------------- sax/qa/cppunit/test_converter.cxx | 10 --------- sfx2/qa/cppunit/test_controlleritem.cxx | 3 --- sfx2/qa/cppunit/test_metadatable.cxx | 12 ---------- shell/qa/zip/ziptest.cxx | 2 -- writerfilter/qa/cppunittests/misc/misc.cxx | 11 --------- 17 files changed, 192 deletions(-) diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index cfcc4e7e4e67..e215dcca0c5b 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -132,10 +132,6 @@ public: "31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z"; } - void tearDown() override - { - } - void impex() { B2DPolyPolygon aPoly; @@ -369,10 +365,6 @@ public: maPerspective.set(2,2, 9.0); } - void tearDown() override - { - } - void equal() { B2DHomMatrix aIdentity; diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 0847a39333b1..9ca522f4358e 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -169,10 +169,6 @@ public: #endif } - void tearDown() override - { - } - B2DPolyPolygon normalizePoly( const B2DPolyPolygon& rPoly ) { B2DPolyPolygon aRes; diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index 1414a86aac25..d1c44b5f83f6 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -86,9 +86,6 @@ public: aSubtract.subtractRange(aEast); } - void tearDown() override - {} - void verifyPoly(const char* sName, const char* sSvg, const tools::B2DClipState& toTest) { #if OSL_DEBUG_LEVEL > 2 diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index ea835c1f200b..d22adad5e5f9 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -66,7 +66,6 @@ namespace { class Test: public CppUnit::TestFixture { public: virtual void setUp() override; - virtual void tearDown() override; void testKeyFetch(); void testKeySet(); @@ -212,10 +211,6 @@ void Test::setUp() comphelper::getProcessComponentContext() ); } -void Test::tearDown() -{ -} - void Test::testKeyFetch() { OUString s; diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 988cc46aa5fc..0e9c7f557fa4 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -20,12 +20,6 @@ using namespace svgi; class TestParser : public CppUnit::TestFixture { public: - void setUp() - {} - - void tearDown() - {} - void testParseColor() { ARGBColor aTmp; diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 809665f74665..1571739f897c 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -323,14 +323,6 @@ namespace rtl_OStringBuffer class remove : public CppUnit::TestFixture { public: - void setUp() override - { - } - - void tearDown() override - { - } - void remove_001() { ::rtl::OStringBuffer sb( diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 7a3913c5d545..2890c5f1c152 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1086,10 +1086,6 @@ namespace osl_FileBase nError = FileBase::getTempDirURL( aUStr ); } - void tearDown() override - { - } - // test code. void getTempDirURL_001() { diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index fc99838ee573..0f7f2b24848c 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -44,10 +44,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - void getDefault_001() { rtl_Locale* pData = rtl_locale_getDefault(); @@ -107,10 +103,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - // insert your test code here. void getLanguage_001() { @@ -145,10 +137,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - // insert your test code here. void getCountry_001() { @@ -183,10 +171,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - // insert your test code here. void getVariant_001() { @@ -221,10 +205,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - // insert your test code here. void hashCode_001() { @@ -259,10 +239,6 @@ public: rtl_locale::setDefaultLocale(); } - void tearDown() override - { - } - // insert your test code here. void equals_001() { diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index e77f661db7f0..c7a70ce13cba 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -71,15 +71,6 @@ namespace rtl_Process class getAppCommandArg : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - void getAppCommandArg_001() { #if defined(_WIN32) @@ -196,14 +187,6 @@ void printUuidtoBuffer( sal_uInt8 *pNode, sal_Char * pBuffer ) class getGlobalProcessId : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } //gets a 16-byte fixed size identifier which is guaranteed not to change during the current process. void getGlobalProcessId_001() { diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index c91bb54ee9f6..2adafa5dca86 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -36,15 +36,6 @@ namespace rtl_random class createPool : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - // insert your test code here. // this is only demonstration code void createPool_001() @@ -71,15 +62,6 @@ public: class destroyPool : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - // insert your test code here. void destroyPool_000() { @@ -109,15 +91,6 @@ public: class addBytes : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - // insert your test code here. // this is only demonstration code void addBytes_000() @@ -242,15 +215,6 @@ public: class getBytes : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - // insert your test code here. void getBytes_000() { diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index 2a3e43bdde28..b0f2dbda0fbf 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -33,10 +33,6 @@ namespace class testBestMime : public CppUnit::TestFixture { public: - void setUp() override - { - } - void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut) { const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding(eIn); @@ -485,10 +481,6 @@ namespace class testBestUnix : public CppUnit::TestFixture { public: - void setUp() override - { - } - void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut) { const sal_Char *pCharSet = rtl_getBestUnixCharsetFromTextEncoding(eIn); @@ -1017,10 +1009,6 @@ namespace class testBestWindows : public CppUnit::TestFixture { public: - void setUp() override - { - } - void check(rtl_TextEncoding nIn, rtl_TextEncoding nOut) { const sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding(nIn); @@ -1580,15 +1568,6 @@ namespace class testTextEncodingInfo: public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - // not implemented encoding test void testTextEncodingInfo_001() { diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 3f661e453e41..7f1412357229 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -44,15 +44,6 @@ namespace rtl_Uuid class createUuid : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - #define TEST_UUID 20 void createUuid_001() { @@ -115,15 +106,6 @@ public: class createNamedUuid : public CppUnit::TestFixture { public: - // initialise your test code values here. - void setUp() override - { - } - - void tearDown() override - { - } - void createNamedUuid_001() { sal_uInt8 NameSpace_DNS[16] = RTL_UUID_NAMESPACE_DNS; diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index ecaa92e9c9b1..d8fe313eb047 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -48,8 +48,6 @@ class ConverterTest : public ::CppUnit::TestFixture { public: - virtual void setUp() override; - virtual void tearDown() override; void testDuration(); void testDateTime(); @@ -78,14 +76,6 @@ public: private: }; -void ConverterTest::setUp() -{ -} - -void ConverterTest::tearDown() -{ -} - static void doTest(util::Duration const & rid, char const*const pis, char const*const i_pos = nullptr) { diff --git a/sfx2/qa/cppunit/test_controlleritem.cxx b/sfx2/qa/cppunit/test_controlleritem.cxx index 095a71bf5014..e7efb98b37ac 100644 --- a/sfx2/qa/cppunit/test_controlleritem.cxx +++ b/sfx2/qa/cppunit/test_controlleritem.cxx @@ -22,9 +22,6 @@ class ControllerItemTest : public ::CppUnit::TestFixture { public: - virtual void setUp() override {} - virtual void tearDown() override {} - void test(); CPPUNIT_TEST_SUITE(ControllerItemTest); diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 593e4fb98776..91d3872de2b7 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -44,9 +44,6 @@ class MetadatableTest : public ::CppUnit::TestFixture { public: - virtual void setUp() override; - virtual void tearDown() override; - void test(); CPPUNIT_TEST_SUITE(MetadatableTest); @@ -56,15 +53,6 @@ public: private: }; -void MetadatableTest::setUp() -{ -} - -void MetadatableTest::tearDown() -{ -} - - class MockMetadatable : public ::sfx2::Metadatable { diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx index df501a6c107d..5898a0183607 100644 --- a/shell/qa/zip/ziptest.cxx +++ b/shell/qa/zip/ziptest.cxx @@ -43,8 +43,6 @@ private: LPSTREAM pStream; public: Test(); - void setUp() {} - void tearDown() {} void test_file_directory(); void test_file_hasContentCaseInSensitive(); void test_file_getContent(); diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx index 0d788ba1f24c..1bf158158f1a 100644 --- a/writerfilter/qa/cppunittests/misc/misc.cxx +++ b/writerfilter/qa/cppunittests/misc/misc.cxx @@ -28,9 +28,6 @@ class WriterfilterMiscTest : public ::CppUnit::TestFixture { public: - virtual void setUp() override; - virtual void tearDown() override; - void testTwipConversions(); void testFieldParameters(); @@ -40,14 +37,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void WriterfilterMiscTest::setUp() -{ -} - -void WriterfilterMiscTest::tearDown() -{ -} - void WriterfilterMiscTest::testTwipConversions() { using writerfilter::dmapper::ConversionHelper::convertTwipToMM100; -- cgit