You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2010/12/14 11:03:36 UTC

svn commit: r1049017 - in /maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools: DefaultSiteToolTest.java SiteToolTest.java

Author: ltheussl
Date: Tue Dec 14 10:03:35 2010
New Revision: 1049017

URL: http://svn.apache.org/viewvc?rev=1049017&view=rev
Log:
formatting, javadocs, house cleaning

Modified:
    maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
    maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java

Modified: maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java?rev=1049017&r1=1049016&r2=1049017&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java Tue Dec 14 10:03:35 2010
@@ -28,25 +28,10 @@ import junit.framework.TestCase;
 public class DefaultSiteToolTest
     extends TestCase
 {
-    /** {@inheritDoc} */
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-    }
-
-    /** {@inheritDoc} */
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-    }
-
     /**
-     * @throws Exception
+     * test getNormalizedPath().
      */
     public void testGetNormalizedPath()
-        throws Exception
     {
         assertEquals( null, DefaultSiteTool.getNormalizedPath( null ) );
         assertEquals( "", DefaultSiteTool.getNormalizedPath( "" ) );
@@ -58,6 +43,6 @@ public class DefaultSiteToolTest
         assertEquals( "foo", DefaultSiteTool.getNormalizedPath( "./foo" ) );
         assertEquals( "../foo", DefaultSiteTool.getNormalizedPath( "../foo" ) );
         assertEquals( "../../foo", DefaultSiteTool.getNormalizedPath( "../../foo" ) );
+        assertEquals( "index.html", DefaultSiteTool.getNormalizedPath( "./foo/../index.html" ) );
     }
-
 }

Modified: maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java?rev=1049017&r1=1049016&r2=1049017&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java Tue Dec 14 10:03:35 2010
@@ -41,21 +41,9 @@ import org.codehaus.plexus.PlexusTestCas
 public class SiteToolTest
     extends PlexusTestCase
 {
-    /** {@inheritDoc} */
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-    }
-
-    /** {@inheritDoc} */
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-    }
-
     /**
+     * @return the repo.
+     *
      * @throws Exception
      */
     protected ArtifactRepository getLocalRepo()
@@ -71,11 +59,13 @@ public class SiteToolTest
         ArtifactRepositoryLayout defaultArtifactRepositoryLayout = (ArtifactRepositoryLayout) lookup(
                                                                                                       ArtifactRepositoryLayout.ROLE,
                                                                                                       "default" );
-        return artifactRepositoryFactory.createArtifactRepository( "local", getTestFile( "target/local-repo" ).toURL()
+        return artifactRepositoryFactory.createArtifactRepository( "local", getTestFile( "target/local-repo" ).toURI().toURL()
             .toString(), defaultArtifactRepositoryLayout, snapshotsPolicy, releasesPolicy );
     }
 
     /**
+     * @return the local repo directory.
+     *
      * @throws Exception
      */
     protected File getLocalRepoDir()