diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index dbc78e893aac..f00b16272e16 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -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 */ diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 07ba9e28205e..e5f23e8eb8b8 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -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 const pChanges(preTest(filename)); - load(filename, pPassword); - verify(); - finish(); - maTempFile.EnableKillingFile(); - } + maTempFile.EnableKillingFile(false); + header(); + std::unique_ptr 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 const pChanges(preTest(filename)); load(filename, pPassword); - if (mustTestImportOf(filename)) - { - verify(); - } + verify(); postLoad(filename); reload(mpFilter, filename, pPassword); verify();