Revision: 469
http://svn.sourceforge.net/stripes/?rev=469&view=rev
Author: bengunter
Date: 2006-11-16 05:09:20 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
Accidentally committed the previous revision prematurely; the reader tests all
pass now.
Modified Paths:
--------------
trunk/tests/src/net/sourceforge/stripes/action/FileBeanTests.java
Modified: trunk/tests/src/net/sourceforge/stripes/action/FileBeanTests.java
===================================================================
--- trunk/tests/src/net/sourceforge/stripes/action/FileBeanTests.java
2006-11-16 05:05:29 UTC (rev 468)
+++ trunk/tests/src/net/sourceforge/stripes/action/FileBeanTests.java
2006-11-16 13:09:20 UTC (rev 469)
@@ -46,6 +46,32 @@
Assert.assertNull(in.readLine());
}
+ /** Helper method that copies a reader into a writer. */
+ private void copyReaderOut(Reader in) throws IOException {
+ Writer out = null;
+ try {
+ out = new FileWriter(this.to);
+ char[] buf = new char[1024];
+ for (int count; (count = in.read(buf)) > 0;)
+ out.write(buf, 0, count);
+ }
+ finally {
+ try {
+ if (in != null)
+ in.close();
+ }
+ catch (Exception e) {
+ }
+ try {
+ if (out != null)
+ out.close();
+ }
+ catch (Exception e) {
+ }
+ this.from.delete();
+ }
+ }
+
@Test(groups="fast")
public void testBasicSave() throws Exception {
FileBean bean = new FileBean(from, "text/plain", "somefile.txt");
@@ -60,11 +86,7 @@
public void testReader() throws Exception {
FileBean bean = new FileBean(from, "text/plain", "somefile.txt");
- Writer writer = new FileWriter(this.to);
- Reader reader = bean.getReader();
- char[] buf = new char[1024];
- for (int count; (count = reader.read(buf)) > 0;)
- writer.write(buf, 0, count);
+ copyReaderOut(bean.getReader());
Assert.assertTrue(this.to.exists());
Assert.assertFalse(this.from.exists());
@@ -76,11 +98,7 @@
String charset = Charset.defaultCharset().name();
FileBean bean = new FileBean(from, "text/plain", "somefile.txt",
charset);
- Writer writer = new FileWriter(this.to);
- Reader reader = bean.getReader();
- char[] buf = new char[1024];
- for (int count; (count = reader.read(buf)) > 0;)
- writer.write(buf, 0, count);
+ copyReaderOut(bean.getReader());
Assert.assertTrue(this.to.exists());
Assert.assertFalse(this.from.exists());
@@ -92,11 +110,7 @@
String charset = Charset.defaultCharset().name();
FileBean bean = new FileBean(from, "text/plain", "somefile.txt");
- Writer writer = new FileWriter(this.to);
- Reader reader = bean.getReader(charset);
- char[] buf = new char[1024];
- for (int count; (count = reader.read(buf)) > 0;)
- writer.write(buf, 0, count);
+ copyReaderOut(bean.getReader(charset));
Assert.assertTrue(this.to.exists());
Assert.assertFalse(this.from.exists());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
