-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
LUCENE-8933: Validate JapaneseTokenizer user dictionary entry #809
Merged
mocobeta
merged 6 commits into
apache:master
from
mocobeta:jira/LUCENE-8933-kuromoji-userdic-to-master
Aug 14, 2019
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5f6df64
LUCENE-8933: Validate JapaneseTokenizer user dictionary entry if the …
mocobeta f7cca9e
fix typo.
mocobeta 090bdc7
Use whitespace character class to remove all whitespace.
mocobeta 8e7e5a8
lucene/MIGRATE.txt
mocobeta ea914b7
Merge branch 'master' into jira/LUCENE-8933-kuromoji-userdic-to-master
mocobeta df390db
Update changes
mocobeta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ | |
|
||
|
||
import java.io.IOException; | ||
import java.io.StringReader; | ||
|
||
import org.apache.lucene.analysis.ja.TestJapaneseTokenizer; | ||
import org.apache.lucene.util.LuceneTestCase; | ||
|
@@ -77,4 +78,19 @@ public void testRead() throws IOException { | |
UserDictionary dictionary = TestJapaneseTokenizer.readDict(); | ||
assertNotNull(dictionary); | ||
} | ||
|
||
@Test(expected = RuntimeException.class) | ||
public void testReadInvalid1() throws IOException { | ||
// the concatenated segment must be the same as the surface form | ||
String invalidEntry = "日経新聞,日本 経済 新聞,ニホン ケイザイ シンブン,カスタム名詞"; | ||
UserDictionary dictionary = UserDictionary.open(new StringReader(invalidEntry)); | ||
} | ||
|
||
@Test(expected = RuntimeException.class) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
||
public void testReadInvalid2() throws IOException { | ||
// the concatenated segment must be the same as the surface form | ||
String invalidEntry = "日本経済新聞,日経 新聞,ニッケイ シンブン,カスタム名詞"; | ||
UserDictionary dictionary = UserDictionary.open(new StringReader(invalidEntry)); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you use
expectThrows
and check that the message is correct ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you mean
assertThrows
that was introduced from JUnit 4.13https://junit.org/junit4/javadoc/latest/org/junit/Assert.html#assertThrows(java.lang.String,%20java.lang.Class,%20org.junit.function.ThrowingRunnable)
Lucene uses junit 4.12, so we cannot use it (Am I missing something?).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I missed LuceneTestCase#expectThrows. Will fix this in another patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in #830