mbenson 2004/02/18 08:34:49
Modified: src/testcases/org/apache/tools/ant/taskdefs
ExecuteOnTest.java ExecTaskTest.java
Log:
If initialization determines that the corresponding target could not run,
bail out of the test (pass).
Revision Changes Path
1.3 +22 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
Index: ExecuteOnTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExecuteOnTest.java 16 Feb 2004 19:42:13 -0000 1.2
+++ ExecuteOnTest.java 18 Feb 2004 16:34:49 -0000 1.3
@@ -49,6 +49,10 @@
public void testNoRedirect() {
executeTarget("no-redirect");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
+
String log = getLog();
File x = getProject().resolveFile("x");
File y = getProject().resolveFile("y");
@@ -73,6 +77,9 @@
public void testRedirect1() {
executeTarget("redirect1");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String actualOut = null;
try {
actualOut = FileUtils.newFileUtils().readFully(new FileReader(
@@ -102,6 +109,9 @@
public void testRedirect2() {
executeTarget("redirect2");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String actualOut = null;
String actualErr = null;
try {
@@ -134,6 +144,9 @@
public void testRedirect3() {
executeTarget("redirect3");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String actualOut = null;
try {
actualOut = FileUtils.newFileUtils().readFully(new FileReader(
@@ -164,6 +177,9 @@
public void testRedirect4() {
executeTarget("redirect4");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String actualOut = null;
String actualErr = null;
try {
@@ -206,6 +222,9 @@
private void testRedirect5or6(String target) {
executeTarget(target);
+ if (getProject().getProperty("sed.can.run") == null) {
+ return;
+ }
String actualOut = null;
String actualErr = null;
try {
@@ -224,6 +243,9 @@
public void testRedirect7() {
executeTarget("redirect7");
+ if (getProject().getProperty("sed.can.run") == null) {
+ return;
+ }
String actualOut = null;
String actualErr = null;
try {
1.12 +26 -3
ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java
Index: ExecTaskTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExecTaskTest.java 16 Feb 2004 19:39:13 -0000 1.11
+++ ExecTaskTest.java 18 Feb 2004 16:34:49 -0000 1.12
@@ -59,12 +59,19 @@
}
public void testNoRedirect() {
- expectLog("no-redirect", getProject().getProperty("ant.file") + "
out"
- + getProject().getProperty("ant.file") + " err");
+ executeTarget("no-redirect");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
+ assertEquals(getProject().getProperty("ant.file") + " out"
+ + getProject().getProperty("ant.file") + " err", getLog());
}
public void testRedirect1() {
executeTarget("redirect1");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String expectedOut = getProject().getProperty("ant.file") + " out\n"
+ getProject().getProperty("ant.file") + " err\n";
@@ -79,6 +86,9 @@
public void testRedirect2() {
executeTarget("redirect2");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String expectedOut = getProject().getProperty("ant.file") + " out\n";
String expectedErr = getProject().getProperty("ant.file") + " err\n";
@@ -96,7 +106,11 @@
}
public void testRedirect3() {
- expectLog("redirect3", getProject().getProperty("ant.file") + "
err");
+ executeTarget("redirect3");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
+ assertEquals(getProject().getProperty("ant.file") + " err",
getLog());
String expectedOut = getProject().getProperty("ant.file") + " out\n";
String actualOut = null;
@@ -111,6 +125,9 @@
public void testRedirect4() {
executeTarget("redirect4");
+ if (getProject().getProperty("test.can.run") == null) {
+ return;
+ }
String expectedOut = getProject().getProperty("ant.file") + " out\n";
String expectedErr = getProject().getProperty("ant.file") + " err\n";
@@ -139,6 +156,9 @@
public void testRedirect5or6(String target) {
executeTarget(target);
+ if (getProject().getProperty("wc.can.run") == null) {
+ return;
+ }
String expectedOut = getProject().getProperty("ant.file") + " out\n";
@@ -159,6 +179,9 @@
public void testRedirect7() {
executeTarget("redirect7");
+ if (getProject().getProperty("wc.can.run") == null) {
+ return;
+ }
String expectedOut = getProject().getProperty("ant.file") + " out\n";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
