You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/07/06 16:04:14 UTC

svn commit: r1689405 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java

Author: mikemccand
Date: Mon Jul  6 14:04:14 2015
New Revision: 1689405

URL: http://svn.apache.org/r1689405
Log:
LUCENE-6365: fix test to not add duplicate strings

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java
    lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java?rev=1689405&r1=1689404&r2=1689405&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java Mon Jul  6 14:04:14 2015
@@ -33,6 +33,9 @@ import java.util.BitSet;
  * <p>Be aware that the iteration order is implementation dependent
  * and may change across releases.
  *
+ * <p>If the automaton is not determinized then it's possible this iterator
+ * will return duplicates.
+ *
  * @lucene.experimental
  */
 public class FiniteStringsIterator {

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java?rev=1689405&r1=1689404&r2=1689405&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java Mon Jul  6 14:04:14 2015
@@ -47,11 +47,12 @@ public class FiniteStringsIteratorTest e
     IntsRefBuilder scratch = new IntsRefBuilder();
     for(int i=0;i<numStrings;i++) {
       String s = TestUtil.randomSimpleString(random(), 1, 200);
-      automata.add(Automata.makeString(s));
       Util.toUTF32(s.toCharArray(), 0, s.length(), scratch);
-      strings.add(scratch.toIntsRef());
-      if (VERBOSE) {
-        System.out.println("  add string=" + s);
+      if (strings.add(scratch.toIntsRef())) {
+        automata.add(Automata.makeString(s));
+        if (VERBOSE) {
+          System.out.println("  add string=" + s);
+        }
       }
     }