Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors reported by Checkstyle 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813612 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-09-10 21:58:39 +00:00
parent 388fcd100e
commit b82977a18c
13 changed files with 230 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.execution; package org.apache.maven.execution;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license * Licensed to the Apache Software Foundation (ASF) under one
* agreements. See the NOTICE file distributed with this work for additional information regarding * or more contributor license agreements. See the NOTICE file
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the * distributed with this work for additional information
* "License"); you may not use this file except in compliance with the License. You may obtain a * regarding copyright ownership. The ASF licenses this file
* copy of the License at * to you under the Apache License, Version 2.0 (the
* * "License"); you may not use this file except in compliance
* http://www.apache.org/licenses/LICENSE-2.0 * with the License. You may obtain a copy of the License at
* *
* Unless required by applicable law or agreed to in writing, software distributed under the License * http://www.apache.org/licenses/LICENSE-2.0
* 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 * Unless required by applicable law or agreed to in writing,
* the License. * 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.io.File;
@ -41,9 +45,9 @@ public class DefaultMavenExecutionRequest
private RepositoryCache repositoryCache = new SessionRepositoryCache(); private RepositoryCache repositoryCache = new SessionRepositoryCache();
private ArtifactRepository localRepository; private ArtifactRepository localRepository;
private File localRepositoryPath; private File localRepositoryPath;
private boolean offline = false; private boolean offline = false;
private boolean interactiveMode = true; private boolean interactiveMode = true;
@ -73,7 +77,7 @@ public class DefaultMavenExecutionRequest
private File globalSettingsFile; private File globalSettingsFile;
private File userToolchainsFile; private File userToolchainsFile;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Request // Request
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -124,13 +128,15 @@ public class DefaultMavenExecutionRequest
/** /**
* Suppress SNAPSHOT updates. * Suppress SNAPSHOT updates.
* *
* @issue MNG-2681 * @issue MNG-2681
*/ */
private boolean noSnapshotUpdates; private boolean noSnapshotUpdates;
public DefaultMavenExecutionRequest() { } public DefaultMavenExecutionRequest()
{
}
public static MavenExecutionRequest copy( MavenExecutionRequest original ) public static MavenExecutionRequest copy( MavenExecutionRequest original )
{ {
DefaultMavenExecutionRequest copy = new DefaultMavenExecutionRequest(); DefaultMavenExecutionRequest copy = new DefaultMavenExecutionRequest();
@ -166,9 +172,9 @@ public static MavenExecutionRequest copy( MavenExecutionRequest original )
copy.setRepositoryCache( original.getRepositoryCache() ); copy.setRepositoryCache( original.getRepositoryCache() );
copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() ); copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() );
copy.setExecutionListener( original.getExecutionListener() ); copy.setExecutionListener( original.getExecutionListener() );
return original; return original;
} }
public String getBaseDirectory() public String getBaseDirectory()
{ {
if ( basedir == null ) if ( basedir == null )
@ -301,7 +307,7 @@ public MavenExecutionRequest setRemoteRepositories( List<ArtifactRepository> rem
{ {
this.remoteRepositories = null; this.remoteRepositories = null;
} }
return this; return this;
} }
@ -315,7 +321,7 @@ public MavenExecutionRequest setPluginArtifactRepositories( List<ArtifactReposit
{ {
this.pluginArtifactRepositories = null; this.pluginArtifactRepositories = null;
} }
return this; return this;
} }
@ -931,7 +937,7 @@ public MavenExecutionRequest addPluginArtifactRepository( ArtifactRepository rep
return this; return this;
} }
public List<ArtifactRepository> getPluginArtifactRepositories() public List<ArtifactRepository> getPluginArtifactRepositories()
{ {
if ( pluginArtifactRepositories == null ) if ( pluginArtifactRepositories == null )
@ -966,7 +972,7 @@ public ProjectBuildingRequest getProjectBuildingRequest()
return projectBuildingRequest; return projectBuildingRequest;
} }
public MavenExecutionRequest addProfile( Profile profile ) public MavenExecutionRequest addProfile( Profile profile )
{ {
if ( profile == null ) if ( profile == null )

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
View File

@ -61,9 +61,9 @@ private static void decomposeParameterIntoUserInstructions( MojoDescriptor mojo,
if ( param.isEditable() ) if ( param.isEditable() )
{ {
messageBuffer.append( "Inside the definition for plugin \'" + mojo.getPluginDescriptor().getArtifactId() + messageBuffer.append( "Inside the definition for plugin \'" + mojo.getPluginDescriptor().getArtifactId()
"\' specify the following:\n\n<configuration>\n ...\n <" + param.getName() + ">VALUE</" + + "\' specify the following:\n\n<configuration>\n ...\n <" + param.getName() + ">VALUE</"
param.getName() + ">\n</configuration>" ); + param.getName() + ">\n</configuration>" );
String alias = param.getAlias(); String alias = param.getAlias();
if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) ) if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) )

4
maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
View File

@ -42,8 +42,8 @@ public InvalidProjectVersionException( String projectId, String locationInPom, S
private static String formatMessage( String projectId, String locationInPom, String offendingVersion, private static String formatMessage( String projectId, String locationInPom, String offendingVersion,
InvalidVersionSpecificationException cause ) InvalidVersionSpecificationException cause )
{ {
return "Invalid version: " + offendingVersion + " found for: " + locationInPom + " in project: " + projectId + return "Invalid version: " + offendingVersion + " found for: " + locationInPom + " in project: " + projectId
". Reason: " + cause.getMessage(); + ". Reason: " + cause.getMessage();
} }
public String getOffendingVersion() public String getOffendingVersion()

6
maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
View File

@ -43,8 +43,8 @@ public SettingsConfigurationException( String message, Throwable cause )
public SettingsConfigurationException( String message, Throwable cause, int lineNumber, int columnNumber ) public SettingsConfigurationException( String message, Throwable cause, int lineNumber, int columnNumber )
{ {
super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" ) + super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" )
( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause ); + ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
this.lineNumber = lineNumber; this.lineNumber = lineNumber;
this.columnNumber = columnNumber; this.columnNumber = columnNumber;
} }
@ -58,6 +58,6 @@ public int getLineNumber()
{ {
return lineNumber; return lineNumber;
} }
} }

