From 7e27c1ce72908762ce07dd809269d229226d2b92 Mon Sep 17 00:00:00 2001 From: Bhabani Prasad Patel Date: Wed, 19 May 2021 07:52:03 +0530 Subject: [PATCH] removed the conflict change --- .../StringToBigDecimalConversionUnitTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobigdecimal/StringToBigDecimalConversionUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobigdecimal/StringToBigDecimalConversionUnitTest.java index ba2a804f17..cd8ef6c70f 100644 --- a/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobigdecimal/StringToBigDecimalConversionUnitTest.java +++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobigdecimal/StringToBigDecimalConversionUnitTest.java @@ -15,8 +15,6 @@ public class StringToBigDecimalConversionUnitTest { public void givenValidString_WhenBigDecimalObjectWithStringParameter_ThenResultIsDecimalObject() { BigDecimal bigDecimal = new BigDecimal("123"); assertEquals(new BigDecimal(123), bigDecimal); - BigDecimal bigDecimal = new BigDecimal(123); - assertEquals(bigDecimal, new BigDecimal("123")); } @Test(expected = NullPointerException.class) @@ -34,8 +32,6 @@ public class StringToBigDecimalConversionUnitTest { public void givenValidString_WhenValueOfDoubleFromString_ThenResultIsDecimalObject() { BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf("123.42")); 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)