From d1e192dd1ef056acdb2fbfb5f65774361426dc0e Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Mon, 26 Jun 2017 03:54:19 +0000
Subject: [PATCH] ICU-13159 Fixed Java 6 compatibility issue in
 NumberFormatTest. Also fixed a test data loading problem in UTS46Test.

X-SVN-Rev: 40207
---
 .../core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java  | 2 +-
 .../core/src/com/ibm/icu/dev/test/normalizer/UTS46Test.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
index 3031c89344..7fe8d46b47 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
@@ -5497,7 +5497,7 @@ public class NumberFormatTest extends TestFmwk {
                         e.getCause() instanceof NullPointerException);
             } catch (Exception e) {
                 // Other reflection exceptions
-                throw new AssertionError("Reflection error in method " + npeMethod, e);
+                throw new AssertionError("Reflection error in method " + npeMethod + ": " + e.getMessage());
             }
         }
 
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/UTS46Test.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/UTS46Test.java
index 901330316b..174ce578f0 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/UTS46Test.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/UTS46Test.java
@@ -743,7 +743,7 @@ public class UTS46Test extends TestFmwk {
 
     @Test
     public void IdnaTest() throws IOException {
-        BufferedReader idnaTestFile = TestUtil.getDataReader("unicode/IdnaTest.txt");
+        BufferedReader idnaTestFile = TestUtil.getDataReader("unicode/IdnaTest.txt", "UTF-8");
         Pattern semi = Pattern.compile(";");
         try {
             String line;