You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/08/14 12:38:02 UTC
[1/6] ant git commit: Update WHATSNEW
Repository: ant
Updated Branches:
refs/heads/master 10a946e7a -> a6f7fd107
Update WHATSNEW
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f7b0a9d9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f7b0a9d9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f7b0a9d9
Branch: refs/heads/master
Commit: f7b0a9d9117e17cde18867b521c85f4f35e4bc3f
Parents: 94ef3d3
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Aug 13 21:52:40 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Aug 13 21:52:40 2018 +0200
----------------------------------------------------------------------
WHATSNEW | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f7b0a9d9/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 28977da..96943a5 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,13 @@
Changes from Ant 1.9.13 TO Ant 1.9.14
=====================================
+Fixed bugs:
+-----------
+
+ * fetch.xml must retrieve runtime rather than compile dependencies for
+ mail task.
+ Bugzilla Report 62621
+
Other changes:
--------------
* generatekey task now supports SubjectAlternativeName during key
[2/6] ant git commit: bz-62621 get the mail task tests working
Posted by ja...@apache.org.
bz-62621 get the mail task tests working
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/96573e64
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/96573e64
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/96573e64
Branch: refs/heads/master
Commit: 96573e64c83bab5d0ccd376a0a6a30800eab9c87
Parents: f7b0a9d
Author: Jaikiran Pai <ja...@apache.org>
Authored: Tue Aug 14 16:32:45 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Tue Aug 14 16:33:15 2018 +0530
----------------------------------------------------------------------
src/etc/testcases/taskdefs/email/mail.xml | 10 +-
.../org/apache/tools/ant/DummyMailServer.java | 201 ++++++++++
.../junit/org/apache/tools/ant/TestHelper.java | 54 +++
.../tools/ant/taskdefs/email/EmailTaskTest.java | 43 ++-
.../org/apache/tools/mail/MailMessageTest.java | 367 ++++++-------------
5 files changed, 413 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/96573e64/src/etc/testcases/taskdefs/email/mail.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/email/mail.xml b/src/etc/testcases/taskdefs/email/mail.xml
index c56fd40..5144b7a 100644
--- a/src/etc/testcases/taskdefs/email/mail.xml
+++ b/src/etc/testcases/taskdefs/email/mail.xml
@@ -20,7 +20,7 @@
<target name="test1">
<!-- this test is supposed to bring a build exception because user and password is not allowed with plain encoding -->
- <mail host="localhost" port="25" from="joe@abc.com" to="laura@xyz.com" subject="hello" encoding="plain" user="joe" password="secret">
+ <mail mailhost="localhost" mailport="25" from="joe@abc.com" tolist="laura@xyz.com" subject="hello" encoding="plain" user="joe" password="secret">
<message>
Hi Laura, how are you doing ?
</message>
@@ -28,7 +28,7 @@
</target>
<target name="test2">
<!-- this test is supposed to bring a build exception because SSL is not allowed with plain encoding -->
- <mail host="localhost" port="465" from="joe@abc.com" to="laura@xyz.com" subject="hello" encoding="plain" ssl="true">
+ <mail mailhost="localhost" mailport="465" from="joe@abc.com" tolist="laura@xyz.com" subject="hello" encoding="plain" ssl="true">
<message>
Hi Laura, how are you doing ?
</message>
@@ -36,5 +36,9 @@
</target>
-
+ <target name="test3">
+ <mail mailhost="localhost" mailport="${EmailTaskTest.test3.port}" from="test3" subject="just a test">
+ <to address="whoami" />
+ </mail>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/96573e64/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/DummyMailServer.java b/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
new file mode 100644
index 0000000..160528e
--- /dev/null
+++ b/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.Callable;
+
+/**
+ * A utility class that pretends to be a mail transfer agent. This
+ * has minimal functionality and is meant to be used only in tests
+ */
+public class DummyMailServer implements Runnable, Callable<Void> {
+
+ private final String host;
+ private final int port;
+
+
+ private StringBuilder sb = null;
+ private volatile boolean stop = false;
+
+ ServerSocket ssock = null;
+ Socket sock = null;
+ BufferedWriter out = null;
+ BufferedReader in = null;
+ private boolean data = false; // state engine: false=envelope, true=message
+
+ public DummyMailServer(int port) {
+ this("localhost", port);
+ }
+
+ public DummyMailServer(final String host, final int port) {
+ this.host = host;
+ this.port = port;
+ }
+
+ public int getPort() {
+ return this.port;
+ }
+
+ public String getHost() {
+ return this.host;
+ }
+
+ @Override
+ public void run() {
+ call();
+ }
+
+ @Override
+ public Void call() {
+
+ try {
+ ssock = new ServerSocket(port);
+ sock = ssock.accept(); // wait for connection
+ in = new BufferedReader(new InputStreamReader(
+ sock.getInputStream()));
+ out = new BufferedWriter(new OutputStreamWriter(
+ sock.getOutputStream()));
+ sb = new StringBuilder();
+ send("220 test SMTP EmailTaskTest\r\n");
+ while (!stop) {
+ String response = in.readLine();
+ if (response == null) {
+ stop = true;
+ break;
+ }
+ sb.append(response).append("\r\n");
+
+ if (!data && response.startsWith("EHLO")) {
+ // reject Extended HLO semantics, since we don't support it
+ send("500 EHLO unsupported\r\n");
+ } else if (!data && response.startsWith("HELO")) {
+ send("250 " + host + " Hello " + host + " "
+ + "[127.0.0.1], pleased to meet you\r\n");
+ } else if (!data && response.startsWith("MAIL")) {
+ send("250\r\n");
+ } else if (!data && response.startsWith("RCPT")) {
+ send("250\r\n");
+ } else if (!data && response.startsWith("DATA")) {
+ send("354\r\n");
+ data = true;
+ } else if (data && response.equals(".")) {
+ send("250\r\n");
+ data = false;
+ } else if (!data && response.startsWith("QUIT")) {
+ send("221\r\n");
+ stop = true;
+ } else if (!data) {
+ send("500 5.5.1 Command unrecognized: \""
+ + response + "\"\r\n");
+ stop = true;
+ } else {
+ // sb.append(response + "\r\n");
+ }
+ } // while
+ } catch (IOException ioe) {
+ if (stop) {
+ // asked to stop, so ignore the exception and move on
+ return null;
+ }
+ throw new BuildException(ioe);
+ } finally {
+ disconnect();
+ }
+ return null;
+ }
+
+ private void send(String retmsg) throws IOException {
+ out.write(retmsg);
+ out.flush();
+ sb.append(retmsg);
+ }
+
+ public void disconnect() {
+ this.stop = true;
+ if (out != null) {
+ try {
+ out.flush();
+ out.close();
+ out = null;
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ if (in != null) {
+ try {
+ in.close();
+ in = null;
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ if (sock != null) {
+ try {
+ sock.close();
+ sock = null;
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ if (ssock != null) {
+ try {
+ ssock.close();
+ ssock = null;
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+
+ public synchronized String getResult() {
+ this.stop = true;
+ return sb.toString();
+ }
+
+ /**
+ * Starts and returns a new dummy mail server to be used in tests
+ *
+ * @return
+ */
+ public static DummyMailServer startMailServer() {
+ return startMailServer("localhost");
+ }
+
+ /**
+ * Starts and returns a new dummy mail server to be used in tests
+ *
+ * @param host The host on which the mail server will open a server socket to listen on
+ * @return
+ */
+ public static DummyMailServer startMailServer(final String host) {
+ final int port = TestHelper.getMaybeAvailablePort();
+ final DummyMailServer mailServer = new DummyMailServer(host, port);
+ final Thread thread = new Thread(mailServer);
+ thread.setDaemon(true);
+ thread.start();
+ return mailServer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/96573e64/src/tests/junit/org/apache/tools/ant/TestHelper.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/TestHelper.java b/src/tests/junit/org/apache/tools/ant/TestHelper.java
new file mode 100644
index 0000000..f36dd46
--- /dev/null
+++ b/src/tests/junit/org/apache/tools/ant/TestHelper.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+/**
+ * As the name suggests, utility class used in tests
+ */
+public class TestHelper {
+
+ /**
+ * Find a TCP/IP port which may continue to be available.
+ * <br />
+ * The returned port is available since a socket has successfully bind to it, but this availability is not ensured
+ * after this method since the associated socket is released and some other process can now use it.
+ */
+ public static int getMaybeAvailablePort() {
+ final ServerSocket s;
+ try {
+ s = new ServerSocket(0);
+ s.setReuseAddress(true);
+ int port = s.getLocalPort();
+ try {
+ s.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ return port;
+ } catch (IOException e) {
+ // ignore
+ } finally {
+
+ }
+ throw new IllegalStateException("No TCP/IP port available");
+ }
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/96573e64/src/tests/junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java
index 6363f90..a77fc92 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java
@@ -20,12 +20,12 @@ package org.apache.tools.ant.taskdefs.email;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileRule;
+import org.apache.tools.ant.DummyMailServer;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.fail;
-
/**
* TODO : develop these testcases - the email task needs to have attributes allowing
* to simulate sending mail and to catch the output in text files or streams
@@ -40,24 +40,51 @@ public class EmailTaskTest {
buildRule.configureProject("src/etc/testcases/taskdefs/email/mail.xml");
}
+ /**
+ * Expected failure attempting SMTP auth without MIME
+ */
@Test
public void test1() {
try {
buildRule.executeTarget("test1");
- fail("Build exception expected: SMTP auth only possibly with MIME mail");
- } catch(BuildException ex) {
- //TODO assert exception message
+ } catch (BuildException e) {
+ // assert it's the expected one
+ if (!e.getMessage().equals("SMTP auth only possible with MIME mail")) {
+ throw e;
+ }
}
}
+ /**
+ * Expected failure attempting SSL without MIME
+ */
@Test
public void test2() {
try {
buildRule.executeTarget("test2");
- fail("Build exception expected: SSL only possibly with MIME mail");
- } catch(BuildException ex) {
- //TODO assert exception message
+ } catch (BuildException e) {
+ // assert it's the expected one
+ if (!e.getMessage().equals("SSL and STARTTLS only possible with MIME mail")) {
+ throw e;
+ }
}
}
+ /**
+ * Tests that a basic email sending works
+ */
+ @Test
+ public void test3() {
+ final DummyMailServer mailServer = DummyMailServer.startMailServer();
+ try {
+ buildRule.getProject().setProperty("EmailTaskTest.test3.port", String.valueOf(mailServer.getPort()));
+ buildRule.executeTarget("test3");
+ } finally {
+ mailServer.disconnect();
+ }
+ final String smtpInteraction = mailServer.getResult();
+ Assert.assertNotNull("No mail received by mail server", smtpInteraction);
+ // just a basic check
+ Assert.assertTrue("Unexpected recipients on the sent mail", smtpInteraction.contains("RCPT TO:<whoami>"));
+ }
}
http://git-wip-us.apache.org/repos/asf/ant/blob/96573e64/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 f61e6b4..ee7a05c 100644
--- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
@@ -18,24 +18,18 @@
package org.apache.tools.mail;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import org.apache.tools.ant.DummyMailServer;
+import org.junit.AssumptionViolatedException;
+import org.junit.Before;
+import org.junit.Test;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.tools.ant.BuildException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -46,9 +40,6 @@ import static org.junit.Assert.assertFalse;
*/
public class MailMessageTest {
- // 27224 = magic (a random port which is unlikely to be in use)
- private static int TEST_PORT = 27224;
-
private String local = null;
@Before
@@ -69,28 +60,27 @@ public class MailMessageTest {
*/
@Test
public void testAPIExample() throws InterruptedException {
- final int port = TEST_PORT + 1;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
-
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.to("to@you.com");
- testMailClient.cc("cc1@you.com");
- testMailClient.cc("cc2@you.com");
- testMailClient.bcc("bcc@you.com");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("test line 1\n"
- + "test line 2");
-
- Thread client = new Thread(testMailClient);
- client.start();
-
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
-
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.to("to@you.com");
+ testMailClient.cc("cc1@you.com");
+ testMailClient.cc("cc2@you.com");
+ testMailClient.bcc("bcc@you.com");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("test line 1\n"
+ + "test line 2");
+
+ Thread client = new Thread(testMailClient);
+ client.start();
+ client.join(30 * 1000); // a further 30s
+
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
+ "HELO " + local + "\r\n"
@@ -129,23 +119,23 @@ public class MailMessageTest {
*/
@Test
public void testToOnly() throws InterruptedException {
- final int port = TEST_PORT + 2;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.to("to@you.com");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("test line 1\n" + "test line 2");
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.to("to@you.com");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("test line 1\n" + "test line 2");
- Thread client = new Thread(testMailClient);
- client.start();
+ Thread client = new Thread(testMailClient);
+ client.start();
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -179,23 +169,22 @@ public class MailMessageTest {
*/
@Test
public void testCcOnly() throws InterruptedException {
- final int port = TEST_PORT + 3;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
-
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.cc("cc@you.com");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("test line 1\n" + "test line 2");
-
- Thread client = new Thread(testMailClient);
- client.start();
-
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.cc("cc@you.com");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("test line 1\n" + "test line 2");
+
+ Thread client = new Thread(testMailClient);
+ client.start();
+
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -229,23 +218,21 @@ public class MailMessageTest {
*/
@Test
public void testBccOnly() throws InterruptedException {
- final int port = TEST_PORT + 4;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
-
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.bcc("bcc@you.com");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("test line 1\n" + "test line 2");
-
- Thread client = new Thread(testMailClient);
- client.start();
-
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.bcc("bcc@you.com");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("test line 1\n" + "test line 2");
+
+ Thread client = new Thread(testMailClient);
+ client.start();
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -279,22 +266,22 @@ public class MailMessageTest {
*/
@Test
public void testNoSubject() throws InterruptedException {
- final int port = TEST_PORT + 5;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.to("to@you.com");
- testMailClient.setMessage("test line 1\n" + "test line 2");
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.to("to@you.com");
+ testMailClient.setMessage("test line 1\n" + "test line 2");
- Thread client = new Thread(testMailClient);
- client.start();
+ Thread client = new Thread(testMailClient);
+ client.start();
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -327,23 +314,22 @@ public class MailMessageTest {
*/
@Test
public void testEmptyBody() throws InterruptedException {
- final int port = TEST_PORT + 6;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
-
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.to("to@you.com");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("");
-
- Thread client = new Thread(testMailClient);
- client.start();
-
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.to("to@you.com");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("");
+
+ Thread client = new Thread(testMailClient);
+ client.start();
+
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -378,23 +364,23 @@ public class MailMessageTest {
*/
@Test
public void testAsciiCharset() throws InterruptedException {
- final int port = TEST_PORT + 7;
- ServerThread testMailServer = new ServerThread(port);
- Thread server = new Thread(testMailServer);
- server.start();
-
- ClientThread testMailClient = new ClientThread(port);
-
- testMailClient.from("Mail Message <Em...@ant.apache.org>");
- testMailClient.to("Ceki G\u00fclc\u00fc <ab...@mail-abuse.org>");
- testMailClient.setSubject("Test subject");
- testMailClient.setMessage("");
+ final DummyMailServer testMailServer = DummyMailServer.startMailServer(this.local);
+ final ClientThread testMailClient;
- Thread client = new Thread(testMailClient);
- client.start();
-
- server.join(60 * 1000); // 60s
- client.join(30 * 1000); // a further 30s
+ try {
+ testMailClient = new ClientThread(testMailServer.getPort());
+ testMailClient.from("Mail Message <Em...@ant.apache.org>");
+ testMailClient.to("Ceki G\u00fclc\u00fc <ab...@mail-abuse.org>");
+ testMailClient.setSubject("Test subject");
+ testMailClient.setMessage("");
+
+ Thread client = new Thread(testMailClient);
+ client.start();
+
+ client.join(30 * 1000); // a further 30s
+ } finally {
+ testMailServer.disconnect();
+ }
String result = testMailServer.getResult();
String expectedResult = "220 test SMTP EmailTaskTest\r\n"
@@ -430,127 +416,6 @@ public class MailMessageTest {
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
-
- /**
- * A private test class that pretends to be a mail transfer agent
- */
- private class ServerThread implements Runnable {
-
- private final int port;
- private StringBuilder sb = null;
- private boolean loop = false;
- ServerSocket ssock = null;
- Socket sock = null;
- BufferedWriter out = null;
- 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(port);
- sock = ssock.accept(); // wait for connection
- in = new BufferedReader(new InputStreamReader(
- sock.getInputStream()));
- out = new BufferedWriter(new OutputStreamWriter(
- sock.getOutputStream()));
- sb = new StringBuilder();
- send("220 test SMTP EmailTaskTest\r\n");
- loop = true;
- while (loop) {
- String response = in.readLine();
- if (response == null) {
- loop = false;
- break;
- }
- sb.append(response).append("\r\n");
-
- if (!data && response.startsWith("HELO")) {
- send("250 " + local + " Hello " + local + " "
- + "[127.0.0.1], pleased to meet you\r\n");
- } else if (!data && response.startsWith("MAIL")) {
- send("250\r\n");
- } else if (!data && response.startsWith("RCPT")) {
- send("250\r\n");
- } else if (!data && response.startsWith("DATA")) {
- send("354\r\n");
- data = true;
- } else if (data && response.equals(".")) {
- send("250\r\n");
- data = false;
- } else if (!data && response.startsWith("QUIT")) {
- send("221\r\n");
- loop = false;
- } else if (!data) {
- //throw new IllegalStateException("Command unrecognized: "
- // + response);
- send("500 5.5.1 Command unrecognized: \""
- + response + "\"\r\n");
- loop = false;
- } else {
- // sb.append(response + "\r\n");
- }
- } // while
- } catch (IOException ioe) {
- throw new BuildException(ioe);
- } finally {
- disconnect();
- }
- }
-
- private void send(String retmsg) throws IOException {
- out.write(retmsg);
- out.flush();
- sb.append(retmsg);
- }
-
- private void disconnect() {
- if (out != null) {
- try {
- out.flush();
- out.close();
- out = null;
- } catch (IOException e) {
- // ignore
- }
- }
- if (in != null) {
- try {
- in.close();
- in = null;
- } catch (IOException e) {
- // ignore
- }
- }
- if (sock != null) {
- try {
- sock.close();
- sock = null;
- } catch (IOException e) {
- // ignore
- }
- }
- if (ssock != null) {
- try {
- ssock.close();
- ssock = null;
- } catch (IOException e) {
- // ignore
- }
- }
- }
-
- public synchronized String getResult() {
- loop = false;
- return sb.toString();
- }
-
- }
-
/**
* A private test class that wraps MailMessage
*/
[6/6] ant git commit: Merge 1.9.x branch into master
Posted by ja...@apache.org.
Merge 1.9.x branch into master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a6f7fd10
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a6f7fd10
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a6f7fd10
Branch: refs/heads/master
Commit: a6f7fd1077e3d485f834e01ae2620a2ee662b1c2
Parents: 10a946e 27aa22a
Author: Jaikiran Pai <ja...@apache.org>
Authored: Tue Aug 14 18:07:22 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Tue Aug 14 18:07:22 2018 +0530
----------------------------------------------------------------------
build.xml | 5 +
src/etc/testcases/taskdefs/email/mail.xml | 10 +-
.../org/apache/tools/ant/DummyMailServer.java | 199 ++++++++++
.../junit/org/apache/tools/ant/TestHelper.java | 54 +++
.../tools/ant/taskdefs/email/EmailTaskTest.java | 43 ++-
.../org/apache/tools/mail/MailMessageTest.java | 367 ++++++-------------
6 files changed, 418 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a6f7fd10/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 43b6828,cbe6c32..c148105
--- a/build.xml
+++ b/build.xml
@@@ -1842,10 -1755,8 +1842,11 @@@ ${antunit.reports
<exclude name="org/example/"/>
<exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
<exclude name="${optional.package}/junit/TestFormatter.java"/>
+ <exclude name="${ant.package}/TestHelper.java"/>
+ <!-- JUnit 5 / junitlauncher tests that aren't meant to run by junit task -->
+ <exclude name="${optional.package}/junitlauncher/"/>
+
<!-- interactive tests -->
<exclude name="${taskdefs.package}/TestProcess.java"/>
<exclude name="${optional.package}/splash/SplashScreenTest.java"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/a6f7fd10/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
----------------------------------------------------------------------
diff --cc src/tests/junit/org/apache/tools/mail/MailMessageTest.java
index dd5e324,ee7a05c..07f30df
--- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java
@@@ -18,26 -18,21 +18,20 @@@
package org.apache.tools.mail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
- import java.io.BufferedReader;
- import java.io.BufferedWriter;
+ import org.apache.tools.ant.DummyMailServer;
+ import org.junit.AssumptionViolatedException;
+ import org.junit.Before;
+ import org.junit.Test;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
- import java.io.InputStreamReader;
- import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.net.InetAddress;
- import java.net.ServerSocket;
- import java.net.Socket;
-import java.util.Enumeration;
import java.util.Vector;
- import org.apache.tools.ant.BuildException;
- import org.junit.AssumptionViolatedException;
- import org.junit.Before;
- import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
--
/**
* JUnit testcases for org.apache.tools.mail.MailMessage.
*
[3/6] ant git commit: @Override wasn't applicable for interfaces in
Java 1.5 and doesn't get caught while compiling with a higher version of Java
SDK
Posted by ja...@apache.org.
@Override wasn't applicable for interfaces in Java 1.5 and doesn't get caught while compiling with a higher version of Java SDK
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0473a3d0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0473a3d0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0473a3d0
Branch: refs/heads/master
Commit: 0473a3d0ab0d0c30b580754aec429c2c9afbf24b
Parents: 96573e6
Author: Jaikiran Pai <ja...@apache.org>
Authored: Tue Aug 14 16:36:43 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Tue Aug 14 16:36:43 2018 +0530
----------------------------------------------------------------------
src/tests/junit/org/apache/tools/ant/DummyMailServer.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0473a3d0/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/DummyMailServer.java b/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
index 160528e..3fc66f3 100644
--- a/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
+++ b/src/tests/junit/org/apache/tools/ant/DummyMailServer.java
@@ -63,12 +63,10 @@ public class DummyMailServer implements Runnable, Callable<Void> {
return this.host;
}
- @Override
public void run() {
call();
}
- @Override
public Void call() {
try {
[5/6] ant git commit: bz-62621 conditionally enable EmailTaskTest
Posted by ja...@apache.org.
bz-62621 conditionally enable EmailTaskTest
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/27aa22a8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/27aa22a8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/27aa22a8
Branch: refs/heads/master
Commit: 27aa22a82a216d133aa1b635631825f520bc165c
Parents: 00d4ba8
Author: Jaikiran Pai <ja...@apache.org>
Authored: Tue Aug 14 17:50:50 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Tue Aug 14 17:50:50 2018 +0530
----------------------------------------------------------------------
build.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/27aa22a8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ecc0774..cbe6c32 100644
--- a/build.xml
+++ b/build.xml
@@ -1815,6 +1815,10 @@ ${antunit.reports}
<exclude name="${optional.package}/JspcTest.java"
unless="jasper.present"/>
+ <!-- needs JavaMail -->
+ <exclude name="${taskdefs.package}/email/EmailTaskTest.java"
+ unless="javamail.complete"/>
+
<!-- These tests only passes if testcases and Ant classes have
been loaded by the same classloader - will throw
IllegalAccessExceptions otherwise. -->
[4/6] ant git commit: Exclude TestHelper from being considered as a
test
Posted by ja...@apache.org.
Exclude TestHelper from being considered as a test
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/00d4ba8b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/00d4ba8b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/00d4ba8b
Branch: refs/heads/master
Commit: 00d4ba8b99544dbcb4941a8cd9eb893711bd5e2d
Parents: 0473a3d
Author: Jaikiran Pai <ja...@apache.org>
Authored: Tue Aug 14 17:05:13 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Tue Aug 14 17:05:13 2018 +0530
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/00d4ba8b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 52c8884..ecc0774 100644
--- a/build.xml
+++ b/build.xml
@@ -1755,6 +1755,7 @@ ${antunit.reports}
<exclude name="org/example/"/>
<exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
<exclude name="${optional.package}/junit/TestFormatter.java"/>
+ <exclude name="${ant.package}/TestHelper.java"/>
<!-- interactive tests -->
<exclude name="${taskdefs.package}/TestProcess.java"/>