Author: brett
Date: Mon Nov 28 23:49:48 2005
New Revision: 349661
URL: http://svn.apache.org/viewcvs?rev=349661&view=rev
Log:
test invalid version
PR: MRM-9
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/invalid/invalid/
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
Modified:
maven/repository-manager/trunk/maven-repository-discovery/pom.xml
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
Modified: maven/repository-manager/trunk/maven-repository-discovery/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/pom.xml?rev=349661&r1=349660&r2=349661&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/pom.xml Mon Nov
28 23:49:48 2005
@@ -22,18 +22,4 @@
<artifactId>maven-artifact</artifactId>
</dependency>
</dependencies>
- <!-- TODO: why are these needed? -->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java?rev=349661&r1=349660&r2=349661&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
(original)
+++
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
Mon Nov 28 23:49:48 2005
@@ -94,14 +94,34 @@
Collections.reverse( pathParts );
String groupId = StringUtils.join( pathParts.iterator(), "." );
- if ( !filename.startsWith( artifactId + "-" ) )
+ result = artifactFactory.createArtifact( groupId, artifactId, version,
Artifact.SCOPE_RUNTIME, "jar" );
+
+ String remainingFilename = filename;
+ if ( !remainingFilename.startsWith( artifactId + "-" ) )
{
addKickedOutPath( path );
return null;
}
- result = artifactFactory.createArtifact( groupId, artifactId, version,
Artifact.SCOPE_RUNTIME, "jar" );
+ remainingFilename = remainingFilename.substring( artifactId.length() +
1 );
+ if ( result.isSnapshot() )
+ {
+ result = artifactFactory.createArtifact( groupId, artifactId,
version, Artifact.SCOPE_RUNTIME, "jar" );
+ result.setResolvedVersion( remainingFilename.substring( 0,
remainingFilename.length() - 4 ) );
+ if ( !result.getBaseVersion().equals( version ) )
+ {
+ addKickedOutPath( path );
+
+ return null;
+ }
+ }
+ else if ( !remainingFilename.startsWith( version ) )
+ {
+ addKickedOutPath( path );
+
+ return null;
+ }
result.setFile( new File( path ) );
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java?rev=349661&r1=349660&r2=349661&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
Mon Nov 28 23:49:48 2005
@@ -150,6 +150,26 @@
}
}
+ public void testKickoutWithWrongVersion()
+ {
+ 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/invalid/1.0/invalid-2.0.jar" );
+ }
+ assertTrue( "Check kickout was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not 'invalid-2.0.jar'",
a.getFile().getName().equals( "invalid-2.0.jar" ) );
+ }
+ }
+
public void testSnapshotInclusion()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation,
null, true );
@@ -157,7 +177,7 @@
assertTrue( "Check normal included", artifacts.contains(
createArtifact( "javax.sql", "jdbc", "2.0" ) ) );
assertTrue( "Check snapshot included",
- artifacts.contains( createArtifact( "org.apache.maven",
"test", "1.0-SNAPSHOT" ) ) );
+ artifacts.contains( createArtifact( "org.apache.maven",
"test", "1.0-20050611.112233-1" ) ) );
}
public void testSnapshotExclusion()
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar?rev=349661&view=auto
==============================================================================
(empty)
