JAMES-2085 Correct error handling in MimeMessageWrapper tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/972001da Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/972001da Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/972001da Branch: refs/heads/master Commit: 972001da5c48d98611de896f13257ff4fad293db Parents: a3438cf Author: benwa <btell...@linagora.com> Authored: Mon Jul 3 15:59:24 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Jul 5 17:13:47 2017 +0700 ---------------------------------------------------------------------- .../james/core/MimeMessageWrapperTest.java | 61 ++++++-------------- 1 file changed, 19 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/972001da/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java index 10fe7e3..64c6723 100644 --- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java +++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java @@ -151,59 +151,36 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest { mmw.writeTo(System.out); } - /* - * Class under test for String getSubject() - */ @Test - public void testGetSubjectFolding() { - try { - StringBuilder res = new StringBuilder(); - BufferedReader r = new BufferedReader(new InputStreamReader(mw.getInputStream())); - String line; - while (r.ready()) { - line = r.readLine(); - res.append(line).append("\r\n"); - } - r.close(); - assertEquals(body, res.toString()); - } catch (MessagingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + public void testGetSubjectFolding() throws Exception { + StringBuilder res = new StringBuilder(); + BufferedReader r = new BufferedReader(new InputStreamReader(mw.getInputStream())); + String line; + while (r.ready()) { + line = r.readLine(); + res.append(line).append("\r\n"); } + r.close(); + assertEquals(body, res.toString()); } - /* - * Class under test for String getSubject() - */ @Test - public void testAddHeaderAndSave() { - try { - mw.addHeader("X-Test", "X-Value"); - - assertEquals("X-Value", mw.getHeader("X-Test")[0]); + public void testAddHeaderAndSave() throws Exception { + mw.addHeader("X-Test", "X-Value"); - mw.saveChanges(); + assertEquals("X-Value", mw.getHeader("X-Test")[0]); - ByteArrayOutputStream rawMessage = new ByteArrayOutputStream(); - mw.writeTo(rawMessage); + mw.saveChanges(); - assertEquals("X-Value", mw.getHeader("X-Test")[0]); + ByteArrayOutputStream rawMessage = new ByteArrayOutputStream(); + mw.writeTo(rawMessage); - String res = rawMessage.toString(); + assertEquals("X-Value", mw.getHeader("X-Test")[0]); - boolean found = res.indexOf("X-Test: X-Value") > 0; - assertEquals(true, found); + String res = rawMessage.toString(); - } catch (MessagingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + boolean found = res.indexOf("X-Test: X-Value") > 0; + assertEquals(true, found); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org