You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by bw...@apache.org on 2003/02/03 15:14:16 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck LinkCheckTest.java

bwalding    2003/02/03 06:14:16

  Modified:    src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck
                        LinkCheckTest.java
  Log:
  Coding conventions
  
  Revision  Changes    Path
  1.3       +45 -46    jakarta-turbine-maven/src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck/LinkCheckTest.java
  
  Index: LinkCheckTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/linkcheck/src/test/org/apache/maven/linkcheck/LinkCheckTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LinkCheckTest.java	30 Jan 2003 15:34:46 -0000	1.2
  +++ LinkCheckTest.java	3 Feb 2003 14:14:16 -0000	1.3
  @@ -60,8 +60,6 @@
   import java.util.Iterator;
   import java.util.Map;
   
  -import org.apache.maven.linkcheck.validation.FileLinkValidator;
  -import org.apache.maven.linkcheck.validation.LinkValidatorManager;
   
   import junit.framework.TestCase;
   
  @@ -69,55 +67,56 @@
    * @author Ben Walding
    *
    */
  -public class LinkCheckTest extends TestCase {
  -    String baseDir;
  -
  -    public void setUp() {
  -        baseDir = System.getProperty("basedir");
  +public class LinkCheckTest extends TestCase
  +{
  +  String baseDir;
  +
  +  public void setUp()
  +  {
  +    baseDir = System.getProperty("basedir");
  +  }
  +
  +  public void testScan() throws Exception
  +  {
  +    File f = new File(baseDir + "/src/test-resources");
  +    LinkCheck lc = new LinkCheck();
  +    lc.setBasedir(f);
  +    lc.setOutput(new File(baseDir + "/target/linkcheck.xml"));
  +    lc.setOutputEncoding("ISO8859-1");
  +    lc.setCache(baseDir + "/target/linkcheck-cache.xml");
  +    lc.doExecute();
  +
  +    Iterator iter = lc.getFiles().iterator();
  +    Map map = new HashMap();
  +    while (iter.hasNext())
  +    {
  +      FileToCheck ftc = (FileToCheck) iter.next();
  +      map.put(ftc.getName(), ftc);
       }
   
  -    public void testScan() throws Exception {
  -        File f = new File(baseDir + "/src/test-resources");
  -        LinkCheck lc = new LinkCheck();
  -        lc.setBasedir(f);
  -        lc.setOutput(new File(baseDir + "/target/linkcheck.xml"));
  -        lc.setOutputEncoding("ISO8859-1");
  -        lc.setCache(baseDir + "/target/linkcheck-cache.xml");
  -        lc.doExecute();
  -
  -        Iterator iter = lc.getFiles().iterator();
  -        Map map = new HashMap();
  -        while (iter.hasNext()) {
  -            FileToCheck ftc = (FileToCheck) iter.next();
  -            map.put(ftc.getName(), ftc);
  -        }
  -
  -        assertEquals("files.size()", 6, lc.getFiles().size());
  -
  -        check(map, "nolink.html", 0);
  -        check(map, "test-resources/nolink.html", 0);
  -        check(map, "test-resources/test1/test1.html", 1);
  -        check(map, "test-resources/test1/test2.html", 0);
  -        check(map, "test1/test1.html", 1);
  -        check(map, "testA.html", 2);
  +    assertEquals("files.size()", 6, lc.getFiles().size());
   
  -    }
  +    check(map, "nolink.html", 0);
  +    check(map, "test-resources/nolink.html", 0);
  +    check(map, "test-resources/test1/test1.html", 1);
  +    check(map, "test-resources/test1/test2.html", 0);
  +    check(map, "test1/test1.html", 1);
  +    check(map, "testA.html", 2);
   
  -    private void check(Map map, String name, int linkCount) {
  -        FileToCheck ftc;
  +  }
   
  -        ftc = (FileToCheck) map.get(name);
  -        assertNotNull(name, ftc);
  -        
  -        /*if (ftc.getResults().size() != linkCount) {
  -            
  -        }*/
  +  private void check(Map map, String name, int linkCount)
  +  {
  +    FileToCheck ftc;
  +
  +    ftc = (FileToCheck) map.get(name);
  +    assertNotNull(name, ftc);
  +
  +    /*if (ftc.getResults().size() != linkCount) {
           
  -        assertEquals(
  -            name + ".getLinks().size()",
  -            linkCount,
  -            ftc.getResults().size());
  -        }
  - 
  +    }*/
  +
  +    assertEquals(name + ".getLinks().size()", linkCount, ftc.getResults().size());
  +  }
   
   }