You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/03/06 11:41:51 UTC
[maven-dependency-plugin] branch aether created (now 208f36f)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch aether
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.
at 208f36f wip
This branch includes the following new commits:
new 208f36f wip
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-dependency-plugin] 01/01: wip
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch aether
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 208f36f53235adffe374bfaba2475a3b5165b711
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Mar 6 06:41:30 2020 -0500
wip
---
.../dependency/analyze/TestAnalyzeDepMgt.java | 54 ++++++----------------
.../TestCopyDependenciesMojo2.java | 2 +-
...ExcludeReactorProjectsDependencyFilterTest.java | 13 ++----
.../testUtils/stubs/DependencyProjectStub.java | 49 ++------------------
.../translators/TestClassifierTypeTranslator.java | 9 ----
5 files changed, 21 insertions(+), 106 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
index 268ac1d..d3392a2 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
@@ -34,6 +34,8 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
import org.apache.maven.project.MavenProject;
@@ -192,60 +194,30 @@ public class TestAnalyzeDepMgt
}
public void testMojo()
- throws IOException
+ throws IOException, MojoExecutionException, MojoFailureException
{
mojo.setIgnoreDirect( false );
- try
- {
- // test with nothing in depMgt
- mojo.execute();
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- fail( "Caught Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ // test with nothing in depMgt
+ mojo.execute();
- try
- {
- DependencyProjectStub project = (DependencyProjectStub) mojo.getProject();
- project.setDependencyManagement( depMgt );
- // test with exclusion
- mojo.execute();
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- fail( "Caught Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ DependencyProjectStub project = (DependencyProjectStub) mojo.getProject();
+ project.setDependencyManagement( depMgt );
+ // test with exclusion
+ mojo.execute();
try
{
- DependencyProjectStub project = (DependencyProjectStub) mojo.getProject();
- project.setDependencyManagement( depMgt );
// test with exclusion
mojo.setFailBuild( true );
mojo.execute();
fail( "Expected exception to fail the build." );
}
- catch ( Exception e )
+ catch ( MojoExecutionException e )
{
- System.out.println( "Caught Expected Exception:" + e.getLocalizedMessage() );
}
- try
- {
- DependencyProjectStub project = (DependencyProjectStub) mojo.getProject();
- project.setDependencyManagement( depMgt );
- // test with exclusion
- mojo.setFailBuild( true );
- mojo.setIgnoreDirect( true );
- mojo.execute();
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- fail( "Caught Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ mojo.setFailBuild( true );
+ mojo.setIgnoreDirect( true );
+ mojo.execute();
}
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
index e4870bc..df52114 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
@@ -287,7 +287,7 @@ public class TestCopyDependenciesMojo2
File outputDirectory = mojo.outputDirectory;
ArtifactRepository targetRepository =
- new MavenArtifactRepository( "local", outputDirectory.toURL().toExternalForm(),
+ new MavenArtifactRepository( "local", outputDirectory.toURI().toString(),
new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(),
new ArtifactRepositoryPolicy() );
diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilterTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilterTest.java
index 0119358..7c5e80d 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilterTest.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilterTest.java
@@ -27,6 +27,7 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.artifact.filter.resolve.Node;
+import org.hamcrest.MatcherAssert;
import org.mockito.ArgumentCaptor;
import java.util.Collections;
@@ -34,9 +35,7 @@ import java.util.HashSet;
import java.util.Set;
import static java.util.Collections.singletonList;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -79,9 +78,7 @@ public class ExcludeReactorProjectsDependencyFilterTest extends AbstractDependen
}
};
- final boolean result = filter.accept( node , Collections.<Node>emptyList() );
-
- assertThat( result, is( false ));
+ assertFalse( filter.accept( node , Collections.<Node>emptyList() ) );
}
public void testRejectWithLogging()
@@ -124,7 +121,7 @@ public class ExcludeReactorProjectsDependencyFilterTest extends AbstractDependen
ArgumentCaptor<String> captor = ArgumentCaptor.forClass( String.class );
verify( log ).debug( captor.capture() );
- assertThat( captor.getValue(), containsString( "Skipped dependency" ) );
+ MatcherAssert.assertThat( captor.getValue(), containsString( "Skipped dependency" ) );
}
public void testAccept()
@@ -163,8 +160,6 @@ public class ExcludeReactorProjectsDependencyFilterTest extends AbstractDependen
}
};
- final boolean result = filter.accept( node , Collections.<Node>emptyList() );
-
- assertThat( result, is( true ));
+ assertTrue( filter.accept( node , Collections.<Node>emptyList() ) );
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java
index f8bafdb..e347204 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/testUtils/stubs/DependencyProjectStub.java
@@ -96,10 +96,6 @@ public class DependencyProjectStub
private List<ArtifactRepository> pluginArtifactRepositories;
- // private ArtifactRepository releaseArtifactRepository;
-
- // private ArtifactRepository snapshotArtifactRepository;
-
private List<Profile> activeProfiles;
private Set<Artifact> dependencyArtifacts;
@@ -108,20 +104,8 @@ public class DependencyProjectStub
private Artifact artifact;
- // private Map artifactMap;
-
private Model originalModel;
- // private Map pluginArtifactMap;
-
- // private Map reportArtifactMap;
-
- // private Map extensionArtifactMap;
-
- // private Map projectReferences;
-
- // private Build buildOverlay;
-
private boolean executionRoot;
private List<Artifact> compileArtifacts;
@@ -422,36 +406,6 @@ public class DependencyProjectStub
this.scriptSourceRoots = scriptSourceRoots;
}
- public void setArtifactMap( Map artifactMap )
- {
- // this.artifactMap = artifactMap;
- }
-
- public void setPluginArtifactMap( Map pluginArtifactMap )
- {
- // this.pluginArtifactMap = pluginArtifactMap;
- }
-
- public void setReportArtifactMap( Map reportArtifactMap )
- {
- // this.reportArtifactMap = reportArtifactMap;
- }
-
- public void setExtensionArtifactMap( Map extensionArtifactMap )
- {
- // this.extensionArtifactMap = extensionArtifactMap;
- }
-
- public void setProjectReferences( Map projectReferences )
- {
- // this.projectReferences = projectReferences;
- }
-
- public void setBuildOverlay( Build buildOverlay )
- {
- // this.buildOverlay = buildOverlay;
- }
-
public void setCompileDependencies( List<Dependency> compileDependencies )
{
this.compileDependencies = compileDependencies;
@@ -657,6 +611,7 @@ public class DependencyProjectStub
return null;
}
+ @Override
public void setMailingLists( List list )
{
@@ -672,6 +627,7 @@ public class DependencyProjectStub
}
+ @Override
public void setDevelopers( List list )
{
@@ -993,6 +949,7 @@ public class DependencyProjectStub
return Collections.emptyList();
}
+ @Override
public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
throws InvalidDependencyVersionException
{
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
index 02f2bb8..756bbd1 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
@@ -37,9 +37,7 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -57,10 +55,6 @@ public class TestClassifierTypeTranslator
Log log = new SilentLog();
- private RepositoryManager repoManager;
-
- private ProjectBuildingRequest buildingRequest;
-
private ArtifactHandlerManager artifactHandlerManager;
protected void setUp()
@@ -79,10 +73,7 @@ public class TestClassifierTypeTranslator
DependencyArtifactStubFactory factory = new DependencyArtifactStubFactory( null, false );
artifacts = factory.getMixedArtifacts();
- repoManager = lookup( RepositoryManager.class );
-
MavenSession session = newMavenSession( new MavenProjectStub() );
- buildingRequest = session.getProjectBuildingRequest();
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );