You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/03/09 17:29:09 UTC
svn commit: r1665295 [3/3] - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/cloud/
solr/core/src/java/org/apache/solr/core/
solr/core/src/java/org/apache/solr/handler/
solr/core/src/java/org/apache/solr/handle...
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java?rev=1665295&r1=1665294&r2=1665295&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java Mon Mar 9 16:29:08 2015
@@ -180,7 +180,11 @@ public class SpellCheckComponentTest ext
request = req("qt", "spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle",
"spellcheck", "true", "spellcheck.dictionary", "default",
"spellcheck.reload", "true");
- ResponseBuilder rb = new ResponseBuilder(request, new SolrQueryResponse(), new ArrayList(h.getCore().getSearchComponents().values()));
+ List<SearchComponent> components = new ArrayList<>();
+ for (String name : h.getCore().getSearchComponents().keySet()) {
+ components.add(h.getCore().getSearchComponent(name));
+ }
+ ResponseBuilder rb = new ResponseBuilder(request, new SolrQueryResponse(), components);
checker.prepare(rb);
try {
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java?rev=1665295&r1=1665294&r2=1665295&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java Mon Mar 9 16:29:08 2015
@@ -55,11 +55,7 @@ public class QueryEqualityTest extends S
public static void afterClassParserCoverageTest() {
if ( ! doAssertParserCoverage) return;
-
- for (int i=0; i < QParserPlugin.standardPlugins.length; i+=2) {
- assertTrue("qparser #"+i+" name not a string",
- QParserPlugin.standardPlugins[i] instanceof String);
- final String name = (String)QParserPlugin.standardPlugins[i];
+ for (String name : QParserPlugin.standardPlugins.keySet()) {
assertTrue("testParserCoverage was run w/o any other method explicitly testing qparser: " + name, qParsersTested.contains(name));
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java?rev=1665295&r1=1665294&r2=1665295&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java Mon Mar 9 16:29:08 2015
@@ -24,7 +24,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -48,15 +47,13 @@ public class TestStandardQParsers extend
*/
@Test
public void testRegisteredName() throws Exception {
- Map<String, Class<QParserPlugin>> standardPlugins = getStandardQParsers();
+ List<String> notStatic = new ArrayList<>(QParserPlugin.standardPlugins.size());
+ List<String> notFinal = new ArrayList<>(QParserPlugin.standardPlugins.size());
+ List<String> mismatch = new ArrayList<>(QParserPlugin.standardPlugins.size());
- List<String> notStatic = new ArrayList<>(standardPlugins.size());
- List<String> notFinal = new ArrayList<>(standardPlugins.size());
- List<String> mismatch = new ArrayList<>(standardPlugins.size());
-
- for (Map.Entry<String,Class<QParserPlugin>> pair : standardPlugins.entrySet()) {
+ for (Map.Entry<String, Class<? extends QParserPlugin>> pair : QParserPlugin.standardPlugins.entrySet()) {
String regName = pair.getKey();
- Class<QParserPlugin> clazz = pair.getValue();
+ Class<? extends QParserPlugin> clazz = pair.getValue();
Field nameField = clazz.getField(FIELD_NAME);
int modifiers = nameField.getModifiers();
@@ -79,30 +76,8 @@ public class TestStandardQParsers extend
assertTrue("DEFAULT_QTYPE is not in the standard set of registered names: " +
QParserPlugin.DEFAULT_QTYPE,
- standardPlugins.keySet().contains(QParserPlugin.DEFAULT_QTYPE));
+ QParserPlugin.standardPlugins.keySet().contains(QParserPlugin.DEFAULT_QTYPE));
}
- /**
- * Get standard query parsers registered by default.
- *
- * @see org.apache.solr.search.QParserPlugin#standardPlugins
- * @return Map of classes extending QParserPlugin keyed by the registered name
- */
- private Map<String,Class<QParserPlugin>> getStandardQParsers() {
- Object[] standardPluginsValue = QParserPlugin.standardPlugins;
-
- Map<String, Class<QParserPlugin>> standardPlugins
- = new HashMap<>(standardPluginsValue.length / 2);
-
- for (int i = 0; i < standardPluginsValue.length; i += 2) {
- @SuppressWarnings("unchecked")
- String registeredName = (String) standardPluginsValue[i];
- @SuppressWarnings("unchecked")
- Class<QParserPlugin> clazz = (Class<QParserPlugin>) standardPluginsValue[i + 1];
- standardPlugins.put(registeredName, clazz);
- }
- return standardPlugins;
- }
-
}