20
maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
View File

@ -19,7 +19,6 @@
* under the License. * under the License.
*/ */
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -33,7 +32,6 @@
import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.DefaultMavenExecutionRequest;
@ -69,16 +67,18 @@ public void setUp()
throws Exception throws Exception
{ {
super.setUp(); super.setUp();
factory = lookup( ArtifactFactory.class ); factory = lookup( ArtifactFactory.class );
artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class ); artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class );
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown()
factory = null; throws Exception
super.tearDown(); {
factory = null;
super.tearDown();
} }
public void testPluginDescriptorExpressionReference() public void testPluginDescriptorExpressionReference()
throws Exception throws Exception
{ {
@ -445,7 +445,7 @@ private MojoExecution newMojoExecution()
private MavenSession newMavenSession() private MavenSession newMavenSession()
throws Exception throws Exception
{ {
return createMavenSession( null ); return createMavenSession( null );
} }
@Override @Override

42
maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
View File

@ -24,22 +24,24 @@
public class MavenMetadataSourceTest public class MavenMetadataSourceTest
extends PlexusTestCase extends PlexusTestCase
{ {
private RepositorySystem repositorySystem; private RepositorySystem repositorySystem;
protected void setUp() protected void setUp()
throws Exception throws Exception
{ {
super.setUp(); super.setUp();
repositorySystem = lookup( RepositorySystem.class ); repositorySystem = lookup( RepositorySystem.class );
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown()
repositorySystem = null; throws Exception
super.tearDown(); {
repositorySystem = null;
super.tearDown();
} }
public void testShouldNotCarryExclusionsOverFromDependencyToDependency() public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
throws Exception throws Exception
{ {
@ -49,39 +51,39 @@ public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
dep1.setArtifactId( "test-artifact" ); dep1.setArtifactId( "test-artifact" );
dep1.setVersion( "1" ); dep1.setVersion( "1" );
dep1.setType( "jar" ); dep1.setType( "jar" );
Exclusion exc = new Exclusion(); Exclusion exc = new Exclusion();
exc.setGroupId( "test" ); exc.setGroupId( "test" );
exc.setArtifactId( "test-artifact3" ); exc.setArtifactId( "test-artifact3" );
dep1.addExclusion( exc ); dep1.addExclusion( exc );
Dependency dep2 = new Dependency(); Dependency dep2 = new Dependency();
dep2.setGroupId( "test" ); dep2.setGroupId( "test" );
dep2.setArtifactId( "test-artifact2" ); dep2.setArtifactId( "test-artifact2" );
dep2.setVersion( "1" ); dep2.setVersion( "1" );
dep2.setType( "jar" ); dep2.setType( "jar" );
List deps = new ArrayList(); List deps = new ArrayList();
deps.add( dep1 ); deps.add( dep1 );
deps.add( dep2 ); deps.add( dep2 );
ArtifactFactory factory = lookup( ArtifactFactory.class ); ArtifactFactory factory = lookup( ArtifactFactory.class );
ArtifactFilter dependencyFilter = new ScopeArtifactFilter( Artifact.SCOPE_COMPILE ); ArtifactFilter dependencyFilter = new ScopeArtifactFilter( Artifact.SCOPE_COMPILE );
MavenProject project = new MavenProject( new Model() ); MavenProject project = new MavenProject( new Model() );
Set result = project.createArtifacts( dependencyFilter ); Set result = project.createArtifacts( dependencyFilter );
for ( Iterator it = result.iterator(); it.hasNext(); ) for ( Iterator it = result.iterator(); it.hasNext(); )
{ {
Artifact artifact = ( Artifact ) it.next(); Artifact artifact = ( Artifact ) it.next();
if ( "test-artifact2".equals( artifact.getArtifactId() ) ) if ( "test-artifact2".equals( artifact.getArtifactId() ) )
{ {
ArtifactFilter filter = artifact.getDependencyFilter(); ArtifactFilter filter = artifact.getDependencyFilter();
assertSame( dependencyFilter, filter ); assertSame( dependencyFilter, filter );
} }
} }
@ -158,9 +160,9 @@ public void testShouldUseInjectedTestScopeFromDependencyManagement()
TestModelDefaultsInjector injector = new TestModelDefaultsInjector(); TestModelDefaultsInjector injector = new TestModelDefaultsInjector();
injector.injectDefaults( model ); injector.injectDefaults( model );
project.setArtifacts( project.createArtifacts( null ) ); project.setArtifacts( project.createArtifacts( null ) );
String key = ArtifactUtils.versionlessKey( groupId, artifactId ); String key = ArtifactUtils.versionlessKey( groupId, artifactId );
Map artifactMap = project.getArtifactMap(); Map artifactMap = project.getArtifactMap();

18
maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
View File

@ -67,16 +67,18 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts(); Set set = project1.getArtifacts();
assertNotNull("No artifacts", set); assertNotNull( "No artifacts", set );
assertTrue("No Artifacts", set.size() > 0); assertTrue( "No Artifacts", set.size() > 0 );
assertTrue("Set size should be 3, is " + set.size(), set.size() == 3); assertTrue( "Set size should be 3, is " + set.size(), set.size() == 3 );
Iterator iter = set.iterator(); Iterator iter = set.iterator();
while (iter.hasNext()) { while ( iter.hasNext() )
Artifact artifact = (Artifact)iter.next(); {
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + Artifact artifact = (Artifact) iter.next();
" Optional=" + (artifact.isOptional() ? "true" : "false")); System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
} }
} }

14
maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
View File

@ -63,16 +63,16 @@ public void testDependencyManagement()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts(); Set set = project1.getArtifacts();
assertNotNull("No artifacts", set); assertNotNull( "No artifacts", set );
assertTrue("No Artifacts", set.size() > 0); assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator(); Iterator iter = set.iterator();
while (iter.hasNext()) while ( iter.hasNext() )
{ {
Artifact artifact = (Artifact)iter.next(); Artifact artifact = (Artifact) iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " "
artifact.getVersion() + " Scope: " + artifact.getScope()); + artifact.getVersion() + " Scope: " + artifact.getScope() );
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals( "1.0" ) );
} }
} }

