svn commit: r611763 [1/2] - in /harmony/enhanced/classlib/trunk/modules/luni/src/test: api/common/org/apache/harmony/luni/tests/java/io/ api/common/tests/api/java/io/ resources/org/apache/harmony/luni/tests/java/io/ resources/serialization/org/apache/h...

[te...@apache.org]

Author: tellison
Date: Mon Jan 14 02:59:54 2008
New Revision: 611763

URL: http://svn.apache.org/viewvc?rev=611763&view=rev
Log:
Restructure some of LUNI's IO tests from tests.api package to o.a.h.l.tests,
including regenerating a few golden serialization files, restructuring resources,
and merging some test cases.

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharConversionExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharConversionExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/EOFExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/EOFExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileDescriptorTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileNotFoundExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilePermissionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/IOExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InterruptedIOExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InvalidClassExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotActiveExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotSerializableExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamClassTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamFieldTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OpenRandomFileTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/OpenRandomFileTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/OutputStreamWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PipedInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PipedOutputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PipedReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PipedWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PrintStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PrintWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PushbackInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PushbackInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PushbackReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/PushbackReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/RandomAccessFileTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SequenceInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SequenceInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializablePermissionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializablePermissionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest1.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest1.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest2.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest2.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest3.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest3.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest4.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest4.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SerializationStressTest5.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest5.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/StreamCorruptedExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/StreamCorruptedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/StreamTokenizerTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/StreamTokenizerTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/StringBufferInputStreamTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/StringBufferInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/StringReaderTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/StringReaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/StringWriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/StringWriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/SyncFailedExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/SyncFailedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/UTFDataFormatExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/UTFDataFormatExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/UnsupportedEncodingExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/UnsupportedEncodingExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/WriteAbortedExceptionTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/WriteAbortedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/WriterTest.java
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/WriterTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/java/io/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/java/io/testfile-utf8.txt   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/java/io/testfile.txt   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_integers.ser
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/io/test_array_integers.ser
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/test_array_strings.ser
      - copied, changed from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/io/test_array_strings.ser
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/io/testfile
      - copied unchanged from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/io/testfile
Removed:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PushBackInputStreamTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/io/

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -39,39 +39,52 @@
 	byte[] ibuf = new byte[4096];
 
 	public String fileString = "Test_All_Tests\nTest_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_Class
 NotFoundException\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_Obj
 ect\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_SocketE
 xception\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";
