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 2014/08/15 20:12:27 UTC
svn commit: r1618252 - in
/lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor:
LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java
LanguageIdentifierUpdateProcessorFactoryTestCase.java
Author: uschindler
Date: Fri Aug 15 18:12:26 2014
New Revision: 1618252
URL: http://svn.apache.org/r1618252
Log:
SOLR-6381: Fix brokenness with RAM accounting in Java 9 (this is just a workaround for the bug in test framework, but it makes the test behave correct - using static fields here is a bug!)
Modified:
lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java
lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
Modified: lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java?rev=1618252&r1=1618251&r2=1618252&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java Fri Aug 15 18:12:26 2014
@@ -40,7 +40,7 @@ public class LangDetectLanguageIdentifie
*/
@Test @Override
public void testLangIdGlobal() throws Exception {
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "name,subject");
parameters.add("langid.langField", "language_s");
parameters.add("langid.fallback", "un");
Modified: lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java?rev=1618252&r1=1618251&r2=1618252&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java (original)
+++ lucene/dev/trunk/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java Fri Aug 15 18:12:26 2014
@@ -26,17 +26,14 @@ import org.apache.solr.core.SolrCore;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.servlet.SolrRequestParsers;
public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends SolrTestCaseJ4 {
- protected static SolrRequestParsers _parser;
- protected static SolrQueryRequest req;
- protected static SolrQueryResponse resp = new SolrQueryResponse();
- protected static LanguageIdentifierUpdateProcessor liProcessor;
- protected static ModifiableSolrParams parameters;
+ protected static final SolrRequestParsers _parser = new SolrRequestParsers(null);
+ protected static final SolrQueryResponse resp = new SolrQueryResponse();
+ protected LanguageIdentifierUpdateProcessor liProcessor;
@BeforeClass
public static void beforeClass() throws Exception {
@@ -44,7 +41,6 @@ public abstract class LanguageIdentifier
SolrCore core = h.getCore();
UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("lang_id");
assertNotNull(chained);
- _parser = new SolrRequestParsers(null);
}
@Override
@@ -57,7 +53,7 @@ public abstract class LanguageIdentifier
@Test
public void testLangIdGlobal() throws Exception {
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "name,subject");
parameters.add("langid.langField", "language_s");
parameters.add("langid.fallback", "un");
@@ -88,7 +84,7 @@ public abstract class LanguageIdentifier
@Test
public void testMapFieldName() throws Exception {
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "name");
parameters.add("langid.map.lcmap", "jp:s zh:cjk ko:cjk");
parameters.set("langid.enforceSchema", "false");
@@ -115,7 +111,7 @@ public abstract class LanguageIdentifier
@Test
public void testMapLangcode() throws Exception {
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "name");
parameters.add("langid.lcmap", "zh_cn:zh zh_tw:zh");
parameters.set("langid.enforceSchema", "false");
@@ -132,7 +128,7 @@ public abstract class LanguageIdentifier
@Test
public void testPreExisting() throws Exception {
SolrInputDocument doc;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text");
parameters.add("langid.langField", "language");
parameters.add("langid.langsField", "languages");
@@ -158,7 +154,7 @@ public abstract class LanguageIdentifier
@Test
public void testPreExistingMultiValue() throws Exception {
SolrInputDocument doc;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text_multivalue");
parameters.add("langid.langField", "language");
parameters.add("langid.langsField", "languages");
@@ -184,7 +180,7 @@ public abstract class LanguageIdentifier
@Test
public void testPreExistingMultiValueMixedLang() throws Exception {
SolrInputDocument doc;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text_multivalue");
parameters.add("langid.langField", "language");
parameters.add("langid.langsField", "languages");
@@ -206,7 +202,7 @@ public abstract class LanguageIdentifier
@Test
public void testDefaultFallbackEmptyString() throws Exception {
SolrInputDocument doc;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text");
parameters.add("langid.langField", "language");
parameters.add("langid.enforceSchema", "false");
@@ -219,7 +215,7 @@ public abstract class LanguageIdentifier
@Test
public void testFallback() throws Exception {
SolrInputDocument doc;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text");
parameters.add("langid.langField", "language");
parameters.add("langid.fallbackFields", "noop,fb");
@@ -240,7 +236,7 @@ public abstract class LanguageIdentifier
@Test
public void testResolveLanguage() throws Exception {
List<DetectedLanguage> langs;
- parameters = new ModifiableSolrParams();
+ ModifiableSolrParams parameters = new ModifiableSolrParams();
parameters.add("langid.fl", "text");
parameters.add("langid.langField", "language");
liProcessor = createLangIdProcessor(parameters);