You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/10/20 03:51:41 UTC
svn commit: r1024486 - in /lucene/dev/trunk/solr/src/test/org/apache/solr:
analysis/TestLuceneMatchVersion.java core/SOLR749Test.java
Author: yonik
Date: Wed Oct 20 01:51:40 2010
New Revision: 1024486
URL: http://svn.apache.org/viewvc?rev=1024486&view=rev
Log:
tests: convert to junit4
Modified:
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
lucene/dev/trunk/solr/src/test/org/apache/solr/core/SOLR749Test.java
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java?rev=1024486&r1=1024485&r2=1024486&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java Wed Oct 20 01:51:40 2010
@@ -20,6 +20,7 @@ import java.io.StringReader;
import java.lang.reflect.Field;
import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.Config;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.FieldType;
@@ -27,20 +28,16 @@ import org.apache.solr.util.AbstractSolr
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
+import org.junit.BeforeClass;
/**
* Tests for luceneMatchVersion property for analyzers
*/
-public class TestLuceneMatchVersion extends AbstractSolrTestCase {
+public class TestLuceneMatchVersion extends SolrTestCaseJ4 {
- @Override
- public String getSchemaFile() {
- return "schema-luceneMatchVersion.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "solrconfig.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig.xml","schema-luceneMatchVersion.xml");
}
// this must match the solrconfig.xml version for this test
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/SOLR749Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/SOLR749Test.java?rev=1024486&r1=1024485&r2=1024486&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/SOLR749Test.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/SOLR749Test.java Wed Oct 20 01:51:40 2010
@@ -16,23 +16,22 @@ package org.apache.solr.core;
* limitations under the License.
*/
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.FooQParserPlugin;
import org.apache.solr.search.ValueSourceParser;
+import org.junit.BeforeClass;
/**
* Test for https://issues.apache.org/jira/browse/SOLR-749
*
**/
-public class SOLR749Test extends AbstractSolrTestCase{
- public String getSchemaFile() {
- return "schema.xml";
- }
-
- public String getSolrConfigFile() {
- return "solrconfig-SOLR-749.xml";
+public class SOLR749Test extends SolrTestCaseJ4 {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig-SOLR-749.xml","schema.xml");
}
public void testConstruction() throws Exception {