You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/11 17:04:19 UTC

svn commit: r312898 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo: AbstractMavenReportTestCase.java DependenciesReportTest.java ScmReportTest.java

Author: brett
Date: Tue Oct 11 08:04:12 2005
New Revision: 312898

URL: http://svn.apache.org/viewcvs?rev=312898&view=rev
Log:
if there's an exception, show it

Modified:
    maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractMavenReportTestCase.java
    maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
    maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java

Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractMavenReportTestCase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractMavenReportTestCase.java?rev=312898&r1=312897&r2=312898&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractMavenReportTestCase.java (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractMavenReportTestCase.java Tue Oct 11 08:04:12 2005
@@ -55,13 +55,6 @@
     protected static String M2_SITE_GOAL = "site:site";
 
     /**
-     * Set this to 'true' to bypass unit tests entirely.
-     *
-     * @parameter expression="${maven.test.skip}"
-     */
-    protected boolean skip;
-
-    /**
      * The default locale is English.
      */
     protected Locale locale = Locale.ENGLISH;

Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java?rev=312898&r1=312897&r2=312898&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java Tue Oct 11 08:04:12 2005
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-import java.net.URL;
-
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.httpunit.WebTable;
 
+import java.net.URL;
+
 /**
  * Test the <code>Scm Report</code> generation for defined projects in the <code>PROJECTS_DIR</code> directory.
  * <p>Testing only section title and links with <a href="http://www.httpunit.org/">HTTPUnit</a> framework.</p>
@@ -36,7 +36,9 @@
 {
     private static final String TEST1 = "project-info-reports-plugin-test1";
 
-    /** WebConversation object */
+    /**
+     * WebConversation object
+     */
     private static final WebConversation webConversation = new WebConversation();
 
     /**
@@ -51,49 +53,38 @@
      * Test a the <code>ClearCase</code> SCM report
      */
     public void testClearCaseScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( TEST1 );
+        loadTestMavenProject( TEST1 );
 
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getDependencies() );
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getDependencies() );
 
-            executeMaven2CommandLine();
+        executeMaven2CommandLine();
 
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
 
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
 
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
 
-            // Test the Page title
-            assertEquals( getString( "report.dependencies.title" ), response.getTitle() );
+        // Test the Page title
+        assertEquals( getString( "report.dependencies.title" ), response.getTitle() );
 
-            // Test the tables
-            WebTable[] webTables = response.getTables();
-            assertEquals( webTables.length, 2 );
+        // Test the tables
+        WebTable[] webTables = response.getTables();
+        assertEquals( webTables.length, 2 );
 
-            assertEquals( webTables[0].getColumnCount(), 5);
-            assertEquals( webTables[0].getRowCount(), 1 + getTestMavenProject().getDependencies().size());
+        assertEquals( webTables[0].getColumnCount(), 5 );
+        assertEquals( webTables[0].getRowCount(), 1 + getTestMavenProject().getDependencies().size() );
 
-            assertEquals( webTables[1].getColumnCount(), 5);
+        assertEquals( webTables[1].getColumnCount(), 5 );
 
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        testLinks( response );
     }
 }

Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java?rev=312898&r1=312897&r2=312898&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java Tue Oct 11 08:04:12 2005
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-import java.net.URL;
-
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.TextBlock;
 import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
+import java.net.URL;
+
 /**
  * Test the <code>Scm Report</code> generation for defined projects in the <code>PROJECTS_DIR</code> directory.
  * <p>Testing only section title and links with <a href="http://www.httpunit.org/">HTTPUnit</a> framework.</p>
@@ -46,7 +46,9 @@
 
     private static final String UNKNOWN_PROJECT = "project-info-reports-plugin-scm-unknown";
 
-    /** WebConversation object */
+    /**
+     * WebConversation object
+     */
     private static final WebConversation webConversation = new WebConversation();
 
     /**
@@ -61,335 +63,268 @@
      * Test a the <code>ClearCase</code> SCM report
      */
     public void testClearCaseScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( CLEARCASE_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 8 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.devaccess.clearcase.intro" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace();
-            assertFalse( true );
-        }
+        loadTestMavenProject( CLEARCASE_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 8 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.devaccess.clearcase.intro" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
+
+        testLinks( response );
     }
 
     /**
      * Test a the <code>CVS</code> SCM report
      */
     public void testCVSScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( CVS_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 9 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.cvs.intro" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.devaccess.cvs.intro" ), textBlocks[7].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[8].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        loadTestMavenProject( CVS_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 9 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.cvs.intro" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.devaccess.cvs.intro" ), textBlocks[7].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[8].getText() );
+
+        testLinks( response );
     }
 
     /**
      * Test a the <code>Perforce</code> SCM report
      */
     public void testPerforceScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( PERFORCE_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 8 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.devaccess.perforce.intro" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        loadTestMavenProject( PERFORCE_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 8 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.devaccess.perforce.intro" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
+
+        testLinks( response );
     }
 
     /**
      * Test a the <code>Starteam</code> SCM report
      */
     public void testStarteamScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( STARTEAM_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 8 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.devaccess.starteam.intro" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        loadTestMavenProject( STARTEAM_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 8 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.devaccess.starteam.intro" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[7].getText() );
