diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-03-30 22:41:49 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-06 13:27:43 +0200 |
| commit | 1d116089e32f2ac0d95e1d78d292f4f272f978dd (patch) | |
| tree | 7c11c62cc1c745d9f3104205acbf289cdaa23da9 /tools/qa | |
| parent | 32061680dd379bef98ea4e55cd2b9f7a5fdc801b (diff) | |
tdf#148253: fix matching algorithm
Using 'flag' as a "continue the loop" marker allowed to continue
processing wildcard after its last character - not crashing because
it was a subview of a larger string with separators, but failing
the match.
Change-Id: I308058b68c59d5719f3c8b5f5656998a95a9ba09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132336
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 50add7c97e75d604287218f49c9283aab052fdf0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132374
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'tools/qa')
| -rw-r--r-- | tools/qa/cppunit/test_Wildcard.cxx | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/tools/qa/cppunit/test_Wildcard.cxx b/tools/qa/cppunit/test_Wildcard.cxx new file mode 100644 index 000000000000..1760ca6932db --- /dev/null +++ b/tools/qa/cppunit/test_Wildcard.cxx @@ -0,0 +1,46 @@ +/* -*- 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 <sal/types.h> +#include <cppunit/TestAssert.h> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <tools/wldcrd.hxx> + +namespace +{ +class Test : public CppUnit::TestFixture +{ +public: + void test_Wildcard(); + + CPPUNIT_TEST_SUITE(Test); + CPPUNIT_TEST(test_Wildcard); + CPPUNIT_TEST_SUITE_END(); +}; + +void Test::test_Wildcard() +{ + WildCard wildcard(u"*.html;*??a;*\\*abc;*\\?xyz", ';'); // tdf#148253 + CPPUNIT_ASSERT(wildcard.Matches(u"foo.html")); + CPPUNIT_ASSERT(wildcard.Matches(u"foo.ht.html")); // test stepping back after partial match + CPPUNIT_ASSERT(wildcard.Matches(u"foo.html.html")); // test stepping back after full match + CPPUNIT_ASSERT(wildcard.Matches(u"??aa")); // test stepping back with question marks + CPPUNIT_ASSERT(wildcard.Matches(u"111*abc")); // test escaped asterisk + CPPUNIT_ASSERT(!wildcard.Matches(u"111-abc")); // test escaped asterisk + CPPUNIT_ASSERT(wildcard.Matches(u"111?xyz")); // test escaped question mark + CPPUNIT_ASSERT(!wildcard.Matches(u"111-xyz")); // test escaped question mark +} + +CPPUNIT_TEST_SUITE_REGISTRATION(Test); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |