[bugfix] Fix binary-value equality checks.

Author: chris-evolvedbinary

exist-core/src/main/java/org/exist/xquery/functions/fn/FunCollationKey.java

@@ -65,7 +65,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
         final Collator collator = (args.length >= 2) ? Collations.getCollationFromURI(args[1].itemAt(0).toString()) : null;
 
         return new BinaryValueFromBinaryString(new Base64BinaryValueType(), Base64.encodeBase64String(
-                (collator == null) ? source.getBytes(StandardCharsets.UTF_8) : new String(collator.getCollationKey(source).toByteArray()).getBytes(StandardCharsets.UTF_8)));
+                (collator == null) ? source.getBytes(StandardCharsets.UTF_8) : new String(collator.getCollationKey(source).toByteArray()).getBytes(StandardCharsets.UTF_8))).convertTo(new Base64BinaryValueType());
     }
 
     private static FunctionSignature[] functionSignatures(final String name, final String description, final FunctionReturnSequenceType returnType, final FunctionParameterSequenceType[][] variableParamTypes) {

exist-core/src/main/java/org/exist/xquery/value/BinaryValue.java

@@ -31,6 +31,7 @@
 import org.exist.xquery.XPathException;
 
 import java.io.*;
+import java.util.Objects;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -109,10 +110,13 @@ private int compareTo(BinaryValue otherValue) {
             return -1;
         } else if (otherIs == null) {
             return 1;
+        } else if (is == otherIs) {
+            return 0;
         } else {
-            int read = -1;
-            int otherRead = -1;
-            while (true) {
+            int read;
+            int otherRead;
+            do {
+
                 try {
                     read = is.read();
                 } catch (final IOException ioe) {
@@ -125,8 +129,12 @@ private int compareTo(BinaryValue otherValue) {
                     return 1;
                 }
 
-                return read - otherRead;
-            }
+                final int readComparison = Integer.compare(read, otherRead);
+                if (readComparison != 0) {
+                    return readComparison;
+                }
+            } while (read != -1 && otherRead != -1);
+            return 0;
         }
     }
 
@@ -276,4 +284,12 @@ public void streamTo(OutputStream os) throws IOException {
      * Increments the number of shared references to this binary value.
      */
     public abstract void incrementSharedReferences();
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BinaryValue that = (BinaryValue) o;
+        return compareTo(that) == 0;
+    }
 }

exist-core/src/test/xquery/xquery3/fnCollationKey.xqm

@@ -67,17 +67,17 @@ function fnck:exist-equal() {
 
 declare
     %test:assertTrue
-function fnck:exist-equal-ignore-case() {
+function fnck:exist-not-equal() {
     let $first := fn:collation-key("a", "http://exist-db.org/collation")
-    let $second := fn:collation-key("A", "http://exist-db.org/collation")
-    return $first eq $second
+    let $second := fn:collation-key("b", "http://exist-db.org/collation")
+    return $first ne $second
 };
 
 declare
     %test:assertTrue
-function fnck:exist-not-equal() {
+function fnck:exist-not-equal-ignore-case() {
     let $first := fn:collation-key("a", "http://exist-db.org/collation")
-    let $second := fn:collation-key("b", "http://exist-db.org/collation")
+    let $second := fn:collation-key("A", "http://exist-db.org/collation")
     return $first ne $second
 };
 
@@ -90,16 +90,16 @@ function fnck:invalid-uri() {
 declare
     %test:assertTrue
 function fnck:uca-equal() {
-    let $first := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA")
-    let $second := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA")
+    let $first := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA?lang=en;strength=primary")
+    let $second := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA?lang=en;strength=primary")
     return $first eq $second
 };
 
 declare
     %test:assertTrue
 function fnck:uca-equal-ignore-case() {
-    let $first := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA")
-    let $second := fn:collation-key("A", "http://www.w3.org/2013/collation/UCA")
+    let $first := fn:collation-key("a", "http://www.w3.org/2013/collation/UCA?lang=en;strength=primary")
+    let $second := fn:collation-key("A", "http://www.w3.org/2013/collation/UCA?lang=en;strength=primary")
     return $first eq $second
 };
 
@@ -108,5 +108,5 @@ declare
 function fnck:uca-not-equal() {
     let $first := fn:collation-key(fn:codepoints-to-string((37, 65500, 37)))
     let $second := fn:collation-key(fn:codepoints-to-string((37, 100000, 37)))
-    return $first eq $second
+    return $first lt $second
 };