+
+        testLinks( response );
     }
 
     /**
      * Test a the <code>SVN</code> SCM report
      */
     public void testSVNScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( SVN_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 15 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.svn.intro" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.devaccess.svn.intro1" ), textBlocks[7].getText() );
-            assertEquals( getString( "report.scm.devaccess.svn.intro2" ), textBlocks[8].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[9].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.svn.intro" ), textBlocks[10].getText() );
-            assertEquals( getString( "report.scm.accessthroughtproxy.title" ), textBlocks[11].getText() );
-            assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro1" ), textBlocks[12].getText() );
-            assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro2" ), textBlocks[13].getText() );
-            assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro3" ), textBlocks[14].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        loadTestMavenProject( SVN_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 15 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.svn.intro" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.devaccess.svn.intro1" ), textBlocks[7].getText() );
+        assertEquals( getString( "report.scm.devaccess.svn.intro2" ), textBlocks[8].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[9].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.svn.intro" ), textBlocks[10].getText() );
+        assertEquals( getString( "report.scm.accessthroughtproxy.title" ), textBlocks[11].getText() );
+        assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro1" ), textBlocks[12].getText() );
+        assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro2" ), textBlocks[13].getText() );
+        assertEquals( getString( "report.scm.accessthroughtproxy.svn.intro3" ), textBlocks[14].getText() );
+
+        testLinks( response );
     }
 
     /**
      * Test a the <code>unknown</code> SCM report
      */
     public void testUnknownScmReport()
+        throws Exception
     {
-        if ( skip )
-        {
-            return;
-        }
-
-        try
-        {
-            loadTestMavenProject( UNKNOWN_PROJECT );
-
-            assertNotNull( getTestMavenProject() );
-            assertNotNull( getTestMavenProject().getScm() );
-
-            executeMaven2CommandLine();
-
-            URL reportURL = getGeneratedReport().toURL();
-            assertNotNull( reportURL );
-
-            // HTTPUnit
-            WebRequest request = new GetMethodWebRequest( reportURL.toString() );
-            WebResponse response = webConversation.getResponse( request );
-
-            // Basic HTML tests
-            assertTrue( response.isHTML() );
-            assertTrue( response.getContentLength() > 0 );
-
-            // Test the Page title
-            assertEquals( getString( "report.scm.title" ), response.getTitle() );
-
-            // Test the sections
-            TextBlock[] textBlocks = response.getTextBlocks();
-
-            assertEquals( textBlocks.length, 11 );
-
-            assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
-            assertEquals( getString( "report.scm.general.intro" ), textBlocks[2].getText() );
-            assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[3].getText() );
-            assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[4].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[5].getText() );
-            assertEquals( getString( "report.scm.anonymousaccess.general.intro" ), textBlocks[6].getText() );
-            assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[7].getText() );
-            assertEquals( getString( "report.scm.devaccess.general.intro" ), textBlocks[8].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[9].getText() );
-            assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[10].getText() );
-
-            testLinks( response );
-        }
-        catch ( Exception e )
-        {
-            assertFalse( true );
-        }
+        loadTestMavenProject( UNKNOWN_PROJECT );
+
+        assertNotNull( getTestMavenProject() );
+        assertNotNull( getTestMavenProject().getScm() );
+
+        executeMaven2CommandLine();
+
+        URL reportURL = getGeneratedReport().toURL();
+        assertNotNull( reportURL );
+
+        // HTTPUnit
+        WebRequest request = new GetMethodWebRequest( reportURL.toString() );
+        WebResponse response = webConversation.getResponse( request );
+
+        // Basic HTML tests
+        assertTrue( response.isHTML() );
+        assertTrue( response.getContentLength() > 0 );
+
+        // Test the Page title
+        assertEquals( getString( "report.scm.title" ), response.getTitle() );
+
+        // Test the sections
+        TextBlock[] textBlocks = response.getTextBlocks();
+
+        assertEquals( textBlocks.length, 11 );
+
+        assertEquals( getString( "report.scm.overview.title" ), textBlocks[1].getText() );
+        assertEquals( getString( "report.scm.general.intro" ), textBlocks[2].getText() );
+        assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[3].getText() );
+        assertEquals( getString( "report.scm.webaccess.url" ), textBlocks[4].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.title" ), textBlocks[5].getText() );
+        assertEquals( getString( "report.scm.anonymousaccess.general.intro" ), textBlocks[6].getText() );
+        assertEquals( getString( "report.scm.devaccess.title" ), textBlocks[7].getText() );
+        assertEquals( getString( "report.scm.devaccess.general.intro" ), textBlocks[8].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[9].getText() );
+        assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[10].getText() );
+
+        testLinks( response );
     }
 }