harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r612114 - /harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java
Date Tue, 15 Jan 2008 13:17:30 GMT
Author: tellison
Date: Tue Jan 15 05:17:29 2008
New Revision: 612114

URL: http://svn.apache.org/viewvc?rev=612114&view=rev
Log:
Tidy-up CharArrayReaderTest, including remove verbose system output during test run, and letting
JUnit handle exceptions.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/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?rev=612114&r1=612113&r2=612114&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/CharArrayReaderTest.java
Tue Jan 15 05:17:29 2008
@@ -22,163 +22,126 @@
 
 public class CharArrayReaderTest extends junit.framework.TestCase {
 
-	char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' };
+    char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' };
 
-	CharArrayReader cr;
+    CharArrayReader cr;
+
+    /**
+     * @tests java.io.CharArrayReader#CharArrayReader(char[])
+     */
+    public void test_Constructor$C() throws IOException {
+        cr = new CharArrayReader(hw);
+        assertTrue("Failed to create reader", cr.ready());
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#CharArrayReader(char[], int, int)
+     */
+    public void test_Constructor$CII() throws IOException {
+        cr = new CharArrayReader(hw, 5, 5);
+        assertTrue("Failed to create reader", cr.ready());
+
+        int c = cr.read();
+        assertTrue("Created incorrect reader--returned '" + (char) c
+                + "' intsead of 'W'", c == 'W');
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#close()
+     */
+    public void test_close() {
+        cr = new CharArrayReader(hw);
+        cr.close();
+        try {
+            cr.read();
+            fail("Failed to throw exception on read from closed stream");
+        } catch (IOException e) {
+            // Expected
+        }
+
+        // No-op
+        cr.close();
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#mark(int)
+     */
+    public void test_markI() throws IOException {
+        cr = new CharArrayReader(hw);
+        cr.skip(5L);
+        cr.mark(100);
+        cr.read();
+        cr.reset();
+        assertEquals("Failed to mark correct position", 'W', cr.read());
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#markSupported()
+     */
+    public void test_markSupported() {
+        cr = new CharArrayReader(hw);
+        assertTrue("markSupported returned false", cr.markSupported());
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#read()
+     */
+    public void test_read() throws IOException {
+        cr = new CharArrayReader(hw);
+        assertEquals("Read returned incorrect char", 'H', cr.read());
+        cr = new CharArrayReader(new char[] { '\u8765' });
+        assertTrue("Incorrect double byte char", cr.read() == '\u8765');
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#read(char[], int, int)
+     */
+    public void test_read$CII() throws IOException {
+        char[] c = new char[11];
+        cr = new CharArrayReader(hw);
+        cr.read(c, 1, 10);
+        assertTrue("Read returned incorrect chars", new String(c, 1, 10)
+                .equals(new String(hw, 0, 10)));
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#ready()
+     */
+    public void test_ready() throws IOException {
+        cr = new CharArrayReader(hw);
+        assertTrue("ready returned false", cr.ready());
+        cr.skip(1000);
+        assertTrue("ready returned true", !cr.ready());
+        cr.close();
+
+        try {
+            cr.ready();
+            fail("No exception 1");
+        } catch (IOException e) {
+            // expected
+        }
+        try {
+            cr = new CharArrayReader(hw);
+            cr.close();
+            cr.ready();
+            fail("No exception 2");
+        } catch (IOException e) {
+            // expected
+        }
+    }
+
+    /**
+     * @tests java.io.CharArrayReader#reset()
+     */
+    public void test_reset() throws IOException {
+        cr = new CharArrayReader(hw);
+        cr.skip(5L);
+        cr.mark(100);
+        cr.read();
+        cr.reset();
+        assertEquals("Reset failed to return to marker position", 'W', cr
+                .read());
 
-	/**
-	 * @tests java.io.CharArrayReader#CharArrayReader(char[])
-	 */
-	public void test_Constructor$C() {
-		// Test for method java.io.CharArrayReader(char [])
-
-		try {
-			cr = new CharArrayReader(hw);
-			assertTrue("Failed to create reader", cr.ready());
-		} catch (IOException e) {
-			fail("Exception determining ready state : " + e.getMessage());
-		}
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#CharArrayReader(char[], int, int)
-	 */
-	public void test_Constructor$CII() {
-		// Test for method java.io.CharArrayReader(char [], int, int)
-		try {
-			cr = new CharArrayReader(hw, 5, 5);
-			assertTrue("Failed to create reader", cr.ready());
-		} catch (IOException e) {
-			fail("Exception determining ready state : " + e.getMessage());
-		}
-		try {
-			int c = cr.read();
-			assertTrue("Created incorrect reader--returned '" + (char) c
-					+ "' intsead of 'W'", c == 'W');
-		} catch (IOException e) {
-			fail("Exception reading from new reader : " + e.getMessage());
-		}
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#close()
-	 */
-	public void test_close() {
-		// Test for method void java.io.CharArrayReader.close()
-		cr = new CharArrayReader(hw);
-		cr.close();
-		try {
-			cr.read();
-		} catch (IOException e) { // Correct
-			return;
-		}
-		fail("Failed to throw exception on reqad from closed stream");
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#mark(int)
-	 */
-	public void test_markI() {
-		// Test for method void java.io.CharArrayReader.mark(int)
-		try {
-			cr = new CharArrayReader(hw);
-			cr.skip(5L);
-			cr.mark(100);
-			cr.read();
-			cr.reset();
-			assertEquals("Failed to mark correct position", 'W', cr.read());
-		} catch (IOException e) {
-			fail("Exception during mark test: " + e.getMessage());
-		}
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#markSupported()
-	 */
-	public void test_markSupported() {
-		// Test for method boolean java.io.CharArrayReader.markSupported()
-		cr = new CharArrayReader(hw);
-		assertTrue("markSupported returned false", cr.markSupported());
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#read()
-	 */
-	public void test_read() {
-		// Test for method int java.io.CharArrayReader.read()
-		try {
-			cr = new CharArrayReader(hw);
-			assertEquals("Read returned incorrect char", 'H', cr.read());
-			cr = new CharArrayReader(new char[] { '\u8765' });
-			assertTrue("Incorrect double byte char", cr.read() == '\u8765');
-		} catch (IOException e) {
-			fail("Exception during read test: " + e.getMessage());
-		}
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#read(char[], int, int)
-	 */
-	public void test_read$CII() {
-		// Test for method int java.io.CharArrayReader.read(char [], int, int)
-		char[] c = new char[11];
-		try {
-			cr = new CharArrayReader(hw);
-			cr.read(c, 1, 10);
-			assertTrue("Read returned incorrect chars", new String(c, 1, 10)
-					.equals(new String(hw, 0, 10)));
-		} catch (IOException e) {
-			fail("Exception during read test : " + e.getMessage());
-		}
-	}
-
-	/**
-	 * @tests java.io.CharArrayReader#ready()
-	 */
-	public void test_ready() {
-		// Test for method boolean java.io.CharArrayReader.ready()
-		cr = new CharArrayReader(hw);
-		boolean expectException = false;
-		try {
-			assertTrue("ready returned false", cr.ready());
-			cr.skip(1000);
-			assertTrue("ready returned true", !cr.ready());
-			cr.close();
-			expectException = true;
-			cr.ready();
-			fail("No exception 1");
-		} catch (IOException e) {
-			if (!expectException)
-				fail("Unexpected: " + e);
-		}
-		try {
-			cr = new CharArrayReader(hw);
-			cr.close();
-			cr.ready();
-			fail("No exception 2");
-		} catch (IOException e) {
-		}
-
-	}
-
-	/**
-	 * @throws IOException 
-	 * @tests java.io.CharArrayReader#reset()
-	 */
-	public void test_reset() throws IOException {
-		// Test for method void java.io.CharArrayReader.reset()
-		try {
-			cr = new CharArrayReader(hw);
-			cr.skip(5L);
-			cr.mark(100);
-			cr.read();
-			cr.reset();
-			assertEquals("Reset failed to return to marker position",
-					'W', cr.read());
-		} catch (IOException e) {
-			fail("Exception during reset test : " + e.getMessage());
-		}
-        
         // Regression for HARMONY-4357
         String str = "offsetHello world!";
         char[] data = new char[str.length()];
@@ -188,43 +151,28 @@
 
         CharArrayReader reader = new CharArrayReader(data, offsetLength, length);
         reader.reset();
-        for (int i = 0; i < length; i++)
+        for (int i = 0; i < length; i++) {
             assertEquals(data[offsetLength + i], (char) reader.read());
+        }
     }
 
-	/**
-	 * @tests java.io.CharArrayReader#skip(long)
-	 */
-	public void test_skipJ() {
-		// Test for method long java.io.CharArrayReader.skip(long)
-		long skipped = 0;
-		try {
-			cr = new CharArrayReader(hw);
-			skipped = cr.skip(5L);
-		} catch (IOException e) {
-			fail("Exception during skip test : " + e.getMessage());
-		}
-		assertEquals("Failed to skip correct number of chars", 5L, skipped);
-		try {
-			assertEquals("Skip skipped wrong chars", 'W', cr.read());
-		} catch (IOException e) {
-			fail("read exception during skip test : " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Sets up the fixture, for example, open a network connection. This method
-	 * is called before a test is executed.
-	 */
-	protected void setUp() {
-	}
-
-	/**
-	 * Tears down the fixture, for example, close a network connection. This
-	 * method is called after a test is executed.
-	 */
-	protected void tearDown() {
-		if (cr != null)
-			cr.close();
-	}
+    /**
+     * @tests java.io.CharArrayReader#skip(long)
+     */
+    public void test_skipJ() throws IOException {
+        cr = new CharArrayReader(hw);
+        long skipped = cr.skip(5L);
+
+        assertEquals("Failed to skip correct number of chars", 5L, skipped);
+        assertEquals("Skip skipped wrong chars", 'W', cr.read());
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection. This
+     * method is called after a test is executed.
+     */
+    protected void tearDown() {
+        if (cr != null)
+            cr.close();
+    }
 }



Mime
View raw message