svn commit: r546168 - /incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java

[gscokart]

Author: gscokart
Date: Mon Jun 11 08:03:26 2007
New Revision: 546168

URL: http://svn.apache.org/viewvc?view=rev&rev=546168
Log:
clean code

Modified:
    incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java

Modified: 
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java?view=diff&rev=546168&r1=546167&r2=546168
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java 
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java 
Mon Jun 11 08:03:26 2007
@@ -47,6 +47,8 @@
     private DefaultModuleDescriptor md4;
 
     private static Ivy ivy;
+    
+    
 
     /*
      * (non-Javadoc)
@@ -139,14 +141,17 @@
             public void handleCircularDependency(ModuleRevisionId[] mrids) {
                 assertEquals("handleCircularDependency is expected to be 
called only once", 0,
                     nbOfCall);
-                assertTrue("incorrect cicular dependency invocation"
-                        + CircularDependencyHelper.formatMessage(mrids), 
mrids.length == 3
-                        && ((mrids[0].equals(md2.getModuleRevisionId())
-                                && mrids[1].equals(md3.getModuleRevisionId()) 
&& mrids[2]
-                                .equals(md2.getModuleRevisionId())) || 
(mrids[0].equals(md3
-                                .getModuleRevisionId())
-                                && mrids[1].equals(md2.getModuleRevisionId()) 
&& mrids[2]
-                                .equals(md3.getModuleRevisionId()))));
+                String assertMsg = "incorrect cicular dependency invocation" 
+                        + CircularDependencyHelper.formatMessage(mrids);
+                assertEquals(assertMsg, 3 , mrids.length);
+                if (mrids[0].equals(md2.getModuleRevisionId())) {
+                    assertEquals(assertMsg , md3.getModuleRevisionId() , 
mrids[1]);
+                    assertEquals(assertMsg , md2.getModuleRevisionId() , 
mrids[2]);
+                } else {
+                    assertEquals(assertMsg , md3.getModuleRevisionId() , 
mrids[0]);
+                    assertEquals(assertMsg , md2.getModuleRevisionId() , 
mrids[1]);
+                    assertEquals(assertMsg , md3.getModuleRevisionId() , 
mrids[2]);
+                }
                 nbOfCall++;
             }
 
@@ -261,9 +266,9 @@
     /**
      * Verifies that sorted in one of the list of listOfPossibleSort.
      * 
-     * @param An
+     * @param listOfPossibleSort
      *            array of possible sort result
-     * @param The
+     * @param sorted
      *            actual sortedList to compare
      */
     private void assertSorted(DefaultModuleDescriptor[][] listOfPossibleSort, 
List sorted) {