diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-05-24 09:56:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-05-24 14:53:26 +0200 |
| commit | 72b869d1c006f61bf78d8af4ce76b14489f477d4 (patch) | |
| tree | fea19ccbb9e77ba44c4bf42ed08243ec3dbb177a | |
| parent | bcad9f53c8b421590beacbe1e65cb065db67d1a9 (diff) | |
Fix CppunitTest_configmgr_unit for --disable-report-builder
...after abd630e81bc150d05e4129cc22752ecf461777c7 "Allow all hierarchical path
segments to be ['...'] quoted", which failed as the checked
MimeTypeClassIDRelations group is conditional on install:module="reportbuilder".
(See the comments at
<https://gerrit.libreoffice.org/c/core/+/151673/2#message-f029dd1877f8a946647456ed73a7b60f6dfc0e8f>
"Allow all hierarchical path segments to be ['...'] quoted".)
It looks like there is no other, non-conditional property with a slash in its
name, so the test now just tests the ['...'] syntax on an otherwise
unproblematic property name. (Alternatively, we could have extended the
configuration data used by unit tests with such a problematicaly named
property.)
Change-Id: I820004a5b824326d86e67c158994f13e71ba135e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152184
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index aa5b137413d3..d6213692405d 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/XChangesBatch.hpp> +#include <cppu/unotype.hxx> #include <cppuhelper/implbase.hxx> #include <osl/time.h> #include <rtl/ref.hxx> @@ -214,13 +215,8 @@ void Test::testKeyFetch() s); } { - auto const v = getKey( - "/org.openoffice.Office.Embedding", - "MimeTypeClassIDRelations/['application/vnd.sun.xml.report.chart']"); - OUString s; - CPPUNIT_ASSERT(v >>= s); - CPPUNIT_ASSERT_EQUAL(OUString("80243D39-6741-46C5-926E-069164FF87BB"), s); - // cf. officecfg/registry/data/org/openoffice/Office/Embedding.xcu + auto const v = getKey("/org.openoffice.System", "L10N/['Locale']"); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<OUString>::get(), v.getValueType()); } } |