You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/09/13 14:34:45 UTC
svn commit: r1702772 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/ solr/contrib/analytics/src/test/org/apache/solr/analytics/
solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/
solr/contrib/map-reduce/src/test/org/apache/sol...
Author: uschindler
Date: Sun Sep 13 12:34:43 2015
New Revision: 1702772
URL: http://svn.apache.org/r1702772
Log:
Merged revision(s) 1702770 from lucene/dev/trunk:
LUCENE-6795: Fix Solr tests that break RamUsageTester on Java 9 Jigsaw
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Modified: lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java Sun Sep 13 12:34:43 2015
@@ -41,6 +41,8 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.analytics.util.MedianCalculator;
import org.apache.solr.analytics.util.PercentileCalculator;
import org.apache.solr.request.SolrQueryRequest;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -73,16 +75,28 @@ public class AbstractAnalyticsStatsTest
}
static private Document doc;
- static private XPathFactory xPathFact = XPathFactory.newInstance();
+ static private XPathFactory xPathFact;
static private String rawResponse;
+
+ @BeforeClass
+ public static void beforeClassAbstractAnalysis() {
+ xPathFact = XPathFactory.newInstance();
+ }
+
+ @AfterClass
+ public static void afterClassAbstractAnalysis() {
+ xPathFact = null;
+ doc = null;
+ rawResponse = null;
+ defaults.clear();
+ }
public static void setResponse(String response) throws ParserConfigurationException, IOException, SAXException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true); // never forget this!
DocumentBuilder builder = factory.newDocumentBuilder();
doc = builder.parse(new InputSource(new ByteArrayInputStream(response.getBytes(StandardCharsets.UTF_8))));
- xPathFact = XPathFactory.newInstance();
rawResponse = response;
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java Sun Sep 13 12:34:43 2015
@@ -35,6 +35,8 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.analytics.util.MedianCalculator;
import org.apache.solr.analytics.util.PercentileCalculator;
import org.apache.solr.request.SolrQueryRequest;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import com.google.common.collect.ObjectArrays;
@@ -57,15 +59,27 @@ public class AbstractAnalyticsFacetTest
protected String latestType = "";
private static Document doc;
- private static XPathFactory xPathFact = XPathFactory.newInstance();
+ private static XPathFactory xPathFact;
private static String rawResponse;
+ @BeforeClass
+ public static void beforeClassAbstractAnalysis() {
+ xPathFact = XPathFactory.newInstance();
+ }
+
+ @AfterClass
+ public static void afterClassAbstractAnalysis() {
+ xPathFact = null;
+ doc = null;
+ rawResponse = null;
+ defaults.clear();
+ }
+
protected static void setResponse(String response) throws ParserConfigurationException, IOException, SAXException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true); // never forget this!
DocumentBuilder builder = factory.newDocumentBuilder();
doc = builder.parse(new InputSource(new ByteArrayInputStream(response.getBytes(StandardCharsets.UTF_8))));
- xPathFact = XPathFactory.newInstance();
rawResponse = response;
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java Sun Sep 13 12:34:43 2015
@@ -46,6 +46,7 @@ public abstract class MRUnitBase extends
@AfterClass
public static void teardownClass() throws Exception {
if (solrHomeZip != null) Files.delete(solrHomeZip.toPath());
+ solrHomeZip = null;
}
protected void setupHadoopConfig(Configuration config) throws IOException {
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java Sun Sep 13 12:34:43 2015
@@ -39,6 +39,7 @@ public class SolrCellMorphlineTest exten
private Map<String,Integer> expectedRecords = new HashMap<>();
private Map<String, Map<String, Object>> expectedRecordContents = new HashMap<>();
+
@BeforeClass
public static void beforeClass2() {
assumeFalse("FIXME: Morphlines currently has issues with Windows paths", Constants.WINDOWS);
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Sun Sep 13 12:34:43 2015
@@ -100,6 +100,7 @@ public class AbstractSolrMorphlineTestBa
if (savedLocale != null) {
Locale.setDefault(savedLocale);
}
+ savedLocale = null;
}
protected static void myInitCore(String baseDirName) throws Exception {
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java Sun Sep 13 12:34:43 2015
@@ -20,6 +20,7 @@ package org.apache.solr.morphlines.solr;
import com.codahale.metrics.MetricRegistry;
import com.google.common.collect.ListMultimap;
import com.typesafe.config.Config;
+
import org.apache.commons.io.FileUtils;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -27,6 +28,7 @@ import org.apache.solr.cloud.AbstractFul
import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.kitesdk.morphline.api.Collector;
import org.kitesdk.morphline.api.Command;
@@ -72,6 +74,11 @@ public abstract class AbstractSolrMorphl
FileUtils.copyDirectory(SOLR_INSTANCE_DIR, solrHomeDirectory);
}
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ solrHomeDirectory = null;
+ }
+
@Override
public void distribSetUp() throws Exception {
super.distribSetUp();
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java Sun Sep 13 12:34:43 2015
@@ -34,11 +34,10 @@ import java.util.TimeZone;
import java.util.Locale;
public class DateFieldTest extends SolrTestCaseJ4 {
- public static TimeZone UTC = DateFormatUtil.UTC;
private final String testInstanceDir = TEST_HOME() + File.separator + "collection1";
private final String testConfHome = testInstanceDir + File.separator + "conf"+ File.separator;
private TrieDateField f = null;
- private DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
+ private DateMathParser p = new DateMathParser(DateFormatUtil.UTC, Locale.ROOT);
@Override
public void setUp() throws Exception {
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java Sun Sep 13 12:34:43 2015
@@ -25,14 +25,12 @@ import org.junit.Test;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import java.util.TimeZone;
/**
* Tests that defaults are set for Primitive (non-analyzed) fields
*/
public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 {
private final String testConfHome = TEST_HOME() + File.separator + "collection1" + File.separator + "conf"+ File.separator;
- public static TimeZone UTC = TimeZone.getTimeZone("UTC");
protected SolrConfig config;
protected IndexSchema schema;
protected HashMap<String,String> initMap;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java Sun Sep 13 12:34:43 2015
@@ -17,6 +17,8 @@
package org.apache.solr.util;
+import static org.apache.solr.util.DateFormatUtil.UTC;
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.DateMathParser;
@@ -26,10 +28,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import java.util.Locale;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.HashSet;
-
import java.util.Map;
import java.util.HashMap;
import java.text.ParseException;
@@ -39,8 +37,6 @@ import java.text.ParseException;
*/
public class DateMathParserTest extends LuceneTestCase {
- public static TimeZone UTC = TimeZone.getTimeZone("UTC");
-
/**
* A formatter for specifying every last nuance of a Date for easy
* refernece in assertion statements
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java Sun Sep 13 12:34:43 2015
@@ -51,6 +51,7 @@ public class TestZkConfigManager extends
@AfterClass
public static void shutdownZkServer() throws IOException, InterruptedException {
zkServer.shutdown();
+ zkServer = null;
}
@Test
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1702772&r1=1702771&r2=1702772&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Sun Sep 13 12:34:43 2015
@@ -46,7 +46,14 @@ public abstract class AbstractZkTestCase
public static File SOLRHOME;
- static {
+
+ protected static ZkTestServer zkServer;
+
+ protected static String zkDir;
+
+
+ @BeforeClass
+ public static void azt_beforeClass() throws Exception {
try {
SOLRHOME = new File(TEST_HOME());
} catch (RuntimeException e) {
@@ -54,15 +61,7 @@ public abstract class AbstractZkTestCase
// solrj tests not working with TEST_HOME()
// must override getSolrHome
}
- }
-
- protected static ZkTestServer zkServer;
-
- protected static String zkDir;
-
- @BeforeClass
- public static void azt_beforeClass() throws Exception {
zkDir = createTempDir("zkData").toFile().getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
@@ -161,6 +160,7 @@ public abstract class AbstractZkTestCase
zkServer = null;
}
zkDir = null;
+ SOLRHOME = null;
}
protected void printLayout(String zkHost) throws Exception {