ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
Date Tue, 09 Dec 2003 14:40:25 GMT
antoine     2003/12/09 06:40:25

  Modified:    src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
  Log:
  Remove line with $Id
  
  Revision  Changes    Path
  1.8       +13 -14    ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
  
  Index: XMLCatalogTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLCatalogTest.java	9 Dec 2003 01:14:31 -0000	1.7
  +++ XMLCatalogTest.java	9 Dec 2003 14:40:25 -0000	1.8
  @@ -76,8 +76,7 @@
   /**
    * JUnit testcases for org.apache.tools.ant.types.XMLCatalog
    *
  - * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a> 
  - * @version $Id$
  + * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
    */
   public class XMLCatalogTest extends TestCase {
   
  @@ -110,7 +109,7 @@
           // logger.setOutputPrintStream(System.out);
           // logger.setErrorPrintStream(System.err);
           // project.addBuildListener(logger);
  -        
  +
           catalog = newCatalog();
       }
   
  @@ -118,10 +117,10 @@
         project = null;
         catalog = null;
      }
  -   
  +
      public void testEmptyCatalog() {
          try {
  -           InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
  +           InputSource result = catalog.resolveEntity("PUBLIC ID ONE",
                                                         "i/dont/exist.dtd");
              assertNull("Empty catalog should return null", result);
          } catch (Exception e) {
  @@ -136,9 +135,9 @@
              // These shenanigans are necessary b/c Norm Walsh's resolver
              // has a different idea of how file URLs are created on windoze
              // ie file://c:/foo instead of file:///c:/foo
  -           // 
  +           //
              String resultStr = new URL(((SAXSource)result).getInputSource().getSystemId()).getFile();
  -           assertTrue("Empty catalog should return input", 
  +           assertTrue("Empty catalog should return input",
                         expected.endsWith(resultStr));
          } catch (Exception e) {
              fail("resolve() failed!" + e.toString());
  @@ -152,7 +151,7 @@
           dtd.setLocation("i/dont/exist.dtd");
   
           try {
  -            InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
  +            InputSource result = catalog.resolveEntity("PUBLIC ID ONE",
                                                          "i/dont/exist.dtd");
               assertNull("Nonexistent Catalog entry should not be returned", result);
           } catch (Exception e) {
  @@ -177,15 +176,15 @@
           dtd.setLocation("i/dont/exist.dtd");
           catalog.addDTD(dtd);
           project.addReference("catalog", catalog);
  -        
  +
           try {
               catalog.setRefid(new Reference("dummyref"));
               fail("Can add reference to nonexistent XMLCatalog");
           } catch (BuildException be) {
  -            assertEquals("You must not specify more than one " 
  +            assertEquals("You must not specify more than one "
                            + "attribute when using refid", be.getMessage());
           }
  -        
  +
           XMLCatalog catalog2 = newCatalog();
           catalog2.setRefid(new Reference("catalog"));
   
  @@ -205,7 +204,7 @@
           catalog.setRefid(new Reference("catalog"));
   
           try {
  -            InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
  +            InputSource result = catalog.resolveEntity("PUBLIC ID ONE",
                                                          "i/dont/exist.dtd");
               fail("Can make XMLCatalog a Reference to itself.");
           } catch (BuildException be) {
  @@ -228,7 +227,7 @@
           catalog1.setRefid(new Reference("catalog2"));
   
           try {
  -            InputSource result = catalog1.resolveEntity("PUBLIC ID ONE", 
  +            InputSource result = catalog1.resolveEntity("PUBLIC ID ONE",
                                                           "i/dont/exist.dtd");
               fail("Can make circular reference");
           } catch (BuildException be) {
  @@ -270,7 +269,7 @@
           dtd.setLocation(sysid);
           catalog.addDTD(dtd);
           File dtdFile = project.resolveFile(sysid);
  -        
  +
           try {
               InputSource result = catalog.resolveEntity("-//stevo//DTD doc 1.0//EN",
                                                          "nap:chemical+brothers");
  
  
  

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


Mime
View raw message