diff options
| -rw-r--r-- | comphelper/CppunitTest_comphelper_test.mk | 1 | ||||
| -rw-r--r-- | comphelper/qa/unit/propertyvalue.cxx | 60 | ||||
| -rw-r--r-- | include/comphelper/propertyvalue.hxx | 2 |
3 files changed, 62 insertions, 1 deletions
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index de4ee90818f2..ab2f893a0866 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \ comphelper/qa/container/testifcontainer \ comphelper/qa/unit/test_hash \ comphelper/qa/unit/base64_test \ + comphelper/qa/unit/propertyvalue \ comphelper/qa/unit/types_test \ comphelper/qa/unit/test_guards \ comphelper/qa/unit/test_traceevent \ diff --git a/comphelper/qa/unit/propertyvalue.cxx b/comphelper/qa/unit/propertyvalue.cxx new file mode 100644 index 000000000000..40f60bb0463d --- /dev/null +++ b/comphelper/qa/unit/propertyvalue.cxx @@ -0,0 +1,60 @@ +/* -*- 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 <sal/config.h> + +#include <cppunit/TestAssert.h> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> + +#include <comphelper/propertyvalue.hxx> +#include <cppu/unotype.hxx> +#include <o3tl/any.hxx> + +namespace +{ +class MakePropertyValueTest : public CppUnit::TestFixture +{ + CPPUNIT_TEST_SUITE(MakePropertyValueTest); + CPPUNIT_TEST(testLvalue); + CPPUNIT_TEST(testRvalue); + CPPUNIT_TEST(testBitField); + CPPUNIT_TEST_SUITE_END(); + + void testLvalue() + { + sal_Int32 const i = 123; + auto const v = comphelper::makePropertyValue("test", i); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), v.Value.getValueType()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(123), *o3tl::doAccess<sal_Int32>(v.Value)); + } + + void testRvalue() + { + auto const v = comphelper::makePropertyValue("test", sal_Int32(456)); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), v.Value.getValueType()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(456), *o3tl::doAccess<sal_Int32>(v.Value)); + } + + void testBitField() + { + struct + { + bool b : 1; + } s = { false }; + auto const v = comphelper::makePropertyValue("test", s.b); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<bool>::get(), v.Value.getValueType()); + CPPUNIT_ASSERT_EQUAL(false, *o3tl::doAccess<bool>(v.Value)); + } +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(MakePropertyValueTest); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/comphelper/propertyvalue.hxx b/include/comphelper/propertyvalue.hxx index 9d0d94d3256a..de71791100b1 100644 --- a/include/comphelper/propertyvalue.hxx +++ b/include/comphelper/propertyvalue.hxx @@ -33,7 +33,7 @@ css::beans::PropertyValue makePropertyValue(const OUString& rName, T&& rValue) css::beans::PropertyState_DIRECT_VALUE }; } // Allows to pass e.g. bit fields -template <typename T, std::enable_if_t<std::is_arithmetic_v<std::remove_reference_t<T>>, int> = 0> +template <typename T, std::enable_if_t<std::is_arithmetic_v<T>, int> = 0> css::beans::PropertyValue makePropertyValue(const OUString& rName, T aValue) { return makePropertyValue(rName, css::uno::toAny(aValue)); |