From d15ef9e13c9ad4729adc358a8c87e1a50da068a9 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Thu, 18 Mar 2004 21:31:13 +0000 Subject: [PATCH] Reduce level of skip message to VERBOSE. PR: 27784 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276249 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/ImportTask.java | 2 +- .../org/apache/tools/ant/taskdefs/ImportTest.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java index 1069bb86a..24db70c15 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java @@ -136,7 +136,7 @@ public class ImportTask extends Task { if (importStack.contains(importedFile)) { getProject().log( "Skipped already imported file:\n " - + importedFile + "\n", Project.MSG_WARN); + + importedFile + "\n", Project.MSG_VERBOSE); return; } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java index 0b22e6be7..128f2cd54 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java @@ -51,8 +51,12 @@ public class ImportTest extends BuildFileTest { public void testSerial() { configureProject("src/etc/testcases/taskdefs/import/subdir/serial.xml"); - assertLogContaining( - "Unnamed2.xmlUnnamed1.xmlSkipped already imported file"); + assertLogContaining("Unnamed2.xmlUnnamed1.xml"); + String fullLog = getFullLog(); + String substring = "Skipped already imported file"; + assertTrue("expecting full log to contain \"" + substring + + "\" full log was \"" + fullLog + "\"", + fullLog.indexOf(substring) >= 0); } // allow this as imported in targets are only tested when a target is run