You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/03/23 16:45:18 UTC
svn commit: r1580518 - in
/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing:
AnalyzingSuggesterTest.java TestFreeTextSuggester.java
Author: mikemccand
Date: Sun Mar 23 15:45:18 2014
New Revision: 1580518
URL: http://svn.apache.org/r1580518
Log:
LUCENE-5528: remove generics
Modified:
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java?rev=1580518&r1=1580517&r2=1580518&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java Sun Mar 23 15:45:18 2014
@@ -1192,10 +1192,9 @@ public class AnalyzingSuggesterTest exte
}
}
- @SafeVarargs
- public final <T> Iterable<T> shuffle(T...values) {
- final List<T> asList = new ArrayList<>(values.length);
- for (T value : values) {
+ static final Iterable<Input> shuffle(Input...values) {
+ final List<Input> asList = new ArrayList<>(values.length);
+ for (Input value : values) {
asList.add(value);
}
Collections.shuffle(asList, random());
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java?rev=1580518&r1=1580517&r2=1580518&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java Sun Mar 23 15:45:18 2014
@@ -53,7 +53,7 @@ import org.junit.Ignore;
public class TestFreeTextSuggester extends LuceneTestCase {
public void testBasic() throws Exception {
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo bar baz blah", 50),
new Input("boo foo bar foo bee", 20)
);
@@ -102,7 +102,7 @@ public class TestFreeTextSuggester exten
public void testIllegalByteDuringBuild() throws Exception {
// Default separator is INFORMATION SEPARATOR TWO
// (0x1e), so no input token is allowed to contain it
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo\u001ebar baz", 50)
);
FreeTextSuggester sug = new FreeTextSuggester(new MockAnalyzer(random()));
@@ -117,7 +117,7 @@ public class TestFreeTextSuggester exten
public void testIllegalByteDuringQuery() throws Exception {
// Default separator is INFORMATION SEPARATOR TWO
// (0x1e), so no input token is allowed to contain it
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo bar baz", 50)
);
FreeTextSuggester sug = new FreeTextSuggester(new MockAnalyzer(random()));
@@ -196,7 +196,7 @@ public class TestFreeTextSuggester exten
// Make sure you can suggest based only on unigram model:
public void testUnigrams() throws Exception {
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo bar baz blah boo foo bar foo bee", 50)
);
@@ -210,7 +210,7 @@ public class TestFreeTextSuggester exten
// Make sure the last token is not duplicated
public void testNoDupsAcrossGrams() throws Exception {
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo bar bar bar bar", 50)
);
Analyzer a = new MockAnalyzer(random());
@@ -222,7 +222,7 @@ public class TestFreeTextSuggester exten
// Lookup of just empty string produces unicode only matches:
public void testEmptyString() throws Exception {
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("foo bar bar bar bar", 50)
);
Analyzer a = new MockAnalyzer(random());
@@ -249,7 +249,7 @@ public class TestFreeTextSuggester exten
}
};
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("wizard of oz", 50)
);
FreeTextSuggester sug = new FreeTextSuggester(a, a, 3, (byte) 0x20);
@@ -277,7 +277,7 @@ public class TestFreeTextSuggester exten
}
};
- Iterable<Input> keys = shuffle(
+ Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(
new Input("wizard of of oz", 50)
);
FreeTextSuggester sug = new FreeTextSuggester(a, a, 3, (byte) 0x20);
@@ -603,15 +603,5 @@ public class TestFreeTextSuggester exten
}
return b.toString().trim();
}
-
- @SafeVarargs
- private final <T> Iterable<T> shuffle(T...values) {
- final List<T> asList = new ArrayList<>(values.length);
- for (T value : values) {
- asList.add(value);
- }
- Collections.shuffle(asList, random());
- return asList;
- }
}