Snap for 6534196 from 5d3661115d1ebcc79bfd2b146135fb6ff3ab7894 to rvc-release
Change-Id: I9fe907413712103d3e04ae19765fbff4b1021fad
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
index 4a5c803..2191b0c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
@@ -5700,7 +5700,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(baos));
for (int i = 0; i < count; ++i) {
- out.write(Integer.toString(123) + " ");
+ out.write("123 ");
}
out.close();
@@ -5709,7 +5709,16 @@
Scanner s = new Scanner(new BufferedReader(new InputStreamReader(bais)));
for (int i = 0; i < count; ++i) {
- if (s.nextInt() != 123) {
+ final int value;
+ try {
+ value = s.nextInt();
+ } catch (RuntimeException e) {
+ String msg = String.format(Locale.US,
+ "Failed to parse float on item %d/%d with locale %s: %s",
+ (i+1), count, s.locale(), s);
+ throw new RuntimeException(msg, e);
+ }
+ if (value != 123) {
fail();
}
}
@@ -5717,7 +5726,16 @@
bais.reset();
s = new Scanner(new BufferedReader(new InputStreamReader(bais)));
for (int i = 0; i < count; ++i) {
- if (s.nextFloat() != 123.0) {
+ final float value;
+ try {
+ value = s.nextFloat();
+ } catch (RuntimeException e) {
+ String msg = String.format(Locale.US,
+ "Failed to parse float on item %d/%d with locale %s: %s",
+ (i+1), count, s.locale(), s);
+ throw new RuntimeException(msg, e);
+ }
+ if (value != 123.0) {
fail();
}
}
