diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-03-20 21:42:07 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-03-21 09:07:02 +0100 |
commit | ba83043d679b11740323708e0c9da8b1e4cae488 (patch) | |
tree | ff96243de5dfc110754da8d20ac8096fa294c1ee /svx/qa/unit/unodraw.cxx | |
parent | 5bcad163b67e1d83ab44ac31ae29d3f5c4bb3eb9 (diff) |
CppunitTest_svx_unit: use CPPUNIT_TEST_FIXTURE()
Change-Id: Ib2eac7368ebb06702f05101641e8830ea1fff6d5
Reviewed-on: https://gerrit.libreoffice.org/69483
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/qa/unit/unodraw.cxx')
-rw-r--r-- | svx/qa/unit/unodraw.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx index 263d3f8c3825..f3d28bda4bac 100644 --- a/svx/qa/unit/unodraw.cxx +++ b/svx/qa/unit/unodraw.cxx @@ -29,18 +29,13 @@ char const DATA_DIRECTORY[] = "/svx/qa/unit/data/"; /// Tests for svx/source/unodraw/ code. class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest { +protected: uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: - void testWriterGraphicExport(); - void setUp() override; void tearDown() override; - - CPPUNIT_TEST_SUITE(UnodrawTest); - CPPUNIT_TEST(testWriterGraphicExport); - CPPUNIT_TEST_SUITE_END(); }; void UnodrawTest::setUp() @@ -59,7 +54,7 @@ void UnodrawTest::tearDown() test::BootstrapFixture::tearDown(); } -void UnodrawTest::testWriterGraphicExport() +CPPUNIT_TEST_FIXTURE(UnodrawTest, testWriterGraphicExport) { // Load a document with a Writer picture in it. OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "unodraw-writer-image.odt"; @@ -82,8 +77,6 @@ void UnodrawTest::testWriterGraphicExport() { "MediaType", uno::Any(OUString("image/jpeg")) } })); CPPUNIT_ASSERT(xExportFilter->filter(aProperties)); } - -CPPUNIT_TEST_SUITE_REGISTRATION(UnodrawTest); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |