mbenson 2004/06/24 09:47:41
Modified: src/testcases/org/apache/tools/ant/taskdefs/optional/unix
Tag: ANT_16_BRANCH SymlinkTest.java
Log:
Sync with HEAD
Revision Changes Path
No revision
No revision
1.3.2.6 +7 -16
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
Index: SymlinkTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- SymlinkTest.java 7 Jun 2004 12:03:55 -0000 1.3.2.5
+++ SymlinkTest.java 24 Jun 2004 16:47:41 -0000 1.3.2.6
@@ -47,7 +47,6 @@
private Project p;
private boolean supportsSymlinks = Os.isFamily("unix");
- private boolean testfail = false;
public SymlinkTest(String name) {
super(name);
@@ -62,7 +61,6 @@
public void testSingle() {
- testfail = true;
if (supportsSymlinks) {
executeTarget("test-single");
p = getProject();
@@ -71,11 +69,9 @@
assertNotNull("Failed to create link",
p.getProperty("test.single.link.created"));
}
- testfail = false;
}
public void testDelete() {
- testfail = true;
if (supportsSymlinks) {
executeTarget("test-delete");
p = getProject();
@@ -86,11 +82,9 @@
fail(linkDeleted);
}
}
- testfail = false;
}
public void testRecord() {
- testfail = true;
if (supportsSymlinks) {
executeTarget("test-record");
p = getProject();
@@ -144,11 +138,9 @@
}
}
- testfail = false;
}
public void testRecreate() {
- testfail = true;
if (supportsSymlinks) {
executeTarget("test-recreate");
p = getProject();
@@ -176,22 +168,21 @@
p.getProperty("test.recreate.link3.recreated"));
assertNotNull("Failed to recreate dirlink",
p.getProperty("test.recreate.dirlink.recreated"));
-
- String doubleRecreate =
p.getProperty("test.recreate.dirlink2.recreated.twice");
+
+ String doubleRecreate =
p.getProperty("test.recreate.dirlink2.recreated.twice");
- if (doubleRecreate != null) {
- fail(doubleRecreate);
- }
+ if (doubleRecreate != null) {
+ fail(doubleRecreate);
+ }
assertNotNull("Failed to alter dirlink3",
p.getProperty("test.recreate.dirlink3.was.altered"));
}
- testfail = false;
}
public void tearDown() {
- if (supportsSymlinks && !testfail) {
+ if (supportsSymlinks) {
executeTarget("teardown");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
