From: Brett Porter <brett@apache.org>
Date: Tue, 29 Nov 2005 10:53:28 +0000 (+0000)
Subject: more test coverage
X-Git-Tag: archiva-0.9-alpha-1~1103
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8c5813308ddfff076dd168ccdee1a2196c50d910;p=archiva.git

more test coverage
PR: MRM-9

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@349703 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
index 01931061a..902742124 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
+++ b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
@@ -150,6 +150,26 @@ public class DefaultArtifactDiscovererTest
         }
     }
 
+    public void testKickoutWithNoType()
+    {
+        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/invalid-1" );
+        }
+        assertTrue( "Check kickout was found", found );
+
+        for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+        {
+            Artifact a = (Artifact) i.next();
+            assertFalse( "Check not 'invalid-1'", a.getFile().getName().equals( "invalid-1" ) );
+        }
+    }
+
     public void testKickoutWithWrongVersion()
     {
         List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
@@ -170,6 +190,26 @@ public class DefaultArtifactDiscovererTest
         }
     }
 
+    public void testKickoutWithLongerVersion()
+    {
+        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-1.0b.jar" );
+        }
+        assertTrue( "Check kickout was found", found );
+
+        for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+        {
+            Artifact a = (Artifact) i.next();
+            assertFalse( "Check not 'invalid-1.0b.jar'", a.getFile().getName().equals( "invalid-1.0b.jar" ) );
+        }
+    }
+
     public void testKickoutWithWrongSnapshotVersion()
     {
         List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
@@ -261,6 +301,15 @@ public class DefaultArtifactDiscovererTest
                     artifacts.contains( createArtifact( "org.apache.maven", "test", "1.0-20050611.112233-1" ) ) );
     }
 
+    public void testSnapshotInclusionWithClassifier()
+    {
+        List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, true );
+        assertNotNull( "Check artifacts not null", artifacts );
+
+        assertTrue( "Check snapshot included", artifacts.contains(
+            createArtifact( "org.apache.maven", "test", "1.0-20050611.112233-1", "jar", "javadoc" ) ) );
+    }
+
     public void testSnapshotExclusion()
     {
         List artifacts = discoverer.discoverArtifacts( repositoryLocation, null, false );
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1 b/maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1
new file mode 100644
index 000000000..e69de29bb
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
new file mode 100644
index 000000000..e69de29bb