17
maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
View File

@ -63,17 +63,18 @@ public void testDependencyManagement()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts(); Set set = project1.getArtifacts();
assertNotNull("No artifacts", set); assertNotNull( "No artifacts", set );
assertTrue("No Artifacts", set.size() > 0); assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator(); Iterator iter = set.iterator();
assertTrue("Set size should be 4, is " + set.size(), set.size() == 4); assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
while (iter.hasNext()) while ( iter.hasNext() )
{ {
Artifact artifact = (Artifact)iter.next(); Artifact artifact = (Artifact) iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
" Optional=" + (artifact.isOptional() ? "true" : "false")); + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
} }
} }

19
maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
View File

@ -62,19 +62,20 @@ public void testDependencyManagement()
MavenProject project1 = getProjectWithDependencies( pom1 ); MavenProject project1 = getProjectWithDependencies( pom1 );
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
System.out.println("Project " + project1.getId() + " " + project1); System.out.println( "Project " + project1.getId() + " " + project1 );
Set set = project1.getArtifacts(); Set set = project1.getArtifacts();
assertNotNull("No artifacts", set); assertNotNull( "No artifacts", set );
assertTrue("No Artifacts", set.size() > 0); assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator(); Iterator iter = set.iterator();
assertTrue("Set size should be 4, is " + set.size(), set.size() == 4); assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
while (iter.hasNext()) while ( iter.hasNext() )
{ {
Artifact artifact = (Artifact)iter.next(); Artifact artifact = (Artifact) iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
" Optional=" + (artifact.isOptional() ? "true" : "false")); + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0")); assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
} }
} }

