jvanzyl 2004/05/18 18:37:05
Modified: maven-project/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
maven-project/src/test/java/org/apache/maven/artifact/downloader
DefaultArtifactDownloaderTest.java
maven-project/src/test/java/org/apache/maven/artifact/resolver
DefaultArtifactResolverTest.java
maven-project/src/test/java/org/apache/maven/artifact/snapshot
DefaultSnapshotResolverTest.java
maven-project/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
Removed: maven-project/src/main/java/org/apache/maven/artifact/satisfier
ArtifactSatisfier.java
DefaultArtifactSatisfier.java
UnsatisfiedArtifactException.java
Log:
o removing the satisfying code as it is currently not being used
o alter sigs of tests slightly so that the test method itself throws an
exception so that exceptions flow upward. There was a null component which
was being hidden by trapping exception within the test method.
Revision Changes Path
1.7 +8 -21
maven-components/maven-project/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultArtifactResolver.java 17 May 2004 21:11:34 -0000 1.6
+++ DefaultArtifactResolver.java 19 May 2004 01:37:05 -0000 1.7
@@ -11,32 +11,19 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
* @version $Id$
*/
-public class DefaultArtifactResolver implements ArtifactResolver
+public class DefaultArtifactResolver
+ implements ArtifactResolver
{
-
- /**
- * @requirement
- */
- MavenArtifactFactory artifactFactory;
-
- /**
- * @requirement
- */
- ArtifactDownloader artifactDownloader;
-
-
- /**
- * @requirement
- */
- SnapshotResolver snapshotResolver;
-
+ private MavenArtifactFactory artifactFactory;
+ private ArtifactDownloader artifactDownloader;
+
+ private SnapshotResolver snapshotResolver;
public MavenArtifact getArtifact( Dependency dependency, MavenProject project )
{
MavenArtifact retValue = artifactFactory.createArtifact( dependency,
project.getLocalRepository() );
-
-
+
if ( retValue.isSnapshot() )
{
boolean snapshotResolved = snapshotResolver.resolveSnapshotArtifact(
retValue, project.getRepositories() );
1.4 +4 -4
maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java
Index: DefaultArtifactDownloaderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultArtifactDownloaderTest.java 16 May 2004 15:58:10 -0000 1.3
+++ DefaultArtifactDownloaderTest.java 19 May 2004 01:37:05 -0000 1.4
@@ -17,12 +17,10 @@
*/
import org.apache.maven.artifact.MavenArtifact;
-import org.apache.maven.artifact.downloader.ArtifactDownloader;
import org.apache.maven.artifact.factory.MavenArtifactFactory;
import org.apache.maven.project.AbstractProjectTestCase;
import org.apache.maven.project.MavenProject;
-
import java.io.File;
import java.util.List;
@@ -43,7 +41,8 @@
super( testName );
}
- public void setUp() throws Exception
+ public void setUp()
+ throws Exception
{
super.setUp();
@@ -57,6 +56,7 @@
}
public void testArtifactDownloading()
+ throws Exception
{
File f = new File( getLocalRepository(),
1.3 +37 -55
maven-components/maven-project/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
Index: DefaultArtifactResolverTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactResolverTest.java 10 May 2004 19:26:22 -0000 1.2
+++ DefaultArtifactResolverTest.java 19 May 2004 01:37:05 -0000 1.3
@@ -24,79 +24,61 @@
import org.apache.maven.project.MavenProject;
/**
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
* @version $Id$
*/
public class DefaultArtifactResolverTest
extends AbstractProjectTestCase
{
-
-
public DefaultArtifactResolverTest( String testName )
{
super( testName );
}
-
-
-
private ArtifactResolver artifactResolver;
-
- public void setUp() throws Exception
+
+ public void setUp()
+ throws Exception
{
super.setUp();
-
- artifactResolver = ( ArtifactResolver ) lookup( ArtifactResolver.ROLE );
-
+
+ artifactResolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
+
assertNotNull( "Test artifactResolver can't be null!", artifactResolver );
-
}
-
-
- public void testArtifactResolving( )
+
+ public void testArtifactResolving()
+ throws Exception
{
-
- File f = new File( getLocalRepository(),
"/maven-test/poms/maven-test-a-1.0.pom" );
+ File f = new File( getLocalRepository(),
"/maven-test/poms/maven-test-a-1.0.pom" );
assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!",
f.exists() );
- try
- {
- MavenProject project = projectBuilder.build( f );
-
- assertNotNull( "Project is null", project );
-
- project.setLocalRepository( getLocalRepository() );
-
- Dependency dependency = new Dependency();
-
- dependency.setGroupId( "maven-test" );
-
- dependency.setArtifactId( "maven-test-a" );
-
- dependency.setVersion( "1.0" );
-
- dependency.setType( "jar" );
-
- MavenArtifact a_1 = artifactResolver.getArtifact( dependency, project );
-
- assertNotNull( "Artifact should exists" , a_1 );
-
- dependency.setType( "foo" );
-
- MavenArtifact a_2 = artifactResolver.getArtifact( dependency, project );
-
- assertNull( a_2 );
-
-
- }
- catch ( Exception e )
- {
- e.printStackTrace();
-
- fail( e.getMessage() );
- }
+ MavenProject project = projectBuilder.build( f );
+
+ assertNotNull( "Project is null", project );
+
+ project.setLocalRepository( getLocalRepository() );
+
+ Dependency dependency = new Dependency();
+
+ dependency.setGroupId( "maven-test" );
+
+ dependency.setArtifactId( "maven-test-a" );
+
+ dependency.setVersion( "1.0" );
+
+ dependency.setType( "jar" );
+
+ MavenArtifact a_1 = artifactResolver.getArtifact( dependency, project );
+
+ assertNotNull( "Artifact should exists", a_1 );
+
+ dependency.setType( "foo" );
+
+ MavenArtifact a_2 = artifactResolver.getArtifact( dependency, project );
+
+ assertNull( a_2 );
}
}
1.2 +44 -66
maven-components/maven-project/src/test/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolverTest.java
Index: DefaultSnapshotResolverTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolverTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultSnapshotResolverTest.java 16 May 2004 15:58:10 -0000 1.1
+++ DefaultSnapshotResolverTest.java 19 May 2004 01:37:05 -0000 1.2
@@ -25,130 +25,111 @@
import org.codehaus.plexus.util.FileUtils;
/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
- * @version $Id$
+ * @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
+ * @version $Id$
*/
-public class DefaultSnapshotResolverTest extends AbstractProjectTestCase
+public class DefaultSnapshotResolverTest
+ extends AbstractProjectTestCase
{
-
private SnapshotResolver snapshotResolver;
- /**
- * @param testName
- */
public DefaultSnapshotResolverTest( String testName )
{
super( testName );
}
- public void setUp() throws Exception
+ public void setUp()
+ throws Exception
{
-
super.setUp();
- snapshotResolver = ( SnapshotResolver ) lookup( SnapshotResolver.ROLE );
+ snapshotResolver = (SnapshotResolver) lookup( SnapshotResolver.ROLE );
assertNotNull( "Test SnapshotResolver snapshotResolver can't be null!",
- snapshotResolver );
-
+ snapshotResolver );
}
public void testSnapshotResolving()
+ throws Exception
{
+ File f = new File( getLocalRepository(),
"/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom" );
- try
- {
- File f = new File( getLocalRepository(),
- "/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom" );
+ assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!",
f.exists() );
- assertTrue( "Test file: '" + f.getAbsolutePath()
- + "' doesn't exist!", f.exists() );
+ System.setProperty( "maven.repo.local", getLocalRepository() );
- System.setProperty( "maven.repo.local", getLocalRepository() );
+ MavenProject project = buildProject( f );
- MavenProject project = buildProject( f );
+ assertEquals( project.getLocalRepository(), getLocalRepository() );
- assertEquals( project.getLocalRepository(), getLocalRepository() );
+ List artifacts = project.getArtifacts();
- List artifacts = project.getArtifacts();
+ assertEquals( 5, artifacts.size() );
- assertEquals( 5, artifacts.size() );
+ initRemoteRepositories( project );
- initRemoteRepositories( project );
+ // 0 newer version of this snapshot is in remote repository
- // 0 newer version of this snapshot is in remote repository
+ MavenArtifact a = (MavenArtifact) artifacts.get( 0 );
- MavenArtifact a = ( MavenArtifact ) artifacts.get( 0 );
+ snapshotResolver.resolveSnapshotArtifact( a, project.getRepositories() );
- snapshotResolver.resolveSnapshotArtifact( a, project.getRepositories()
);
+ assertEquals( "remote", getContent( a ) );
- assertEquals( "remote", getContent( a ) );
+ assertEquals( "20050101.101010", getVersion( a ) );
- assertEquals( "20050101.101010", getVersion( a ) );
+ // 1 newer version of this snapshot is in local repository
- // 1 newer version of this snapshot is in local repository
+ MavenArtifact b = (MavenArtifact) artifacts.get( 1 );
- MavenArtifact b = ( MavenArtifact ) artifacts.get( 1 );
+ snapshotResolver.resolveSnapshotArtifact( b, project.getRepositories() );
- snapshotResolver.resolveSnapshotArtifact( b, project.getRepositories()
);
+ assertEquals( "local", getContent( b ) );
- assertEquals( "local", getContent( b ) );
+ assertEquals( "20040101.101010", getVersion( b ) );
- assertEquals( "20040101.101010", getVersion( b ) );
+ // 2 this snapshot is missing in local repository but can be found in
remote repository
- // 2 this snapshot is missing in local repository but can be found in
remote repository
-
- MavenArtifact c = ( MavenArtifact ) artifacts.get( 2 );
+ MavenArtifact c = (MavenArtifact) artifacts.get( 2 );
- snapshotResolver.resolveSnapshotArtifact( c, project.getRepositories()
);
+ snapshotResolver.resolveSnapshotArtifact( c, project.getRepositories() );
- assertEquals( "remote", getContent( c ) );
+ assertEquals( "remote", getContent( c ) );
- assertEquals( "20040101.101010", getVersion( c ) );
+ assertEquals( "20040101.101010", getVersion( c ) );
- // 3 this snapshot is neither in local repository nor in any of remote
repositories
-
- MavenArtifact d = ( MavenArtifact ) artifacts.get( 3 );
+ // 3 this snapshot is neither in local repository nor in any of remote
repositories
- snapshotResolver.resolveSnapshotArtifact( d, project.getRepositories()
);
+ MavenArtifact d = (MavenArtifact) artifacts.get( 3 );
- assertEquals( null, getContent( d ) );
+ snapshotResolver.resolveSnapshotArtifact( d, project.getRepositories() );
- assertEquals( null, getVersion( d ) );
+ assertEquals( null, getContent( d ) );
- // 4 this snapshot is in the local repository but it was removed from
all remote repositories
-
- MavenArtifact e = ( MavenArtifact ) artifacts.get( 4 );
+ assertEquals( null, getVersion( d ) );
- snapshotResolver.resolveSnapshotArtifact( e, project.getRepositories()
);
+ // 4 this snapshot is in the local repository but it was removed from all
remote repositories
- assertEquals( "local", getContent( e ) );
+ MavenArtifact e = (MavenArtifact) artifacts.get( 4 );
- assertEquals( "20040101.101010", getVersion( e ) );
+ snapshotResolver.resolveSnapshotArtifact( e, project.getRepositories() );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
-
- fail( e.getMessage() );
- }
+ assertEquals( "local", getContent( e ) );
+ assertEquals( "20040101.101010", getVersion( e ) );
}
private String getContent( MavenArtifact a )
{
-
String retValue = null;
try
{
retValue = FileUtils.fileRead( a.getFile() );
-
}
catch ( Exception e )
{
-
+ // do nothing
}
return retValue;
@@ -156,20 +137,17 @@
private String getVersion( MavenArtifact a )
{
-
String retValue = null;
try
{
retValue = FileUtils.fileRead( a.getSnapshotVersionFile() );
-
}
catch ( Exception e )
{
-
+ // do nothing
}
return retValue;
}
-
}
1.7 +29 -44
maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractProjectTestCase.java 18 May 2004 20:09:17 -0000 1.6
+++ AbstractProjectTestCase.java 19 May 2004 01:37:05 -0000 1.7
@@ -10,13 +10,13 @@
{
protected MavenProjectBuilder projectBuilder;
- private String localRepository = System.getProperty( "basedir" ) +
"/target/test-classes/local-repo";
-
+ private String localRepository = System.getProperty( "basedir" ) +
"/target/test-classes/local-repo";
+
public AbstractProjectTestCase( String testName )
{
- super( testName );
+ super( testName );
}
-
+
public void setUp()
throws Exception
{
@@ -26,13 +26,13 @@
assertNotNull( "Test projectBuilder can't be null!", projectBuilder );
}
-
+
public String getLocalRepository()
{
- return localRepository;
+ return localRepository;
}
-
-
+
+
public void initLocalRepository()
{
File tempLocalRepository = new File( basedir, "target/temp-repo-local" );
@@ -40,60 +40,45 @@
// delete
try
{
- FileUtils.deleteDirectory( tempLocalRepository );
+ FileUtils.deleteDirectory( tempLocalRepository );
}
- catch( Exception e)
+ catch ( Exception e )
{
- System.out.println( "Could not delete the remaining from previous
tests!! Test will continue anyway ");
-
- }
-
+ System.out.println( "Could not delete the remaining from previous
tests!! Test will continue anyway " );
+
+ }
+
tempLocalRepository.mkdirs();
-
+
System.out.println( "Created temporary local repository: " +
tempLocalRepository );
-
- System.setProperty( "maven.repo.local", tempLocalRepository.getPath() );
-
-
+
+ System.setProperty( "maven.repo.local", tempLocalRepository.getPath() );
}
- /**
- * @param f
- * @return
- */
protected MavenProject buildProject( File f )
+ throws Exception
{
MavenProject project = null;
-
- try
- {
- project = projectBuilder.build( f );
- }
- catch( Exception e)
- {
- fail( "Could not build the project which was supposed to be used as
provider of artifacts" );
- }
-
+
+ project = projectBuilder.build( f );
+
assertNotNull( "Project is null", project );
-
+
return project;
}
- /**
- * @param project
- */
protected void initRemoteRepositories( MavenProject project )
{
File repo_1 = new File( basedir, "target/test-classes/remote-repo-1" );
-
- File repo_2 = new File( basedir, "target/test-classes/remote-repo-2" );
-
+
+ File repo_2 = new File( basedir, "target/test-classes/remote-repo-2" );
+
project.addRepository( "file://" + repo_1.getPath() );
-
+
project.addRepository( "file://" + repo_2.getPath() );
-
+
assertEquals( 2, project.getRepositories().size() );
}
-
-
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
