svn commit: r889062 - in /archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src: main/java/org/apache/archiva/metadata/repository/file/ test/java/org/apache/archiva/metadata/repository/file/

[brett]

Author: brett
Date: Thu Dec 10 02:30:01 2009
New Revision: 889062

URL: http://svn.apache.org/viewvc?rev=889062&view=rev
Log:
[MRM-1282] fix problem with getArtifactVersions when there are multiple 
artifacts

Modified:
    
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
    
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java

Modified: 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=889062&r1=889061&r2=889062&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
 Thu Dec 10 02:30:01 2009
@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -691,7 +692,7 @@
 
         Properties properties = readOrCreateProperties( directory, 
PROJECT_VERSION_METADATA_KEY );
 
-        List<String> versions = new ArrayList<String>();
+        Set<String> versions = new HashSet<String>();
         for ( Map.Entry entry : properties.entrySet() )
         {
             String name = (String) entry.getKey();

Modified: 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java?rev=889062&r1=889061&r2=889062&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
 Thu Dec 10 02:30:01 2009
@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -220,7 +221,21 @@
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, 
TEST_PROJECT_VERSION, artifact1 );
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, 
TEST_PROJECT_VERSION, artifact2 );
 
-        assertEquals( Arrays.asList( version2, version1 ),
+        assertEquals( new HashSet<String>( Arrays.asList( version2, version1 ) 
),
+                      repository.getArtifactVersions( TEST_REPO_ID, 
TEST_NAMESPACE, TEST_PROJECT,
+                                                      TEST_PROJECT_VERSION ) );
+    }
+
+    public void testGetArtifactVersionsMultipleArtifactsSingleVersion()
+    {
+        ArtifactMetadata artifact1 = createArtifact();
+        artifact1.setId( TEST_PROJECT + "-" + TEST_PROJECT_VERSION + ".jar" );
+        ArtifactMetadata artifact2 = createArtifact();
+        artifact2.setId( TEST_PROJECT + "-" + TEST_PROJECT_VERSION + 
"-sources.jar" );
+        repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, 
TEST_PROJECT_VERSION, artifact1 );
+        repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, 
TEST_PROJECT_VERSION, artifact2 );
+
+        assertEquals( Collections.singleton( TEST_PROJECT_VERSION ),
                       repository.getArtifactVersions( TEST_REPO_ID, 
TEST_NAMESPACE, TEST_PROJECT,
                                                       TEST_PROJECT_VERSION ) );
     }