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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 17 12:25:38 UTC 2019


 tools/qa/cppunit/test_config.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d5f1b512406fa3025c91738fc3ee6bcc3a209111
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 17 13:00:34 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 17 14:24:43 2019 +0200

    Use CPPUNIT_ASSERT in test code
    
    Change-Id: I0ac21995315e136ae0035aeaf0f6a6d1e5f5811a
    Reviewed-on: https://gerrit.libreoffice.org/79055
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/tools/qa/cppunit/test_config.cxx b/tools/qa/cppunit/test_config.cxx
index bf61b887b701..c24a30848ec4 100644
--- a/tools/qa/cppunit/test_config.cxx
+++ b/tools/qa/cppunit/test_config.cxx
@@ -27,10 +27,9 @@ public:
         maOriginalConfigFile = m_directories.getURLFromSrc("/tools/qa/data/");
         maOriginalConfigFile += "testconfig.ini";
 
-        if (osl::FileBase::getTempDirURL(maConfigFile) == osl::File::RC::E_None)
-            maConfigFile += "/config.ini";
-        else
-            assert(false && "cannot create temp folder");
+        auto const e = osl::FileBase::getTempDirURL(maConfigFile);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("cannot create temp folder", osl::File::RC::E_None, e);
+        maConfigFile += "/config.ini";
 
         osl::File::copy(maOriginalConfigFile, maConfigFile);
     }


More information about the Libreoffice-commits mailing list