diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-11-24 15:47:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-25 15:54:38 +0100 |
commit | 3511baaf9440fedbf2d0c39dfe890123f459ae97 (patch) | |
tree | 9d7bedc58d6542cf6eb5528fd225c2fd24609ee0 /cppuhelper | |
parent | b03f7cdc04f9df778e2da93eadfe1d44f7665caf (diff) |
add cppu::throwException test case
that is definitely run by the ubsan tinderbox to flush out
cppuhelper/source/exc_thrower.cxx:201:15: runtime error: member call on address
"foo" which does not point to an object of type 'cppuhelper::detail::XExceptionThrower'
Change-Id: Ia798cc6695011480717c1a80d0ab7830080b5de1
Reviewed-on: https://gerrit.libreoffice.org/45244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/CppunitTest_cppuhelper_qa_misc.mk | 28 | ||||
-rw-r--r-- | cppuhelper/Module_cppuhelper.mk | 1 | ||||
-rw-r--r-- | cppuhelper/qa/misc/test_misc.cxx | 59 |
3 files changed, 88 insertions, 0 deletions
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_misc.mk b/cppuhelper/CppunitTest_cppuhelper_qa_misc.mk new file mode 100644 index 000000000000..980f40e9571c --- /dev/null +++ b/cppuhelper/CppunitTest_cppuhelper_qa_misc.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_qa_misc)) + +$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_misc,\ + cppuhelper/qa/misc/test_misc \ +)) + +$(eval $(call gb_CppunitTest_use_api,cppuhelper_qa_misc,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_misc,\ + cppu \ + cppuhelper \ + sal \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 7978aaba96a7..296b85daf3f9 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_check_targets,cppuhelper,\ # CppunitTest_cppuhelper_qa_weak depends on module bridges $(eval $(call gb_Module_add_subsequentcheck_targets,cppuhelper,\ + CppunitTest_cppuhelper_qa_misc \ CppunitTest_cppuhelper_qa_weak \ )) diff --git a/cppuhelper/qa/misc/test_misc.cxx b/cppuhelper/qa/misc/test_misc.cxx new file mode 100644 index 000000000000..151eb15ea1f6 --- /dev/null +++ b/cppuhelper/qa/misc/test_misc.cxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> + +#include <cppuhelper/exc_hlp.hxx> + +namespace +{ +class Test : public ::CppUnit::TestFixture +{ +public: + void testCatchThrow(); + + CPPUNIT_TEST_SUITE(Test); + CPPUNIT_TEST(testCatchThrow); + CPPUNIT_TEST_SUITE_END(); +}; + +void Test::testCatchThrow() +{ + css::uno::Any aSavedException; + try + { + throw css::uno::RuntimeException("RuntimeException"); + } + catch (const css::uno::RuntimeException&) + { + aSavedException = cppu::getCaughtException(); + } + CPPUNIT_ASSERT(aSavedException.hasValue()); + try + { + cppu::throwException(aSavedException); + } + catch (const css::uno::RuntimeException&) + { + // the expected case + } + catch (...) + { + CPPUNIT_ASSERT(false); + } +} + +CPPUNIT_TEST_SUITE_REGISTRATION(Test); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |