svn commit: r447735 - in /maven/archiva/trunk/archiva-discoverer/src/test: java/org/apache/maven/archiva/discoverer/ legacy-repository/CVS/ repository/CVS/

[brett]

Author: brett
Date: Mon Sep 18 22:09:52 2006
New Revision: 447735

URL: http://svn.apache.org/viewvc?view=rev&rev=447735
Log:
adjust tests to work even if they are exported from SVN rather than a checkout

Added:
    maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/
    maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/Root
    maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/
    maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/Root
Modified:
    
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
    
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java

Modified: 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java?view=diff&rev=447735&r1=447734&r2=447735
==============================================================================
--- 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
 (original)
+++ 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
 Mon Sep 18 22:09:52 2006
@@ -63,7 +63,7 @@
 
             String path = dPath.getPath();
 
-            boolean b = path.indexOf( ".svn" ) >= 0;
+            boolean b = path.indexOf( "CVS" ) >= 0;
             if ( b )
             {
                 found = true;
@@ -75,6 +75,7 @@
         for ( Iterator i = artifacts.iterator(); i.hasNext(); )
         {
             Artifact a = (Artifact) i.next();
+            assertFalse( "Check not CVS", a.getFile().getPath().indexOf( "CVS" 
) >= 0 );
             assertFalse( "Check not .svn", a.getFile().getPath().indexOf( 
".svn" ) >= 0 );
         }
     }

Modified: 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java?view=diff&rev=447735&r1=447734&r2=447735
==============================================================================
--- 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
 (original)
+++ 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
 Mon Sep 18 22:09:52 2006
@@ -60,7 +60,7 @@
 
             String path = dPath.getPath();
 
-            if ( path.indexOf( ".svn" ) >= 0 )
+            if ( path.indexOf( "CVS" ) >= 0 )
             {
                 found = true;
                 assertEquals( "Check comment", "Artifact was in the specified 
list of exclusions", dPath.getComment() );
@@ -71,6 +71,7 @@
         for ( Iterator i = artifacts.iterator(); i.hasNext(); )
         {
             Artifact a = (Artifact) i.next();
+            assertFalse( "Check not CVS", a.getFile().getPath().indexOf( "CVS" 
) >= 0 );
             assertFalse( "Check not .svn", a.getFile().getPath().indexOf( 
".svn" ) >= 0 );
         }
     }

Added: 
maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/Root
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/Root?view=auto&rev=447735
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/Root 
(added)
+++ maven/archiva/trunk/archiva-discoverer/src/test/legacy-repository/CVS/Root 
Mon Sep 18 22:09:52 2006
@@ -0,0 +1 @@
+not a real CVS root - for testing exclusions

Added: maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/Root
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/Root?view=auto&rev=447735
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/Root (added)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/CVS/Root Mon Sep 
18 22:09:52 2006
@@ -0,0 +1 @@
+not a real CVS root - for testing exclusions