Use Float.compare in java equals
Summary: Handles nans. Also if the unit is undefined there is no need to check the value. Reviewed By: astreet Differential Revision: D4531805 fbshipit-source-id: 723e15381e9fa39837a4c99f726501eda26af11b
This commit is contained in:
committed by
Facebook Github Bot
parent
168ae4099d
commit
e0e2a61dfc
@@ -33,7 +33,9 @@ public class YogaValue {
|
|||||||
public boolean equals(Object other) {
|
public boolean equals(Object other) {
|
||||||
if (other instanceof YogaValue) {
|
if (other instanceof YogaValue) {
|
||||||
final YogaValue otherValue = (YogaValue) other;
|
final YogaValue otherValue = (YogaValue) other;
|
||||||
return value == otherValue.value && unit == otherValue.unit;
|
if (unit == otherValue.unit) {
|
||||||
|
return unit == YogaUnit.UNDEFINED || Float.compare(value, otherValue.value) == 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
26
java/tests/com/facebook/yoga/YogaValueTest.java
Normal file
26
java/tests/com/facebook/yoga/YogaValueTest.java
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2014-present, Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD-style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.facebook.yoga;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
public class YogaValueTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEquals() {
|
||||||
|
assertEquals(new YogaValue(0, YogaUnit.UNDEFINED), new YogaValue(0, YogaUnit.UNDEFINED));
|
||||||
|
assertEquals(new YogaValue(0, YogaUnit.PIXEL), new YogaValue(0, YogaUnit.PIXEL));
|
||||||
|
assertEquals(new YogaValue(0, YogaUnit.PERCENT), new YogaValue(0, YogaUnit.PERCENT));
|
||||||
|
assertEquals(new YogaValue(0, YogaUnit.UNDEFINED), new YogaValue(1, YogaUnit.UNDEFINED));
|
||||||
|
assertEquals(new YogaValue(Float.NaN, YogaUnit.PIXEL), new YogaValue(Float.NaN, YogaUnit.PIXEL));
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user