From ad355b66ca79f1413c924025619cfd0b57210c3f Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Fri, 15 Oct 2010 01:19:00 +0000 Subject: [PATCH] tests: axe long, uneccessary, extra distrib test git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1022805 13f79535-47bb-0310-9956-ffa450edef68 --- .../DistributedSpellCheckComponentTest.java | 4 + .../DistributedSpellCollatorTest.java | 87 ------------------- 2 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 solr/src/test/org/apache/solr/handler/component/DistributedSpellCollatorTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java index ecfed62e6fb..78988b313b0 100644 --- a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java +++ b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java @@ -96,5 +96,9 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true"); query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","bluo", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4"); query("q", "The quick reb fox jumped over the lazy brown dogs", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4", SpellCheckComponent.SPELLCHECK_COLLATE, "true"); + + query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "10", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true"); + query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "10", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false"); + query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "0", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false"); } } diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCollatorTest.java b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCollatorTest.java deleted file mode 100644 index bd580559ac0..00000000000 --- a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCollatorTest.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.apache.solr.handler.component; - -import java.io.File; - -import org.apache.solr.BaseDistributedSearchTestCase; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.util.AbstractSolrTestCase; - -public class DistributedSpellCollatorTest extends BaseDistributedSearchTestCase { - - private String saveProp; - @Override - public void setUp() throws Exception { - // this test requires FSDir - saveProp = System.getProperty("solr.directoryFactory"); - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - super.setUp(); - } - - @Override - public void tearDown() throws Exception { - super.tearDown(); - if (saveProp == null) - System.clearProperty("solr.directoryFactory"); - else - System.setProperty("solr.directoryFactory", saveProp); - } - - private void q(Object... q) throws Exception { - final ModifiableSolrParams params = new ModifiableSolrParams(); - - for (int i = 0; i < q.length; i += 2) { - params.add(q[i].toString(), q[i + 1].toString()); - } - - controlClient.query(params); - - // query a random server - params.set("shards", shards); - int which = r.nextInt(clients.size()); - SolrServer client = clients.get(which); - client.query(params); - } - - @Override - public void doTest() throws Exception { - index(id, "1", "lowerfilt", "The quick red fox jumped over the lazy brown dogs."); - index(id, "2" , "lowerfilt", "The quack rex fox jumped over the lazy brown dogs."); - index(id, "3" , "lowerfilt", "The quote rex fox jumped over the lazy brown dogs."); - index(id, "4" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "5" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "6" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "7" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "8" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "9" , "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "10", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "11", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "12", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "13", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "14", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - index(id, "15", "lowerfilt", "The quote redo fox jumped over the lazy brown dogs."); - commit(); - - handle.clear(); - handle.put("QTime", SKIPVAL); - handle.put("timestamp", SKIPVAL); - handle.put("maxScore", SKIPVAL); - // we care only about the spellcheck results - handle.put("response", SKIP); - q("q", "*:*", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH"); - - query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "10", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true"); - query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "10", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false"); - query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "0", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false"); - - // Ensure that each iteration of test uses a fresh Jetty data directory. - // Otherwise we get incorrect # hits - // This probably should be fixed in BaseDistributedSearch in its own issue, - // but I needed this test to pass now... - AbstractSolrTestCase.recurseDelete(testDir); - testDir = new File(System.getProperty("java.io.tmpdir") - + System.getProperty("file.separator") + getClass().getName() + "-" - + System.currentTimeMillis()); - testDir.mkdirs(); - } -}