You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/04/20 23:04:09 UTC
svn commit: r649978 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/
main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
test/java/org/apache/maven/report/projectinfo/ test...
Author: hboutemy
Date: Sun Apr 20 14:04:07 2008
New Revision: 649978
URL: http://svn.apache.org/viewvc?rev=649978&view=rev
Log:
fixed some errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/PluginManagementRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Sun Apr 20 14:04:07 2008
@@ -139,7 +139,8 @@
attributes.put( "outputEncoding", "UTF-8" );
attributes.put( "project", project );
Locale locale = Locale.getDefault();
- Artifact defaultSkin = siteTool.getDefaultSkinArtifact( localRepository, project.getRemoteArtifactRepositories() );
+ Artifact defaultSkin =
+ siteTool.getDefaultSkinArtifact( localRepository, project.getRemoteArtifactRepositories() );
SiteRenderingContext siteContext = siteRenderer.createContextForSkin( defaultSkin.getFile(), attributes,
model, getName( locale ), locale );
@@ -150,7 +151,9 @@
outputDirectory.mkdirs();
- Writer writer = new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, getOutputName() + ".html" ) ), "UTF-8" );
+ Writer writer =
+ new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, getOutputName() + ".html" ) ),
+ "UTF-8" );
siteRenderer.generateDocument( writer, sink, siteContext );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Sun Apr 20 14:04:07 2008
@@ -151,7 +151,8 @@
new DependenciesReportConfiguration( dependencyDetailsEnabled, dependencyLocationsEnabled );
DependenciesRenderer r =
- new DependenciesRenderer( getSink(), locale, i18n, dependencies, dependencyTree, config, repoUtils, project );
+ new DependenciesRenderer( getSink(), locale, i18n, dependencies, dependencyTree, config, repoUtils,
+ project );
repoUtils.setLog( getLog() );
r.setLog( getLog() );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java Sun Apr 20 14:04:07 2008
@@ -57,7 +57,8 @@
public void executeReport( Locale locale )
{
- ManagementDependencies dependencies = new ManagementDependencies(project.getDependencyManagement().getDependencies());
+ ManagementDependencies dependencies =
+ new ManagementDependencies( project.getDependencyManagement().getDependencies() );
DependencyManagementRenderer r = new DependencyManagementRenderer( getSink(), locale, i18n, dependencies );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Sun Apr 20 14:04:07 2008
@@ -136,8 +136,8 @@
javascript.append( " var now = new Date();\n" );
javascript.append( " var nowTime = now.getTime();\n" );
javascript.append( " var localOffset = now.getTimezoneOffset();\n" );
- javascript
- .append( " var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );\n" );
+ javascript.append( " var developerTime = nowTime + ( offset * 60 * 60 * 1000 )"
+ + "+ ( localOffset * 60 * 1000 );\n" );
javascript.append( " var developerDate = new Date(developerTime);\n" );
javascript.append( "\n" );
javascript.append( " document.getElementById(id).innerHTML = developerDate;\n" );
@@ -178,77 +178,7 @@
{
Developer developer = (Developer) i.next();
- // To handle JS
- sink.tableRow();
-
- if ( headersMap.get( ID ) == Boolean.TRUE )
- {
- tableCell( "<a name=\"" + developer.getId() + "\"></a>" + developer.getId(), true );
- }
- if ( headersMap.get( NAME ) == Boolean.TRUE )
- {
- tableCell( developer.getName() );
- }
- if ( headersMap.get( EMAIL ) == Boolean.TRUE )
- {
- tableCell( createLinkPatternedText( developer.getEmail(), developer.getEmail() ) );
- }
- if ( headersMap.get( URL ) == Boolean.TRUE )
- {
- tableCellForUrl( developer.getUrl() );
- }
- if ( headersMap.get( ORGANIZATION ) == Boolean.TRUE )
- {
- tableCell( developer.getOrganization() );
- }
- if ( headersMap.get( ORGANIZATION_URL ) == Boolean.TRUE )
- {
- tableCellForUrl( developer.getOrganizationUrl() );
- }
- if ( headersMap.get( ROLES ) == Boolean.TRUE )
- {
- if ( developer.getRoles() != null )
- {
- // Comma separated roles
- tableCell( StringUtils.join( developer.getRoles().toArray( EMPTY_STRING_ARRAY ), ", " ) );
- }
- else
- {
- tableCell( null );
- }
- }
- if ( headersMap.get( TIME_ZONE ) == Boolean.TRUE )
- {
- tableCell( developer.getTimezone() );
-
- // To handle JS
- sink.tableCell();
- sink.rawText( "<span id=\"developer-" + developersRows + "\">" );
- text( developer.getTimezone() );
- if ( !StringUtils.isEmpty( developer.getTimezone() ) )
- {
- javascript.append( " offsetDate('developer-" ).append( developersRows ).append( "', '" );
- javascript.append( developer.getTimezone() );
- javascript.append( "');\n" );
- }
- sink.rawText( "</span>" );
- sink.tableCell_();
- }
-
- if ( headersMap.get( PROPERTIES ) == Boolean.TRUE )
- {
- Properties props = developer.getProperties();
- if ( props != null )
- {
- tableCell( propertiesToString( props ) );
- }
- else
- {
- tableCell( null );
- }
- }
-
- sink.tableRow_();
+ renderDeveloper( developer, developersRows, headersMap, javascript );
developersRows++;
}
@@ -285,73 +215,7 @@
{
Contributor contributor = (Contributor) i.next();
- sink.tableRow();
- if ( headersMap.get( NAME ) == Boolean.TRUE )
- {
- tableCell( contributor.getName() );
- }
- if ( headersMap.get( EMAIL ) == Boolean.TRUE )
- {
- tableCell( createLinkPatternedText( contributor.getEmail(), contributor.getEmail() ) );
- }
- if ( headersMap.get( URL ) == Boolean.TRUE )
- {
- tableCellForUrl( contributor.getUrl() );
- }
- if ( headersMap.get( ORGANIZATION ) == Boolean.TRUE )
- {
- tableCell( contributor.getOrganization() );
- }
- if ( headersMap.get( ORGANIZATION_URL ) == Boolean.TRUE )
- {
- tableCellForUrl( contributor.getOrganizationUrl() );
- }
- if ( headersMap.get( ROLES ) == Boolean.TRUE )
- {
- if ( contributor.getRoles() != null )
- {
- // Comma separated roles
- tableCell( StringUtils.join( contributor.getRoles().toArray( EMPTY_STRING_ARRAY ), ", " ) );
- }
- else
- {
- tableCell( null );
- }
-
- }
- if ( headersMap.get( TIME_ZONE ) == Boolean.TRUE )
- {
- tableCell( contributor.getTimezone() );
-
- // To handle JS
- sink.tableCell();
- sink.rawText( "<span id=\"contributor-" + contributorsRows + "\">" );
- text( contributor.getTimezone() );
- if ( !StringUtils.isEmpty( contributor.getTimezone() ) )
- {
- javascript.append( " offsetDate('contributor-" ).append( contributorsRows )
- .append( "', '" );
- javascript.append( contributor.getTimezone() );
- javascript.append( "');\n" );
- }
- sink.rawText( "</span>" );
- sink.tableCell_();
- }
-
- if ( headersMap.get( PROPERTIES ) == Boolean.TRUE )
- {
- Properties props = contributor.getProperties();
- if ( props != null )
- {
- tableCell( propertiesToString( props ) );
- }
- else
- {
- tableCell( null );
- }
- }
-
- sink.tableRow_();
+ renderContributor( contributor, contributorsRows, headersMap, javascript );
contributorsRows++;
}
@@ -366,6 +230,153 @@
// To handle JS
javascript.append( "}\n" ).append( "\n" ).append( "window.onLoad = init();\n" );
javaScript( javascript.toString() );
+ }
+
+ private void renderDeveloper( Developer developer, int developerRow, Map headersMap, StringBuffer javascript )
+ {
+ // To handle JS
+ sink.tableRow();
+
+ if ( headersMap.get( ID ) == Boolean.TRUE )
+ {
+ tableCell( "<a name=\"" + developer.getId() + "\"></a>" + developer.getId(), true );
+ }
+ if ( headersMap.get( NAME ) == Boolean.TRUE )
+ {
+ tableCell( developer.getName() );
+ }
+ if ( headersMap.get( EMAIL ) == Boolean.TRUE )
+ {
+ tableCell( createLinkPatternedText( developer.getEmail(), developer.getEmail() ) );
+ }
+ if ( headersMap.get( URL ) == Boolean.TRUE )
+ {
+ tableCellForUrl( developer.getUrl() );
+ }
+ if ( headersMap.get( ORGANIZATION ) == Boolean.TRUE )
+ {
+ tableCell( developer.getOrganization() );
+ }
+ if ( headersMap.get( ORGANIZATION_URL ) == Boolean.TRUE )
+ {
+ tableCellForUrl( developer.getOrganizationUrl() );
+ }
+ if ( headersMap.get( ROLES ) == Boolean.TRUE )
+ {
+ if ( developer.getRoles() != null )
+ {
+ // Comma separated roles
+ tableCell( StringUtils.join( developer.getRoles().toArray( EMPTY_STRING_ARRAY ), ", " ) );
+ }
+ else
+ {
+ tableCell( null );
+ }
+ }
+ if ( headersMap.get( TIME_ZONE ) == Boolean.TRUE )
+ {
+ tableCell( developer.getTimezone() );
+
+ // To handle JS
+ sink.tableCell();
+ sink.rawText( "<span id=\"developer-" + developerRow + "\">" );
+ text( developer.getTimezone() );
+ if ( !StringUtils.isEmpty( developer.getTimezone() ) )
+ {
+ javascript.append( " offsetDate('developer-" ).append( developerRow ).append( "', '" );
+ javascript.append( developer.getTimezone() );
+ javascript.append( "');\n" );
+ }
+ sink.rawText( "</span>" );
+ sink.tableCell_();
+ }
+
+ if ( headersMap.get( PROPERTIES ) == Boolean.TRUE )
+ {
+ Properties props = developer.getProperties();
+ if ( props != null )
+ {
+ tableCell( propertiesToString( props ) );
+ }
+ else
+ {
+ tableCell( null );
+ }
+ }
+
+ sink.tableRow_();
+ }
+
+ private void renderContributor( Contributor contributor, int contributorRow, Map headersMap,
+ StringBuffer javascript )
+ {
+ sink.tableRow();
+ if ( headersMap.get( NAME ) == Boolean.TRUE )
+ {
+ tableCell( contributor.getName() );
+ }
+ if ( headersMap.get( EMAIL ) == Boolean.TRUE )
+ {
+ tableCell( createLinkPatternedText( contributor.getEmail(), contributor.getEmail() ) );
+ }
+ if ( headersMap.get( URL ) == Boolean.TRUE )
+ {
+ tableCellForUrl( contributor.getUrl() );
+ }
+ if ( headersMap.get( ORGANIZATION ) == Boolean.TRUE )
+ {
+ tableCell( contributor.getOrganization() );
+ }
+ if ( headersMap.get( ORGANIZATION_URL ) == Boolean.TRUE )
+ {
+ tableCellForUrl( contributor.getOrganizationUrl() );
+ }
+ if ( headersMap.get( ROLES ) == Boolean.TRUE )
+ {
+ if ( contributor.getRoles() != null )
+ {
+ // Comma separated roles
+ tableCell( StringUtils.join( contributor.getRoles().toArray( EMPTY_STRING_ARRAY ), ", " ) );
+ }
+ else
+ {
+ tableCell( null );
+ }
+
+ }
+ if ( headersMap.get( TIME_ZONE ) == Boolean.TRUE )
+ {
+ tableCell( contributor.getTimezone() );
+
+ // To handle JS
+ sink.tableCell();
+ sink.rawText( "<span id=\"contributor-" + contributorRow + "\">" );
+ text( contributor.getTimezone() );
+ if ( !StringUtils.isEmpty( contributor.getTimezone() ) )
+ {
+ javascript.append( " offsetDate('contributor-" ).append( contributorRow )
+ .append( "', '" );
+ javascript.append( contributor.getTimezone() );
+ javascript.append( "');\n" );
+ }
+ sink.rawText( "</span>" );
+ sink.tableCell_();
+ }
+
+ if ( headersMap.get( PROPERTIES ) == Boolean.TRUE )
+ {
+ Properties props = contributor.getProperties();
+ if ( props != null )
+ {
+ tableCell( propertiesToString( props ) );
+ }
+ else
+ {
+ tableCell( null );
+ }
+ }
+
+ sink.tableRow_();
}
/**
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Sun Apr 20 14:04:07 2008
@@ -223,7 +223,8 @@
private void renderSectionJavaVersion()
{
- Xpp3Dom pluginConfig = project.getGoalConfiguration( "org.apache.maven.plugins", "maven-compiler-plugin", null, null );
+ Xpp3Dom pluginConfig =
+ project.getGoalConfiguration( "org.apache.maven.plugins", "maven-compiler-plugin", null, null );
String source = null;
String target = null;
String compilerVersion = null;
@@ -249,31 +250,41 @@
if ( source == null && target == null )
{
- javaOptionsText = i18n.format( "project-info-report", locale, "report.dependencies.java.options.notset", compilerVersion );
+ javaOptionsText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.options.notset",
+ compilerVersion );
}
else if ( source != null && target != null )
{
minimumJavaVersion = target;
if ( source.equals( target ) )
{
- javaOptionsText = i18n.format( "project-info-report", locale, "report.dependencies.java.options.same", compilerVersion, source );
+ javaOptionsText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.options.same",
+ compilerVersion, source );
}
else
{
Object[] args = new Object[] { compilerVersion, source, target };
- javaOptionsText = i18n.format( "project-info-report", locale, "report.dependencies.java.options.different", args );
+ javaOptionsText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.options.different", args );
}
}
else if ( target != null )
{
minimumJavaVersion = target;
- javaOptionsText = i18n.format( "project-info-report", locale, "report.dependencies.java.options.target", compilerVersion, target );
+ javaOptionsText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.options.target", compilerVersion,
+ target );
}
else
{
- javaOptionsText = i18n.format( "project-info-report", locale, "report.dependencies.java.options.source", compilerVersion, source );
+ javaOptionsText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.options.source", compilerVersion,
+ source );
}
- String minimumJavaText = i18n.format( "project-info-report", locale, "report.dependencies.java.minimum", minimumJavaVersion);
+ String minimumJavaText =
+ i18n.format( "project-info-report", locale, "report.dependencies.java.minimum", minimumJavaVersion );
// Output the section text
startSection( getReportString( "report.dependencies.java.section.title" ) );
@@ -282,19 +293,19 @@
endSection();
}
- private String getChildValue(Xpp3Dom parent, String childName)
+ private String getChildValue( Xpp3Dom parent, String childName )
{
- if (parent == null)
+ if ( parent == null )
{
return null;
}
- Xpp3Dom child = parent.getChild(childName);
- if (child == null)
+ Xpp3Dom child = parent.getChild( childName );
+ if ( child == null )
{
return null;
}
String value = child.getValue();
- if (child == null || value.trim().length() == 0)
+ if ( child == null || value.trim().length() == 0 )
{
return null;
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/PluginManagementRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/PluginManagementRenderer.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/PluginManagementRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/PluginManagementRenderer.java Sun Apr 20 14:04:07 2008
@@ -158,7 +158,8 @@
try
{
MavenProject pluginProject =
- mavenProjectBuilder.buildFromRepository( pluginArtifact, artifactRepositories, localRepository );
+ mavenProjectBuilder.buildFromRepository( pluginArtifact, artifactRepositories,
+ localRepository );
tableRow( getPluginRow( plugin, pluginProject.getUrl() ) );
}
catch ( ProjectBuildingException e )
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java Sun Apr 20 14:04:07 2008
@@ -133,7 +133,7 @@
* @return the generated report as file
* @throws IOException if the return file doesnt exist
*/
- protected File getGeneratedReport(String name )
+ protected File getGeneratedReport( String name )
throws IOException
{
String outputDirectory = getBasedir() + "/target/test-harness/" + getTestMavenProject().getArtifactId();
@@ -167,7 +167,8 @@
MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
ProfileManager profileManager = new DefaultProfileManager( getContainer() );
- ArtifactRepository localRepository = ( ArtifactRepository ) getVariableValueFromObject( mojo, "localRepository" );
+ ArtifactRepository localRepository = (ArtifactRepository) getVariableValueFromObject( mojo,
+ "localRepository" );
testMavenProject = builder.buildWithDependencies( pluginXmlFile, localRepository, profileManager );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java Sun Apr 20 14:04:07 2008
@@ -38,7 +38,7 @@
/**
* WebConversation object
*/
- private static final WebConversation webConversation = new WebConversation();
+ private static final WebConversation WEB_CONVERSATION = new WebConversation();
/**
* Test report
@@ -56,15 +56,15 @@
// HTTPUnit
WebRequest request = new GetMethodWebRequest( reportURL.toString() );
- WebResponse response = webConversation.getResponse( request );
+ WebResponse response = WEB_CONVERSATION.getResponse( request );
// Basic HTML tests
assertTrue( response.isHTML() );
assertTrue( response.getContentLength() > 0 );
// Test the Page title
- assertEquals( getString( "report.dependency-convergence.name" ) + " - " + getString( "report.dependency-convergence.title" ),
- response.getTitle() );
+ assertEquals( getString( "report.dependency-convergence.name" ) + " - "
+ + getString( "report.dependency-convergence.title" ), response.getTitle() );
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java Sun Apr 20 14:04:07 2008
@@ -39,7 +39,7 @@
/**
* WebConversation object
*/
- private static final WebConversation webConversation = new WebConversation();
+ private static final WebConversation WEB_CONVERSATION = new WebConversation();
/**
* Test report
@@ -57,22 +57,23 @@
// HTTPUnit
WebRequest request = new GetMethodWebRequest( reportURL.toString() );
- WebResponse response = webConversation.getResponse( request );
+ WebResponse response = WEB_CONVERSATION.getResponse( request );
// Basic HTML tests
assertTrue( response.isHTML() );
assertTrue( response.getContentLength() > 0 );
// Test the Page title
- assertEquals( getString( "report.dependencyManagement.name" ) + " - " + getString( "report.dependencyManagement.title" ),
- response.getTitle() );
+ assertEquals( getString( "report.dependencyManagement.name" ) + " - "
+ + getString( "report.dependencyManagement.title" ), response.getTitle() );
// Test the tables
WebTable[] webTables = response.getTables();
assertEquals( webTables.length, 1 );
assertEquals( webTables[0].getColumnCount(), 5 );
- assertEquals( webTables[0].getRowCount(), 1 + getTestMavenProject().getDependencyManagement().getDependencies().size() );
+ assertEquals( webTables[0].getRowCount(),
+ 1 + getTestMavenProject().getDependencyManagement().getDependencies().size() );
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java Sun Apr 20 14:04:07 2008
@@ -105,7 +105,7 @@
* @throws Throwable if any
*/
public void testGetArchiveServer()
- throws Exception, Throwable
+ throws Throwable
{
String server = "http://mail-archives.apache.org/mod_mbox/maven-announce/";
assertEquals( "mail-archives.apache.org", invokeGetArchiveServer( server ) );
@@ -132,7 +132,7 @@
private static String invokeGetArchiveServer( String s )
throws Throwable
{
- return (String)PrivateAccessor.invoke( MailingListsRenderer.class, "getArchiveServer",
- new Class[] { String.class }, new Object[] { s } );
+ return (String) PrivateAccessor.invoke( MailingListsRenderer.class, "getArchiveServer",
+ new Class[] { String.class }, new Object[] { s } );
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java Sun Apr 20 14:04:07 2008
@@ -39,7 +39,7 @@
/**
* WebConversation object
*/
- private static final WebConversation webConversation = new WebConversation();
+ private static final WebConversation WEB_CONVERSATION = new WebConversation();
/**
* Test report
@@ -57,15 +57,15 @@
// HTTPUnit
WebRequest request = new GetMethodWebRequest( reportURL.toString() );
- WebResponse response = webConversation.getResponse( request );
+ WebResponse response = WEB_CONVERSATION.getResponse( request );
// Basic HTML tests
assertTrue( response.isHTML() );
assertTrue( response.getContentLength() > 0 );
// Test the Page title
- assertEquals( getString( "report.pluginManagement.name" ) + " - " + getString( "report.pluginManagement.title" ),
- response.getTitle() );
+ assertEquals( getString( "report.pluginManagement.name" ) + " - "
+ + getString( "report.pluginManagement.title" ), response.getTitle() );
// Test the tables
WebTable[] webTables = response.getTables();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java Sun Apr 20 14:04:07 2008
@@ -38,7 +38,7 @@
/**
* WebConversation object
*/
- private static final WebConversation webConversation = new WebConversation();
+ private static final WebConversation WEB_CONVERSATION = new WebConversation();
/**
* Test report
@@ -56,7 +56,7 @@
// HTTPUnit
WebRequest request = new GetMethodWebRequest( reportURL.toString() );
- WebResponse response = webConversation.getResponse( request );
+ WebResponse response = WEB_CONVERSATION.getResponse( request );
// Basic HTML tests
assertTrue( response.isHTML() );
@@ -68,7 +68,8 @@
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( textBlocks[0].getText(), getString( "report.index.title" ) + " " + getTestMavenProject().getName() );
+ assertEquals( textBlocks[0].getText(), getString( "report.index.title" ) + " "
+ + getTestMavenProject().getName() );
assertEquals( textBlocks[1].getText(), getString( "report.index.nodescription" ) );
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=649978&r1=649977&r2=649978&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Sun Apr 20 14:04:07 2008
@@ -85,8 +85,8 @@
build.setFinalName( model.getArtifactId() );
build.setDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target" );
build.setSourceDirectory( getBasedir() + "/src/main/java" );
- build
- .setOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target/classes" );
+ build.setOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId()
+ + "/target/classes" );
build.setTestSourceDirectory( getBasedir() + "/src/test/java" );
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId()
+ "/target/test-classes" );