From 190fdaaa1f6c240782e126ce4f1890acfae7d324 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 3 Dec 2008 17:04:24 +0000
Subject: [PATCH] Add a verbose attribute to dependset.  PR 13681

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@722972 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/DependSet.java  |  3 +-
 src/tests/antunit/taskdefs/dependset-test.xml | 79 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 8633c2d23..9635347f0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -291,7 +291,8 @@ public class DependSet extends MatchingTask {
         if (verbose) {
             for (Iterator i = missing.iterator(); i.hasNext(); ) {
                 Resource r = (Resource) i.next();
-                log("Expected " + what + " " + r.toLongString() + " is missing.");
+                log("Expected " + what + " " + r.toLongString()
+                    + " is missing.");
             }
         }
     }
diff --git a/src/tests/antunit/taskdefs/dependset-test.xml b/src/tests/antunit/taskdefs/dependset-test.xml
index 721dc29e8..04c7f17c3 100644
--- a/src/tests/antunit/taskdefs/dependset-test.xml
+++ b/src/tests/antunit/taskdefs/dependset-test.xml
@@ -66,12 +66,31 @@
       <srcfilelist dir="${input}" files="newer.tmp" />
       <targetfilelist dir="${output}" files="older.tmp" />
     </dependset>
-    <!--au:assertLogContains text="older.tmp&quot; is oldest target file"
-                          level="verbose"/-->
+    <au:assertLogContains text="older.tmp&quot; is oldest target file"
+                          level="verbose"/>
     <au:assertLogContains text="newer.tmp&quot; is newest source"
                           level="verbose"/>
     <au:assertLogContains text="Deleting all target files."
                           level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
+  </target>
+
+  <target name="testMoreRecentSourceFileVerbose" depends="setUp">
+    <touch file="${output}/older.tmp" />
+    <sleep seconds="3" />
+    <touch file="${input}/newer.tmp" />
+    <dependset verbose="true">
+      <srcfilelist dir="${input}" files="newer.tmp" />
+      <targetfilelist dir="${output}" files="older.tmp" />
+    </dependset>
+    <au:assertLogContains text="older.tmp&quot; is oldest target file"
+                          level="info"/>
+    <au:assertLogContains text="newer.tmp&quot; is newest source"
+                          level="info"/>
+    <au:assertLogContains text="Deleting all target files."
+                          level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
     <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
@@ -90,12 +109,39 @@
         <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp" />
       </targets>
     </dependset>
-    <!--au:assertLogContains text="targetset_1&quot; is oldest target file"
-                          level="verbose"/-->
+    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file"
+                          level="verbose"/>
     <au:assertLogContains text="sourceset_2.tmp&quot; is newest source"
                           level="verbose"/>
     <au:assertLogContains text="Deleting all target files."
                           level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertFileDoesntExist file="${output}/targetset_1.tmp" />
+    <au:assertFileDoesntExist file="${output}/targetset_2.tmp" />
+  </target>
+
+  <target name="testMultipleFilesVerbose" depends="setUp">
+    <touch file="${input}/sourceset_1.tmp" />
+    <touch file="${output}/targetset_1.tmp" />
+    <sleep seconds="3" />
+    <touch file="${input}/sourceset_2.tmp" />
+    <touch file="${output}/targetset_2.tmp" />
+    <sleep seconds="2" />	
+    <dependset verbose="true">
+      <sources>
+        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp" />
+      </sources>
+      <targets>
+        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp" />
+      </targets>
+    </dependset>
+    <au:assertLogContains text="targetset_1.tmp&quot; is oldest target file"
+                          level="info"/>
+    <au:assertLogContains text="sourceset_2.tmp&quot; is newest source"
+                          level="info"/>
+    <au:assertLogContains text="Deleting all target files."
+                          level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
     <au:assertFileDoesntExist file="${output}/targetset_1.tmp" />
     <au:assertFileDoesntExist file="${output}/targetset_2.tmp" />
   </target>
@@ -114,6 +160,31 @@
                           level="verbose"/>
     <au:assertLogContains text="Deleting all target files."
                           level="verbose"/>
+    <au:assertLogDoesntContain text="Deleting" level="info"/>
+    <au:assertLogDoesntContain
+       text="Expected source propertyresource &quot;null&quot; is missing."
+       level="info"/>
+    <au:assertFileDoesntExist file="${output}/older.tmp" />
+  </target>
+
+  <target name="testMissingSourceResourceVerbose" depends="setUp">
+    <touch file="${output}/older.tmp" />
+    <dependset verbose="true">
+      <sources>
+        <propertyresource name="thereisnosuchproperty" />
+      </sources>
+      <targets>
+        <filelist dir="${output}" files="older.tmp" />
+      </targets>
+    </dependset>
+    <au:assertLogContains text="1 nonexistent sources"
+                          level="verbose"/>
+    <au:assertLogContains text="Deleting all target files."
+                          level="verbose"/>
+    <au:assertLogContains text="Deleting" level="info"/>
+    <au:assertLogContains
+       text="Expected source propertyresource &quot;null&quot; is missing."
+       level="info"/>
     <au:assertFileDoesntExist file="${output}/older.tmp" />
   </target>