You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/11/29 06:36:58 UTC
svn commit: r349655 - in
/maven/repository-manager/trunk/maven-repository-discovery/src:
main/java/org/apache/maven/repository/discovery/
test/java/org/apache/maven/repository/discovery/
test/legacy-repository/invalid/jars/ test/legacy-repository/org.a...
Author: brett
Date: Mon Nov 28 21:36:41 2005
New Revision: 349655
URL: http://svn.apache.org/viewcvs?rev=349655&view=rev
Log:
more legacy discoverer tests
PR: MRM-9
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java?rev=349655&r1=349654&r2=349655&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java Mon Nov 28 21:36:41 2005
@@ -18,7 +18,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
@@ -144,6 +143,13 @@
return null;
}
}
+ else
+ {
+ // no extension
+ addKickedOutPath( path );
+
+ return null;
+ }
}
// TODO: this is obscene - surely a better way?
@@ -281,7 +287,9 @@
if ( version.length() < 1 )
{
- version = null;
+ addKickedOutPath( path );
+
+ return null;
}
getLogger().debug( "Extracted artifact information from path:\n" + "groupId: \'" + groupId + "\'\n" +
@@ -299,17 +307,10 @@
}
else
{
- if ( StringUtils.isNotEmpty( groupId ) && StringUtils.isNotEmpty( artifactId ) &&
- StringUtils.isNotEmpty( version ) && StringUtils.isNotEmpty( type ) )
- {
- result = artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, type );
- }
+ result = artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, type );
}
- if ( result != null )
- {
- result.setFile( new File( path ) );
- }
+ result.setFile( new File( path ) );
return result;
}
Modified: maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java?rev=349655&r1=349654&r2=349655&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java Mon Nov 28 21:36:41 2005
@@ -119,7 +119,7 @@
found = path.replace( '\\', '/' ).equals( "invalid/invalid-1.0.jar" );
}
- assertTrue( "Check exclusion was found", found );
+ assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
@@ -139,7 +139,7 @@
found = path.replace( '\\', '/' ).equals( "invalid/jars/1.0/invalid-1.0.jar" );
}
- assertTrue( "Check exclusion was found", found );
+ assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
@@ -159,7 +159,7 @@
found = path.replace( '\\', '/' ).equals( "invalid/foo/invalid-1.0.foo" );
}
- assertTrue( "Check exclusion was found", found );
+ assertTrue( "Check kickout was found", found );
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
@@ -168,6 +168,66 @@
}
}
+ public void testKickoutWithNoExtension()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
+ assertNotNull( "Check artifacts not null", artifacts );
+ boolean found = false;
+ for ( Iterator i = discoverer.getKickedOutPathsIterator(); i.hasNext() && !found; )
+ {
+ String path = (String) i.next();
+
+ found = path.replace( '\\', '/' ).equals( "invalid/jars/no-extension" );
+ }
+ assertTrue( "Check kickout was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not 'no-extension'", a.getFile().getName().equals( "no-extension" ) );
+ }
+ }
+
+ public void testKickoutWithWrongExtension()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
+ assertNotNull( "Check artifacts not null", artifacts );
+ boolean found = false;
+ for ( Iterator i = discoverer.getKickedOutPathsIterator(); i.hasNext() && !found; )
+ {
+ String path = (String) i.next();
+
+ found = path.replace( '\\', '/' ).equals( "invalid/jars/invalid-1.0.rar" );
+ }
+ assertTrue( "Check kickout was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not 'invalid-1.0.rar'", a.getFile().getName().equals( "invalid-1.0.rar" ) );
+ }
+ }
+
+ public void testKickoutWithNoVersion()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
+ assertNotNull( "Check artifacts not null", artifacts );
+ boolean found = false;
+ for ( Iterator i = discoverer.getKickedOutPathsIterator(); i.hasNext() && !found; )
+ {
+ String path = (String) i.next();
+
+ found = path.replace( '\\', '/' ).equals( "invalid/jars/invalid.jar" );
+ }
+ assertTrue( "Check kickout was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not 'invalid.jar'", a.getFile().getName().equals( "invalid.jar" ) );
+ }
+ }
+
public void testInclusion()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
@@ -177,13 +237,43 @@
artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0" ) ) );
}
+ public void testTextualVersion()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
+ assertNotNull( "Check artifacts not null", artifacts );
+
+ assertTrue( "Check normal included",
+ artifacts.contains( createArtifact( "org.apache.maven", "testing", "UNKNOWN" ) ) );
+ }
+
+ public void testArtifactWithClassifier()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
+ assertNotNull( "Check artifacts not null", artifacts );
+
+ assertTrue( "Check normal included",
+ artifacts.contains( createArtifact( "org.apache.maven", "some-ejb", "1.0", "jar", "client" ) ) );
+ }
+
public void testJavaSourcesInclusion()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
assertNotNull( "Check artifacts not null", artifacts );
assertTrue( "Check normal included",
- artifacts.contains( createSourceArtifact( "org.apache.maven", "testing", "1.0" ) ) );
+ artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source" ) ) );
+ }
+
+ public void testDistributionInclusion()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
+ assertNotNull( "Check artifacts not null", artifacts );
+
+ assertTrue( "Check zip included",
+ artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "distribution-zip" ) ) );
+
+ assertTrue( "Check tar.gz included",
+ artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "distribution-tgz" ) ) );
}
public void testSnapshotInclusion()
@@ -211,9 +301,14 @@
return factory.createArtifact( groupId, artifactId, version, null, "jar" );
}
- private Artifact createSourceArtifact( String groupId, String artifactId, String version )
+ private Artifact createArtifact( String groupId, String artifactId, String version, String type )
+ {
+ return factory.createArtifact( groupId, artifactId, version, null, type );
+ }
+
+ private Artifact createArtifact( String groupId, String artifactId, String version, String type, String classifier )
{
- return factory.createArtifact( groupId, artifactId, version, null, "java-source" );
+ return factory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
}
}
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip?rev=349655&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar?rev=349655&view=auto
==============================================================================
(empty)