[Libreoffice-commits] core.git: writerfilter/qa

[Libreoffice Gerrit user]

 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 2e1a28981d727068b0ba0c11dde8ae418b53fdf9
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jan 31 10:12:22 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 31 12:21:05 2019 +0100

    CppunitTest_writerfilter_rtftok: use CPPUNIT_TEST_FIXTURE()
    
    Change-Id: I16e0c1adf854c3a2fa8d945724270d2d87461b39
    Reviewed-on: https://gerrit.libreoffice.org/67192
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 6396ffefbce4..a7f60d4bbfc0 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -30,12 +30,6 @@ public:
     virtual bool load(const OUString&, const OUString& rURL, const OUString&, SfxFilterFlags,
                       SotClipboardFormatId, unsigned int) override;
 
-    void test();
-
-    CPPUNIT_TEST_SUITE(RtfTest);
-    CPPUNIT_TEST(test);
-    CPPUNIT_TEST_SUITE_END();
-
 private:
     uno::Reference<document::XFilter> m_xFilter;
 };
@@ -72,15 +66,13 @@ bool RtfTest::load(const OUString&, const OUString& rURL, const OUString&, SfxFi
     }
 }
 
-void RtfTest::test()
+CPPUNIT_TEST_FIXTURE(RtfTest, testFilter)
 {
 #ifndef DISABLE_CVE_TESTS
     testDir(OUString(), m_directories.getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"));
 #endif
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(RtfTest);
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */