From e412f315261101643c905aefaf70b6987297b979 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 3 May 2001 11:16:53 +0000
Subject: [PATCH] fix testcase 13 for available.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269001 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/available.xml         |  5 +++++
 .../apache/tools/ant/taskdefs/AvailableTest.java | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml
index 2b215d5e7..cfcb5aaa9 100644
--- a/src/etc/testcases/taskdefs/available.xml
+++ b/src/etc/testcases/taskdefs/available.xml
@@ -64,6 +64,11 @@
   </target>
 
   <target name="test13">
+    <available property="test" 
+               file="" type="file" />
+  </target>
+
+  <target name="test13b">
     <available property="test" 
                file=""/>
   </target>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
index eb2fe08d5..6750f6005 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -127,20 +127,26 @@ public class AvailableTest extends TaskdefsTest {
     // All three specified but class missing -> null
     public void test11() { 
         executeTarget("test11");
-        assertEquals(null, project.getProperty("test"));
+        assertNull(project.getProperty("test"));
     }
 
     // Specified property-name is "" -> true
     public void test12() { 
         executeTarget("test12");
-        assertEquals(null, project.getProperty("test"));
+        assertNull(project.getProperty("test"));
         assertEquals("true", project.getProperty(""));
     }
 
     // Specified file is "" -> invalid files do not exist
     public void test13() { 
         executeTarget("test13");
-        assertEquals(null, project.getProperty("test"));
+        assertNull(project.getProperty("test"));
+    }
+
+    // Specified file is "" actually a directory, so it should pass
+    public void test13b() { 
+        executeTarget("test13b");
+        assertEquals("true", project.getProperty("test"));
     }
 
     // Specified resource is "" -> can such a thing exist?
@@ -155,7 +161,7 @@ public class AvailableTest extends TaskdefsTest {
     // Specified class is "" -> can not exist
     public void test15() { 
         executeTarget("test15");
-        assertEquals(null, project.getProperty("test"));
+        assertNull(project.getProperty("test"));
     }
 
     // Specified dir is "" -> this is the current directory and should
@@ -175,6 +181,6 @@ public class AvailableTest extends TaskdefsTest {
     // Specified dir is "../this_dir_should_never_exist" -> null
     public void test18() { 
         executeTarget("test18");
-        assertEquals(null, project.getProperty("test"));
+        assertNull(project.getProperty("test"));
     }
 }