Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[LANG-1615] - ArrayUtils contains && indexOf fails to handle Float.NaN (#651) 

* LANG-1615 - ArrayUtils contains && indexOf fails to handle Float.NaN

* Change var name

* Fix checkstyle spaces black

* Fix checkstyle spaces black
This commit is contained in:
Arturo Bernal 2020-11-15 23:37:54 +01:00 committed by GitHub
parent 08d1f66236
commit 2ccc58e344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/commons/lang3/ArrayUtils.java
View File

@ -2518,8 +2518,10 @@ public class ArrayUtils {
if (startIndex < 0) {
startIndex = 0;
}
final boolean searchNaN = Float.isNaN(valueToFind);
for (int i = startIndex; i < array.length; i++) {
if (valueToFind == array[i]) {
final float element = array[i];
if (valueToFind == element || (searchNaN && Float.isNaN(element))) {
return i;
}
}
@ -7877,7 +7879,7 @@ public static int indexOf(final int[] array, final int valueToFind, int startInd
*
* @param <T> the array type.
* @param array the array to sort.
* @param comparator the comparator to determine the order of the array.
* @param comparator the comparator to determine the order of the array.
* A {@code null} value uses the elements' {@link Comparable natural ordering}.
* @return the given array.
* @see Arrays#sort(Object[])
@ -7887,7 +7889,7 @@ public static int indexOf(final int[] array, final int valueToFind, int startInd
Arrays.sort(array, comparator);
return array;
}
/**
* <p>Produces a new {@code boolean} array containing the elements
* between the start and end indices.

16
src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
View File

@ -309,6 +309,14 @@ public class ArrayUtilsTest {
assertFalse(ArrayUtils.contains(array, (float) 99));
}
@Test
public void testContainsFloatNaN() {
float[] array = new float[] { Float.NEGATIVE_INFINITY, Float.NaN, Float.POSITIVE_INFINITY };
assertTrue(ArrayUtils.contains(array, Float.POSITIVE_INFINITY));
assertTrue(ArrayUtils.contains(array, Float.NEGATIVE_INFINITY));
assertTrue(ArrayUtils.contains(array, Float.NaN));
}
@Test
public void testContainsInt() {
int[] array = null;
@ -1124,6 +1132,14 @@ public class ArrayUtilsTest {
assertEquals(-1, ArrayUtils.indexOf(array, (float) 99));
}
@Test
public void testIndexOfFloatNaN() {
float[] array = new float[] { Float.NEGATIVE_INFINITY, Float.NaN, Float.POSITIVE_INFINITY, Float.NaN };
assertEquals(0, ArrayUtils.indexOf(array, Float.NEGATIVE_INFINITY));
assertEquals(1, ArrayUtils.indexOf(array, Float.NaN));
assertEquals(2, ArrayUtils.indexOf(array, Float.POSITIVE_INFINITY));
}
@SuppressWarnings("cast")
@Test
public void testIndexOfFloatWithStartIndex() {

2
src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
View File

@ -210,7 +210,7 @@ public class FieldUtilsTest {
@Test
public void testGetFieldsWithAnnotation() throws NoSuchFieldException {
assertArrayEquals(new Field[0], FieldUtils.getFieldsWithAnnotation(Object.class, Annotated.class));
final Field[] annotatedFields = sort(new Field[] {
final Field[] annotatedFields = sort(new Field[] {
FieldUtilsTest.class.getDeclaredField("publicChild"),
FieldUtilsTest.class.getDeclaredField("privatelyShadowedChild") });
assertArrayEquals(annotatedFields,

2
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
View File

@ -790,7 +790,7 @@ public class TypeUtilsTest<B> {
assertFalse(paramType.getClass().isAssignableFrom(WildcardType.class));
WildcardType testType = TypeUtils.WILDCARD_ALL;
// TODO This test returns true unlike the test above.
// TODO This test returns true unlike the test above.
// Is this a bug in this test or in the main code?
assertFalse(TypeUtils.isAssignable(paramType, testType),
() -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));