commit 3159b26abf6bb4a7b54d30b43633b61f958c93ef
author Elliott Hughes <enh@google.com> Mon May 23 17:16:52 2011 -0700
committer Elliott Hughes <enh@google.com> Mon May 23 17:16:52 2011 -0700
tree 23e213cc9673ca419fd28b96453a5cb8b9eb16f2
parent 1ca31a87029e076a632a886400cdada568cab4a5

Fix some Harmony tests.

Bogus exception priority cruft.

Change-Id: I5457c94cac68f10b397ed1e01b6cea4ea13e8a81

luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java

diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java
index ce5b60b..20e1880 100644
--- a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java
+++ b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java
@@ -197,9 +197,6 @@
         }
     }
 
-    /**
-     * @tests java.io.PipedReader#read(char[], int, int)
-     */
     public void test_read$CII_ExceptionPriority() throws IOException {
         // Regression for HARMONY-387
         PipedWriter pw = new PipedWriter();
@@ -207,45 +204,30 @@
         try {
             obj = new PipedReader(pw);
             obj.read(new char[0], (int) 0, (int) -1);
-            fail("IndexOutOfBoundsException expected");
-        } catch (IndexOutOfBoundsException t) {
-            assertEquals(
-                    "IndexOutOfBoundsException rather than a subclass expected",
-                    IndexOutOfBoundsException.class, t.getClass());
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
         }
     }
 
-    /**
-     * @tests java.io.PipedReader#read(char[], int, int)
-     */
     public void test_read$CII_ExceptionPriority2() throws IOException {
         PipedWriter pw = new PipedWriter();
         PipedReader obj = null;
         try {
             obj = new PipedReader(pw);
             obj.read(new char[0], (int) -1, (int) 0);
-            fail("IndexOutOfBoundsException expected");
-        } catch (ArrayIndexOutOfBoundsException t) {
-            fail("IndexOutOfBoundsException expected");
-        } catch (IndexOutOfBoundsException t) {
-            // Expected
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
         }
     }
 
-    /**
-     * @tests java.io.PipedReader#read(char[], int, int)
-     */
     public void test_read$CII_ExceptionPriority3() throws IOException {
         PipedWriter pw = new PipedWriter();
         PipedReader obj = null;
         try {
             obj = new PipedReader(pw);
             obj.read(new char[0], (int) -1, (int) -1);
-            fail("IndexOutOfBoundsException expected");
-        } catch (ArrayIndexOutOfBoundsException t) {
-            fail("IndexOutOfBoundsException expected");
-        } catch (IndexOutOfBoundsException t) {
-            // Expected
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
         }
     }
 
@@ -255,6 +237,7 @@
         try {
             pr.read(null, -1, 1);
             fail();
+        } catch (NullPointerException expected) {
         } catch (IndexOutOfBoundsException expected) {
         }
     }
@@ -262,10 +245,9 @@
     public void test_read_$CII_IOException() throws IOException {
         PipedWriter pw = new PipedWriter();
         PipedReader pr = new PipedReader(pw);
-        char[] buf = null;
         pr.close();
         try {
-            pr.read(buf, 0, 10);
+            pr.read(null, 0, 10);
             fail("Should throws IOException"); //$NON-NLS-1$
         } catch (IOException e) {
             // expected
@@ -275,10 +257,9 @@
         }
 
         pr = new PipedReader();
-        buf = null;
         pr.close();
         try {
-            pr.read(buf, 0, 10);
+            pr.read(null, 0, 10);
             fail("Should throws IOException"); //$NON-NLS-1$
         } catch (IOException e) {
             // expected
@@ -288,10 +269,9 @@
 
         pw = new PipedWriter();
         pr = new PipedReader(pw);
-        buf = new char[10];
         pr.close();
         try {
-            pr.read(buf, -1, 0);
+            pr.read(new char[10], -1, 0);
             fail("Should throws IOException"); //$NON-NLS-1$
         } catch (IOException e) {
             // expected
@@ -302,10 +282,9 @@
 
         pw = new PipedWriter();
         pr = new PipedReader(pw);
-        buf = new char[10];
         pr.close();
         try {
-            pr.read(buf, 0, -1);
+            pr.read(new char[10], 0, -1);
             fail("Should throws IOException"); //$NON-NLS-1$
         } catch (IOException e) {
             // expected
@@ -316,10 +295,9 @@
 
         pw = new PipedWriter();
         pr = new PipedReader(pw);
-        buf = new char[10];
         pr.close();
         try {
-            pr.read(buf, 1, 10);
+            pr.read(new char[10], 1, 10);
             fail("Should throws IOException"); //$NON-NLS-1$
         } catch (IOException e) {
             // expected