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

[Noel Grandin (via logerrit)]

 sw/qa/inc/swmodeltestbase.hxx  |    7 -------
 sw/qa/unit/swmodeltestbase.cxx |   23 ++++++++---------------
 2 files changed, 8 insertions(+), 22 deletions(-)

New commits:
commit 952b876d5190781e2051bbb6ffcd835d108daf87
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 18 15:31:48 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 18 18:42:11 2022 +0100

    mustTestImportOf is dead
    
    since
        commit a5e416712e9477c496ce5fd4d935133083330ddf
        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.gran...@collabora.co.uk>

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<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();