From 208f36f53235adffe374bfaba2475a3b5165b711 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 6 Mar 2020 06:41:30 -0500 Subject: [PATCH 1/2] wip --- .../dependency/analyze/TestAnalyzeDepMgt.java | 54 +++++-------------- .../TestCopyDependenciesMojo2.java | 2 +- ...deReactorProjectsDependencyFilterTest.java | 13 ++--- .../stubs/DependencyProjectStub.java | 49 ++--------------- .../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 268ac1d13..d3392a2d7 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.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 void testGetMismatch() } 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 e4870bc47..df5211420 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 void testRepositoryLayout() 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 011935813..7c5e80df4 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.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.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 Dependency getDependency() { } }; - final boolean result = filter.accept( node , Collections.emptyList() ); - - assertThat( result, is( false )); + assertFalse( filter.accept( node , Collections.emptyList() ) ); } public void testRejectWithLogging() @@ -124,7 +121,7 @@ public Dependency getDependency() { ArgumentCaptor 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 Dependency getDependency() { } }; - final boolean result = filter.accept( node , Collections.emptyList() ); - - assertThat( result, is( true )); + assertTrue( filter.accept( node , Collections.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 f8bafdb79..e3472043c 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 pluginArtifactRepositories; - // private ArtifactRepository releaseArtifactRepository; - - // private ArtifactRepository snapshotArtifactRepository; - private List activeProfiles; private Set 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 compileArtifacts; @@ -422,36 +406,6 @@ public void setScriptSourceRoots( List scriptSourceRoots ) 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 compileDependencies ) { this.compileDependencies = compileDependencies; @@ -657,6 +611,7 @@ public Scm getScm() return null; } + @Override public void setMailingLists( List list ) { @@ -672,6 +627,7 @@ public void addMailingList( MailingList mailingList ) } + @Override public void setDevelopers( List list ) { @@ -993,6 +949,7 @@ public List getBuildExtensions() return Collections.emptyList(); } + @Override public Set 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 02f2bb879..756bbd1a9 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.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 @@ protected void setUp() 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() ) ); From 55e3862fc5dd1019cf31c809f6009bb22e712533 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 8 Mar 2020 07:55:55 -0400 Subject: [PATCH 2/2] static import --- .../resolvers/ExcludeReactorProjectsDependencyFilterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7c5e80df4..2b66b4c22 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,7 +27,6 @@ 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; @@ -36,6 +35,7 @@ import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -121,7 +121,7 @@ public Dependency getDependency() { ArgumentCaptor captor = ArgumentCaptor.forClass( String.class ); verify( log ).debug( captor.capture() ); - MatcherAssert.assertThat( captor.getValue(), containsString( "Skipped dependency" ) ); + assertThat( captor.getValue(), containsString( "Skipped dependency" ) ); } public void testAccept()