diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java index e58e5ce99..15564a7fb 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java @@ -71,16 +71,24 @@ public class TranslateTest { @SuppressWarnings("resource") FileInputStream fis1 = new FileInputStream(file1); - @SuppressWarnings("resource") - FileInputStream fis2 = new FileInputStream(file2); - int read = 0; - while ((read = fis1.read(buffer1)) != -1) { - fis2.read(buffer2); - for (int i = 0; i < read; ++i) { - if (buffer1[i] != buffer2[i]) { - return false; + try { + @SuppressWarnings("resource") + FileInputStream fis2 = new FileInputStream(file2); + try { + int read = 0; + while ((read = fis1.read(buffer1)) != -1) { + fis2.read(buffer2); + for (int i = 0; i < read; ++i) { + if (buffer1[i] != buffer2[i]) { + return false; + } + } } + } finally { + fis2.close(); } + } finally { + fis1.close(); } return true; } diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java index 3d7582640..9a1aa8c77 100644 --- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java +++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java @@ -69,12 +69,12 @@ public class MailMessageTest { */ @Test public void testAPIExample() throws InterruptedException { - - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 1; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.to("to@you.com"); @@ -120,24 +120,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - /*for (int icounter = 0; icounterresult.length()) { - System.out.println("excedent of expected result " - + expectedResult.substring(result.length())); - } - if (expectedResult.length()"); testMailClient.to("to@you.com"); @@ -188,7 +171,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - assertEquals(expectedResult.length(), result.length()); assertEquals(expectedResult, result); // order of headers cannot be guaranteed assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); } @@ -200,11 +182,12 @@ public class MailMessageTest { */ @Test public void testCcOnly() throws InterruptedException { - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 3; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.cc("cc@you.com"); @@ -240,7 +223,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - assertEquals(expectedResult.length(), result.length()); assertEquals(expectedResult, result); assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); } @@ -252,11 +234,12 @@ public class MailMessageTest { */ @Test public void testBccOnly() throws InterruptedException { - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 4; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.bcc("bcc@you.com"); @@ -291,7 +274,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - assertEquals(expectedResult.length(), result.length()); assertEquals(expectedResult, result); assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); } @@ -304,11 +286,12 @@ public class MailMessageTest { */ @Test public void testNoSubject() throws InterruptedException { - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 5; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.to("to@you.com"); @@ -342,7 +325,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - assertEquals(expectedResult.length(), result.length()); assertEquals(expectedResult, result); assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); } @@ -354,11 +336,12 @@ public class MailMessageTest { */ @Test public void testEmptyBody() throws InterruptedException { - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 6; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.to("to@you.com"); @@ -392,7 +375,6 @@ public class MailMessageTest { "250\r\n" + "QUIT\r\n" + "221\r\n"; - assertEquals(expectedResult.length(), result.length()); assertEquals(expectedResult, result); assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); } @@ -406,12 +388,12 @@ public class MailMessageTest { */ @Test public void testAsciiCharset() throws InterruptedException { - - ServerThread testMailServer = new ServerThread(); + final int port = TEST_PORT + 7; + ServerThread testMailServer = new ServerThread(port); Thread server = new Thread(testMailServer); server.start(); - ClientThread testMailClient = new ClientThread(); + ClientThread testMailClient = new ClientThread(port); testMailClient.from("Mail Message "); testMailClient.to("Ceki G\u00fclc\u00fc "); @@ -453,8 +435,6 @@ public class MailMessageTest { bos1.print(expectedResult); bos2.print(result); - assertEquals("expected message length != actual message length " - + "in testAsciiCharset()", expectedResult.length(), result.length()); assertEquals("baos1 and baos2 should be the same in testAsciiCharset()", baos1.toString(), baos2.toString()); // order of headers cannot be guaranteed assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed()); @@ -466,6 +446,7 @@ public class MailMessageTest { */ private class ServerThread implements Runnable { + private final int port; private StringBuilder sb = null; private boolean loop = false; ServerSocket ssock = null; @@ -474,10 +455,14 @@ public class MailMessageTest { BufferedReader in = null; private boolean data = false; // state engine: false=envelope, true=message + ServerThread(int port) { + this.port = port; + } + public void run() { try { - ssock = new ServerSocket(TEST_PORT); + ssock = new ServerSocket(port); sock = ssock.accept(); // wait for connection in = new BufferedReader(new InputStreamReader( sock.getInputStream())); @@ -582,6 +567,7 @@ public class MailMessageTest { */ private class ClientThread implements Runnable { + private final int port; private MailMessage msg; private boolean fail = false; private String failMessage = null; @@ -595,11 +581,14 @@ public class MailMessageTest { protected Vector ccList = new Vector(); protected Vector bccList = new Vector(); + ClientThread(int port) { + this.port = port; + } public void run() { for (int i = 9; i > 0; i--) { try { - msg = new MailMessage("localhost", TEST_PORT); + msg = new MailMessage("localhost", port); } catch (java.net.ConnectException ce) { try { Thread.sleep(10 * 1000);