You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/05 22:48:06 UTC
[maven-project-info-reports-plugin] 02/02: Use site.xml
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch use-site.xml
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit ed77948c2a574e4959101cf939a550967f5b1236
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 5 23:43:31 2022 +0100
Use site.xml
---
.../projectinfo/AbstractProjectInfoTestCase.java | 5 +++-
.../report/projectinfo/CiManagementReportTest.java | 13 +++++-----
.../DependencyConvergenceReportTest.java | 2 +-
.../DependencyManagementReportTest.java | 4 ++--
.../maven/report/projectinfo/IndexReportTest.java | 4 ++--
.../projectinfo/IssueManagementReportTest.java | 12 +++++-----
.../report/projectinfo/LicensesReportTest.java | 28 +++++++++++-----------
.../report/projectinfo/MailingListsReportTest.java | 4 ++--
.../report/projectinfo/ModulesReportTest.java | 6 ++---
.../projectinfo/PluginManagementReportTest.java | 4 ++--
.../maven/report/projectinfo/ScmReportTest.java | 14 +++++------
.../report/projectinfo/SummaryReportTest.java | 10 ++++----
.../maven/report/projectinfo/TeamReportTest.java | 16 ++++++-------
13 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index a4ca918..85a3452 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -22,6 +22,7 @@ package org.apache.maven.report.projectinfo;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.List;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.LegacySupport;
@@ -184,8 +185,10 @@ public abstract class AbstractProjectInfoTestCase
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( artifactStubFactory.getWorkingDir() ) ) );
+ List<MavenProject> reactorProjects = mojo.getReactorProjects() != null ? mojo.getReactorProjects() : Collections.emptyList();
+
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
- setVariableValueToObject( mojo, "reactorProjects", Collections.emptyList() );
+ setVariableValueToObject( mojo, "reactorProjects", reactorProjects );
setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
setVariableValueToObject( mojo, "pluginRepositories", mojo.getProject().getPluginArtifactRepositories() );
setVariableValueToObject( mojo, "siteDirectory", new File( mojo.getProject().getBasedir(), "src/site" ) );
diff --git a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
index 027c328..2acf6a5 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
@@ -69,9 +69,9 @@ public class CiManagementReportTest
assertEquals( expectedTitle, response.getTitle() );
// Test the texts
- TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.ci-management.name" ), textBlocks[0].getText() );
- assertEquals( getString( "report.ci-management.nocim" ), textBlocks[1].getText() );
+ TextBlock[] textBlocks = response. getTextBlocks();
+ assertEquals( getString( "report.ci-management.name" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.ci-management.nocim" ), textBlocks[2].getText() );
}
/**
@@ -99,9 +99,10 @@ public class CiManagementReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertTrue( textBlocks[1].getText().startsWith( "This project uses " ) );
- assertEquals(3, textBlocks[1].getNode().getChildNodes().getLength());
- HTMLAnchorElement anchor = (HTMLAnchorElement) textBlocks[1].getNode().getChildNodes().item( 1 );
+ TextBlock textBlock = textBlocks[2];
+ assertTrue( textBlock.getText().startsWith( "This project uses " ) );
+ assertEquals(3, textBlock.getNode().getChildNodes().getLength());
+ HTMLAnchorElement anchor = (HTMLAnchorElement) textBlock.getNode().getChildNodes().item( 1 );
assertEquals( "https://www.jetbrains.com/teamcity/", anchor.getAttribute( "href" ) );
assertEquals( "TeamCity", anchor.getFirstChild().getNodeValue() );
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
index 91768f2..d10f836 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
@@ -69,6 +69,6 @@ public class DependencyConvergenceReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.dependency-convergence.reactor.name" ), textBlocks[0].getText() );
+ assertEquals( getString( "report.dependency-convergence.reactor.name" ), textBlocks[1].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
index 143cb2d..ea86af2 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
@@ -78,7 +78,7 @@ public class DependencyManagementReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.dependency-management.title" ), textBlocks[0].getText() );
- assertEquals( "test", textBlocks[1].getText() );
+ assertEquals( getString( "report.dependency-management.title" ), textBlocks[1].getText() );
+ assertEquals( "test", textBlocks[2].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java
index ccd6e37..cd6897e 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java
@@ -71,7 +71,7 @@ public class IndexReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
assertEquals( getString( "report.index.title" ) + " " + getTestMavenProject().getName(),
- textBlocks[0].getText() );
- assertEquals( getString( "report.index.nodescription" ), textBlocks[1].getText() );
+ textBlocks[1].getText() );
+ assertEquals( getString( "report.index.nodescription" ), textBlocks[2].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
index 0f235bf..801baa3 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
@@ -70,16 +70,16 @@ public class IssueManagementReportTest
// Test the links
WebLink[] weblinks = response.getLinks();
- assertEquals( 3, weblinks.length );
+ assertEquals( 4, weblinks.length );
- assertEquals( "JIRA", weblinks[1].getText() );
+ assertEquals( "JIRA", weblinks[2].getText() );
- assertEquals( "http://localhost/jira", weblinks[2].getText() );
+ assertEquals( "http://localhost/jira", weblinks[3].getText() );
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.issue-management.overview.title" ), textBlocks[0].getText() );
- assertEquals( "This project uses JIRA.", textBlocks[1].getText() ); // due to link pattern
- assertEquals( getString( "report.issue-management.name" ), textBlocks[2].getText() );
+ assertEquals( getString( "report.issue-management.overview.title" ), textBlocks[1].getText() );
+ assertEquals( "This project uses JIRA.", textBlocks[2].getText() ); // due to link pattern
+ assertEquals( getString( "report.issue-management.name" ), textBlocks[3].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
index 95fdf52..0446c6c 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
@@ -70,15 +70,15 @@ public class LicensesReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.licenses.overview.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.licenses.overview.intro" ), textBlocks[1].getText() );
- assertEquals( getString( "report.licenses.title" ), textBlocks[2].getText() );
- assertEquals( "The Apache Software License, Version 2.0", textBlocks[3].getText() );
+ assertEquals( getString( "report.licenses.overview.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.licenses.overview.intro" ), textBlocks[2].getText() );
+ assertEquals( getString( "report.licenses.title" ), textBlocks[3].getText() );
+ assertEquals( "The Apache Software License, Version 2.0", textBlocks[4].getText() );
// only 1 link in default report
final WebLink[] links = response.getLinks();
- assertEquals( 1, links.length );
- assertEquals( "http://maven.apache.org/", links[0].getURLString() );
+ assertEquals( 2, links.length );
+ assertEquals( "http://maven.apache.org/", links[1].getURLString() );
}
public void testReportLinksOnly()
@@ -105,16 +105,16 @@ public class LicensesReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.licenses.overview.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.licenses.overview.intro" ), textBlocks[1].getText() );
- assertEquals( getString( "report.licenses.title" ), textBlocks[2].getText() );
- assertEquals( "The Apache Software License, Version 2.0", textBlocks[3].getText() );
+ assertEquals( getString( "report.licenses.overview.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.licenses.overview.intro" ), textBlocks[2].getText() );
+ assertEquals( getString( "report.licenses.title" ), textBlocks[3].getText() );
+ assertEquals( "The Apache Software License, Version 2.0", textBlocks[4].getText() );
// here's our specific test
final WebLink[] links = response.getLinks();
- assertEquals( 2, links.length );
- assertEquals( "http://maven.apache.org/", links[0].getURLString() );
- assertEquals( "https://www.apache.org/licenses/LICENSE-2.0.txt", links[1].getURLString() );
- assertEquals( "https://www.apache.org/licenses/LICENSE-2.0.txt", links[1].getText() );
+ assertEquals( 3, links.length );
+ assertEquals( "http://maven.apache.org/", links[1].getURLString() );
+ assertEquals( "https://www.apache.org/licenses/LICENSE-2.0.txt", links[2].getURLString() );
+ assertEquals( "https://www.apache.org/licenses/LICENSE-2.0.txt", links[2].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
index ef20784..61c2a50 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
@@ -70,8 +70,8 @@ public class MailingListsReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.mailing-lists.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.mailing-lists.intro" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.mailing-lists.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.mailing-lists.intro" ), textBlocks[2].getText() );
// MPIR-385 + MPIR-401: Test links are URIs otherwise assume a plain email address
String post = getString("report.mailing-lists.column.post");
diff --git a/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java
index a90106c..7449e29 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java
@@ -88,9 +88,9 @@ public class ModulesReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
// Last one is footer noise
- assertEquals( 2, textBlocks.length - 1 );
- assertEquals( getString( "report.modules.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.modules.intro" ), textBlocks[1].getText() );
+ assertEquals( 3, textBlocks.length - 1 );
+ assertEquals( getString( "report.modules.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.modules.intro" ), textBlocks[2].getText() );
String[][] cellTexts = response.getTables()[0].asText();
assertEquals( 3, cellTexts.length );
diff --git a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
index 68cd90e..3de654d 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
@@ -114,7 +114,7 @@ public class PluginManagementReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.plugin-management.title" ), textBlocks[0].getText() );
+ assertEquals( getString( "report.plugin-management.title" ), textBlocks[1].getText() );
}
/**
@@ -159,7 +159,7 @@ public class PluginManagementReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.plugin-management.title" ), textBlocks[0].getText() );
+ assertEquals( getString( "report.plugin-management.title" ), textBlocks[1].getText() );
}
private static ProjectBuildingResult createProjectBuildingResult( Artifact artifact, String url )
diff --git a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
index 49504ec..adcc14b 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
@@ -73,13 +73,13 @@ public class ScmReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
// Last one is footer noise
- assertEquals( 6, textBlocks.length - 1 );
- assertEquals( getString( "report.scm.overview.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.scm.general.intro" ), textBlocks[1].getText() );
- assertEquals( getString( "report.scm.webaccess.title" ), textBlocks[2].getText() );
- assertEquals( getString( "report.scm.webaccess.nourl" ), textBlocks[3].getText() );
- assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[4].getText() );
- assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[5].getText() );
+ assertEquals( 7, textBlocks.length - 1 );
+ 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.nourl" ), textBlocks[4].getText() );
+ assertEquals( getString( "report.scm.accessbehindfirewall.title" ), textBlocks[5].getText() );
+ assertEquals( getString( "report.scm.accessbehindfirewall.general.intro" ), textBlocks[6].getText() );
}
/**
diff --git a/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
index a716488..5a7e560 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
@@ -70,10 +70,10 @@ public class SummaryReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
- assertEquals( getString( "report.summary.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.summary.general.title" ), textBlocks[1].getText() );
- assertEquals( getString( "report.summary.organization.title" ), textBlocks[2].getText() );
- assertEquals( getString( "report.summary.noorganization" ), textBlocks[3].getText() );
- assertEquals( getString( "report.summary.build.title" ), textBlocks[4].getText() );
+ assertEquals( getString( "report.summary.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.summary.general.title" ), textBlocks[2].getText() );
+ assertEquals( getString( "report.summary.organization.title" ), textBlocks[3].getText() );
+ assertEquals( getString( "report.summary.noorganization" ), textBlocks[4].getText() );
+ assertEquals( getString( "report.summary.build.title" ), textBlocks[5].getText() );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
index e45272e..bc39708 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
@@ -79,14 +79,14 @@ public class TeamReportTest
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
// Last one is footer noise
- assertEquals( 7, textBlocks.length - 1 );
- assertEquals( getString( "report.team.intro.title" ), textBlocks[0].getText() );
- assertEquals( getString( "report.team.intro.description1" ), textBlocks[1].getText() );
- assertEquals( getString( "report.team.intro.description2" ), textBlocks[2].getText() );
- assertEquals( getString( "report.team.developers.title" ), textBlocks[3].getText() );
- assertEquals( getString( "report.team.developers.intro" ), textBlocks[4].getText() );
- assertEquals( getString( "report.team.contributors.title" ), textBlocks[5].getText() );
- assertEquals( getString( "report.team.nocontributor" ), textBlocks[6].getText() );
+ assertEquals( 8, textBlocks.length - 1 );
+ assertEquals( getString( "report.team.intro.title" ), textBlocks[1].getText() );
+ assertEquals( getString( "report.team.intro.description1" ), textBlocks[2].getText() );
+ assertEquals( getString( "report.team.intro.description2" ), textBlocks[3].getText() );
+ assertEquals( getString( "report.team.developers.title" ), textBlocks[4].getText() );
+ assertEquals( getString( "report.team.developers.intro" ), textBlocks[5].getText() );
+ assertEquals( getString( "report.team.contributors.title" ), textBlocks[6].getText() );
+ assertEquals( getString( "report.team.nocontributor" ), textBlocks[7].getText() );
WebTable[] tables = response.getTables();
assertEquals(1, tables.length);