Kaydet (Commit) 428f1a27 authored tarafından Miklos Vajna's avatar Miklos Vajna

CppunitTest_sw_mailmerge: move executeMailMergeTest() from header file

Change-Id: Ia1cfe9f65fe7c7be0c93ad03a6c34c57ffa4b45e
üst 0e6e2fda
...@@ -295,35 +295,6 @@ protected: ...@@ -295,35 +295,6 @@ protected:
maTempFile.EnableKillingFile(); maTempFile.EnableKillingFile();
} }
/**
* Helper func used by each unit test to test the 'mail merge' code.
*
* Registers the data source, loads the original file as reference,
* initializes the mail merge job and its default argument sequence.
*
* The 'verify' method actually has to execute the mail merge by
* calling executeMailMerge() after modifying the job arguments.
*/
void executeMailMergeTest(const char* filename, const char* datasource, const char* tablename = 0)
{
header();
preTest(filename);
load(mpTestDocumentPath, filename);
const OUString aPrefix( "LOMM_" );
utl::TempFile aTempDir(nullptr, true);
const OUString aWorkDir = aTempDir.GetURL();
const OUString aURI( getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(datasource) );
OUString aDBName = registerDBsource( aURI, aPrefix, aWorkDir );
initMailMergeJobAndArgs( filename, tablename, aDBName, aPrefix, aWorkDir );
postTest(filename);
verify();
finish();
::utl::removeTree(aWorkDir);
}
/** /**
* Function overloaded by unit test. See DECLARE_SW_*_TEST macros * Function overloaded by unit test. See DECLARE_SW_*_TEST macros
*/ */
......
...@@ -35,6 +35,35 @@ class MMTest : public SwModelTestBase ...@@ -35,6 +35,35 @@ class MMTest : public SwModelTestBase
{ {
public: public:
MMTest() : SwModelTestBase("/sw/qa/extras/mailmerge/data/", "writer8") {} MMTest() : SwModelTestBase("/sw/qa/extras/mailmerge/data/", "writer8") {}
/**
* Helper func used by each unit test to test the 'mail merge' code.
*
* Registers the data source, loads the original file as reference,
* initializes the mail merge job and its default argument sequence.
*
* The 'verify' method actually has to execute the mail merge by
* calling executeMailMerge() after modifying the job arguments.
*/
void executeMailMergeTest(const char* filename, const char* datasource, const char* tablename = 0)
{
header();
preTest(filename);
load(mpTestDocumentPath, filename);
const OUString aPrefix( "LOMM_" );
utl::TempFile aTempDir(nullptr, true);
const OUString aWorkDir = aTempDir.GetURL();
const OUString aURI( getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(datasource) );
OUString aDBName = registerDBsource( aURI, aPrefix, aWorkDir );
initMailMergeJobAndArgs( filename, tablename, aDBName, aPrefix, aWorkDir );
postTest(filename);
verify();
finish();
::utl::removeTree(aWorkDir);
}
}; };
#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, BaseClass) \ #define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, BaseClass) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment