Index: modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java =================================================================== --- modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java (revision 800827) +++ modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java Tue Aug 04 11:17:39 PDT 2009 @@ -25,6 +25,7 @@ import java.io.PipedReader; import java.io.Reader; import java.io.StringReader; +import java.util.Scanner; import junit.framework.TestCase; import tests.support.Support_StringReader; @@ -35,7 +36,40 @@ String testString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n"; - /** + /** + * The spec says that BufferedReader.readLine() considers only "\r", "\n" + * and "\r\n" to be line separators. We must not permit additional separator + * characters. + */ + public void testReadLineIgnoresEbcdic85Characters() throws IOException { + assertLines("A\u0085B", "A\u0085B"); + } + + public void testReadLineSeparators() throws IOException { + assertLines("A\nB\nC", "A", "B", "C"); + assertLines("A\rB\rC", "A", "B", "C"); + assertLines("A\r\nB\r\nC", "A", "B", "C"); + assertLines("A\n\rB\n\rC", "A", "", "B", "", "C"); + assertLines("A\n\nB\n\nC", "A", "", "B", "", "C"); + assertLines("A\r\rB\r\rC", "A", "", "B", "", "C"); + assertLines("A\n\n", "A", ""); + assertLines("A\n\r", "A", ""); + assertLines("A\r\r", "A", ""); + assertLines("A\r\n", "A"); + assertLines("A\r\n\r\n", "A", ""); + } + + private void assertLines(String in, String... lines) throws IOException { + BufferedReader bufferedReader + = new BufferedReader(new Support_StringReader(in)); + for (String line : lines) { + assertEquals(line, bufferedReader.readLine()); + } + assertNull(bufferedReader.readLine()); + } + + + /** * @tests java.io.BufferedReader#BufferedReader(java.io.Reader) */ public void test_ConstructorLjava_io_Reader() { Index: modules/luni/src/main/java/java/io/BufferedReader.java =================================================================== --- modules/luni/src/main/java/java/io/BufferedReader.java (revision 800827) +++ modules/luni/src/main/java/java/io/BufferedReader.java Tue Aug 04 11:23:09 PDT 2009 @@ -301,8 +301,7 @@ * Returns the next line of text available from this reader. A line is * represented by zero or more characters followed by {@code '\n'}, * {@code '\r'}, {@code "\r\n"} or the end of the reader. The string does - * not include the newline sequence. In EBCDIC systems, a new line can also - * be represented by the {@code \u0085} (NEL) character. + * not include the newline sequence. * * @return the contents of the line or {@code null} if no characters were * read before the end of the reader has been reached. @@ -320,9 +319,6 @@ } for (int charPos = pos; charPos < count; charPos++) { char ch = buf[charPos]; - if ((ch > '\r') && (ch != '\u0085')) { - continue; - } if (ch == '\n') { String res = new String(buf, pos, charPos - pos); pos = charPos + 1; @@ -335,11 +331,6 @@ pos++; } return res; - } else if (ch == '\u0085') { - /* Also handle the EBCDIC NEL character */ - String res = new String(buf, pos, charPos - pos); - pos = charPos + 1; - return res; } } @@ -364,7 +355,7 @@ } for (int charPos = pos; charPos < count; charPos++) { if (eol == '\0') { - if ((buf[charPos] == '\n' || buf[charPos] == '\r') || (buf[charPos] == '\u0085')) { + if ((buf[charPos] == '\n' || buf[charPos] == '\r')) { eol = buf[charPos]; } } else if (eol == '\r' && (buf[charPos] == '\n')) { @@ -373,7 +364,7 @@ } pos = charPos + 1; return result.toString(); - } else if (eol != '\0') { + } else { if (charPos > pos) { result.append(buf, pos, charPos - pos - 1); }