From: Brett Porter <brett@apache.org>
Date: Wed, 15 Mar 2006 03:15:15 +0000 (+0000)
Subject: make test case portable
X-Git-Tag: archiva-0.9-alpha-1~878
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab1bc02dece44ab54f6010a3f9da6c1488b86117;p=archiva.git

make test case portable

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@385958 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 83614f981..0b4919f9a 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
@@ -26,6 +26,8 @@ import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -359,34 +361,47 @@ public class DefaultArtifactDiscovererTest
 
     public void testStandalonePoms()
     {
-        List artifacts = discoverer.discoverStandalonePoms( repository, null, false );
-        assertEquals( 4, artifacts.size() );
-        Iterator itr = artifacts.iterator();
-        //Artifact artifact = (Artifact) itr.next();
+        List models = discoverer.discoverStandalonePoms( repository, null, false );
+        assertEquals( 4, models.size() );
+
+        // Define order we expect
+        Collections.sort( models, new Comparator()
+        {
+            public int compare( Object o1, Object o2 )
+            {
+                Model m1 = (Model) o1;
+                Model m2 = (Model) o2;
+
+                int result = m1.getGroupId().compareTo( m2.getGroupId() );
+                if ( result == 0 )
+                {
+                    result = m1.getArtifactId().compareTo( m2.getArtifactId() );
+                }
+                if ( result == 0 )
+                {
+                    result = m1.getVersion().compareTo( m2.getVersion() );
+                }
+                return result;
+            }
+        } );
+
+        Iterator itr = models.iterator();
         Model model = (Model) itr.next();
-        Artifact artifact =
-            createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), model.getPackaging() );
-        assertEquals( "org.apache.maven", artifact.getGroupId() );
-        assertEquals( "B", artifact.getArtifactId() );
-        assertEquals( "1.0", artifact.getVersion() );
+        assertEquals( "org.apache.maven", model.getGroupId() );
+        assertEquals( "B", model.getArtifactId() );
+        assertEquals( "1.0", model.getVersion() );
         model = (Model) itr.next();
-        artifact =
-            createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), model.getPackaging() );
-        assertEquals( "org.apache.maven", artifact.getGroupId() );
-        assertEquals( "B", artifact.getArtifactId() );
-        assertEquals( "2.0", artifact.getVersion() );
+        assertEquals( "org.apache.maven", model.getGroupId() );
+        assertEquals( "B", model.getArtifactId() );
+        assertEquals( "2.0", model.getVersion() );
         model = (Model) itr.next();
-        artifact =
-            createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), model.getPackaging() );
-        assertEquals( "org.apache.maven", artifact.getGroupId() );
-        assertEquals( "discovery", artifact.getArtifactId() );
-        assertEquals( "1.0", artifact.getVersion() );
+        assertEquals( "org.apache.maven", model.getGroupId() );
+        assertEquals( "discovery", model.getArtifactId() );
+        assertEquals( "1.0", model.getVersion() );
         model = (Model) itr.next();
-        artifact =
-            createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), model.getPackaging() );
-        assertEquals( "org.apache.testgroup", artifact.getGroupId() );
-        assertEquals( "discovery", artifact.getArtifactId() );
-        assertEquals( "1.0", artifact.getVersion() );
+        assertEquals( "org.apache.testgroup", model.getGroupId() );
+        assertEquals( "discovery", model.getArtifactId() );
+        assertEquals( "1.0", model.getVersion() );
     }
 
     private Artifact createArtifact( String groupId, String artifactId, String version )