ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ImportTest.java
Date Thu, 18 Mar 2004 21:31:13 GMT
mbenson     2004/03/18 13:31:13

  Modified:    src/main/org/apache/tools/ant/taskdefs ImportTask.java
               src/testcases/org/apache/tools/ant/taskdefs ImportTest.java
  Log:
  Reduce level of skip message to VERBOSE.
  PR:  27784
  
  Revision  Changes    Path
  1.26      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
  
  Index: ImportTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ImportTask.java	9 Mar 2004 16:48:05 -0000	1.25
  +++ ImportTask.java	18 Mar 2004 21:31:13 -0000	1.26
  @@ -136,7 +136,7 @@
           if (importStack.contains(importedFile)) {
               getProject().log(
                   "Skipped already imported file:\n   "
  -                + importedFile + "\n", Project.MSG_WARN);
  +                + importedFile + "\n", Project.MSG_VERBOSE);
               return;
           }
   
  
  
  
  1.12      +6 -2      ant/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java
  
  Index: ImportTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ImportTest.java	9 Mar 2004 16:48:57 -0000	1.11
  +++ ImportTest.java	18 Mar 2004 21:31:13 -0000	1.12
  @@ -51,8 +51,12 @@
   
       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
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message