commit 0b5b3bcdb10f0086e77d2eaed7c812232c3246b3
author Markus Scherer <markus.icu@gmail.com> Fri Aug 30 16:26:59 2019 -0700
committer Markus Scherer <markus.icu@gmail.com> Wed Sep 04 11:12:45 2019 -0700
tree 2a6c34c6515859a76a16c628285b8d58de9cdc38
parent 710b6e1421cac33ea7e6a6c51bf5416df81da337

ICU-11976 test & fix ByteArrayWrapper.hashCode()

icu4j/main/classes/core/src/com/ibm/icu/util/ByteArrayWrapper.java

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ByteArrayWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ByteArrayWrapper.java
index e39fdd0..1c2c75c 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ByteArrayWrapper.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ByteArrayWrapper.java
@@ -237,7 +237,7 @@
      */
     @Override
     public int hashCode() {
-        int result = bytes.length;
+        int result = size;
         for (int i = 0; i < size; ++i) {
             result = 37*result + bytes[i];
         }

icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UtilityTest.java

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UtilityTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UtilityTest.java
index 7cfc981..0613c2d 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UtilityTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UtilityTest.java
@@ -137,10 +137,10 @@
         }
 
         // test equality
-        if (!x.equals(y) || !x.equals(z))
-            errln("FAIL: test (operator ==): Failed!");
-        if (x.hashCode()!=y.hashCode())
-            errln("FAIL: identical objects have different hash codes.");
+        assertEquals("x==y", x, y);
+        assertEquals("y==z", y, z);
+        assertEquals("x.hashCode()==y.hashCode()", x.hashCode(), y.hashCode());
+        assertEquals("y.hashCode()==z.hashCode()", y.hashCode(), z.hashCode());
 
         // test non-equality
         y = new ByteArrayWrapper(bb, 4);