You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2020/04/08 21:17:23 UTC
[commons-numbers] 05/08: Use assertThrows to detect exceptions
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit 25ce3fab796588830b4da9adfae2370548c20c1c
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Wed Apr 8 22:01:17 2020 +0100
Use assertThrows to detect exceptions
---
.../commons/numbers/fraction/BigFractionTest.java | 48 ++++++----------------
.../commons/numbers/fraction/FractionTest.java | 4 +-
2 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
index 0b7030d..b0ae45f 100644
--- a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
+++ b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
@@ -69,30 +69,17 @@ public class BigFractionTest {
Assertions.assertEquals(15.0000000000001, BigFraction.from(15.0000000000001).doubleValue(), 0.0);
assertFraction(3602879701896487L, 9007199254740992L, BigFraction.from(0.40000000000001));
assertFraction(1055531162664967L, 70368744177664L, BigFraction.from(15.0000000000001));
- try {
- BigFraction.of(null, BigInteger.ONE);
- Assertions.fail("Expecting NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- BigFraction.of(BigInteger.ONE, null);
- Assertions.fail("Expecting NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- BigFraction.of(BigInteger.ONE, BigInteger.ZERO);
- Assertions.fail("Expecting ArithmeticException");
- } catch (ArithmeticException ignored) {
- // expected
- }
- try {
- BigFraction.from(2.0 * Integer.MAX_VALUE, 1.0e-5, 100000);
- Assertions.fail("Expecting ArithmeticException");
- } catch (ArithmeticException ignored) {
- // expected
- }
+
+ // Divide by zero
+ Assertions.assertThrows(ArithmeticException.class, () -> BigFraction.of(BigInteger.ONE, BigInteger.ZERO));
+
+ // Null pointers
+ Assertions.assertThrows(NullPointerException.class, () -> BigFraction.of(null, BigInteger.ONE));
+ Assertions.assertThrows(NullPointerException.class, () -> BigFraction.of(BigInteger.ONE, null));
+ Assertions.assertThrows(NullPointerException.class, () -> BigFraction.of(null));
+
+ Assertions.assertThrows(ArithmeticException.class,
+ () -> BigFraction.from(2.0 * Integer.MAX_VALUE, 1.0e-5, 100000));
}
@Test
@@ -410,12 +397,7 @@ public class BigFractionTest {
assertFraction(-6124895493223875L, 36028797018963968L, BigFraction.from(17.0 / -100.0));
assertFraction(-1784551352345559L, 562949953421312L, BigFraction.from(-317.0 / 100.0));
for (double v : new double[] {Double.NaN, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY}) {
- try {
- BigFraction.from(v);
- Assertions.fail("Expecting IllegalArgumentException");
- } catch (IllegalArgumentException iae) {
- // expected
- }
+ Assertions.assertThrows(IllegalArgumentException.class, () -> BigFraction.from(v));
}
Assertions.assertEquals(1L, BigFraction.from(Double.MAX_VALUE).getDenominatorAsLong());
Assertions.assertEquals(1L, BigFraction.from(Double.longBitsToDouble(0x0010000000000000L)).getNumeratorAsLong());
@@ -438,11 +420,7 @@ public class BigFractionTest {
}
BigFraction f = BigFraction.of(0, 3);
- try {
- f = f.reciprocal();
- Assertions.fail("expecting ArithmeticException");
- } catch (ArithmeticException ignored) {
- }
+ Assertions.assertThrows(ArithmeticException.class, f::reciprocal);
}
@Test
diff --git a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
index e075d56..8e0d979 100644
--- a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
+++ b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
@@ -224,9 +224,7 @@ public class FractionTest {
}
final Fraction f = Fraction.of(0, 3);
- Assertions.assertThrows(ArithmeticException.class,
- f::reciprocal
- );
+ Assertions.assertThrows(ArithmeticException.class, f::reciprocal);
}
@Test