110
maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
View File

@ -1,10 +1,28 @@
package org.apache.maven.settings; package org.apache.maven.settings;
/*
* 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.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder; import org.apache.maven.project.DefaultProjectBuilder;
@ -19,15 +37,15 @@
import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomConstructionWithSettingsTest public class PomConstructionWithSettingsTest
extends PlexusTestCase extends PlexusTestCase
{ {
private static String BASE_DIR = "src/test"; private static final String BASE_DIR = "src/test";
private static String BASE_POM_DIR = BASE_DIR + "/resources-settings"; private static final String BASE_POM_DIR = BASE_DIR + "/resources-settings";
private DefaultProjectBuilder projectBuilder; private DefaultProjectBuilder projectBuilder;
private RepositorySystem repositorySystem; private RepositorySystem repositorySystem;
private File testDirectory; private File testDirectory;
@ -41,60 +59,64 @@ protected void setUp()
} }
@Override @Override
protected void tearDown() throws Exception { protected void tearDown()
projectBuilder = null; throws Exception
{
projectBuilder = null;
super.tearDown(); super.tearDown();
} }
public void testSettingsNoPom() throws Exception public void testSettingsNoPom() throws Exception
{ {
PomTestWrapper pom = buildPom( "settings-no-pom" ); PomTestWrapper pom = buildPom( "settings-no-pom" );
assertEquals( "local-profile-prop-value", pom.getValue( "properties/local-profile-prop" ) ); assertEquals( "local-profile-prop-value", pom.getValue( "properties/local-profile-prop" ) );
} }
/**MNG-4107 */ /**MNG-4107 */
public void testPomAndSettingsInterpolation() throws Exception public void testPomAndSettingsInterpolation() throws Exception
{ {
PomTestWrapper pom = buildPom( "test-pom-and-settings-interpolation" ); PomTestWrapper pom = buildPom( "test-pom-and-settings-interpolation" );
assertEquals("applied", pom.getValue( "properties/settingsProfile" ) ); assertEquals( "applied", pom.getValue( "properties/settingsProfile" ) );
assertEquals("applied", pom.getValue( "properties/pomProfile" ) ); assertEquals( "applied", pom.getValue( "properties/pomProfile" ) );
assertEquals("settings", pom.getValue( "properties/pomVsSettings" ) ); assertEquals( "settings", pom.getValue( "properties/pomVsSettings" ) );
assertEquals("settings", pom.getValue( "properties/pomVsSettingsInterpolated" ) ); assertEquals( "settings", pom.getValue( "properties/pomVsSettingsInterpolated" ) );
} }
/**MNG-4107 */ /**MNG-4107 */
public void testRepositories() throws Exception public void testRepositories() throws Exception
{ {
PomTestWrapper pom = buildPom( "repositories" ); PomTestWrapper pom = buildPom( "repositories" );
assertEquals("maven-core-it-0", pom.getValue( "repositories[1]/id" )); assertEquals( "maven-core-it-0", pom.getValue( "repositories[1]/id" ) );
} }
private PomTestWrapper buildPom( String pomPath ) private PomTestWrapper buildPom( String pomPath )
throws Exception throws Exception
{ {
File pomFile = new File( testDirectory + File.separator + pomPath , "pom.xml" ); File pomFile = new File( testDirectory + File.separator + pomPath, "pom.xml" );
File settingsFile = new File( testDirectory + File.separator + pomPath, "settings.xml" ); File settingsFile = new File( testDirectory + File.separator + pomPath, "settings.xml" );
Settings settings = readSettingsFile(settingsFile); Settings settings = readSettingsFile( settingsFile );
ProjectBuildingRequest config = new DefaultProjectBuildingRequest(); ProjectBuildingRequest config = new DefaultProjectBuildingRequest();
for ( org.apache.maven.settings.Profile rawProfile : settings.getProfiles() ) for ( org.apache.maven.settings.Profile rawProfile : settings.getProfiles() )
{ {
Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile ); Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
config.addProfile( profile ); config.addProfile( profile );
} }
String localRepoUrl = System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" ); String localRepoUrl =
System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" );
localRepoUrl = "file://" + localRepoUrl; localRepoUrl = "file://" + localRepoUrl;
config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl, new DefaultRepositoryLayout(), null, null ) ); config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl,
new DefaultRepositoryLayout(), null, null ) );
config.setActiveProfileIds( settings.getActiveProfiles() ); config.setActiveProfileIds( settings.getActiveProfiles() );
return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() ); return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() );
} }
private static Settings readSettingsFile(File settingsFile) private static Settings readSettingsFile( File settingsFile )
throws IOException, XmlPullParserException throws IOException, XmlPullParserException
{ {
Settings settings = null; Settings settings = null;
@ -113,6 +135,6 @@ private static Settings readSettingsFile(File settingsFile)
IOUtil.close( reader ); IOUtil.close( reader );
} }
return settings; return settings;
} }
} }

