unotools/CppunitTest_unotools_configpaths.mk | 21 ++++
unotools/Module_unotools.mk | 1
unotools/qa/unit/configpaths.cxx | 128 +++++++++++++++++++++++++++
3 files changed, 150 insertions(+)
New commits:
commit 4689f7579ac3db998bb0de07b0adbe4092d5be14
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Sep 22 17:49:48 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Sep 23 19:59:05 2022 +0200
Add tests for utl::splitLastFromConfigurationPath
...documenting how the implementation is in discordance with the
documentation
for some corner cases and how things got recently broken with
5edefc801fb48559c8064003f23d22d838710ee4 "use more string_view in
unotools", in
preparation for an upcoming improvement of that function's implementation
Change-Id: Ia47243c64b724009c5ed5eecb9d890820287e9ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140492
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/unotools/CppunitTest_unotools_configpaths.mk
b/unotools/CppunitTest_unotools_configpaths.mk
new file mode 100644
index 000000000000..d5f002b9bb7b
--- /dev/null
+++ b/unotools/CppunitTest_unotools_configpaths.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,unotools_configpaths))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,unotools_configpaths, \
+ unotools/qa/unit/configpaths \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,unotools_configpaths, \
+ sal \
+ utl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk
index c8a46e33e22c..e069960530c3 100644
--- a/unotools/Module_unotools.mk
+++ b/unotools/Module_unotools.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
JunitTest_unotools_complex \
))
$(eval $(call gb_Module_add_check_targets,unotools,\
+ CppunitTest_unotools_configpaths \
CppunitTest_unotools_fontdefs \
))
diff --git a/unotools/qa/unit/configpaths.cxx b/unotools/qa/unit/configpaths.cxx
new file mode 100644
index 000000000000..e0a92f37c894
--- /dev/null
+++ b/unotools/qa/unit/configpaths.cxx
@@ -0,0 +1,128 @@
+/* -*- 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 <cppunit/plugin/TestPlugIn.h>
+
+#include <unotools/configpaths.hxx>
+
+namespace
+{
+class Test : public CppUnit::TestFixture
+{
+public:
+ void testSplitLastFromConfigurationPath()
+ {
+ {
+ OUString path, last;
+ CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString(""), last);
+ }
+ {
+ // Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools", and in discordance with the documentation, this
returned true (but
+ // "@returns <FALSE/>, if the path was a one-level path or an
invalid path"):
+ OUString path, last;
+ CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString(""), last);
+ }
+ {
+ // Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools", and in discordance with the documentation, this
returned true (but
+ // "@returns <FALSE/>, if the path was a one-level path or an
invalid path"):
+ OUString path, last;
+ CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
+ }
+ // TODO: Broken since 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools" (expected "" vs. actual "/foo"):
+ if ((false))
+ {
+ // Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools", and in discordance with the documentation, this
returned true (but
+ // "@returns <FALSE/>, if the path was a one-level path or an
invalid path"):
+ OUString path, last;
+ CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
+ }
+ {
+ OUString path, last;
+
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/bar/baz", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar"), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
+ }
+ // TODO: Broken since 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools" (expected "/foo/bar" vs. actual "/foo/bar/baz"):
+ if ((false))
+ {
+ // Trailing slash accepted for backwards compatibility (cf
+ // . "for backwards compatibility, ignore a final slash" comment in
+ // Data::resolvePathRepresentation, configmgr/source/data.cxx):
+ OUString path, last;
+
CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"/foo/bar/baz/", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar"), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
+ }
+ // TODO: Broken since 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools" (expected true vs. actual false return):
+ if ((false))
+ {
+ OUString path, last;
+ CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(
+ u"/foo/bar/baz['abc']/baz['de&f']", path, last));
+ CPPUNIT_ASSERT_EQUAL(OUString("/foo/bar/baz['abc']"), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("de&f"), last);
+ }
+ {
+ OUString path, last;
+ CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"foo", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
+ }
+ // TODO: Broken since 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools" (expected false vs. actual true return):
+ if ((false))
+ {
+ // Already prior to 5edefc801fb48559c8064003f23d22d838710ee4 "use
more string_view in
+ // unotools", and in discordance with the documentation, this set
last to "foo" rather
+ // than "foo/" (but "If <var>_sInPath</var> could not be parsed as
a valid configuration
+ // path, this is set to <var>_sInPath</var>"):
+ OUString path, last;
+ CPPUNIT_ASSERT(!utl::splitLastFromConfigurationPath(u"foo/", path,
last));
+ CPPUNIT_ASSERT_EQUAL(OUString(""), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo"), last);
+ }
+ {
+ // Some broken input missing a leading slash happens to be
considered OK:
+ OUString path, last;
+ CPPUNIT_ASSERT(utl::splitLastFromConfigurationPath(u"foo/bar/baz",
path, last));
+ CPPUNIT_ASSERT_EQUAL(OUString("foo/bar"), path);
+ CPPUNIT_ASSERT_EQUAL(OUString("baz"), last);
+ }
+ }
+
+ CPPUNIT_TEST_SUITE(Test);
+ CPPUNIT_TEST(testSplitLastFromConfigurationPath);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
