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 05:57:04 UTC
svn commit: r349647 - 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/ test/legacy-repository/invalid/ja...
Author: brett
Date: Mon Nov 28 20:56:46 2005
New Revision: 349647
URL: http://svn.apache.org/viewcvs?rev=349647&view=rev
Log:
more legacy discoverer tests
PR: MRM-9
Added:
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/
maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
- copied, changed from r349600, maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/maven-test-1.0-20050611.112233-1.jar
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
Removed:
maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/maven-test-1.0-20050611.112233-1.jar
Modified:
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
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/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.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/AbstractArtifactDiscoverer.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java?rev=349647&r1=349646&r2=349647&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java Mon Nov 28 20:56:46 2005
@@ -80,6 +80,7 @@
* Add a path to the list of files that were kicked out due to being invalid.
*
* @param path the path to add
+ * @todo add a reason
*/
protected void addKickedOutPath( String path )
{
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=349647&r1=349646&r2=349647&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 20:56:46 2005
@@ -81,20 +81,25 @@
return null;
}
- //discard the actual artifact filename.
- pathParts.remove( 0 );
+ // the actual artifact filename.
+ String filename = (String) pathParts.remove( 0 );
// the next one is the version.
- String version = (String) pathParts.get( 0 );
- pathParts.remove( 0 );
+ String version = (String) pathParts.remove( 0 );
// the next one is the artifactId.
- String artifactId = (String) pathParts.get( 0 );
- pathParts.remove( 0 );
+ String artifactId = (String) pathParts.remove( 0 );
// the remaining are the groupId.
Collections.reverse( pathParts );
String groupId = StringUtils.join( pathParts.iterator(), "." );
+
+ if ( !filename.startsWith( artifactId + "-" ) )
+ {
+ addKickedOutPath( path );
+
+ return null;
+ }
result = artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, "jar" );
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=349647&r1=349646&r2=349647&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 20:56:46 2005
@@ -303,7 +303,10 @@
}
}
- result.setFile( new File( path ) );
+ if ( result != null )
+ {
+ result.setFile( new File( path ) );
+ }
return result;
}
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=349647&r1=349646&r2=349647&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 20:56:46 2005
@@ -29,6 +29,7 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
+ * @todo other tests for kickouts to do here, along the lines of wrong artifactId, parse classifiers, locate poms
*/
public class DefaultArtifactDiscovererTest
extends PlexusTestCase
@@ -118,12 +119,34 @@
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(); )
{
Artifact a = (Artifact) i.next();
assertFalse( "Check not invalid-1.0.jar", a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ }
+ }
+
+ public void testKickoutWithWrongArtifactId()
+ {
+ 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(
+ "org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar" );
+ }
+ assertTrue( "Check kickout was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not wrong jar",
+ a.getFile().getName().equals( "wrong-artifactId-1.0-20050611.112233-1.jar" ) );
}
}
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=349647&r1=349646&r2=349647&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 20:56:46 2005
@@ -107,7 +107,6 @@
assertFalse( "Check jdbc not included", artifacts.contains( createArtifact( "javax.sql", "jdbc", "2.0" ) ) );
}
-/*
public void testKickoutWithShortPath()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
@@ -128,6 +127,26 @@
}
}
+ public void testKickoutWithLongPath()
+ {
+ 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/1.0/invalid-1.0.jar" );
+ }
+ assertTrue( "Check exclusion was found", found );
+
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ {
+ Artifact a = (Artifact) i.next();
+ assertFalse( "Check not invalid-1.0.jar", a.getFile().getName().equals( "invalid-1.0.jar" ) );
+ }
+ }
+
public void testSnapshotInclusion()
{
List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
@@ -135,7 +154,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", "testing", "1.0-20050611.112233-1" ) ) );
}
public void testSnapshotExclusion()
@@ -145,9 +164,8 @@
assertTrue( "Check normal included", artifacts.contains( createArtifact( "javax.sql", "jdbc", "2.0" ) ) );
assertFalse( "Check snapshot included",
- artifacts.contains( createArtifact( "org.apache.maven", "test", "1.0-SNAPSHOT" ) ) );
+ artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0-20050611.112233-1" ) ) );
}
-*/
private Artifact createArtifact( String groupId, String artifactId, String version )
{
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar?rev=349647&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar?rev=349647&view=auto
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.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-20050611.112233-1.jar?rev=349647&view=auto
==============================================================================
(empty)
Copied: maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar (from r349600, maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/maven-test-1.0-20050611.112233-1.jar)
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar?p2=maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar&p1=maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/maven-test-1.0-20050611.112233-1.jar&r1=349600&r2=349647&rev=349647&view=diff
==============================================================================
(empty)
Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar?rev=349647&view=auto
==============================================================================
(empty)