mustTestImportOf is dead
since
commit a5e416712e
CppunitTest_sw_ww8export4: remove not needed mustTestImportOf()
Change-Id: I00721babc7cd1a66a5220e33567ad46b62acc681
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142943
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
parent
e684762425
commit
952b876d51
2 changed files with 8 additions and 22 deletions
|
@ -146,13 +146,6 @@ protected:
|
|||
CPPUNIT_FAIL( "verify method must be overridden" );
|
||||
}
|
||||
|
||||
/**
|
||||
* Override this function if interested in skipping import test for this file
|
||||
*/
|
||||
virtual bool mustTestImportOf(const char* /* filename */) const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* Override this function if some special filename-specific setup is needed
|
||||
*/
|
||||
|
|
|
@ -64,17 +64,13 @@ SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath, const char*
|
|||
|
||||
void SwModelTestBase::executeImportTest(const char* filename, const char* pPassword)
|
||||
{
|
||||
// If the testcase is stored in some other format, it's pointless to test.
|
||||
if (mustTestImportOf(filename))
|
||||
{
|
||||
maTempFile.EnableKillingFile(false);
|
||||
header();
|
||||
std::unique_ptr<Resetter> const pChanges(preTest(filename));
|
||||
load(filename, pPassword);
|
||||
verify();
|
||||
finish();
|
||||
maTempFile.EnableKillingFile();
|
||||
}
|
||||
maTempFile.EnableKillingFile(false);
|
||||
header();
|
||||
std::unique_ptr<Resetter> const pChanges(preTest(filename));
|
||||
load(filename, pPassword);
|
||||
verify();
|
||||
finish();
|
||||
maTempFile.EnableKillingFile();
|
||||
}
|
||||
|
||||
void SwModelTestBase::executeLoadVerifyReloadVerify(const char* filename, const char* pPassword)
|
||||
|
@ -83,10 +79,7 @@ void SwModelTestBase::executeLoadVerifyReloadVerify(const char* filename, const
|
|||
header();
|
||||
std::unique_ptr<Resetter> const pChanges(preTest(filename));
|
||||
load(filename, pPassword);
|
||||
if (mustTestImportOf(filename))
|
||||
{
|
||||
verify();
|
||||
}
|
||||
verify();
|
||||
postLoad(filename);
|
||||
reload(mpFilter, filename, pPassword);
|
||||
verify();
|
||||
|
|
Loading…
Reference in a new issue