Merge remote-tracking branch 'origin/MNG-6182'

This commit is contained in:
Stephen Connolly 2017-03-19 17:18:53 +00:00
commit abca6ab6e2
2 changed files with 468 additions and 0 deletions

View File

@ -0,0 +1,246 @@
package org.apache.maven.project;
/*
* 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 java.io.File;
import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.repository.RemoteRepository;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull;
import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
import static org.codehaus.plexus.PlexusTestCase.getBasedir;
/**
* Test cases for the project {@code ModelResolver} implementation.
*
* @author Christian Schulte
* @since 3.5.0-alpha-2
*/
public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
{
/**
* Creates a new {@code ProjectModelResolverTest} instance.
*/
public ProjectModelResolverTest()
{
super();
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "org.apache" );
parent.setArtifactId( "apache" );
parent.setVersion( "0" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
}
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "org.apache" );
parent.setArtifactId( "apache" );
parent.setVersion( "[2.0,2.1)" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
e.getMessage() );
}
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "org.apache" );
parent.setArtifactId( "apache" );
parent.setVersion( "[1,)" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "The requested parent version range '[1,)' does not specify an upper bound",
e.getMessage() );
}
}
public void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "org.apache" );
parent.setArtifactId( "apache" );
parent.setVersion( "1" );
assertNotNull( this.newModelResolver().resolveModel( parent ) );
assertEquals( "1", parent.getVersion() );
}
public void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "org.apache" );
parent.setArtifactId( "apache" );
parent.setVersion( "(,2.0)" );
assertNotNull( this.newModelResolver().resolveModel( parent ) );
assertEquals( "1", parent.getVersion() );
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "org.apache" );
dependency.setArtifactId( "apache" );
dependency.setVersion( "0" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
}
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "org.apache" );
dependency.setArtifactId( "apache" );
dependency.setVersion( "[2.0,2.1)" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
e.getMessage() );
}
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "org.apache" );
dependency.setArtifactId( "apache" );
dependency.setVersion( "[1,)" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "The requested dependency version range '[1,)' does not specify an upper bound",
e.getMessage() );
}
}
public void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "org.apache" );
dependency.setArtifactId( "apache" );
dependency.setVersion( "1" );
assertNotNull( this.newModelResolver().resolveModel( dependency ) );
assertEquals( "1", dependency.getVersion() );
}
public void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "org.apache" );
dependency.setArtifactId( "apache" );
dependency.setVersion( "(,2.0)" );
assertNotNull( this.newModelResolver().resolveModel( dependency ) );
assertEquals( "1", dependency.getVersion() );
}
private ModelResolver newModelResolver() throws Exception
{
final File localRepo = new File( this.getLocalRepository().getBasedir() );
final DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession();
repoSession.setLocalRepositoryManager( new LegacyLocalRepositoryManager( localRepo ) );
return new ProjectModelResolver( repoSession, null, lookup( RepositorySystem.class ),
lookup( RemoteRepositoryManager.class ),
this.getRemoteRepositories(),
ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT, null );
}
private List<RemoteRepository> getRemoteRepositories()
throws InvalidRepositoryException
{
final File repoDir = new File( getBasedir(), "src/test/remote-repo" ).getAbsoluteFile();
final RemoteRepository remoteRepository =
new RemoteRepository.Builder( org.apache.maven.repository.RepositorySystem.DEFAULT_REMOTE_REPO_ID,
"default", repoDir.toURI().toASCIIString() ).build();
return Collections.singletonList( remoteRepository );
}
}

View File

@ -0,0 +1,222 @@
package org.apache.maven.repository.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 java.net.MalformedURLException;
import java.util.Arrays;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.eclipse.aether.impl.ArtifactResolver;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.impl.VersionRangeResolver;
/**
* Test cases for the default {@code ModelResolver} implementation.
*
* @author Christian Schulte
* @since 3.5.0-alpha-2
*/
public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
{
/**
* Creates a new {@code DefaultModelResolverTest} instance.
*/
public DefaultModelResolverTest()
{
super();
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "ut.simple" );
parent.setArtifactId( "artifact" );
parent.setVersion( "0" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
}
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "ut.simple" );
parent.setArtifactId( "artifact" );
parent.setVersion( "[2.0,2.1)" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
e.getMessage() );
}
}
public void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "ut.simple" );
parent.setArtifactId( "artifact" );
parent.setVersion( "[1.0,)" );
try
{
this.newModelResolver().resolveModel( parent );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "The requested parent version range '[1.0,)' does not specify an upper bound",
e.getMessage() );
}
}
public void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "ut.simple" );
parent.setArtifactId( "artifact" );
parent.setVersion( "1.0" );
assertNotNull( this.newModelResolver().resolveModel( parent ) );
assertEquals( "1.0", parent.getVersion() );
}
public void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
{
final Parent parent = new Parent();
parent.setGroupId( "ut.simple" );
parent.setArtifactId( "artifact" );
parent.setVersion( "(,2.0)" );
assertNotNull( this.newModelResolver().resolveModel( parent ) );
assertEquals( "1.0", parent.getVersion() );
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "ut.simple" );
dependency.setArtifactId( "artifact" );
dependency.setVersion( "0" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertNotNull( e.getMessage() );
assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
}
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "ut.simple" );
dependency.setArtifactId( "artifact" );
dependency.setVersion( "[2.0,2.1)" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
e.getMessage() );
}
}
public void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "ut.simple" );
dependency.setArtifactId( "artifact" );
dependency.setVersion( "[1.0,)" );
try
{
this.newModelResolver().resolveModel( dependency );
fail( "Expected 'UnresolvableModelException' not thrown." );
}
catch ( final UnresolvableModelException e )
{
assertEquals( "The requested dependency version range '[1.0,)' does not specify an upper bound",
e.getMessage() );
}
}
public void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "ut.simple" );
dependency.setArtifactId( "artifact" );
dependency.setVersion( "1.0" );
assertNotNull( this.newModelResolver().resolveModel( dependency ) );
assertEquals( "1.0", dependency.getVersion() );
}
public void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
{
final Dependency dependency = new Dependency();
dependency.setGroupId( "ut.simple" );
dependency.setArtifactId( "artifact" );
dependency.setVersion( "(,2.0)" );
assertNotNull( this.newModelResolver().resolveModel( dependency ) );
assertEquals( "1.0", dependency.getVersion() );
}
private ModelResolver newModelResolver() throws ComponentLookupException, MalformedURLException
{
return new DefaultModelResolver( this.session, null, this.getClass().getName(),
lookup( ArtifactResolver.class ), lookup( VersionRangeResolver.class ),
lookup( RemoteRepositoryManager.class ),
Arrays.asList( newTestRepository() ) );
}
}