strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

These tests can just derive from plain CppUnit::TestFixture

Browse source 
...and then no longer need to override any base class setUp/tearDown

Change-Id: Iaea19dfb341325bb45062d0ac0b5fa1eed0d34e0
This commit is contained in:
Stephan Bergmann 2016-03-10 11:06:29 +01:00
parent 68d200f490
commit 3d82b08bce
3 changed files with 7 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
oox/qa/unit/vba_compression.cxx
View file

@ -7,17 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <unotest/bootstrapfixturebase.hxx>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h>
#include <oox/ole/vbaexport.hxx>
#include <tools/stream.hxx>
#include <unotest/directories.hxx>
#include <algorithm>
class TestVbaCompression : public test::BootstrapFixtureBase
class TestVbaCompression : public CppUnit::TestFixture
{
public:
@ -42,10 +41,6 @@ public:
// section 3.2.3
void testSpec323();
// avoid the BootstrapFixtureBase::setUp and tearDown
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(TestVbaCompression);
CPPUNIT_TEST(testSimple1);
CPPUNIT_TEST(testSimple2);
@ -57,6 +52,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
test::Directories m_directories;
};
namespace {
@ -237,14 +233,6 @@ void TestVbaCompression::testSpec323()
}
}
void TestVbaCompression::setUp()
{
}
void TestVbaCompression::tearDown()
{
}
CPPUNIT_TEST_SUITE_REGISTRATION(TestVbaCompression);
CPPUNIT_PLUGIN_IMPLEMENT();

17
oox/qa/unit/vba_encryption.cxx
View file

@ -7,8 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <unotest/bootstrapfixturebase.hxx>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h>
@ -16,7 +14,7 @@
#include <oox/ole/vbaexport.hxx>
#include <algorithm>
class TestVbaEncryption : public test::BootstrapFixtureBase
class TestVbaEncryption : public CppUnit::TestFixture
{
public:
@ -29,17 +27,11 @@ public:
void testProjKey1();
// avoid the BootstrapFixtureBase::setUp and tearDown
virtual void setUp() override;
virtual void tearDown() override;
CPPUNIT_TEST_SUITE(TestVbaEncryption);
// CPPUNIT_TEST(testSimple1);
// CPPUNIT_TEST(testSimple2);
CPPUNIT_TEST(testProjKey1);
CPPUNIT_TEST_SUITE_END();
private:
};
#if 0
@ -86,13 +78,6 @@ void TestVbaEncryption::testProjKey1()
CPPUNIT_ASSERT_EQUAL((int)0xdf, (int)nProjKey);
}
void TestVbaEncryption::setUp()
{
}
void TestVbaEncryption::tearDown()
{
}
CPPUNIT_TEST_SUITE_REGISTRATION(TestVbaEncryption);
CPPUNIT_PLUGIN_IMPLEMENT();

21
ucb/qa/cppunit/webdav/webdav_local_neon.cxx
View file

@ -7,7 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <test/bootstrapfixture.hxx>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include "NeonUri.hxx"
@ -15,17 +16,10 @@
namespace
{
class webdav_local_test: public test::BootstrapFixture
class webdav_local_test: public CppUnit::TestFixture
{
public:
webdav_local_test() : BootstrapFixture( true, true ) {}
// initialise your test code values here.
void setUp( ) override;
void tearDown( ) override;
void NeonUriTest();
// Change the following lines only, if you add, remove or rename
@ -37,15 +31,6 @@ namespace
CPPUNIT_TEST_SUITE_END();
}; // class webdav_local_test
// initialise your test code values here.
void webdav_local_test::setUp()
{
}
void webdav_local_test::tearDown()
{
}
void webdav_local_test::NeonUriTest()
{
//try URL decomposition