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/26 10:32:21 UTC
[1/3] ant git commit: Update the EmailTaskTest to ensure that the
mail task does indeed fail in expected cases
Repository: ant
Updated Branches:
refs/heads/master 33e2efec4 -> 87b252f74
Update the EmailTaskTest to ensure that the mail task does indeed fail in expected cases
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/41e6b2c7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/41e6b2c7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/41e6b2c7
Branch: refs/heads/master
Commit: 41e6b2c7ee45bf308d467055711172bfffdf8a01
Parents: 27aa22a
Author: Jaikiran Pai <ja...@apache.org>
Authored: Thu Aug 16 16:31:42 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Aug 16 16:31:42 2018 +0530
----------------------------------------------------------------------
.../junit/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/41e6b2c7/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 a77fc92..200ebac 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
@@ -47,6 +47,7 @@ public class EmailTaskTest {
public void test1() {
try {
buildRule.executeTarget("test1");
+ Assert.fail("Execution of mail task was expected to fail");
} catch (BuildException e) {
// assert it's the expected one
if (!e.getMessage().equals("SMTP auth only possible with MIME mail")) {
@@ -62,6 +63,7 @@ public class EmailTaskTest {
public void test2() {
try {
buildRule.executeTarget("test2");
+ Assert.fail("Execution of mail task was expected to fail");
} catch (BuildException e) {
// assert it's the expected one
if (!e.getMessage().equals("SSL and STARTTLS only possible with MIME mail")) {
[2/3] ant git commit: bz-62655 throw a BuildException from augment
task if the id attribute isn't specified or if the value points to an unknown
reference
Posted by ja...@apache.org.
bz-62655 throw a BuildException from augment task if the id attribute isn't specified or if the value points to an unknown reference
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/21de7add
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/21de7add
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/21de7add
Branch: refs/heads/master
Commit: 21de7add9a935c4ae61716cce269f58db26e949a
Parents: 41e6b2c
Author: Jaikiran Pai <ja...@apache.org>
Authored: Sat Aug 25 17:13:31 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sat Aug 25 17:13:31 2018 +0530
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/AugmentReference.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/21de7add/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java b/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
index 637795f..7402d44 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
@@ -17,6 +17,7 @@
*/
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.RuntimeConfigurable;
import org.apache.tools.ant.Task;
@@ -48,7 +49,7 @@ public class AugmentReference extends Task implements TypeAdapter {
log("project reference " + id + "=" + String.valueOf(result), Project.MSG_DEBUG);
return result;
}
- throw new IllegalStateException("Unknown reference \"" + id + "\"");
+ throw new BuildException("Unknown reference \"" + id + "\"");
}
/**
@@ -63,7 +64,7 @@ public class AugmentReference extends Task implements TypeAdapter {
RuntimeConfigurable wrapper = getWrapper();
id = wrapper.getId();
if (id == null) {
- throw new IllegalStateException(getTaskName() + " attribute 'id' unset");
+ throw new BuildException(getTaskName() + " attribute 'id' unset");
}
wrapper.setAttribute("id", null);
wrapper.removeAttribute("id");
[3/3] 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/87b252f7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/87b252f7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/87b252f7
Branch: refs/heads/master
Commit: 87b252f740999c88701b38b387ac6de4617fb6bf
Parents: 33e2efe 21de7ad
Author: Jaikiran Pai <ja...@apache.org>
Authored: Sun Aug 26 16:00:14 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sun Aug 26 16:00:14 2018 +0530
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/AugmentReference.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------