58
maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
View File

@ -29,42 +29,50 @@
* *
* @author mkleint * @author mkleint
*/ */
public class DefaultSettingsValidatorTest extends TestCase { public class DefaultSettingsValidatorTest
extends TestCase
public DefaultSettingsValidatorTest(String testName) { {
super(testName);
public DefaultSettingsValidatorTest( String testName )
{
super( testName );
} }
protected void setUp() throws Exception { protected void setUp()
throws Exception
{
super.setUp(); super.setUp();
} }
protected void tearDown() throws Exception { protected void tearDown()
throws Exception
{
super.tearDown(); super.tearDown();
} }
public void testValidate() { public void testValidate()
{
Settings model = new Settings(); Settings model = new Settings();
Profile prof = new Profile(); Profile prof = new Profile();
prof.setId("xxx"); prof.setId( "xxx" );
model.addProfile(prof); model.addProfile( prof );
DefaultSettingsValidator instance = new DefaultSettingsValidator(); DefaultSettingsValidator instance = new DefaultSettingsValidator();
SettingsValidationResult result = instance.validate(model); SettingsValidationResult result = instance.validate( model );
assertEquals(0, result.getMessageCount()); assertEquals( 0, result.getMessageCount() );
Repository repo = new Repository(); Repository repo = new Repository();
prof.addRepository(repo); prof.addRepository( repo );
result = instance.validate(model); result = instance.validate( model );
assertEquals(2, result.getMessageCount()); assertEquals( 2, result.getMessageCount() );
repo.setUrl("http://xxx.xxx.com"); repo.setUrl( "http://xxx.xxx.com" );
result = instance.validate(model); result = instance.validate( model );
assertEquals(1, result.getMessageCount()); assertEquals( 1, result.getMessageCount() );
repo.setId("xxx"); repo.setId( "xxx" );
result = instance.validate(model); result = instance.validate( model );
assertEquals(0, result.getMessageCount()); assertEquals( 0, result.getMessageCount() );
} }
} }

