lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r925611 - /lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
Date Sat, 20 Mar 2010 13:44:30 GMT
Author: rmuir
Date: Sat Mar 20 13:44:30 2010
New Revision: 925611

URL: http://svn.apache.org/viewvc?rev=925611&view=rev
Log:
convert SpellCheckComponentTest to SolrTestCaseJ4

Modified:
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java?rev=925611&r1=925610&r2=925611&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
(original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
Sat Mar 20 13:44:30 2010
@@ -20,6 +20,7 @@ package org.apache.solr.handler.componen
 import java.io.File;
 import java.util.*;
 
+import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -33,38 +34,33 @@ import org.apache.solr.response.SolrQuer
 import org.apache.solr.spelling.AbstractLuceneSpellChecker;
 import org.apache.solr.spelling.IndexBasedSpellChecker;
 import org.apache.solr.util.AbstractSolrTestCase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * @since solr 1.3
  */
-public class SpellCheckComponentTest extends AbstractSolrTestCase {
-  @Override
-  public String getSchemaFile() {
-    return "schema.xml";
-  }
-
-  @Override
-  public String getSolrConfigFile() {
-    return "solrconfig.xml";
-  }
-
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-    assertU(adoc("id", "0", "lowerfilt", "This is a title"));
-    assertU(adoc("id", "1", "lowerfilt",
-            "The quick reb fox jumped over the lazy brown dogs."));
-    assertU(adoc("id", "2", "lowerfilt", "This is a document"));
-    assertU(adoc("id", "3", "lowerfilt", "another document"));
+public class SpellCheckComponentTest extends SolrTestCaseJ4 {
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    initCore("solrconfig.xml","schema.xml");
+    assertNull(h.validateUpdate(adoc("id", "0", "lowerfilt", "This is a title")));
+    assertNull(h.validateUpdate(adoc("id", "1", "lowerfilt",
+            "The quick reb fox jumped over the lazy brown dogs.")));
+    assertNull(h.validateUpdate(adoc("id", "2", "lowerfilt", "This is a document")));
+    assertNull(h.validateUpdate(adoc("id", "3", "lowerfilt", "another document")));
     //bunch of docs that are variants on blue
-    assertU(adoc("id", "4", "lowerfilt", "blue"));
-    assertU(adoc("id", "5", "lowerfilt", "blud"));
-    assertU(adoc("id", "6", "lowerfilt", "boue"));
-    assertU(adoc("id", "7", "lowerfilt", "glue"));
-    assertU(adoc("id", "8", "lowerfilt", "blee"));
-    assertU("commit", commit());
+    assertNull(h.validateUpdate(adoc("id", "4", "lowerfilt", "blue")));
+    assertNull(h.validateUpdate(adoc("id", "5", "lowerfilt", "blud")));
+    assertNull(h.validateUpdate(adoc("id", "6", "lowerfilt", "boue")));
+    assertNull(h.validateUpdate(adoc("id", "7", "lowerfilt", "glue")));
+    assertNull(h.validateUpdate(adoc("id", "8", "lowerfilt", "blee")));
+    assertNull(h.validateUpdate(commit()));
   }
   
+  @Test
   public void testExtendedResultsCount() throws Exception {
     SolrCore core = h.getCore();
     SearchComponent speller = core.getSearchComponent("spellcheck");
@@ -116,6 +112,7 @@ public class SpellCheckComponentTest ext
     }
   }
 
+  @Test
   public void test() throws Exception {
     SolrCore core = h.getCore();
     SearchComponent speller = core.getSearchComponent("spellcheck");
@@ -148,7 +145,7 @@ public class SpellCheckComponentTest ext
     assertEquals("document", theSuggestion.iterator().next());
   }
 
-
+  @Test
   public void testCollate() throws Exception {
     SolrCore core = h.getCore();
     SearchComponent speller = core.getSearchComponent("spellcheck");
@@ -195,6 +192,7 @@ public class SpellCheckComponentTest ext
     assertEquals("document brown",collation);
   }
 
+  @Test
   public void testCorrectSpelling() throws Exception {
     SolrCore core = h.getCore();
     Map<String, String> args = new HashMap<String, String>();
@@ -238,6 +236,7 @@ public class SpellCheckComponentTest ext
         "//*[@numFound='1']", "//*/lst[@name='suggestions']", "//*/bool[@name='correctlySpelled'][.='true']");
   }
 
+  @Test
   public void testInit() throws Exception {
     SolrCore core = h.getCore();
     SpellCheckComponent scc = new SpellCheckComponent();
@@ -281,6 +280,7 @@ public class SpellCheckComponentTest ext
   }
   
   @SuppressWarnings("unchecked")
+  @Test
   public void testRelativeIndexDirLocation() throws Exception {
     SolrCore core = h.getCore();
     Map<String, String> args = new HashMap<String, String>();
@@ -310,7 +310,8 @@ public class SpellCheckComponentTest ext
         "spellcheckerIndexDir was not created inside the configured value for dataDir folder
as configured in solrconfig.xml",
         indexDir.exists());
   }
-  
+
+  @Test
   public void testReloadOnStart() throws Exception {
     assertU(adoc("id", "0", "lowerfilt", "This is a title"));
     assertU(commit());
@@ -347,6 +348,7 @@ public class SpellCheckComponentTest ext
   }
   
     @SuppressWarnings("unchecked")
+    @Test
   public void testRebuildOnCommit() throws Exception {
     SolrQueryRequest req = req("q", "lowerfilt:lucenejavt", "qt", "spellCheckCompRH", "spellcheck",
"true");
     String response = h.query(req);



Mime
View raw message