ICU-13159 Fixed Java 6 compatibility issue in NumberFormatTest. Also fixed a test...

X-SVN-Rev: 40207

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 3031c89344d596bf8735dcdec1d71a009cc40133..7fe8d46b479562528b4d34848225710afe0cd524 100644 (file)
--- 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 901330316b6868953858cead3988b49611ba66af..174ce578f0efa5af597d48e880569910931b78ba 100644 (file)
--- 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;