43
maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
View File

@ -25,37 +25,42 @@
* *
* @author mkleint * @author mkleint
*/ */
public class RequirementMatcherFactoryTest extends TestCase { public class RequirementMatcherFactoryTest
extends TestCase
public RequirementMatcherFactoryTest(String testName) { {
super(testName);
public RequirementMatcherFactoryTest( String testName )
{
super( testName );
} }
/** /**
* Test of createExactMatcher method, of class RequirementMatcherFactory. * Test of createExactMatcher method, of class RequirementMatcherFactory.
*/ */
public void testCreateExactMatcher() { public void testCreateExactMatcher()
{
RequirementMatcher matcher; RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createExactMatcher("foo"); matcher = RequirementMatcherFactory.createExactMatcher( "foo" );
assertFalse(matcher.matches("bar")); assertFalse( matcher.matches( "bar" ) );
assertFalse(matcher.matches("foobar")); assertFalse( matcher.matches( "foobar" ) );
assertFalse(matcher.matches("foob")); assertFalse( matcher.matches( "foob" ) );
assertTrue(matcher.matches("foo")); assertTrue( matcher.matches( "foo" ) );
} }
/** /**
* Test of createVersionMatcher method, of class RequirementMatcherFactory. * Test of createVersionMatcher method, of class RequirementMatcherFactory.
*/ */
public void testCreateVersionMatcher() { public void testCreateVersionMatcher()
{
RequirementMatcher matcher; RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createVersionMatcher("1.5.2"); matcher = RequirementMatcherFactory.createVersionMatcher( "1.5.2" );
assertFalse(matcher.matches("1.5")); assertFalse( matcher.matches( "1.5" ) );
assertTrue(matcher.matches("1.5.2")); assertTrue( matcher.matches( "1.5.2" ) );
assertFalse(matcher.matches("[1.4,1.5)")); assertFalse( matcher.matches( "[1.4,1.5)" ) );
assertFalse(matcher.matches("[1.5,1.5.2)")); assertFalse( matcher.matches( "[1.5,1.5.2)" ) );
assertFalse(matcher.matches("(1.5.2,1.6)")); assertFalse( matcher.matches( "(1.5.2,1.6)" ) );
assertTrue(matcher.matches("(1.4,1.5.2]")); assertTrue( matcher.matches( "(1.4,1.5.2]" ) );
assertTrue(matcher.matches("(1.5,)")); assertTrue( matcher.matches( "(1.5,)" ) );
} }
} }