You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/01/29 21:27:19 UTC
[maven-artifact-transfer] 01/01: [MSHARED-679] - Make all classes
package private in internal package
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-679-package-private
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit ea95528ed92d148426f8d445954d35f98264794a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Jan 29 22:26:52 2018 +0100
[MSHARED-679] - Make all classes package private in internal package
---
.../deploy/internal/DefaultArtifactDeployer.java | 2 +-
.../deploy/internal/Maven30ArtifactDeployer.java | 2 +-
.../deploy/internal/Maven31ArtifactDeployer.java | 2 +-
.../install/internal/DefaultArtifactInstaller.java | 2 +-
.../install/internal/Maven30ArtifactInstaller.java | 2 +-
.../install/internal/Maven31ArtifactInstaller.java | 2 +-
.../resolve/internal/DefaultArtifactResolver.java | 2 +-
.../resolve/internal/Maven30ArtifactResolver.java | 2 +-
.../resolve/internal/Maven30ArtifactResult.java | 2 +-
.../resolve/internal/Maven31ArtifactResolver.java | 2 +-
.../resolve/internal/Maven31ArtifactResult.java | 2 +-
.../internal/DefaultDependencyCollector.java | 3 +-
.../internal/Maven30ArtifactRepositoryAdapter.java | 2 +-
.../collect/internal/Maven30CollectorResult.java | 2 +-
.../internal/Maven30DependencyCollector.java | 2 +-
.../internal/Maven31ArtifactRepositoryAdapter.java | 2 +-
.../collect/internal/Maven31CollectorResult.java | 2 +-
.../internal/Maven31DependencyCollector.java | 2 +-
.../internal/DefaultDependencyResolver.java | 2 +-
.../internal/Maven30DependencyResolver.java | 2 +-
.../internal/Maven31DependencyResolver.java | 2 +-
.../deploy/internal/DefaultProjectDeployer.java | 2 +-
.../internal/DefaultRepositoryManager.java | 2 +-
.../internal/Maven302RepositoryManager.java | 2 +-
.../internal/Maven30RepositoryManager.java | 2 +-
.../internal/Maven31RepositoryManager.java | 2 +-
.../internal/DefaultDependencyCollectorTest.java | 115 +++++++++++++++++++++
27 files changed, 142 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
index c7f6523..b0958c6 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
*
*/
@Component( role = ArtifactDeployer.class )
-public class DefaultArtifactDeployer
+class DefaultArtifactDeployer
implements ArtifactDeployer, Contextualizable
{
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
index e7500f6..a5ac4ed 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
@@ -43,7 +43,7 @@ import org.sonatype.aether.util.artifact.SubArtifact;
*
*/
@Component( role = ArtifactDeployer.class, hint = "maven3" )
-public class Maven30ArtifactDeployer
+class Maven30ArtifactDeployer
implements ArtifactDeployer
{
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
index 33086b0..84c8620 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
@@ -43,7 +43,7 @@ import org.eclipse.aether.util.artifact.SubArtifact;
*
*/
@Component( role = ArtifactDeployer.class, hint = "maven31" )
-public class Maven31ArtifactDeployer
+class Maven31ArtifactDeployer
implements ArtifactDeployer
{
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java b/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
index 5d39501..9072fea 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
*
*/
@Component( role = ArtifactInstaller.class )
-public class DefaultArtifactInstaller
+class DefaultArtifactInstaller
implements ArtifactInstaller, Contextualizable
{
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
index a2674fd..9994050 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
@@ -43,7 +43,7 @@ import org.sonatype.aether.util.artifact.SubArtifact;
*
*/
@Component( role = ArtifactInstaller.class, hint = "maven3" )
-public class Maven30ArtifactInstaller
+class Maven30ArtifactInstaller
implements ArtifactInstaller
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
index 2d7dbc0..f683baf 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
@@ -43,7 +43,7 @@ import org.eclipse.aether.util.artifact.SubArtifact;
*
*/
@Component( role = ArtifactInstaller.class, hint = "maven31" )
-public class Maven31ArtifactInstaller
+class Maven31ArtifactInstaller
implements ArtifactInstaller
{
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
index 50a84f5..5c5cd61 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
*
*/
@Component( role = ArtifactResolver.class, hint = "default" )
-public class DefaultArtifactResolver
+class DefaultArtifactResolver
implements ArtifactResolver, Contextualizable
{
private PlexusContainer container;
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
index 950506d..bfbb525 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
@@ -44,7 +44,7 @@ import org.sonatype.aether.util.artifact.DefaultArtifact;
*
*/
@Component( role = ArtifactResolver.class, hint = "maven3" )
-public class Maven30ArtifactResolver
+class Maven30ArtifactResolver
implements ArtifactResolver
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
index c9169b3..35048ea 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
@@ -30,7 +30,7 @@ import org.sonatype.aether.resolution.ArtifactResult;
* @author Robert Scholte
* @since 3.0
*/
-public class Maven30ArtifactResult
+class Maven30ArtifactResult
implements org.apache.maven.shared.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
index 81af4fc..351e732 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
@@ -44,7 +44,7 @@ import org.eclipse.aether.resolution.ArtifactResolutionException;
*
*/
@Component( role = ArtifactResolver.class, hint = "maven31" )
-public class Maven31ArtifactResolver
+class Maven31ArtifactResolver
implements ArtifactResolver
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
index 2f9d7ad..c96384f 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
@@ -30,7 +30,7 @@ import org.eclipse.aether.artifact.Artifact;
* @author Robert Scholte
* @since 3.0
*/
-public class Maven31ArtifactResult
+class Maven31ArtifactResult
implements org.apache.maven.shared.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java
index 19bdc32..904b120 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java
@@ -40,7 +40,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
* @author Robert Scholte
*/
@Component( role = DependencyCollector.class, hint = "default" )
-public class DefaultDependencyCollector implements DependencyCollector, Contextualizable
+class DefaultDependencyCollector
+ implements DependencyCollector, Contextualizable
{
private PlexusContainer container;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
index 3fd681d..a34281d 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
@@ -37,7 +37,7 @@ import org.sonatype.aether.repository.RepositoryPolicy;
* @author Robert Scholte
*
*/
-public class Maven30ArtifactRepositoryAdapter implements ArtifactRepository
+class Maven30ArtifactRepositoryAdapter implements ArtifactRepository
{
private RemoteRepository remoteRepository;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java
index 2ba7948..efffa2f 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java
@@ -37,7 +37,7 @@ import org.sonatype.aether.repository.RemoteRepository;
* @author Robert Scholte
*
*/
-public class Maven30CollectorResult implements CollectorResult
+class Maven30CollectorResult implements CollectorResult
{
private final CollectResult collectResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
index 7f7c49e..30cbd88 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
@@ -50,7 +50,7 @@ import org.sonatype.aether.util.artifact.DefaultArtifact;
*
*/
@Component( role = DependencyCollector.class, hint = "maven3" )
-public class Maven30DependencyCollector
+class Maven30DependencyCollector
implements DependencyCollector
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
index 5de5dbb..b398fb7 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
@@ -37,7 +37,7 @@ import org.eclipse.aether.repository.RepositoryPolicy;
* @author Robert Scholte
*
*/
-public class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
+class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
{
private RemoteRepository remoteRepository;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java
index 9edf119..8bde97a 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java
@@ -37,7 +37,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* @author Robert Scholte
*
*/
-public class Maven31CollectorResult implements CollectorResult
+class Maven31CollectorResult implements CollectorResult
{
private final CollectResult collectResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java
index 9b0a9db..4624ed9 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java
@@ -50,7 +50,7 @@ import org.eclipse.aether.repository.RemoteRepository;
*
*/
@Component( role = DependencyCollector.class, hint = "maven31" )
-public class Maven31DependencyCollector
+class Maven31DependencyCollector
implements DependencyCollector
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java
index a58a80a..74d94ad 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java
@@ -41,7 +41,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
*
*/
@Component( role = DependencyResolver.class, hint = "default" )
-public class DefaultDependencyResolver
+class DefaultDependencyResolver
implements DependencyResolver, Contextualizable
{
private PlexusContainer container;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
index 32d5316..8497cbc 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -57,7 +57,7 @@ import org.sonatype.aether.util.artifact.DefaultArtifactType;
*
*/
@Component( role = DependencyResolver.class, hint = "maven3" )
-public class Maven30DependencyResolver
+class Maven30DependencyResolver
implements DependencyResolver
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
index 0b2ac9a..047cfe4 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -57,7 +57,7 @@ import org.eclipse.aether.resolution.DependencyResult;
*
*/
@Component( role = DependencyResolver.class, hint = "maven31" )
-public class Maven31DependencyResolver
+class Maven31DependencyResolver
implements DependencyResolver
{
@Requirement
diff --git a/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java b/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
index e1a14af..f000ddc 100644
--- a/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
+++ b/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* taken from maven-deploy-plugin.
*/
@Component( role = ProjectDeployer.class )
-public class DefaultProjectDeployer
+class DefaultProjectDeployer
implements ProjectDeployer
{
private static final Logger LOGGER = LoggerFactory.getLogger( DefaultProjectDeployer.class );
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java b/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
index 9896839..4dcdecf 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
@@ -40,7 +40,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
*
*/
@Component( role = RepositoryManager.class )
-public class DefaultRepositoryManager
+class DefaultRepositoryManager
implements RepositoryManager, Contextualizable
{
private PlexusContainer container;
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java b/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java
index ab0be65..8832c32 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java
@@ -27,7 +27,7 @@ import org.sonatype.aether.repository.LocalRepository;
*
*/
@Component( role = RepositoryManager.class, hint = "maven302" )
-public class Maven302RepositoryManager
+class Maven302RepositoryManager
extends Maven30RepositoryManager
{
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java b/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
index eac17c8..e32517c 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
@@ -47,7 +47,7 @@ import org.sonatype.aether.util.metadata.DefaultMetadata;
*
*/
@Component( role = RepositoryManager.class, hint = "maven3" )
-public class Maven30RepositoryManager
+class Maven30RepositoryManager
implements RepositoryManager
{
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java b/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
index b6b108a..2596615 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
@@ -47,7 +47,7 @@ import org.eclipse.aether.repository.LocalRepositoryManager;
*
*/
@Component( role = RepositoryManager.class, hint = "maven31" )
-public class Maven31RepositoryManager
+class Maven31RepositoryManager
implements RepositoryManager
{
@Requirement
diff --git a/src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java b/src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java
new file mode 100644
index 0000000..5e48299
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java
@@ -0,0 +1,115 @@
+package org.apache.maven.shared.dependencies.collect.internal;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.mockito.Mockito.mock;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.dependencies.DependableCoordinate;
+import org.apache.maven.shared.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependencies.collect.internal.DefaultDependencyCollector;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class DefaultDependencyCollectorTest
+{
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ private DependencyCollector dc;
+
+ @Before
+ public void setUp()
+ {
+ dc = new DefaultDependencyCollector();
+ }
+
+ @Test
+ public void collectDependenciesWithDependableCoordinatShouldFailWithIAEWhenParameterBuildingRequestIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." );
+
+ dc.collectDependencies( null, (DependableCoordinate) null );
+ }
+
+ @Test
+ public void collectDependenciesWithDependableCoordinatShouldFailWithIAEWhenParameterRootIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter root is not allowed to be null." );
+
+ ProjectBuildingRequest request = mock( ProjectBuildingRequest.class );
+ dc.collectDependencies( request, (DependableCoordinate) null );
+ }
+
+ @Test
+ public void collectDependenciesWithDependencyShouldFailWithIAEWhenParameterBuildingRequestIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." );
+
+ dc.collectDependencies( null, (Dependency) null );
+ }
+
+ @Test
+ public void collectDependenciesWithDependencyShouldFailWithIAEWhenParameterRootIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter root is not allowed to be null." );
+
+ ProjectBuildingRequest request = mock( ProjectBuildingRequest.class );
+ dc.collectDependencies( request, (Dependency) null );
+ }
+
+ @Test
+ public void collectDependenciesWithModelShouldFailWithIAEWhenParameterBuildingRequestIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." );
+
+ dc.collectDependencies( null, (Model) null );
+ }
+
+ @Test
+ public void collectDependenciesWithModelShouldFailWithIAEWhenParameterRootIsNull()
+ throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException
+ {
+ thrown.expect( IllegalArgumentException.class );
+ thrown.expectMessage( "The parameter root is not allowed to be null." );
+
+ ProjectBuildingRequest request = mock( ProjectBuildingRequest.class );
+ dc.collectDependencies( request, (Model) null );
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.