svn commit: r1655709 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

[rm...@apache.org]

Author: rmuir
Date: Thu Jan 29 15:36:16 2015
New Revision: 1655709

URL: http://svn.apache.org/r1655709
Log:
LUCENE-6206: link to jdk bug, tighten up the assume

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1655709&r1=1655708&r2=1655709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Jan 29 15:36:16 2015
@@ -2550,13 +2550,13 @@ public abstract class LuceneTestCase ext
   /** 
    * Compares two strings with a collator, also looking to see if the the strings
    * are impacted by jdk bugs. may not avoid all jdk bugs in tests.
-   * see LUCENE-2606
+   * see https://bugs.openjdk.java.net/browse/JDK-8071862
    */
   public static int collate(Collator collator, String s1, String s2) {
     int v1 = collator.compare(s1, s2);
     int v2 = collator.getCollationKey(s1).compareTo(collator.getCollationKey(s2));
     // if collation keys don't really respect collation order, things are screwed.
-    assumeTrue("hit JDK collator bug", v1 == v2);
+    assumeTrue("hit JDK collator bug", Integer.signum(v1) == Integer.signum(v2));
     return v1;
   }
 }