From ca5f66c954d36e5b24ce2b03f8cf2b9d9625e11c Mon Sep 17 00:00:00 2001
From: Jan Materne <jhm@apache.org>
Date: Wed, 20 Jul 2005 06:54:21 +0000
Subject: [PATCH] Damn - I forgot to migrate the tests... I love these commit
 mails :-)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278468 13f79535-47bb-0310-9956-ffa450edef68
---
 .../types/selectors/ModifiedSelectorTest.java | 52 +++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
index f7dd2e048..d023e81cf 100644
--- a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
@@ -30,6 +30,7 @@ import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Path;
 
 // inside MockProject
+import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
@@ -589,12 +590,35 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
         }
     }
 
-
+    
     public void _testCustomComparator() {
         // same logic as on algorithm, no testcases created
     }
 
-
+    
+    public void testResourceSelectorSimple() {
+        BFT bft = new BFT("modifiedselector");
+        bft.doTarget("modifiedselectortest-ResourceSimple");
+        bft.deleteCachefile();
+        //new File("src/etc/testcases/types/resources/selectors/cache.properties").delete();
+    }
+    public void testResourceSelectorSelresTrue() {
+        BFT bft = new BFT("modifiedselector");
+        bft.doTarget("modifiedselectortest-ResourceSelresTrue");
+        bft.assertLogContaining("does not provide an InputStream");
+        bft.deleteCachefile();
+    }
+    public void testResourceSelectorSelresFalse() {
+        BFT bft = new BFT("modifiedselector");
+        bft.doTarget("modifiedselectortest-ResourceSelresFalse");
+        bft.deleteCachefile();  
+    }
+    public void testResourceSelectorScenarioSimple() {
+        BFT bft = new BFT("modifiedselector");
+        bft.doTarget("modifiedselectortest-scenario-resourceSimple");
+        bft.doTarget("modifiedselectortest-scenario-clean");
+        bft.deleteCachefile();  
+    }
     /**
      * Test the interface semantic of Comparators.
      * This method does some common test for comparator implementations.
@@ -874,16 +898,19 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
      * and property transfer to that project.
      */
     private class BFT extends org.apache.tools.ant.BuildFileTest {
+        String buildfile = "src/etc/testcases/types/selectors.xml";
+
         BFT() { super("nothing"); }
         BFT(String name) {
             super(name);
         }
+        
         String propfile = "ModifiedSelectorTest.properties";
 
         boolean isConfigured = false;
 
         public void setUp() {
-            configureProject("src/etc/testcases/types/selectors.xml");
+            configureProject(buildfile);
             isConfigured = true;
         }
 
@@ -893,6 +920,13 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
             if (!isConfigured) setUp();
             executeTarget(target);
         }
+        
+        protected void assertLogContaining(String substring) {
+            super.assertLogContaining(substring);
+        }
+        protected void assertOutputContaining(String substring) {
+            super.assertOutputContaining(substring);
+        }
 
         public String getProperty(String property) {
             return project.getProperty(property);
@@ -919,9 +953,21 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
             new File(getProject().getBaseDir(), propfile).delete();
         }
 
+        public void deleteCachefile() {
+            File basedir = new File(buildfile).getParentFile();
+            File cacheFile = new File(basedir, "cache.properties");
+            cacheFile.delete();
+        }
+
         public org.apache.tools.ant.Project getProject() {
             return super.getProject();
         }
+        public String getBuildfile() {
+            return buildfile;
+        }
+        public void setBuildfile(String buildfile) {
+            this.buildfile = buildfile;
+        }
     }//class-BFT