Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect ignoreCase flag in CommonGramsFilterFactory #781

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Respect ignoreCase flag in CommonGramsFilterFactory #781

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e603350
Respect ignoreCase flag in CommonGramsFilterFactory
chenhh021 Dec 12, 2022
9ee498d
Add LUCENENET-specific backport comment
paulirwin Oct 28, 2024
7d62449
Use GetType instead of typeof for resource loader
paulirwin Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilterFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace Lucene.Net.Analysis.CommonGrams
/// </summary>
public class CommonGramsFilterFactory : TokenFilterFactory, IResourceLoaderAware
{
// TODO: shared base class for Stop/Keep/CommonGrams?
// TODO: shared base class for Stop/Keep/CommonGrams?
private CharArraySet commonWords;
private readonly string commonWordFiles;
private readonly string format;
Expand Down Expand Up @@ -71,7 +71,8 @@ public virtual void Inform(IResourceLoader loader)
}
else
{
commonWords = StopAnalyzer.ENGLISH_STOP_WORDS_SET;
// LUCENENET-specific: backported ignoreCase fix from Lucene 8.10.0 (lucene#188, LUCENE-10008)
commonWords = new CharArraySet(m_luceneMatchVersion, StopAnalyzer.ENGLISH_STOP_WORDS_SET, ignoreCase);
}
}

Expand All @@ -85,4 +86,4 @@ public override TokenStream Create(TokenStream input)
return commonGrams;
}
}
}
}
22 changes: 20 additions & 2 deletions src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace Lucene.Net.Analysis.CommonGrams
/// Tests pretty much copied from StopFilterFactoryTest We use the test files
/// used by the StopFilterFactoryTest TODO: consider creating separate test files
/// so this won't break if stop filter test files change
///
///
/// </summary>
public class TestCommonGramsFilterFactory : BaseTokenStreamFactoryTestCase
{
Expand Down Expand Up @@ -79,6 +79,24 @@ public virtual void TestDefaults()
AssertTokenStreamContents(stream, new string[] { "testing", "testing_the", "the", "the_factory", "factory" });
}

// LUCENENET-specific: backported ignoreCase fix from Lucene 8.10.0 (lucene#188, LUCENE-10008)
[Test]
public void TestIgnoreCase()
{
IResourceLoader loader = new ClasspathResourceLoader(typeof(TestAnalyzers));
paulirwin marked this conversation as resolved.
Show resolved Hide resolved
CommonGramsFilterFactory factory =
(CommonGramsFilterFactory)
TokenFilterFactory("CommonGrams", TEST_VERSION_CURRENT, loader, "ignoreCase", "true");
CharArraySet words = factory.CommonWords;
assertTrue("words is null and it shouldn't be", words != null);
assertTrue(words.contains("the"));
assertTrue(words.contains("The"));
Tokenizer tokenizer = new MockTokenizer(new StringReader("testing The factory"),MockTokenizer.WHITESPACE, false);
TokenStream stream = factory.Create(tokenizer);
AssertTokenStreamContents(
stream, new string[] {"testing", "testing_The", "The", "The_factory", "factory"});
}

/// <summary>
/// Test that bogus arguments result in exception </summary>
[Test]
Expand All @@ -95,4 +113,4 @@ public virtual void TestBogusArguments()
}
}
}
}
}
Loading