+   
+    /*
+     * @tests java.io.BufferedInputStream(InputStream)
+     */
+    public void test_ConstructorLjava_io_InputStream() {
+        try {
+            BufferedInputStream str = new BufferedInputStream(null);
+            str.read();
+            fail("Expected an IOException");
+        } catch (IOException e) {
+            // Expected
+        }
+    }
+    /*
+     * @tests java.io.BufferedInputStream(InputStream)
+     */
+    public void test_ConstructorLjava_io_InputStreamI() throws IOException {
+        try {
+            BufferedInputStream str = new BufferedInputStream(null, 1);
+            str.read();
+            fail("Expected an IOException");
+        } catch (IOException e) {
+            // Expected
+        }
 
-	/**
-	 * @throws IOException 
-	 * @tests java.io.BufferedInputStream#BufferedInputStream(java.io.InputStream,
-	 *        int)
-	 */
-	public void test_ConstructorLjava_io_InputStreamI() throws IOException {
 		// Test for method java.io.BufferedInputStream(java.io.InputStream, int)
-		boolean exceptionFired = false;
+
+		// Create buffer with exact size of file
+		is = new BufferedInputStream(isFile, this.fileString
+				.length());
+		// Ensure buffer gets filled by evaluating one read
+		is.read();
+		// Close underlying FileInputStream, all but 1 buffered bytes should
+		// still be available.
+		isFile.close();
+		// Read the remaining buffered characters, no IOException should
+		// occur.
+		is.skip(this.fileString.length() - 2);
+		is.read();
 		try {
-			// Create buffer with exact size of file
-			is = new BufferedInputStream(isFile, this.fileString
-					.length());
-			// Ensure buffer gets filled by evaluating one read
+			// is.read should now throw an exception because it will have to
+			// be filled.
 			is.read();
-			// Close underlying FileInputStream, all but 1 buffered bytes should
-			// still be available.
-			isFile.close();
-			// Read the remaining buffered characters, no IOException should
-			// occur.
-			is.skip(this.fileString.length() - 2);
-			is.read();
-			try {
-				// is.read should now throw an exception because it will have to
-				// be filled.
-				is.read();
-			} catch (IOException e) {
-				exceptionFired = true;
-			}
-			assertTrue("Exception should have been triggered by read()",
-					exceptionFired);
+			fail("Exception should have been triggered by read()");
 		} catch (IOException e) {
-			fail("Exception during test_1_Constructor");
+			// Expected
 		}
 		
 		// regression test for harmony-2407
@@ -146,7 +159,7 @@
 	/**
 	 * @tests java.io.BufferedInputStream#mark(int)
 	 */
-	public void test_markI() {
+	public void test_markI() throws IOException {
 		// Test for method void java.io.BufferedInputStream.mark(int)
 		byte[] buf1 = new byte[100];
 		byte[] buf2 = new byte[100];
@@ -190,6 +203,36 @@
 		} catch (IOException e) {
 			fail("Exception during mark test 3");
 		}
+
+        BufferedInputStream buf = new BufferedInputStream(
+                new ByteArrayInputStream(new byte[] { 0, 1, 2, 3, 4 }), 2);
+        buf.mark(3);
+        bytes = new byte[3];
+        int result = buf.read(bytes);
+        assertEquals(3, result);
+        assertEquals("Assert 0:", 0, bytes[0]);
+        assertEquals("Assert 1:", 1, bytes[1]);
+        assertEquals("Assert 2:", 2, bytes[2]);
+        assertEquals("Assert 3:", 3, buf.read());
+
+        buf = new BufferedInputStream(
+                new ByteArrayInputStream(new byte[] { 0, 1, 2, 3, 4 }), 2);
+        buf.mark(3);
+        bytes = new byte[4];
+        result = buf.read(bytes);
+        assertEquals(4, result);
+        assertEquals("Assert 4:", 0, bytes[0]);
+        assertEquals("Assert 5:", 1, bytes[1]);
+        assertEquals("Assert 6:", 2, bytes[2]);
+        assertEquals("Assert 7:", 3, bytes[3]);
+        assertEquals("Assert 8:", 4, buf.read());
+        assertEquals("Assert 9:", -1, buf.read());
+
+        buf = new BufferedInputStream(
+                new ByteArrayInputStream(new byte[] { 0, 1, 2, 3, 4 }), 2);
+        buf.mark(Integer.MAX_VALUE);
+        buf.read();
+        buf.close();
 	}
 
 	/**

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedReaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedReaderTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedReaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -24,6 +24,7 @@
 import java.io.InputStreamReader;
 import java.io.PipedReader;
 import java.io.Reader;
+import java.io.StringReader;
 
 import tests.support.Support_StringReader;
 
@@ -67,22 +68,19 @@
 	/**
 	 * @tests java.io.BufferedReader#mark(int)
 	 */
-	public void test_markI() {
+	public void test_markI() throws IOException {
 		// Test for method void java.io.BufferedReader.mark(int)
 		char[] buf = null;
-		try {
-			br = new BufferedReader(new Support_StringReader(testString));
-			br.skip(500);
-			br.mark(1000);
-			br.skip(250);
-			br.reset();
-			buf = new char[testString.length()];
-			br.read(buf, 0, 500);
-			assertTrue("Failed to set mark properly", testString.substring(500,
-					1000).equals(new String(buf, 0, 500)));
-		} catch (java.io.IOException e) {
-			fail("Exception during mark test");
-		}
+		br = new BufferedReader(new Support_StringReader(testString));
+		br.skip(500);
+		br.mark(1000);
+		br.skip(250);
+		br.reset();
+		buf = new char[testString.length()];
+		br.read(buf, 0, 500);
+		assertTrue("Failed to set mark properly", testString.substring(500,
+				1000).equals(new String(buf, 0, 500)));
+
 		try {
 			br = new BufferedReader(new Support_StringReader(testString), 800);
 			br.skip(500);
@@ -91,6 +89,7 @@
 			br.reset();
 			fail("Failed to invalidate mark properly");
 		} catch (IOException x) {
+		    // Expected
 		}
 
 		char[] chars = new char[256];
@@ -98,28 +97,48 @@
 			chars[i] = (char) i;
 		Reader in = new BufferedReader(new Support_StringReader(new String(
 				chars)), 12);
-		try {
-			in.skip(6);
-			in.mark(14);
-			in.read(new char[14], 0, 14);
-			in.reset();
-			assertTrue("Wrong chars", in.read() == (char) 6
-					&& in.read() == (char) 7);
-		} catch (IOException e) {
-			fail("Exception during mark test 2:" + e);
-		}
+
+		in.skip(6);
+		in.mark(14);
+		in.read(new char[14], 0, 14);
+		in.reset();
+		assertTrue("Wrong chars", in.read() == (char) 6
+				&& in.read() == (char) 7);
 
 		in = new BufferedReader(new Support_StringReader(new String(chars)), 12);
-		try {
-			in.skip(6);
-			in.mark(8);
-			in.skip(7);
-			in.reset();
-			assertTrue("Wrong chars 2", in.read() == (char) 6
-					&& in.read() == (char) 7);
-		} catch (IOException e) {
-			fail("Exception during mark test 3:" + e);
-		}
+		in.skip(6);
+		in.mark(8);
+		in.skip(7);
+		in.reset();
+		assertTrue("Wrong chars 2", in.read() == (char) 6
+				&& in.read() == (char) 7);
+		
+        BufferedReader br = new BufferedReader(new StringReader("01234"), 2);
+        br.mark(3);
+        char[] carray = new char[3];
+        int result = br.read(carray);
+        assertEquals(3, result);
+        assertEquals("Assert 0:", '0', carray[0]);
+        assertEquals("Assert 1:", '1', carray[1]);
+        assertEquals("Assert 2:", '2', carray[2]);
+        assertEquals("Assert 3:", '3', br.read());
+
+        br = new BufferedReader(new StringReader("01234"), 2);
+        br.mark(3);
+        carray = new char[4];
+        result = br.read(carray);
+        assertEquals("Assert 4:", 4, result);
+        assertEquals("Assert 5:", '0', carray[0]);
+        assertEquals("Assert 6:", '1', carray[1]);
+        assertEquals("Assert 7:", '2', carray[2]);
+        assertEquals("Assert 8:", '3', carray[3]);
+        assertEquals("Assert 9:", '4', br.read());
+        assertEquals("Assert 10:", -1, br.read());
+
+        BufferedReader reader = new BufferedReader(new StringReader("01234"));
+        reader.mark(Integer.MAX_VALUE);
+        reader.read();
+        reader.close();
 	}
 
 	/**
@@ -269,6 +288,36 @@
             new BufferedReader(new PipedReader(), 9).read(new char[] {}, 7, 0);
             fail("should throw IndexOutOfBoundsException");
         }catch(IndexOutOfBoundsException e){
+        }
+        
+        // Regression for HARMONY-54
+        char[] ch = {};
+        BufferedReader reader = new BufferedReader(new CharArrayReader(ch));
+        try {
+            // Check exception thrown when the reader is open.
+            reader.read(null, 1, 0);
+            fail("Assert 0: NullPointerException expected");
+        } catch (NullPointerException e) {
+            // Expected
+        }
+
+        // Now check IOException is thrown in preference to
+        // NullPointerexception when the reader is closed.
+        reader.close();
+        try {
+            reader.read(null, 1, 0);
+            fail("Assert 1: IOException expected");
+        } catch (IOException e) {
+            // Expected
+        }
+
+        try {
+            // And check that the IOException is thrown before
+            // ArrayIndexOutOfBoundException
+            reader.read(ch, 0, 42);
+            fail("Assert 2: IOException expected");
+        } catch (IOException e) {
+            // expected
         }
 	}
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedWriterTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedWriterTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/BufferedWriterTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ByteArrayOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayReaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayReaderTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayReaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.CharArrayReader;
 import java.io.IOException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayWriterTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayWriterTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayWriterTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayWriterTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayWriterTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharArrayWriterTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayWriterTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.CharArrayReader;
 import java.io.CharArrayWriter;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharConversionExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharConversionExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharConversionExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharConversionExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharConversionExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/CharConversionExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharConversionExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 public class CharConversionExceptionTest extends junit.framework.TestCase {
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/DataOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/DataOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/EOFExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/EOFExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/EOFExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/EOFExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/EOFExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/EOFExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/EOFExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileDescriptorTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileDescriptorTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileDescriptorTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -156,16 +156,26 @@
 	/**
 	 * @tests java.io.FileInputStream#read(byte[], int, int)
 	 */
-	public void test_read$BII() throws Exception {
-		// Test for method int java.io.FileInputStream.read(byte [], int, int)
-		byte[] buf1 = new byte[100];
-                is = new java.io.FileInputStream(fileName);
-                is.skip(3000);
-                is.read(buf1, 0, buf1.length);
-                is.close();
-                assertTrue("Failed to read correct data", new String(buf1, 0,
-                                buf1.length).equals(fileString.substring(3000, 3100)));
-	}
+	public void test_read$BII() throws IOException {
+        byte[] buf1 = new byte[100];
+        is = new FileInputStream(fileName);
+        is.skip(3000);
+        is.read(buf1, 0, buf1.length);
+        is.close();
+        assertTrue("Failed to read correct data", new String(buf1, 0,
+                buf1.length).equals(fileString.substring(3000, 3100)));
+        // Regression test for HARMONY-285
+        File file = new File("FileInputStream.tmp");
+        file.createNewFile();
+        file.deleteOnExit();
+        FileInputStream in = new FileInputStream(file);
+        try {
+            in.read(null, 0, 0);
+            fail("Should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // Expected
+        }
+    }
     
     /**
      * @tests java.io.FileInputStream#read(byte[], int, int)

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileNotFoundExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileNotFoundExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileNotFoundExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.FileNotFoundException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,12 +15,13 @@
  * the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 public class FileOutputStreamTest extends junit.framework.TestCase {
 
@@ -145,9 +146,7 @@
     /**
      * @tests java.io.FileOutputStream#write(byte[], int, int)
      */
-    public void test_write$BII() throws Exception {
-        // Test for method void java.io.FileOutputStream.write(byte [], int,
-        // int)
+    public void test_write$BII() throws IOException {
         f = new java.io.File(System.getProperty("user.home"), "output.tst");
         fos = new java.io.FileOutputStream(f.getPath());
         fos.write(fileString.getBytes(), 0, fileString.length());
@@ -156,6 +155,17 @@
         fis.read(rbytes, 0, fileString.length());
         assertTrue("Incorrect bytes written", new String(rbytes, 0, fileString
                 .length()).equals(fileString));
+
+        // Regression test for HARMONY-285
+        File file = new File("FileOutputStream.tmp");
+        file.deleteOnExit();
+        FileOutputStream out = new FileOutputStream(file);
+        try {
+            out.write(null, 0, 0);
+            fail("Should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // Expected
+        }
     }
 
     /**

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilePermissionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilePermissionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilePermissionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.File;
 import java.io.FilePermission;
@@ -152,6 +152,16 @@
 				File.separatorChar), "read,write");
 		assertTrue("returned false for same dir using * and dir", !fp12
 				.implies(fp10));
+		
+        // Regression for HARMONY-47
+        char separator = File.separatorChar;
+        char nonSeparator = (separator == '/') ? '\\' : '/';
+
+        FilePermission fp1 = new FilePermission(nonSeparator + "*", "read");
+        FilePermission fp2 = new FilePermission(separator + "a", "read");
+        assertFalse("Assert 0: non-separator worked", fp1.implies(fp2));
+        fp1 = new FilePermission(nonSeparator + "-", "read");
+        assertFalse("Assert 1: non-separator worked", fp1.implies(fp2));
 	}
 
 	/**

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileReaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileReaderTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileReaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedWriter;
 import java.io.File;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -31,6 +31,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.apache.harmony.testframework.serialization.SerializationTest;
+
 import tests.support.Support_Exec;
 import tests.support.Support_PlatformFile;
 
@@ -111,6 +113,47 @@
         d = new File(s, "/abc");
         assertEquals("Test3: Created Incorrect File " + d.getAbsolutePath(), f
                 .getAbsolutePath(), d.getAbsolutePath());
+        
+
+        // Regression test for HARMONY-21
+        File path = new File("/dir/file");
+        File root = new File("/");
+        File file = new File(root, "/dir/file");
+        assertEquals("Assert 1: wrong path result ", path.getPath(), file
+                .getPath());
+        assertTrue("Assert 1.1: path not absolute ", new File("\\\\\\a\b").isAbsolute());
+        
+        // Test data used in a few places below
+        dirName = System.getProperty("user.dir");
+        fileName = "input.tst";
+
+        // Check filename is preserved correctly
+        d = new File(dirName);
+        f = new File(d, fileName);
+        if (!dirName
+                .regionMatches((dirName.length() - 1), File.separator, 0, 1)) {
+            dirName += File.separator;
+        }
+        dirName += fileName;
+        assertTrue("Assert 2: Created incorrect file " + f.getPath(), f
+                .getPath().equals(dirName));
+
+        // Check null argument is handled
+        try {
+            f = new File(d, null);
+            fail("Assert 3: NullPointerException not thrown.");
+        } catch (NullPointerException e) {
+            // Expected.
+        }
+
+        f = new File((File) null, fileName);
+        assertTrue("Assert 4: Created incorrect file " + f.getPath(), f
+                .getAbsolutePath().equals(dirName));
+        
+        // Regression for HARMONY-46
+        File f1 = new File("a");
+        File f2 = new File("a/");
+        assertEquals("Assert 5: Trailing slash file name is incorrect", f1, f2);
 	}
 
 	/**
@@ -1036,8 +1079,57 @@
 		f2.delete();
 		f3.delete();
 		f4.delete();
+		
+        // Regression for HARMONY-444
+        File file;
+        String separator = File.separator;
+
+        file = new File((File) null, "x/y/z");
+        assertEquals("x" + separator + "y" + separator + "z", file.getPath());
+
+        file = new File((String) null, "x/y/z");
+        assertEquals("x" + separator + "y" + separator + "z", file.getPath());
+        
+        // Regression for HARMONY-829
+        String f1ParentName = "01";
+        f1 = new File(f1ParentName, "");
+        assertEquals(f1ParentName, f1.getPath());
+        
+        String f2ParentName = "0";
+        f2 = new File(f2ParentName, "");
+
+        assertEquals(-1, f2.compareTo(f1));
+        assertEquals(1, f1.compareTo(f2));
+
+        File parent = new File(System.getProperty("user.dir"));
+        f3 = new File(parent, "");
+
+        assertEquals(parent.getPath(), f3.getPath());
+        
+        // Regression for HARMONY-3869
+        File file1 = new File("", "");
+        assertEquals(File.separator, file1.getPath());
+        
+        File file2 = new File(new File(""), "");
+        assertEquals(File.separator, file2.getPath());
 	}
 
+    /**
+     * @tests java.io.File#hashCode()
+     */
+    public void test_hashCode() {
+        // Regression for HARMONY-53
+        String mixedFname = "SoMe FiLeNaMe";
+        File mfile = new File(mixedFname);
+        File lfile = new File(mixedFname.toLowerCase());
+
+        if (mfile.equals(lfile)) {
+            assertTrue("Assert 0: wrong hashcode", mfile.hashCode() == lfile.hashCode());
+        } else {
+            assertFalse("Assert 1: wrong hashcode", mfile.hashCode() == lfile.hashCode());
+        }
+    }
+
 	/**
 	 * @tests java.io.File#isAbsolute()
 	 */
@@ -2293,6 +2385,22 @@
             }
         }
         assertTrue(exist);
+    }
+
+    /**
+     * @tests serialization/deserialization.
+     */
+    public void test_serialization_self() throws Exception {
+        File testFile = new File("test.ser");
+        SerializationTest.verifySelf(testFile);
+    }
+
+    /**
+     * @tests serialization/deserialization compatibility with RI.
+     */
+    public void test_serialization_compatibility() throws Exception {
+        File file = new File("FileTest.golden.ser");
+        SerializationTest.verifyGolden(this, file);
     }
     
 	/**

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileWriterTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileWriterTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FileWriterTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.IOException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/FilterOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 public class FilterOutputStreamTest extends junit.framework.TestCase {
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/IOExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/IOExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/IOExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.IOException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamReaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamReaderTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamReaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -133,6 +133,31 @@
 		super.tearDown();
 	}
 
+
+    public void testGetEncoding_StreamClosed() throws IOException {
+        InputStreamReader in = null;
+        byte b[] = new byte[5];
+        in = new InputStreamReader(new ByteArrayInputStream(b), "UTF-16BE");
+        in.close();
+        String result = in.getEncoding();
+        assertNull(result);
+    }
+
+    /**
+     * @tests java.io.InputStreamReader#read()
+     */
+    public void testGetEncoding_NotHistorical() {
+        InputStreamReader in = null;
+        try {
+            in = new InputStreamReader(System.in, "UTF-16BE");
+        } catch (UnsupportedEncodingException e) {
+            // ok
+        }
+        String result = in.getEncoding();
+        assertEquals("UnicodeBigUnmarked", result);
+
+    }
+
 	public void testClose() throws IOException {
 		reader.close();
 		try {
@@ -265,7 +290,7 @@
 	public void testSpecialCharsetReading() throws IOException {
 		reader.close();
 		in = this.getClass().getClassLoader().getResourceAsStream(
-				"tests/api/java/io/testfile-utf8.txt");
+				"org/apache/harmony/luni/tests/java/io/testfile-utf8.txt");
 		reader = new InputStreamReader(in, "utf-8");
 		int c;
 		StringBuffer sb = new StringBuffer();
@@ -278,7 +303,7 @@
 		sb.setLength(0);
 		reader.close();
 		in = this.getClass().getClassLoader().getResourceAsStream(
-				"tests/api/java/io/testfile.txt");
+				"org/apache/harmony/luni/tests/java/io/testfile.txt");
 		try {
 			reader = new InputStreamReader(in, "gb18030");
 		} catch (UnsupportedEncodingException e) {
@@ -294,7 +319,7 @@
 	public void testAfterClose() throws IOException {
 		reader.close();
 		in = new BufferedInputStream(this.getClass().getClassLoader()
-				.getResourceAsStream("tests/api/java/io/testfile-utf8.txt"));
+				.getResourceAsStream("org/apache/harmony/luni/tests/java/io/testfile-utf8.txt"));
 		reader = new InputStreamReader(in, "utf-8");
 		in.close();
 		try {

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InterruptedIOExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InterruptedIOExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InterruptedIOExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.InterruptedIOException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InvalidClassExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InvalidClassExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InvalidClassExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.InvalidClassException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberReaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberReaderTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/LineNumberReaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotActiveExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotActiveExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotActiveExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.NotActiveException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotSerializableExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotSerializableExceptionTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/NotSerializableExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.NotSerializableException;
 

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java Mon Jan 14 02:59:54 2008
@@ -33,7 +33,7 @@
 
 import junit.framework.TestCase;
 
-public class ObjectInputStreamTest extends TestCase {
+public class ObjectInputStream2Test extends TestCase {
 
     public void test_readUnshared() throws IOException, ClassNotFoundException {
         // Regression test for HARMONY-819
@@ -164,7 +164,7 @@
         @SuppressWarnings("unchecked")
         protected Class resolveClass(ObjectStreamClass desc)
                 throws IOException, ClassNotFoundException {
-            if (desc.getName().endsWith("ObjectInputStreamTest$TestClass1")) {
+            if (desc.getName().endsWith("ObjectInputStream2Test$TestClass1")) {
                 return TestClass2.class;
             }
             return super.resolveClass(desc);

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectInputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectInputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectInputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -1026,14 +1026,23 @@
         
         final String resourcePrefix = ObjectInputStreamTest.class.getPackage().getName().replace('.', '/');
         
+//        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("/temp/test_array_strings.ser"));
+//        TestArray ta = new TestArray(new String[] { "AAA", "BBB" });
+//        oos.writeObject(ta);
+//        oos.close();
+//        oos = new ObjectOutputStream(new FileOutputStream("/temp/test_array_integers.ser"));
+//        ta = new TestArray(new Integer[] { 10, 20 });
+//        oos.writeObject(ta);
+//        oos.close();
+        
         ObjectInputStream oin = new ObjectInputStream(this.getClass().getClassLoader().getResourceAsStream(
-                resourcePrefix+"/test_array_strings.ser"));               
+                "serialization/" + resourcePrefix + "/test_array_strings.ser"));               
         TestArray testArray = (TestArray) oin.readObject();
         String[] strings = new String[] { "AAA", "BBB" };
         assertTrue(java.util.Arrays.equals(strings, testArray.array));
 
         oin = new ObjectInputStream(this.getClass().getClassLoader().getResourceAsStream(
-                resourcePrefix+"/test_array_integers.ser"));        
+                "serialization/" + resourcePrefix + "/test_array_integers.ser"));        
         testArray = (TestArray) oin.readObject();
         Integer[] integers = new Integer[] { 10, 20 };
         assertTrue(java.util.Arrays.equals(integers, testArray.array));

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectOutputStreamTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java (from r611127, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamClassTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamClassTest.java&r1=611127&r2=611763&rev=611763&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamClassTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java Mon Jan 14 02:59:54 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.luni.tests.java.io;
 
 import java.io.ObjectStreamClass;
 import java.io.ObjectStreamField;
@@ -82,7 +82,7 @@
 		ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
 		assertTrue("getName returned incorrect name: " + osc.getName(), osc
 				.getName().equals(
-						"tests.api.java.io.ObjectStreamClassTest$DummyClass"));
+						"org.apache.harmony.luni.tests.java.io.ObjectStreamClassTest$DummyClass"));
 	}
 
 	/**
@@ -106,7 +106,7 @@
 		ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
 		assertTrue("lookup returned wrong class: " + osc.getName(), osc
 				.getName().equals(
-						"tests.api.java.io.ObjectStreamClassTest$DummyClass"));
+						"org.apache.harmony.luni.tests.java.io.ObjectStreamClassTest$DummyClass"));
 	}
 
 	/**