You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2023/09/11 11:37:55 UTC
[maven-javadoc-plugin] 01/01: fix failing test
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch MJAVADOC-742
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit fa0ac222cee0ef92d75b8613592c9442628eee80
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Sep 11 13:25:58 2023 +0200
fix failing test
---
.../maven/plugins/javadoc/JavadocReportTest.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index fce08966..6df45691 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -1080,19 +1080,17 @@ public class JavadocReportTest extends AbstractMojoTestCase {
Path testPom = unit.resolve("tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml");
JavadocReport mojo = lookupMojo(testPom);
- MavenSession session = spy(newMavenSession(mojo.project));
- ProjectBuildingRequest buildingRequest = mock(ProjectBuildingRequest.class);
- when(buildingRequest.getRemoteRepositories()).thenReturn(mojo.project.getRemoteArtifactRepositories());
- when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
- DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
- repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
- .newInstance(repositorySession, new LocalRepository(localRepo)));
- when(buildingRequest.getRepositorySession()).thenReturn(repositorySession);
- when(session.getRepositorySession()).thenReturn(repositorySession);
+ MavenSession session = newMavenSession(mojo.project);
+ DefaultRepositorySystemSession repoSysSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+ repoSysSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
+ .newInstance(session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
+ // Ensure remote repo connection uses SSL
+ File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml");
+ session.getRequest().setGlobalSettingsFile(globalSettingsFile);
LegacySupport legacySupport = lookup(LegacySupport.class);
legacySupport.setSession(session);
setVariableValueToObject(mojo, "session", session);
- setVariableValueToObject(mojo, "repoSession", repositorySession);
+ setVariableValueToObject(mojo, "repoSession", repoSysSession);
mojo.execute();
Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath();