commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/lang/src/test/org/apache/commons/lang ArrayUtilsTest.java
Date Sun, 10 Oct 2004 18:56:16 GMT
scolebourne    2004/10/10 11:56:16

  Modified:    lang/src/java/org/apache/commons/lang ArrayUtils.java
               lang/src/test/org/apache/commons/lang ArrayUtilsTest.java
  Log:
  Remove lastIndex(), which is better done as getLength() - 1
  
  Revision  Changes    Path
  1.49      +2 -25     jakarta-commons/lang/src/java/org/apache/commons/lang/ArrayUtils.java
  
  Index: ArrayUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/ArrayUtils.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ArrayUtils.java	9 Oct 2004 11:55:51 -0000	1.48
  +++ ArrayUtils.java	10 Oct 2004 18:56:16 -0000	1.49
  @@ -955,30 +955,7 @@
               return Array.getLength(array);
           }
       }
  -    
  -    /**
  -     * Returns the last index of the given array or -1 if empty or null.
  -     * This method can deal with <code>Object</code> arrays and with primitive
arrays.
  -     * This value is one less than the size since arrays indices are 0-based.</p>
  -     *
  -     * <pre>
  -     * ArrayUtils.lastIndex(null)            = -1
  -     * ArrayUtils.lastIndex([])              = -1
  -     * ArrayUtils.lastIndex([null])          = 0
  -     * ArrayUtils.lastIndex([true, false])   = 1
  -     * ArrayUtils.lastIndex([1, 2, 3])       = 2
  -     * ArrayUtils.lastIndex(["a", "b", "c"]) = 2
  -     * </pre>
  -     *  
  -     * @param array  the array to return the last index for, may be null
  -     * @return the last index, -1 if empty or null
  -     * @throws IllegalArgumentException if the object arguement is not an array.
  -     * @since 2.1
  -     */
  -    public static int lastIndex(Object array) {
  -        return ArrayUtils.getLength(array) - 1;
  -    }
  -    
  +
       /**
        * <p>Checks whether two arrays are the same type taking into account
        * multi-dimensional arrays.</p>
  
  
  
  1.29      +1 -58     jakarta-commons/lang/src/test/org/apache/commons/lang/ArrayUtilsTest.java
  
  Index: ArrayUtilsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/ArrayUtilsTest.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ArrayUtilsTest.java	25 Aug 2004 21:20:13 -0000	1.28
  +++ ArrayUtilsTest.java	10 Oct 2004 18:56:16 -0000	1.29
  @@ -2490,62 +2490,5 @@
               fail("IllegalArgumentException should have been thrown");
           } catch (IllegalArgumentException e) {}
       }
  -    
  -    public void testLastIndex() {
  -        assertEquals(-1, ArrayUtils.lastIndex(null));
  -        
  -        Object[] emptyObjectArray = new Object[0];
  -        Object[] notEmptyObjectArray = new Object[] {"aValue"};
  -        assertEquals(-1, ArrayUtils.lastIndex((Object[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyObjectArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyObjectArray));
  - 
  -        int[] emptyIntArray = new int[] {};
  -        int[] notEmptyIntArray = new int[] { 1 };
  -        assertEquals(-1, ArrayUtils.lastIndex((int[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyIntArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyIntArray));
   
  -        short[] emptyShortArray = new short[] {};
  -        short[] notEmptyShortArray = new short[] { 1 };
  -        assertEquals(-1, ArrayUtils.lastIndex((short[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyShortArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyShortArray));
  -
  -        char[] emptyCharArray = new char[] {};
  -        char[] notEmptyCharArray = new char[] { 1 };
  -        assertEquals(-1, ArrayUtils.lastIndex((char[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyCharArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyCharArray));
  -
  -        byte[] emptyByteArray = new byte[] {};
  -        byte[] notEmptyByteArray = new byte[] { 1 };
  -        assertEquals(-1, ArrayUtils.lastIndex((byte[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyByteArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyByteArray));
  -
  -        double[] emptyDoubleArray = new double[] {};
  -        double[] notEmptyDoubleArray = new double[] { 1.0 };
  -        assertEquals(-1, ArrayUtils.lastIndex((double[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyDoubleArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyDoubleArray));
  -
  -        float[] emptyFloatArray = new float[] {};
  -        float[] notEmptyFloatArray = new float[] { 1.0F };
  -        assertEquals(-1, ArrayUtils.lastIndex((float[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyFloatArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyFloatArray));
  -
  -        boolean[] emptyBooleanArray = new boolean[] {};
  -        boolean[] notEmptyBooleanArray = new boolean[] { true };
  -        assertEquals(-1, ArrayUtils.lastIndex((boolean[]) null));
  -        assertEquals(-1, ArrayUtils.lastIndex(emptyBooleanArray));
  -        assertEquals(0, ArrayUtils.lastIndex(notEmptyBooleanArray));
  -        
  -        try {
  -            ArrayUtils.lastIndex("notAnArray");
  -            fail("IllegalArgumentException should have been thrown");
  -        } catch (IllegalArgumentException e) {}
  -    }
  -    
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message