You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2021/02/21 18:45:39 UTC
[lucene-solr] branch reference_impl_dev updated: @1375 Test
hardening.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new e22ce65 @1375 Test hardening.
e22ce65 is described below
commit e22ce65fd2abfef95d4fb37df116f86c5383ec0c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Feb 21 12:45:21 2021 -0600
@1375 Test hardening.
Took 14 minutes
---
.../apache/solr/schema/TestICUCollationFieldDocValues.java | 6 ++++++
.../analytics/legacy/expression/LegacyExpressionTest.java | 6 ++++++
.../solr/analytics/legacy/facet/LegacyFieldFacetTest.java | 2 ++
.../dataimport/TestFileListWithLineEntityProcessor.java | 6 ++++++
.../handler/extraction/ExtractingRequestHandlerTest.java | 14 ++++++++++++++
.../apache/solr/client/solrj/TestSolrJErrorHandling.java | 2 +-
6 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
index b79b4e5..ec1aadc 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
@@ -23,6 +23,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.SolrTestUtil;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import com.ibm.icu.text.Collator;
@@ -53,6 +54,11 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertU(adoc("id", "12", "text", "\u0698\u0698"));
assertU(commit());
}
+
+ @AfterClass
+ public static void afterTestICUCollationFieldDocValues() throws Exception {
+ deleteCore();
+ }
/**
* Ugly: but what to do? We want to test custom sort, which reads rules in as a resource.
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
index 3c1203b..4b5f99b 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
@@ -22,6 +22,7 @@ import java.util.Date;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.analytics.legacy.LegacyAbstractAnalyticsTest;
import org.apache.solr.util.DateMathParser;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -62,6 +63,11 @@ public class LegacyExpressionTest extends LegacyAbstractAnalyticsTest {
setResponse(h.query(request(fileToStringArr(LegacyExpressionTest.class, fileName))));
}
+ @AfterClass
+ public static void afterTestICUCollationFieldDocValues() throws Exception {
+ deleteCore();
+ }
+
@Test
public void addTest() throws Exception {
double sumResult = (Double) getStatResult("ar", "sum", VAL_TYPE.DOUBLE);
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
index 0a660d4..66a05d9 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
@@ -423,6 +423,8 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest{
@AfterClass
public static void afterLegacyFieldFacetTest() {
+ deleteCore();
+
//INT
intDateTestStart = null;
intDateTestMissing = null;
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
index edb4834..36e3ca4 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
@@ -21,6 +21,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.solr.SolrTestUtil;
import org.apache.solr.request.LocalSolrQueryRequest;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TestFileListWithLineEntityProcessor extends AbstractDataImportHandlerTestCase {
@@ -28,6 +29,11 @@ public class TestFileListWithLineEntityProcessor extends AbstractDataImportHandl
public static void beforeTestFileListWithLineEntityProcessor() throws Exception {
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
}
+
+ @AfterClass
+ public static void afterTestFileListWithLineEntityProcessor() throws Exception {
+ deleteCore();
+ }
public void test() throws Exception {
File tmpdir = SolrTestUtil.createTempDir(SolrTestUtil.getTestName()).toFile();
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index f714ec4..e4a2319 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@ -35,6 +35,8 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.processor.BufferingRequestProcessor;
+import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -59,14 +61,26 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
initCore("solrconfig.xml", "schema.xml", SolrTestUtil.getFile("extraction/solr").getAbsolutePath());
}
+ @AfterClass
+ public static void afterExtractingRequestHandlerTest() throws Exception {
+ deleteCore();
+ }
+
@Override
@Before
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @Override
+ @After
+ public void tearDown() throws Exception {
clearIndex();
assertU(commit());
+ super.tearDown();
}
+
@Test
public void testExtraction() throws Exception {
SolrCore core = h.getCore();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java
index c3d1e83..5fc837c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java
@@ -65,7 +65,7 @@ public class TestSolrJErrorHandling extends SolrJettyTestBase {
@AfterClass
public static void afterTestSolrJErrorHandling() {
- deleteCore();
+
}
@Override