diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2017-12-20 13:09:40 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-22 16:43:04 +0100 |
| commit | 26be5f21cebfe9acad088a1086f97eebdb437b7c (patch) | |
| tree | 2333ea6b01c8a2cd749e5392ad033f2a28157ea5 /sal | |
| parent | 1b73ed91e1cce20b3b552a36d449fb96cc57bf4f (diff) | |
unotools: don't go belly-up if temp dir is wrong or empty
When a wrong temp directory was set (e.g. wrong path in xcu ist set),
you get a assert in the LO-Debug Version, this patch avoid this assertion.
Change-Id: I192f682860ad9cddf907e4b239eff36b4bd6072d
Reviewed-on: https://gerrit.libreoffice.org/46846
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/CppunitTest_sal_osl.mk | 1 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk index d96ab2d41483..787dbf96174f 100644 --- a/sal/CppunitTest_sal_osl.mk +++ b/sal/CppunitTest_sal_osl.mk @@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\ sal \ + utl \ )) # the test uses the library created by Module_DLL diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index f093d5fe1bb8..fbbefbb03884 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -32,6 +32,9 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include <unotools/tempfile.hxx> + + namespace osl_test_file { @@ -137,8 +140,30 @@ void oldtestfile::test_file_004() #endif } +class TempFileTest : public CppUnit::TestFixture +{ + +public: + TempFileTest() {} + + void SetTempNameBaseDirectory() + { // only testing: of not found the directory + OUString path = utl::TempFile::SetTempNameBaseDirectory("file:///not/found/dir"); + + CPPUNIT_ASSERT_MESSAGE("SetTempNameBaseDirectory must give a empty string back", + path.isEmpty()); + } + + + CPPUNIT_TEST_SUITE(TempFileTest); + CPPUNIT_TEST(SetTempNameBaseDirectory); + CPPUNIT_TEST_SUITE_END(); +}; + + } // namespace osl_test_file CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile); +CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::TempFileTest); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |