svn commit: r659577 - /turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java

[se...@apache.org]

Author: seade
Date: Fri May 23 09:01:07 2008
New Revision: 659577

URL: http://svn.apache.org/viewvc?rev=659577&view=rev
Log:
Fix test case so it will work for a src distribution.

Modified:
    turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java

Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=659577&r1=659576&r2=659577&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java Fri May 23 09:01:07 2008
@@ -22,6 +22,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.turbine.services.pull.PullService;
 import org.apache.turbine.services.pull.TurbinePull;
 import org.apache.turbine.test.BaseTurbineTest;
@@ -109,13 +110,12 @@
         UITool ui = getTool();
 
         String[] skinNames = ui.getSkinNames();
-        // two real skins + ".svn"
-        assertEquals(3, skinNames.length);
+        // Remove the ".svn" dir that may be present.
+        skinNames = (String[]) ArrayUtils.removeElement(skinNames, ".svn");
+        assertEquals(2, skinNames.length);
 
-        // Not completely sure this will always be in the same order.
-        assertEquals(".svn", skinNames[0]); // Not actually a skin
-        assertEquals("myotherskin", skinNames[1]);
-        assertEquals("myskin", skinNames[2]);
+        assertTrue(ArrayUtils.contains(skinNames, "myotherskin"));
+        assertTrue(ArrayUtils.contains(skinNames, "myskin"));
     }
 
     public void testSkinValues()