You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2017/12/21 18:20:34 UTC
lucene-solr:master: SOLR-11754: remove AbstractSolrTestCase;
use SolrTestCaseJ4 instead. Also removed SolrExampleTestBase in
Solrj-tests.
Repository: lucene-solr
Updated Branches:
refs/heads/master 63cba4093 -> f354a278f
SOLR-11754: remove AbstractSolrTestCase; use SolrTestCaseJ4 instead.
Also removed SolrExampleTestBase in Solrj-tests.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f354a278
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f354a278
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f354a278
Branch: refs/heads/master
Commit: f354a278f810fb702048e1f656c3e79a1a8888c2
Parents: 63cba40
Author: David Smiley <ds...@apache.org>
Authored: Thu Dec 21 13:20:22 2017 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Thu Dec 21 13:20:22 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../org/apache/solr/BasicFunctionalityTest.java | 2 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 4 +-
.../org/apache/solr/core/PluginInfoTest.java | 10 +-
.../apache/solr/core/TestJmxIntegration.java | 4 +-
.../apache/solr/core/TestXIncludeConfig.java | 4 +-
.../apache/solr/handler/SearchHandlerTest.java | 4 +-
.../handler/admin/LukeRequestHandlerTest.java | 4 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 4 +-
.../handler/component/StatsComponentTest.java | 4 +-
.../solr/highlight/HighlighterConfigTest.java | 4 +-
.../org/apache/solr/request/TestWriterPerf.java | 4 +-
.../solr/response/TestBinaryResponseWriter.java | 4 +-
.../search/TestComplexPhraseQParserPlugin.java | 4 +-
.../solr/search/TestMaxScoreQueryParser.java | 4 +-
.../org/apache/solr/search/TestQueryTypes.java | 4 +-
.../org/apache/solr/search/TestQueryUtils.java | 4 +-
.../org/apache/solr/search/TestSearchPerf.java | 4 +-
.../solr/search/TestSurroundQueryParser.java | 4 +-
.../search/function/SortByFunctionTest.java | 4 +-
.../solr/search/function/TestFunctionQuery.java | 2 +-
.../solr/security/BasicAuthStandaloneTest.java | 6 +-
.../solr/servlet/DirectSolrConnectionTest.java | 4 +-
.../update/DirectUpdateHandlerOptimizeTest.java | 4 +-
.../apache/solr/update/SoftAutoCommitTest.java | 14 +-
.../solr/update/TestIndexingPerformance.java | 4 +-
.../apache/solr/update/UpdateParamsTest.java | 4 +-
.../UpdateRequestProcessorFactoryTest.java | 4 +-
.../solrj/MergeIndexesExampleTestBase.java | 20 +--
.../solr/client/solrj/SolrExampleTestBase.java | 64 ---------
.../java/org/apache/solr/SolrTestCaseJ4.java | 6 +-
.../apache/solr/util/AbstractSolrTestCase.java | 135 -------------------
32 files changed, 72 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fabe30a..80d0d11 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,8 @@ Other Changes
* SOLR-11757: In tests, fix race condition on SolrException.ignoreException.
Also ensure we register "ignore_exception" in @BeforeClass (previously only @AfterClass) (David Smiley)
+* SOLR-11754: Remove AbstractSolrTestCase which has long been supplanted by SolrTestCaseJ4. (David Smiley)
+
================== 7.2.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 84280ee..2321188 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -57,7 +57,7 @@ import org.junit.Test;
/**
* Tests some basic functionality of Solr while demonstrating good
- * Best Practices for using AbstractSolrTestCase
+ * Best Practices for using SolrTestCaseJ4
*/
public class BasicFunctionalityTest extends SolrTestCaseJ4 {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
index c5ce2c9..fc40395 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.Assert;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCmdExecutor;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
@@ -31,7 +31,7 @@ import org.apache.zookeeper.Watcher;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-public class ZkSolrClientTest extends AbstractSolrTestCase {
+public class ZkSolrClientTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
index 2353226..c0cfe56 100644
--- a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
+++ b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
@@ -18,7 +18,7 @@ package org.apache.solr.core;
import java.util.List;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.DOMUtilTestBase;
import org.junit.Test;
import org.w3c.dom.Node;
@@ -63,14 +63,14 @@ public class PluginInfoTest extends DOMUtilTestBase {
@Test
public void testNameRequired() throws Exception {
Node nodeWithNoName = getNode("<plugin></plugin>", "plugin");
- AbstractSolrTestCase.ignoreException("missing mandatory attribute");
+ SolrTestCaseJ4.ignoreException("missing mandatory attribute");
try {
PluginInfo pi = new PluginInfo(nodeWithNoName, "Node with No name", true, false);
fail("Exception should have been thrown");
} catch (RuntimeException e) {
assertTrue(e.getMessage().contains("missing mandatory attribute"));
} finally {
- AbstractSolrTestCase.resetExceptionIgnores();
+ SolrTestCaseJ4.resetExceptionIgnores();
}
Node nodeWithAName = getNode("<plugin name=\"myName\" />", "plugin");
PluginInfo pi2 = new PluginInfo(nodeWithAName, "Node with a Name", true, false);
@@ -80,7 +80,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
@Test
public void testClassRequired() throws Exception {
Node nodeWithNoClass = getNode("<plugin></plugin>", "plugin");
- AbstractSolrTestCase.ignoreException("missing mandatory attribute");
+ SolrTestCaseJ4.ignoreException("missing mandatory attribute");
try {
@SuppressWarnings("unused")
PluginInfo pi = new PluginInfo(nodeWithNoClass, "Node with No Class", false, true);
@@ -88,7 +88,7 @@ public class PluginInfoTest extends DOMUtilTestBase {
} catch (RuntimeException e) {
assertTrue(e.getMessage().contains("missing mandatory attribute"));
} finally {
- AbstractSolrTestCase.resetExceptionIgnores();
+ SolrTestCaseJ4.resetExceptionIgnores();
}
Node nodeWithAClass = getNode("<plugin class=\"myName\" />", "plugin");
PluginInfo pi2 = new PluginInfo(nodeWithAClass, "Node with a Class", false, true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
index 31e5718..044b300 100644
--- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -20,7 +20,7 @@ import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricReporter;
import org.apache.solr.metrics.reporters.jmx.JmxObjectNameFactory;
import org.apache.solr.metrics.reporters.SolrJmxReporter;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,7 +44,7 @@ import java.util.Set;
*
* @since solr 1.3
*/
-public class TestJmxIntegration extends AbstractSolrTestCase {
+public class TestJmxIntegration extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
index 32be46e..0a80795 100644
--- a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
@@ -21,14 +21,14 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.update.processor.RegexReplaceProcessorFactory;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.Assume;
import org.junit.BeforeClass;
/**
* Test both XInclude as well as more old school "entity includes"
*/
-public class TestXIncludeConfig extends AbstractSolrTestCase {
+public class TestXIncludeConfig extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
index 4fa5f10..ebf4294 100644
--- a/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.solr.handler;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
/**
* Most of the tests for {@link org.apache.solr.handler.component.SearchHandler} are in {@link org.apache.solr.ConvertedLegacyTest}.
*/
-public class SearchHandlerTest extends AbstractSolrTestCase {
+public class SearchHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
index d253ef2..df043c1 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
@@ -23,7 +23,7 @@ import org.apache.solr.common.luke.FieldFlag;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.CustomAnalyzerStrField; // jdoc
import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.TestHarness;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -32,7 +32,7 @@ import org.junit.Test;
/**
* :TODO: currently only tests some of the utilities in the LukeRequestHandler
*/
-public class LukeRequestHandlerTest extends AbstractSolrTestCase {
+public class LukeRequestHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
index 6de7835..3173c12 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
@@ -18,7 +18,7 @@ package org.apache.solr.handler.admin;
import org.apache.lucene.util.Version;
import org.apache.solr.index.LogDocMergePolicyFactory;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Tests for SegmentsInfoRequestHandler. Plugin entry, returning data of created segment.
*/
-public class SegmentsInfoRequestHandlerTest extends AbstractSolrTestCase {
+public class SegmentsInfoRequestHandlerTest extends SolrTestCaseJ4 {
private static final int DOC_COUNT = 5;
private static final int DEL_COUNT = 1;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index cee1ab5..d5c7472 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -50,7 +50,7 @@ import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.SchemaField;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.commons.math3.util.Combinations;
import com.tdunning.math.stats.AVLTreeDigest;
@@ -62,7 +62,7 @@ import org.junit.BeforeClass;
/**
* Statistics Component Test
*/
-public class StatsComponentTest extends AbstractSolrTestCase {
+public class StatsComponentTest extends SolrTestCaseJ4 {
final static String XPRE = "/response/lst[@name='stats']/";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
index 5832132..eb1e2b9 100644
--- a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
@@ -20,13 +20,13 @@ import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.apache.solr.handler.component.HighlightComponent;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.TestHarness;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class HighlighterConfigTest extends AbstractSolrTestCase {
+public class HighlighterConfigTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
index 1e4663f..201f9cb 100644
--- a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
+++ b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
@@ -30,14 +30,14 @@ import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.response.BinaryQueryResponseWriter;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.RTimer;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestWriterPerf extends AbstractSolrTestCase {
+public class TestWriterPerf extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
index ae85d52..5db49ca 100644
--- a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java
@@ -30,7 +30,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.response.BinaryResponseWriter.Resolver;
import org.apache.solr.search.SolrReturnFields;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
/**
@@ -39,7 +39,7 @@ import org.junit.BeforeClass;
*
* @since solr 1.4
*/
-public class TestBinaryResponseWriter extends AbstractSolrTestCase {
+public class TestBinaryResponseWriter extends SolrTestCaseJ4 {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
index 4964d5b..1b5f5ee 100644
--- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
@@ -19,14 +19,14 @@ package org.apache.solr.search;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.HighlightParams;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.TestHarness;
import org.junit.BeforeClass;
import org.junit.Test;
import java.util.HashMap;
-public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase {
+public class TestComplexPhraseQParserPlugin extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
index 6c2694d..1800ddb 100644
--- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
@@ -21,7 +21,7 @@ import org.apache.solr.legacy.LegacyNumericRangeQuery;
import org.apache.lucene.search.*;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -30,7 +30,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Collections;
-public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
+public class TestMaxScoreQueryParser extends SolrTestCaseJ4 {
Query q;
BooleanClause[] clauses;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
index ef976a3..aa94fab 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
@@ -18,11 +18,11 @@ package org.apache.solr.search;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
-public class TestQueryTypes extends AbstractSolrTestCase {
+public class TestQueryTypes extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
index adc8058..8f6e72d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java
@@ -21,7 +21,7 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.Query;
import org.apache.lucene.index.Term;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import java.util.Collection;
@@ -29,7 +29,7 @@ import java.util.Collection;
/**
*
*/
-public class TestQueryUtils extends AbstractSolrTestCase {
+public class TestQueryUtils extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
index 4c63309..08167b6 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -18,7 +18,7 @@ package org.apache.solr.search;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
@@ -34,7 +34,7 @@ import java.io.IOException;
/**
*
*/
-public class TestSearchPerf extends AbstractSolrTestCase {
+public class TestSearchPerf extends SolrTestCaseJ4 {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java
index 7b01a73..8a6d7e2 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java
@@ -16,10 +16,10 @@
*/
package org.apache.solr.search;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
-public class TestSurroundQueryParser extends AbstractSolrTestCase {
+public class TestSurroundQueryParser extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
index ada1208..658a257 100644
--- a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
+++ b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.search.function;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -23,7 +23,7 @@ import org.junit.BeforeClass;
*
* @see TestSortByMinMaxFunction
**/
-public class SortByFunctionTest extends AbstractSolrTestCase {
+public class SortByFunctionTest extends SolrTestCaseJ4 {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
index 30b33da..53e1ea7 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
@@ -35,7 +35,7 @@ import org.junit.Test;
/**
* Tests some basic functionality of Solr while demonstrating good
- * Best Practices for using AbstractSolrTestCase
+ * Best Practices for using SolrTestCaseJ4
*/
public class TestFunctionQuery extends SolrTestCaseJ4 {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
index 98cdcd2..b382342 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
@@ -41,7 +41,7 @@ import org.apache.solr.common.util.Base64;
import org.apache.solr.common.util.Utils;
import org.apache.solr.handler.admin.SecurityConfHandler;
import org.apache.solr.handler.admin.SecurityConfHandlerLocalForTesting;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.LogLevel;
import org.junit.After;
import org.junit.Before;
@@ -54,10 +54,10 @@ import static org.apache.solr.security.BasicAuthIntegrationTest.NOT_NULL_PREDICA
import static org.apache.solr.security.BasicAuthIntegrationTest.STD_CONF;
import static org.apache.solr.security.BasicAuthIntegrationTest.verifySecurityStatus;
-public class BasicAuthStandaloneTest extends AbstractSolrTestCase {
+public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private Path ROOT_DIR = Paths.get(getSolrHome());
+ private Path ROOT_DIR = Paths.get(TEST_HOME());
private Path CONF_DIR = ROOT_DIR.resolve("configsets").resolve("configset-2").resolve("conf");
SecurityConfHandlerLocalForTesting securityConfHandler;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
index 8c7217f..9b70155 100644
--- a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
@@ -19,12 +19,12 @@ package org.apache.solr.servlet;
import java.net.URLEncoder;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
-public class DirectSolrConnectionTest extends AbstractSolrTestCase
+public class DirectSolrConnectionTest extends SolrTestCaseJ4
{
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
index 01e44fd..21a39bd 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
@@ -21,7 +21,7 @@ import java.io.FileFilter;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -29,7 +29,7 @@ import org.junit.BeforeClass;
*
*
**/
-public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
+public class DirectUpdateHandlerOptimizeTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
index a5814d3..93af37a 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -31,7 +31,8 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrEventListener;
import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.util.TestHarness;
import org.junit.Before;
import org.junit.BeforeClass;
import org.slf4j.Logger;
@@ -57,7 +58,7 @@ import org.slf4j.LoggerFactory;
* </ul>
*/
@Slow
-public class SoftAutoCommitTest extends AbstractSolrTestCase {
+public class SoftAutoCommitTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
@@ -529,6 +530,15 @@ public class SoftAutoCommitTest extends AbstractSolrTestCase {
};
public abstract int useValue(final int softCommitWaitMillis, final int hardCommitWaitMillis);
}
+
+ public String delI(String id, String... args) {
+ return TestHarness.deleteById(id, args);
+ }
+
+ public String adoc(int commitWithin, String... fieldsAndValues) {
+ XmlDoc d = doc(fieldsAndValues);
+ return add(d, "commitWithin", String.valueOf(commitWithin));
+ }
}
class MockEventListener implements SolrEventListener {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
index 6aee5bd..802090b 100644
--- a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
+++ b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
@@ -18,7 +18,7 @@ package org.apache.solr.update;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.util.RTimer;
import org.junit.AfterClass;
@@ -36,7 +36,7 @@ import java.util.Arrays;
*
* $ ant test -Dtestcase=TestIndexingPerformance -Dargs="-server -Diter=100000"; grep throughput build/test-results/*TestIndexingPerformance.xml
*/
-public class TestIndexingPerformance extends AbstractSolrTestCase {
+public class TestIndexingPerformance extends SolrTestCaseJ4 {
// TODO: fix this test to not require FSDirectory
static String savedFactory;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
index b90a940..114ff6a 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java
@@ -24,12 +24,12 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.UpdateRequestHandler;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
-public class UpdateParamsTest extends AbstractSolrTestCase {
+public class UpdateParamsTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
index dc7aba1..65f3eca 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
/**
*
*/
-public class UpdateRequestProcessorFactoryTest extends AbstractSolrTestCase {
+public class UpdateRequestProcessorFactoryTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
index 2c8ebe9..76c4e5b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
* @since solr 1.4
*
*/
-public abstract class MergeIndexesExampleTestBase extends SolrExampleTestBase {
+public abstract class MergeIndexesExampleTestBase extends SolrTestCaseJ4 {
protected CoreContainer cores;
private String saveProp;
@@ -49,16 +49,10 @@ public abstract class MergeIndexesExampleTestBase extends SolrExampleTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- @Override
- public String getSolrHome() {
+ static String getSolrHome() {
return SolrTestCaseJ4.getFile("solrj/solr/multicore").getAbsolutePath();
}
- @BeforeClass
- public static void beforeClass2() throws Exception {
-
- }
-
protected void setupCoreContainer() {
cores = new CoreContainer(getSolrHome());
cores.load();
@@ -93,16 +87,6 @@ public abstract class MergeIndexesExampleTestBase extends SolrExampleTestBase {
else System.setProperty("solr.directoryFactory", saveProp);
}
- @Override
- protected final SolrClient getSolrClient() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected final SolrClient createNewSolrClient() {
- throw new UnsupportedOperationException();
- }
-
protected abstract SolrClient getSolrCore0();
protected abstract SolrClient getSolrCore1();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
deleted file mode 100644
index 114d8ed..0000000
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj;
-
-import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.BeforeClass;
-
-/**
- * This should include tests against the example solr config
- *
- * This lets us try various SolrServer implementations with the same tests.
- *
- */
-abstract public class SolrExampleTestBase extends AbstractSolrTestCase {
- @Override
- public String getSolrHome() {
- return "../../../example/solr/";
- }
-
- @BeforeClass
- public static void beforeClass() throws Exception {
-
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
- // this sets the property for jetty starting SolrDispatchFilter
- System.setProperty("solr.solr.home", this.getSolrHome());
- System.setProperty("solr.data.dir", this.initCoreDataDir.getCanonicalPath());
- }
-
- @Override
- public void tearDown() throws Exception {
- System.clearProperty("solr.solr.home");
- System.clearProperty("solr.data.dir");
- super.tearDown();
- }
-
- /**
- * Subclasses need to initialize the server impl
- */
- protected abstract SolrClient getSolrClient();
-
- /**
- * Create a new solr server
- */
- protected abstract SolrClient createNewSolrClient();
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index c089b24..706f1eb 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -118,7 +118,6 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.servlet.DirectSolrConnection;
-import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.LogLevel;
import org.apache.solr.util.RandomizeSSL;
import org.apache.solr.util.RandomizeSSL.SSLRandomizer;
@@ -149,10 +148,9 @@ import static org.apache.solr.update.processor.DistributedUpdateProcessor.Distri
import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
/**
- * A junit4 Solr test harness that extends LuceneTestCaseJ4. To change which core is used when loading the schema and solrconfig.xml, simply
+ * A junit4 Solr test harness that extends LuceneTestCaseJ4.
+ * To change which core is used when loading the schema and solrconfig.xml, simply
* invoke the {@link #initCore(String, String, String, String)} method.
- *
- * Unlike {@link AbstractSolrTestCase}, a new core is not created for each test method.
*/
@ThreadLeakFilters(defaultFilters = true, filters = {
SolrIgnoredThreadsFilter.class,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f354a278/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
deleted file mode 100644
index dcbdb49..0000000
--- a/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.util;
-
-
-import java.io.File;
-import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
-
-import org.apache.lucene.util.QuickPatchThreadsFilter;
-import org.apache.solr.SolrIgnoredThreadsFilter;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.core.SolrConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-
-/**
- * An Abstract base class that makes writing Solr JUnit tests "easier"
- *
- * <p>
- * Test classes that subclass this need only specify the path to the
- * schema.xml file (:TODO: the solrconfig.xml as well) and write some
- * testMethods. This class takes care of creating/destroying the index,
- * and provides several assert methods to assist you.
- * </p>
- *
- * @see #setUp
- * @see #tearDown
- */
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class,
- QuickPatchThreadsFilter.class
-})
-public abstract class AbstractSolrTestCase extends SolrTestCaseJ4 {
- protected SolrConfig solrConfig;
-
-
- /**
- * Subclasses can override this to change a test's solr home
- * (default is in test-files)
- */
- public String getSolrHome() {
- return SolrTestCaseJ4.TEST_HOME();
- }
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-
- /** Causes an exception matching the regex pattern to not be logged. */
- public static void ignoreException(String pattern) {
- if (SolrException.ignorePatterns == null)
- SolrException.ignorePatterns = new HashSet<>();
- SolrException.ignorePatterns.add(pattern);
- }
-
- public static void resetExceptionIgnores() {
- SolrException.ignorePatterns = null;
- ignoreException("ignore_exception"); // always ignore "ignore_exception"
- }
-
- /** Subclasses that override setUp can optionally call this method
- * to log the fact that their setUp process has ended.
- */
- @Override
- public void postSetUp() {
- log.info("####POSTSETUP " + getTestName());
- }
-
-
- /** Subclasses that override tearDown can optionally call this method
- * to log the fact that the tearDown process has started. This is necessary
- * since subclasses will want to call super.tearDown() at the *end* of their
- * tearDown method.
- */
- @Override
- public void preTearDown() {
- log.info("####PRETEARDOWN " + getTestName());
- }
-
-
- /**
- * Generates a simple <add><doc>... XML String with the
- * commitWithin attribute.
- *
- * @param commitWithin the value of the commitWithin attribute
- * @param fieldsAndValues 0th and Even numbered args are fields names odds are field values.
- * @see #add
- * @see #doc
- */
- public String adoc(int commitWithin, String... fieldsAndValues) {
- XmlDoc d = doc(fieldsAndValues);
- return add(d, "commitWithin", String.valueOf(commitWithin));
- }
-
-
- /**
- * Generates a <delete>... XML string for an ID
- *
- * @see TestHarness#deleteById
- */
- public String delI(String id, String... args) {
- return TestHarness.deleteById(id, args);
- }
-
- /**
- * Generates a <delete>... XML string for an query
- *
- * @see TestHarness#deleteByQuery
- */
- public String delQ(String q, String... args) {
- return TestHarness.deleteByQuery(q, args);
- }
-
- /** @see SolrTestCaseJ4#getFile */
- public static File getFile(String name) {
- return SolrTestCaseJ4.getFile(name);
- }
-}