You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/16 15:26:33 UTC

svn commit: r1301544 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java

Author: rmuir
Date: Fri Mar 16 14:26:32 2012
New Revision: 1301544

URL: http://svn.apache.org/viewvc?rev=1301544&view=rev
Log:
LUCENE-3879: backport test

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java

Modified: lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1301544&r1=1301543&r2=1301544&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Fri Mar 16 14:26:32 2012
@@ -1360,6 +1360,9 @@ public class TestIndexWriterExceptions e
     Document doc = new Document();
     Token t1 = new Token("foo", 0, 3);
     t1.setPositionIncrement(Integer.MAX_VALUE-500);
+    if (random.nextBoolean()) {
+      t1.setPayload(new Payload(new byte[] { 0x1 } ));
+    }
     TokenStream overflowingTokenStream = new CannedTokenStream(
         new Token[] { t1 }
     );

Modified: lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java?rev=1301544&r1=1301543&r2=1301544&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java (original)
+++ lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java Fri Mar 16 14:26:32 2012
@@ -21,6 +21,7 @@ import java.io.IOException;
 
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 
 public final class CannedTokenStream extends TokenStream {
@@ -29,6 +30,7 @@ public final class CannedTokenStream ext
   private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
   private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class);
   private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
+  private final PayloadAttribute payloadAtt = addAttribute(PayloadAttribute.class);
   
   public CannedTokenStream(Token[] tokens) {
     this.tokens = tokens;
@@ -45,6 +47,7 @@ public final class CannedTokenStream ext
       termAtt.append(token.toString());
       posIncrAtt.setPositionIncrement(token.getPositionIncrement());
       offsetAtt.setOffset(token.startOffset(), token.endOffset());
+      payloadAtt.setPayload(token.getPayload());
       return true;
     } else {
       return false;