You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/12/09 21:13:19 UTC
[1/4] ant git commit: use different server sockets for tests,
eases binding on windows
Repository: ant
Updated Branches:
refs/heads/1.9.x 79e9d1043 -> 608b65a3e
use different server sockets for tests, eases binding on windows
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/609d3635
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/609d3635
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/609d3635
Branch: refs/heads/1.9.x
Commit: 609d36356f86a193ebce01219357c5728ecb94e0
Parents: 79e9d10
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Dec 9 21:58:47 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Dec 9 21:58:47 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/mail/MailMessageTest.java | 50 +++++++++++++-------
1 file changed, 32 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/609d3635/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
index 3d75826..7f0bd18 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 <Em...@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -148,11 +148,12 @@ public class MailMessageTest {
*/
@Test
public void testToOnly() throws InterruptedException {
- ServerThread testMailServer = new ServerThread();
+ final int port = TEST_PORT + 2;
+ 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 <Em...@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -200,11 +201,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 <Em...@ant.apache.org>");
testMailClient.cc("cc@you.com");
@@ -252,11 +254,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 <Em...@ant.apache.org>");
testMailClient.bcc("bcc@you.com");
@@ -304,11 +307,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 <Em...@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -354,11 +358,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 <Em...@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -406,12 +411,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 <Em...@ant.apache.org>");
testMailClient.to("Ceki G\u00fclc\u00fc <ab...@mail-abuse.org>");
@@ -466,6 +471,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 +480,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 +592,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 +606,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);
[4/4] ant git commit: close streams to make files deletable on windows
Posted by bo...@apache.org.
close streams to make files deletable on windows
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/608b65a3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/608b65a3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/608b65a3
Branch: refs/heads/1.9.x
Commit: 608b65a3e3663c63c63032d058b1c4a4498ed93c
Parents: ca1ed22
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Dec 9 22:04:30 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Dec 9 22:04:30 2017 +0100
----------------------------------------------------------------------
.../taskdefs/optional/i18n/TranslateTest.java | 24 +++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/608b65a3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java
----------------------------------------------------------------------
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 e58e5ce..15564a7 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;
}
[2/4] ant git commit: remove commented out code
Posted by bo...@apache.org.
remove commented out code
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bd676a53
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bd676a53
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bd676a53
Branch: refs/heads/1.9.x
Commit: bd676a53d1c3dbcebab3ba60b05e2ca4eb741bc9
Parents: 609d363
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Dec 9 21:59:48 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Dec 9 21:59:48 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/mail/MailMessageTest.java | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/bd676a53/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
index 7f0bd18..fa95b7b 100644
--- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
@@ -120,23 +120,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
- /*for (int icounter = 0; icounter<expectedResult.length(); icounter++) {
- if (icounter < result.length()) {
- if (expectedResult.charAt(icounter) != result.charAt(icounter)) {
- System.out.println("posit " + icounter + " expected "
- + expectedResult.charAt(icounter)
- + " result " + result.charAt(icounter));
- }
- }
- }
- if (expectedResult.length()>result.length()) {
- System.out.println("excedent of expected result "
- + expectedResult.substring(result.length()));
- }
- if (expectedResult.length()<result.length()) {
- System.out.println("excedent of result "
- + result.substring(expectedResult.length()));
- }*/
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result); // order of headers cannot be guaranteed
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
[3/4] ant git commit: length tests are redundant with content
assertions
Posted by bo...@apache.org.
length tests are redundant with content assertions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ca1ed226
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ca1ed226
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ca1ed226
Branch: refs/heads/1.9.x
Commit: ca1ed226f7814aadc67db6a63970fb10f1e45517
Parents: bd676a5
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Dec 9 22:00:36 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Dec 9 22:00:36 2017 +0100
----------------------------------------------------------------------
src/tests/junit/org/apache/tools/mail/MailMessageTest.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/ca1ed226/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
index fa95b7b..9a1aa8c 100644
--- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
@@ -120,7 +120,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());
}
@@ -172,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());
}
@@ -225,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());
}
@@ -277,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());
}
@@ -329,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());
}
@@ -380,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());
}
@@ -441,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());