diff options
| -rw-r--r-- | sw/qa/extras/inc/swmodeltestbase.hxx | 17 | ||||
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 53b9f07717f7..fbfb1070194e 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -149,23 +149,6 @@ using namespace css; CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \ void TestName::verify() -#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, BaseClass) \ - class TestName : public BaseClass { \ - protected: \ - virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ - public: \ - CPPUNIT_TEST_SUITE(TestName); \ - CPPUNIT_TEST(MailMerge); \ - CPPUNIT_TEST_SUITE_END(); \ - \ - void MailMerge() { \ - executeMailMergeTest(filename, datasource, tablename); \ - } \ - void verify() SAL_OVERRIDE; \ - }; \ - CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \ - void TestName::verify() - /** * Maps database URIs to the registered database names for quick lookups */ diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 33f8f43bb620..defb38789282 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -37,6 +37,23 @@ class MMTest : public SwModelTestBase MMTest() : SwModelTestBase("/sw/qa/extras/mailmerge/data/", "writer8") {} }; +#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, BaseClass) \ + class TestName : public BaseClass { \ + protected: \ + virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ + public: \ + CPPUNIT_TEST_SUITE(TestName); \ + CPPUNIT_TEST(MailMerge); \ + CPPUNIT_TEST_SUITE_END(); \ + \ + void MailMerge() { \ + executeMailMergeTest(filename, datasource, tablename); \ + } \ + void verify() SAL_OVERRIDE; \ + }; \ + CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \ + void TestName::verify() + #define DECLARE_DFLT_MAILMERGE_TEST(TestName, filename, datasource, tablename) \ DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, MMTest) |