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 2013/12/03 16:42:16 UTC
svn commit: r1547442 - in /lucene/dev/trunk/solr/contrib:
solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/
solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/
solr-mr/src/test/org/apache/solr/hadoop/
Author: markrmiller
Date: Tue Dec 3 15:42:16 2013
New Revision: 1547442
URL: http://svn.apache.org/r1547442
Log:
SOLR-1301: Ignore these tests on java 8 and j9 for now.
Modified:
lucene/dev/trunk/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java Tue Dec 3 15:42:16 2013
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.Constants;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.DateUtil;
@@ -29,6 +30,7 @@ import org.apache.solr.morphlines.solr.A
import org.apache.solr.schema.IndexSchema;
import org.apache.tika.metadata.Metadata;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,6 +38,11 @@ public class SolrCellMorphlineTest exten
private Map<String,Integer> expectedRecords = new HashMap<String,Integer>();
+ @BeforeClass
+ public static void beforeClass2() {
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ }
@Before
public void setUp() throws Exception {
Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java Tue Dec 3 15:42:16 2013
@@ -18,6 +18,8 @@ package org.apache.solr.morphlines.solr;
import java.util.Arrays;
+import org.apache.lucene.util.Constants;
+import org.junit.BeforeClass;
import org.junit.Test;
import com.cloudera.cdk.morphline.api.Record;
@@ -26,6 +28,12 @@ import com.cloudera.cdk.morphline.base.N
public class SolrMorphlineTest extends AbstractSolrMorphlineTestBase {
+ @BeforeClass
+ public static void beforeClass2() {
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ }
+
@Test
public void testLoadSolrBasic() throws Exception {
//System.setProperty("ENV_SOLR_HOME", testSolrHome + "/collection1");
Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java Tue Dec 3 15:42:16 2013
@@ -19,6 +19,7 @@ package org.apache.solr.morphlines.solr;
import java.io.IOException;
import java.util.Iterator;
+import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.solr.client.solrj.SolrQuery;
@@ -29,6 +30,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
+import org.junit.BeforeClass;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
@@ -48,7 +50,13 @@ import com.cloudera.cdk.morphline.base.N
@SuppressCodecs({"Lucene3x", "Lucene40"})
@Slow
public class SolrMorphlineZkAliasTest extends AbstractSolrMorphlineZkTestBase {
-
+
+ @BeforeClass
+ public static void beforeClass2() {
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ }
+
@Override
public void doTest() throws Exception {
Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java Tue Dec 3 15:42:16 2013
@@ -28,11 +28,13 @@ import org.apache.avro.file.DataFileRead
import org.apache.avro.file.FileReader;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericDatumReader;
+import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
+import org.junit.BeforeClass;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
@@ -55,6 +57,12 @@ import com.google.common.io.Files;
@Slow
public class SolrMorphlineZkAvroTest extends AbstractSolrMorphlineZkTestBase {
+ @BeforeClass
+ public static void beforeClass2() {
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ }
+
@Override
public void doTest() throws Exception {
File file = new File(RESOURCES_DIR + "/test-documents/sample-statuses-20120906-141433-medium.avro");
Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java Tue Dec 3 15:42:16 2013
@@ -18,11 +18,13 @@ package org.apache.solr.morphlines.solr;
import java.util.Iterator;
+import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
+import org.junit.BeforeClass;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
@@ -42,7 +44,13 @@ import com.cloudera.cdk.morphline.base.N
@SuppressCodecs({"Lucene3x", "Lucene40"})
@Slow
public class SolrMorphlineZkTest extends AbstractSolrMorphlineZkTestBase {
-
+
+ @BeforeClass
+ public static void beforeClass2() {
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ }
+
@Override
public void doTest() throws Exception {
Modified: lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Tue Dec 3 15:42:16 2013
@@ -37,6 +37,7 @@ import org.apache.hadoop.security.author
import org.apache.hadoop.util.JarFinder;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
@@ -109,13 +110,16 @@ public class MorphlineBasicMiniMRTest ex
@BeforeClass
public static void setupClass() throws Exception {
- LuceneTestCase.assumeTrue(
+ assumeTrue(
"Currently this test can only be run without the lucene test security policy in place",
System.getProperty("java.security.manager", "").equals(""));
- LuceneTestCase.assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
+ assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_CONF_DIR, solrHomeDirectory);
Modified: lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Tue Dec 3 15:42:16 2013
@@ -41,6 +41,7 @@ import org.apache.hadoop.security.author
import org.apache.hadoop.util.JarFinder;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
@@ -129,13 +130,16 @@ public class MorphlineGoLiveMiniMRTest e
@BeforeClass
public static void setupClass() throws Exception {
- LuceneTestCase.assumeTrue(
+ assumeTrue(
"Currently this test can only be run without the lucene test security policy in place",
System.getProperty("java.security.manager", "").equals(""));
- LuceneTestCase.assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
+ assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_INSTANCE_DIR, solrHomeDirectory);
Modified: lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java Tue Dec 3 15:42:16 2013
@@ -34,6 +34,8 @@ public class MorphlineMapperTest extends
@BeforeClass
public static void beforeClass() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
}
@Test
Modified: lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java?rev=1547442&r1=1547441&r2=1547442&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java Tue Dec 3 15:42:16 2013
@@ -18,12 +18,10 @@ package org.apache.solr.hadoop;
import static org.mockito.Mockito.when;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.TaskID;
@@ -35,8 +33,6 @@ import org.apache.hadoop.mapreduce.TaskA
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mrunit.mapreduce.ReduceDriver;
import org.apache.lucene.util.Constants;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,6 +46,8 @@ public class MorphlineReducerTest extend
@BeforeClass
public static void beforeClass() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
+ assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
+ assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
}
public static class MySolrReducer extends SolrReducer {