diff options
Diffstat (limited to 'luni/src')
6 files changed, 8 insertions, 43 deletions
diff --git a/luni/src/main/java/java/io/BufferedInputStream.java b/luni/src/main/java/java/io/BufferedInputStream.java index 0b9afc3..1720366 100644 --- a/luni/src/main/java/java/io/BufferedInputStream.java +++ b/luni/src/main/java/java/io/BufferedInputStream.java @@ -108,7 +108,7 @@ public class BufferedInputStream extends FilterInputStream { Logger.global.info( "Default buffer size used in BufferedInputStream " + "constructor. It would be " + - "better to be explicit if an 8k buffer is required."); + "better to be explicit if a 8k buffer is required."); // END android-added } diff --git a/luni/src/main/java/java/io/BufferedOutputStream.java b/luni/src/main/java/java/io/BufferedOutputStream.java index 835d13f..55419d1 100644 --- a/luni/src/main/java/java/io/BufferedOutputStream.java +++ b/luni/src/main/java/java/io/BufferedOutputStream.java @@ -80,7 +80,7 @@ public class BufferedOutputStream extends FilterOutputStream { Logger.global.info( "Default buffer size used in BufferedOutputStream " + "constructor. It would be " + - "better to be explicit if an 8k buffer is required."); + "better to be explicit if a 8k buffer is required."); // END android-added } diff --git a/luni/src/main/java/java/io/BufferedReader.java b/luni/src/main/java/java/io/BufferedReader.java index e82e538..c490b89 100644 --- a/luni/src/main/java/java/io/BufferedReader.java +++ b/luni/src/main/java/java/io/BufferedReader.java @@ -80,7 +80,7 @@ public class BufferedReader extends Reader { Logger.global.info( "Default buffer size used in BufferedReader " + "constructor. It would be " + - "better to be explicit if an 8k-char buffer is required."); + "better to be explicit if a 8k-char buffer is required."); // END android-added } diff --git a/luni/src/main/java/java/io/BufferedWriter.java b/luni/src/main/java/java/io/BufferedWriter.java index 761b9c5..66bfcc9 100644 --- a/luni/src/main/java/java/io/BufferedWriter.java +++ b/luni/src/main/java/java/io/BufferedWriter.java @@ -80,7 +80,7 @@ public class BufferedWriter extends Writer { Logger.global.info( "Default buffer size used in BufferedWriter " + "constructor. It would be " + - "better to be explicit if an 8k-char buffer is required."); + "better to be explicit if a 8k-char buffer is required."); // END android-added } diff --git a/luni/src/main/java/java/util/ArrayList.java b/luni/src/main/java/java/util/ArrayList.java index 3bae372..5ea316a 100644 --- a/luni/src/main/java/java/util/ArrayList.java +++ b/luni/src/main/java/java/util/ArrayList.java @@ -112,7 +112,7 @@ public class ArrayList<E> extends AbstractList<E> implements List<E>, Cloneable, * @param object * the object to add. * @throws IndexOutOfBoundsException - * when {@code location < 0 || > size()} + * when {@code location < 0 || >= size()} * @since Android 1.0 */ @Override diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java index 30510c2..6c995bb 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java @@ -17,14 +17,15 @@ package org.apache.harmony.luni.tests.java.lang; +import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; +import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; +import java.lang.reflect.Constructor; @TestTargetClass(String.class) public class StringTest extends TestCase { @@ -700,40 +701,4 @@ public class StringTest extends TestCase { } catch (IndexOutOfBoundsException e) { } } - - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "Regression test for some existing bugs and crashes", - method = "format", - args = { String.class, Object.class } - ) - public void testProblemCases() { - BigDecimal[] input = new BigDecimal[] { - new BigDecimal("20.00000"), - new BigDecimal("20.000000"), - new BigDecimal(".2"), - new BigDecimal("2"), - new BigDecimal("-2"), - new BigDecimal("200000000000000000000000"), - new BigDecimal("20000000000000000000000000000000000000000000000000") - }; - - String[] output = new String[] { - "20.00", - "20.00", - "0.20", - "2.00", - "-2.00", - "200000000000000000000000.00", - "20000000000000000000000000000000000000000000000000.00" - }; - - for (int i = 0; i < input.length; i++) { - String result = String.format("%.2f", input[i]); - assertEquals("Format test for \"" + input[i] + "\" failed, " + - "expected=" + output[i] + ", " + - "actual=" + result, output[i], result); - } - } - } |