oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

song/StringFilter: add enum Position

Browse Source 
Replaces two conflicting bools.
This commit is contained in:
Max Kellermann
2022-11-15 21:29:53 +01:00
parent 9ca75589c0
commit 9467df526c
5 changed files with 153 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/TestStringFilter.cxx
View File

@@ -36,7 +36,7 @@ protected:
TEST_F(StringFilterTest, ASCII)
{
const StringFilter f{"needle", false, false, false, false};
const StringFilter f{"needle", false, StringFilter::Position::FULL, false};
EXPECT_TRUE(f.Match("needle"));
EXPECT_FALSE(f.Match("nëedle"));
@@ -53,7 +53,7 @@ TEST_F(StringFilterTest, ASCII)
TEST_F(StringFilterTest, Negated)
{
const StringFilter f{"needle", false, false, false, true};
const StringFilter f{"needle", false, StringFilter::Position::FULL, true};
EXPECT_FALSE(f.Match("needle"));
EXPECT_TRUE(f.Match("Needle"));
@@ -66,7 +66,7 @@ TEST_F(StringFilterTest, Negated)
TEST_F(StringFilterTest, StartsWith)
{
const StringFilter f{"needle", false, false, true, false};
const StringFilter f{"needle", false, StringFilter::Position::PREFIX, false};
EXPECT_TRUE(f.Match("needle"));
EXPECT_FALSE(f.Match("Needle"));
@@ -80,7 +80,7 @@ TEST_F(StringFilterTest, StartsWith)
TEST_F(StringFilterTest, IsIn)
{
const StringFilter f{"needle", false, true, false, false};
const StringFilter f{"needle", false, StringFilter::Position::ANYWHERE, false};
EXPECT_TRUE(f.Match("needle"));
EXPECT_FALSE(f.Match("Needle"));
@@ -94,7 +94,7 @@ TEST_F(StringFilterTest, IsIn)
TEST_F(StringFilterTest, Latin)
{
const StringFilter f{"nëedlé", false, false, false, false};
const StringFilter f{"nëedlé", false, StringFilter::Position::FULL, false};
EXPECT_TRUE(f.Match("nëedlé"));
#if defined(HAVE_ICU) || defined(_WIN32)
@@ -117,7 +117,7 @@ TEST_F(StringFilterTest, Latin)
TEST_F(StringFilterTest, Normalize)
{
const StringFilter f{"1①H", true, false, false, false};
const StringFilter f{"1①H", true, StringFilter::Position::FULL, false};
EXPECT_TRUE(f.Match("1①H"));
EXPECT_TRUE(f.Match("¹₁H"));
@@ -127,17 +127,17 @@ TEST_F(StringFilterTest, Normalize)
#ifndef _WIN32
// fails with Windows CompareStringEx()
EXPECT_TRUE(StringFilter("dž", true, false, false, false).Match("dž"));
EXPECT_TRUE(StringFilter("dž", true, StringFilter::Position::FULL, false).Match("dž"));
#endif
EXPECT_TRUE(StringFilter("\u212b", true, false, false, false).Match("\u0041\u030a"));
EXPECT_TRUE(StringFilter("\u212b", true, false, false, false).Match("\u00c5"));
EXPECT_TRUE(StringFilter("\u212b", true, StringFilter::Position::FULL, false).Match("\u0041\u030a"));
EXPECT_TRUE(StringFilter("\u212b", true, StringFilter::Position::FULL, false).Match("\u00c5"));
EXPECT_TRUE(StringFilter("\u1e69", true, false, false, false).Match("\u0073\u0323\u0307"));
EXPECT_TRUE(StringFilter("\u1e69", true, StringFilter::Position::FULL, false).Match("\u0073\u0323\u0307"));
#ifndef _WIN32
// fails with Windows CompareStringEx()
EXPECT_TRUE(StringFilter("\u1e69", true, false, false, false).Match("\u0073\u0307\u0323"));
EXPECT_TRUE(StringFilter("\u1e69", true, StringFilter::Position::FULL, false).Match("\u0073\u0307\u0323"));
#endif
}
@@ -147,7 +147,7 @@ TEST_F(StringFilterTest, Normalize)
TEST_F(StringFilterTest, Transliterate)
{
const StringFilter f{"'", true, false, false, false};
const StringFilter f{"'", true, StringFilter::Position::FULL, false};
EXPECT_TRUE(f.Match("’"));
EXPECT_FALSE(f.Match("\""));
@@ -157,7 +157,7 @@ TEST_F(StringFilterTest, Transliterate)
TEST_F(StringFilterTest, FoldCase)
{
const StringFilter f{"nëedlé", true, false, false, false};
const StringFilter f{"nëedlé", true, StringFilter::Position::FULL, false};
EXPECT_TRUE(f.Match("nëedlé"));
#if defined(HAVE_ICU) || defined(_WIN32)

60
test/TestTagSongFilter.cxx
View File

@@ -44,8 +44,10 @@ InvokeFilter(const TagSongFilter &f, const Tag &tag) noexcept
TEST_F(TagSongFilterTest, Basic)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("needle", false, false, false, false));
const TagSongFilter f{
TAG_TITLE,
{"needle", false, StringFilter::Position::FULL, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "needle")));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "foo", TAG_TITLE, "needle")));
@@ -65,8 +67,10 @@ TEST_F(TagSongFilterTest, Basic)
*/
TEST_F(TagSongFilterTest, Empty)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("", false, false, false, false));
const TagSongFilter f{
TAG_TITLE,
{"", false, StringFilter::Position::FULL, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag()));
@@ -76,8 +80,10 @@ TEST_F(TagSongFilterTest, Empty)
TEST_F(TagSongFilterTest, Substring)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("needle", false, true, false, false));
const TagSongFilter f{
TAG_TITLE,
{"needle", false, StringFilter::Position::ANYWHERE, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "needle")));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "needleBAR")));
@@ -90,8 +96,10 @@ TEST_F(TagSongFilterTest, Substring)
TEST_F(TagSongFilterTest, Startswith)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("needle", false, false, true, false));
const TagSongFilter f{
TAG_TITLE,
{"needle", false, StringFilter::Position::PREFIX, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "needle")));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "needleBAR")));
@@ -104,8 +112,10 @@ TEST_F(TagSongFilterTest, Startswith)
TEST_F(TagSongFilterTest, Negated)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("needle", false, false, false, true));
const TagSongFilter f{
TAG_TITLE,
{"needle", false, StringFilter::Position::FULL, true},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag()));
EXPECT_FALSE(InvokeFilter(f, MakeTag(TAG_TITLE, "needle")));
@@ -117,8 +127,10 @@ TEST_F(TagSongFilterTest, Negated)
*/
TEST_F(TagSongFilterTest, EmptyNegated)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("", false, false, false, true));
const TagSongFilter f{
TAG_TITLE,
{"", false, StringFilter::Position::FULL, true},
};
EXPECT_FALSE(InvokeFilter(f, MakeTag()));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "foo")));
@@ -129,8 +141,10 @@ TEST_F(TagSongFilterTest, EmptyNegated)
*/
TEST_F(TagSongFilterTest, MultiNegated)
{
const TagSongFilter f(TAG_TITLE,
StringFilter("needle", false, false, false, true));
const TagSongFilter f{
TAG_TITLE,
{"needle", false, StringFilter::Position::FULL, true},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_TITLE, "foo", TAG_TITLE, "bar")));
EXPECT_FALSE(InvokeFilter(f, MakeTag(TAG_TITLE, "needle", TAG_TITLE, "bar")));
@@ -143,8 +157,10 @@ TEST_F(TagSongFilterTest, MultiNegated)
*/
TEST_F(TagSongFilterTest, Fallback)
{
const TagSongFilter f(TAG_ALBUM_ARTIST,
StringFilter("needle", false, false, false, false));
const TagSongFilter f{
TAG_ALBUM_ARTIST,
{"needle", false, StringFilter::Position::FULL, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_ALBUM_ARTIST, "needle")));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_ARTIST, "needle")));
@@ -163,8 +179,10 @@ TEST_F(TagSongFilterTest, Fallback)
*/
TEST_F(TagSongFilterTest, EmptyFallback)
{
const TagSongFilter f(TAG_ALBUM_ARTIST,
StringFilter("", false, false, false, false));
const TagSongFilter f{
TAG_ALBUM_ARTIST,
{"", false, StringFilter::Position::FULL, false},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag()));
@@ -177,8 +195,10 @@ TEST_F(TagSongFilterTest, EmptyFallback)
*/
TEST_F(TagSongFilterTest, NegatedFallback)
{
const TagSongFilter f(TAG_ALBUM_ARTIST,
StringFilter("needle", false, false, false, true));
const TagSongFilter f{
TAG_ALBUM_ARTIST,
{"needle", false, StringFilter::Position::FULL, true},
};
EXPECT_TRUE(InvokeFilter(f, MakeTag()));
EXPECT_TRUE(InvokeFilter(f, MakeTag(TAG_ALBUM_ARTIST, "foo")));