Author: brett
Date: Mon Nov 28 21:15:31 2005
New Revision: 349653
URL: http://svn.apache.org/viewcvs?rev=349653&view=rev
Log:
more legacy discoverer tests
PR: MRM-9
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/foo/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.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=349653&r1=349652&r2=349653&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:15:31 2005
@@ -79,10 +79,13 @@
String type = tokens.nextToken();
- if ( type.endsWith( "s" ) )
+ if ( !type.endsWith( "s" ) )
{
- type = type.substring( 0, type.length() - 1 );
+ addKickedOutPath( path );
+
+ return null;
}
+ type = type.substring( 0, type.length() - 1 );
// contains artifactId, version, classifier, and extension.
String avceGlob = tokens.nextToken();
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=349653&r1=349652&r2=349653&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:15:31 2005
@@ -25,10 +25,11 @@
import java.util.List;
/**
- * Test the default artifact discoverer.
+ * Test the legacy artifact discoverer.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
+ * @todo share as much as possible with default via abstract test case
*/
public class LegacyArtifactDiscovererTest
extends PlexusTestCase
@@ -147,6 +148,44 @@
}
}
+ public void testKickoutWithInvalidType()
+ {
+ 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/foo/invalid-1.0.foo" );
+ }
+ assertTrue( "Check exclusion was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not invalid-1.0.foo",
a.getFile().getName().equals( "invalid-1.0.foo" ) );
+ }
+ }
+
+ public void testInclusion()
+ {
+ List artifacts = discoverer.discoverArtifacts( repositoryLocation,
null, true );
+ assertNotNull( "Check artifacts not null", artifacts );
+
+ assertTrue( "Check normal included",
+ artifacts.contains( createArtifact( "org.apache.maven",
"testing", "1.0" ) ) );
+ }
+
+ 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" ) ) );
+ }
+
public void testSnapshotInclusion()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation,
null, true );
@@ -170,6 +209,11 @@
private Artifact createArtifact( String groupId, String artifactId, String
version )
{
return factory.createArtifact( groupId, artifactId, version, null,
"jar" );
+ }
+
+ private Artifact createSourceArtifact( String groupId, String artifactId,
String version )
+ {
+ return factory.createArtifact( groupId, artifactId, version, null,
"java-source" );
}
}
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo?rev=349653&view=auto
==============================================================================
(empty)
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar?rev=349653&view=auto
==============================================================================
(empty)
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar?rev=349653&view=auto
==============================================================================
(empty)
