summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-10-19 11:12:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-19 15:12:35 +0200
commit5e8479a38f0c342979520018f79a6f79d40e99e3 (patch)
tree0f28489dff0a8c2a41b1fe23cd2f1a4c7c1d6d98 /comphelper
parentbc2fca254f8a9d7ca5eb156b7e3c19756a257e3b (diff)
Remove a std::remove_reference_t
...which is unnecessary (short of dubious explicit invocations like `makePropertyValue<int const &>(i)`) as T can never be deduced to be a reference type there. And add some test code (that also tests the bit-field scenario mentioned in the commit message of 23cded985ba0131f85ee445492c04871fbfb6351 "Specialize comphelper::makePropertyValue for arithmetic types"). Change-Id: If41ce20ab643041dd9721d05373eeb32fd099ead Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123805 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/CppunitTest_comphelper_test.mk1
-rw-r--r--comphelper/qa/unit/propertyvalue.cxx60
2 files changed, 61 insertions, 0 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: */