svn commit: r1490794 - in /mahout/trunk/integration/src: main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java

[gs...@apache.org]

Author: gsingers
Date: Fri Jun  7 19:34:00 2013
New Revision: 1490794

URL: http://svn.apache.org/r1490794
Log:
MAHOUT-944: fix test

Modified:
    mahout/trunk/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java
    mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java

Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java?rev=1490794&r1=1490793&r2=1490794&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java Fri Jun  7 19:34:00 2013
@@ -56,9 +56,12 @@ public class LuceneSegmentRecordReader e
     segmentReader = new SegmentReader(segmentInfo, USE_TERM_INFO, IOContext.READ);
 
 
-      IndexSearcher searcher = new IndexSearcher(segmentReader);
+    IndexSearcher searcher = new IndexSearcher(segmentReader);
     Weight weight = lucene2SeqConfiguration.getQuery().createWeight(searcher);
     scorer = weight.scorer(segmentReader.getContext(), false, false, null);
+    if (scorer == null) {
+      throw new IllegalArgumentException("Could not create query scorer for query: " + lucene2SeqConfiguration.getQuery());
+    }
   }
 
   @Override

Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java?rev=1490794&r1=1490793&r2=1490794&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java Fri Jun  7 19:34:00 2013
@@ -19,15 +19,22 @@ package org.apache.mahout.text;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.Writable;
 import org.apache.lucene.search.TermQuery;
 import org.apache.mahout.common.HadoopUtil;
+import org.apache.mahout.common.Pair;
+import org.apache.mahout.common.iterator.sequencefile.PathFilters;
+import org.apache.mahout.common.iterator.sequencefile.PathType;
+import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirIterator;
 import org.apache.mahout.text.doc.SingleFieldDocument;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.List;
 
 import static java.util.Arrays.asList;
@@ -138,7 +145,7 @@ public class SequenceFilesFromLuceneStor
     assertEquals(SequenceFilesFromLuceneStorageDriver.DEFAULT_MAX_HITS, lucene2SeqConf.getMaxHits());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testRun_invalidQuery() throws Exception {
     String[] args = {
       "-i", getIndexPath1AsFile().toString(),
@@ -150,6 +157,11 @@ public class SequenceFilesFromLuceneStor
 
     driver.setConf(conf);
     driver.run(args);
+    assertTrue(FileSystem.get(conf).exists(seqFilesOutputPath));
+    //shouldn't be any real files in the seq files out path
+    SequenceFileDirIterator<Writable, Writable> iter = new SequenceFileDirIterator<Writable, Writable>(seqFilesOutputPath, PathType.LIST, PathFilters.logsCRCFilter(), null, false, conf);
+    assertFalse(iter.hasNext());
+
   }
 
   @Test