removed the conflict change
This commit is contained in:
parent
19a2eb738a
commit
7e27c1ce72
@ -15,8 +15,6 @@ public class StringToBigDecimalConversionUnitTest {
|
|||||||
public void givenValidString_WhenBigDecimalObjectWithStringParameter_ThenResultIsDecimalObject() {
|
public void givenValidString_WhenBigDecimalObjectWithStringParameter_ThenResultIsDecimalObject() {
|
||||||
BigDecimal bigDecimal = new BigDecimal("123");
|
BigDecimal bigDecimal = new BigDecimal("123");
|
||||||
assertEquals(new BigDecimal(123), bigDecimal);
|
assertEquals(new BigDecimal(123), bigDecimal);
|
||||||
BigDecimal bigDecimal = new BigDecimal(123);
|
|
||||||
assertEquals(bigDecimal, new BigDecimal("123"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = NullPointerException.class)
|
@Test(expected = NullPointerException.class)
|
||||||
@ -34,8 +32,6 @@ public class StringToBigDecimalConversionUnitTest {
|
|||||||
public void givenValidString_WhenValueOfDoubleFromString_ThenResultIsDecimalObject() {
|
public void givenValidString_WhenValueOfDoubleFromString_ThenResultIsDecimalObject() {
|
||||||
BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf("123.42"));
|
BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf("123.42"));
|
||||||
assertEquals(new BigDecimal(123.42).setScale(2, BigDecimal.ROUND_HALF_UP), bigDecimal);
|
assertEquals(new BigDecimal(123.42).setScale(2, BigDecimal.ROUND_HALF_UP), bigDecimal);
|
||||||
BigDecimal bigDecimal = new BigDecimal(123.42).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
||||||
assertEquals(bigDecimal, BigDecimal.valueOf(Double.valueOf("123.42")));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = NullPointerException.class)
|
@Test(expected = NullPointerException.class)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user