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:07 UTC
[6/6] ant git commit: Merge 1.9.x branch into master
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.
*