lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1547242 - in /lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop: MapReduceIndexerToolArgumentParserTest.java MorphlineMapperTest.java MorphlineReducerTest.java PathValidation.java
Date Mon, 02 Dec 2013 23:49:31 GMT
Author: uschindler
Date: Mon Dec  2 23:49:30 2013
New Revision: 1547242

URL: http://svn.apache.org/r1547242
Log:
SOLR-1301: Ignore windows tests that cannot work because they use UNIX semantics. Also remove
a never-executed test which tests nothing

Removed:
    lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/PathValidation.java
Modified:
    lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.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-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java?rev=1547242&r1=1547241&r2=1547242&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
(original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
Mon Dec  2 23:49:30 2013
@@ -26,6 +26,7 @@ import java.util.Collections;
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.cloud.AbstractZkTestCase;
 import org.apache.solr.hadoop.dedup.NoChangeUpdateConflictResolver;
@@ -33,6 +34,7 @@ import org.apache.solr.hadoop.dedup.Reta
 import org.apache.solr.util.ExternalPaths;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,10 +55,14 @@ public class MapReduceIndexerToolArgumen
   private static final String MORPHLINE_FILE = RESOURCES_DIR + "/test-morphlines/solrCellDocumentTypes.conf";
     
   private static final Logger LOG = LoggerFactory.getLogger(MapReduceIndexerToolArgumentParserTest.class);
-
   
   private static final File solrHomeDirectory = new File(TEMP_DIR, MorphlineGoLiveMiniMRTest.class.getName());
   
+  @BeforeClass
+  public static void beforeClass() {
+    assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths",
Constants.WINDOWS);
+  }
+  
   @Before
   public void setUp() throws Exception {
     super.setUp();

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=1547242&r1=1547241&r2=1547242&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
Mon Dec  2 23:49:30 2013
@@ -23,12 +23,19 @@ import org.apache.hadoop.io.LongWritable
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mrunit.mapreduce.MapDriver;
 import org.apache.hadoop.mrunit.types.Pair;
+import org.apache.lucene.util.Constants;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.hadoop.morphline.MorphlineMapper;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class MorphlineMapperTest extends MRUnitBase {
   
+  @BeforeClass
+  public static void beforeClass() {
+    assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths",
Constants.WINDOWS);
+  }
+  
   @Test
   public void testMapper() throws Exception {
     MorphlineMapper mapper = new MorphlineMapper();

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=1547242&r1=1547241&r2=1547242&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
Mon Dec  2 23:49:30 2013
@@ -34,6 +34,7 @@ import org.apache.hadoop.mapreduce.Recor
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
 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;
@@ -46,6 +47,11 @@ import com.google.common.collect.Lists;
 
 public class MorphlineReducerTest extends MRUnitBase {
   
+  @BeforeClass
+  public static void beforeClass() {
+    assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths",
Constants.WINDOWS);
+  }
+  
   public static class MySolrReducer extends SolrReducer {
     Context context;
 



Mime
View raw message