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

[Miklos Vajna]

 sw/qa/extras/inc/swmodeltestbase.hxx |   17 -----------------
 sw/qa/extras/mailmerge/mailmerge.cxx |   17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 1ab6bfc952eaa0b5d15d49b2fe2495440be9caac
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Nov 4 16:54:19 2014 +0100

    CppunitTest_sw_mailmerge: move DECLARE_MAILMERGE_TEST from header file
    
    Change-Id: Ie9767aaf0f78db14ac2bbf844e824f8d39191fd1

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 53b9f07..fbfb107 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 33f8f43..defb387 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)