This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit e83a7adbf88ea6fd7b910b82a76493831d3c8762
Author: Schamschi <heinrich.bo...@gmx.at>
AuthorDate: Sun Jun 9 21:25:35 2019 +0200
NUMBERS-100: Make use of assertFraction(int, int, Fraction)
Use the helper method assertFraction(int, int, Fraction) in the class
org.apache.commons.numbers.fraction.FractionTest where appropriate so as to
reduce code duplication.
---
.../commons/numbers/fraction/FractionTest.java | 69 ++++++++--------------
1 file changed, 23 insertions(+), 46 deletions(-)
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 948fd9c..f2bcc0a 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
@@ -264,22 +264,19 @@ public class FractionTest {
{
Fraction f = Fraction.of(50, 75);
f = f.reciprocal();
- Assert.assertEquals(3, f.getNumerator());
- Assert.assertEquals(2, f.getDenominator());
+ assertFraction(3, 2, f);
}
{
Fraction f = Fraction.of(4, 3);
f = f.reciprocal();
- Assert.assertEquals(3, f.getNumerator());
- Assert.assertEquals(4, f.getDenominator());
+ assertFraction(3, 4, f);
}
{
Fraction f = Fraction.of(-15, 47);
f = f.reciprocal();
- Assert.assertEquals(-47, f.getNumerator());
- Assert.assertEquals(15, f.getDenominator());
+ assertFraction(-47, 15, f);
}
{
@@ -294,8 +291,7 @@ public class FractionTest {
// large values
Fraction f = Fraction.of(Integer.MAX_VALUE, 1);
f = f.reciprocal();
- Assert.assertEquals(1, f.getNumerator());
- Assert.assertEquals(Integer.MAX_VALUE, f.getDenominator());
+ assertFraction(1, Integer.MAX_VALUE, f);
}
}
@@ -304,23 +300,20 @@ public class FractionTest {
{
Fraction f = Fraction.of(50, 75);
f = f.negate();
- Assert.assertEquals(-2, f.getNumerator());
- Assert.assertEquals(3, f.getDenominator());
+ assertFraction(-2, 3, f);
}
{
Fraction f = Fraction.of(-50, 75);
f = f.negate();
- Assert.assertEquals(2, f.getNumerator());
- Assert.assertEquals(3, f.getDenominator());
+ assertFraction(2, 3, f);
}
// large values
{
Fraction f = Fraction.of(Integer.MAX_VALUE - 1, Integer.MAX_VALUE);
f = f.negate();
- Assert.assertEquals(Integer.MIN_VALUE + 2, f.getNumerator());
- Assert.assertEquals(Integer.MAX_VALUE, f.getDenominator());
+ assertFraction(Integer.MIN_VALUE + 2, Integer.MAX_VALUE, f);
}
{
@@ -349,13 +342,11 @@ public class FractionTest {
{
Fraction f2 = Fraction.ONE;
Fraction f = f1.add(f2);
- Assert.assertEquals(Integer.MAX_VALUE, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MAX_VALUE, 1, f);
}
{
Fraction f = f1.add(1);
- Assert.assertEquals(Integer.MAX_VALUE, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MAX_VALUE, 1, f);
}
}
@@ -363,8 +354,7 @@ public class FractionTest {
Fraction f1 = Fraction.of(-1, 13*13*2*2);
Fraction f2 = Fraction.of(-2, 13*17*2);
Fraction f = f1.add(f2);
- Assert.assertEquals(13*13*17*2*2, f.getDenominator());
- Assert.assertEquals(-17 - 2*13*2, f.getNumerator());
+ assertFraction(-17 - 2*13*2, 13*13*17*2*2, f);
try {
f.add(null);
@@ -378,24 +368,21 @@ public class FractionTest {
Fraction f1 = Fraction.of(1, 32768 * 3);
Fraction f2 = Fraction.of(1, 59049);
Fraction f = f1.add(f2);
- Assert.assertEquals(52451, f.getNumerator());
- Assert.assertEquals(1934917632, f.getDenominator());
+ assertFraction(52451, 1934917632, f);
}
{
Fraction f1 = Fraction.of(Integer.MIN_VALUE, 3);
Fraction f2 = Fraction.of(1, 3);
Fraction f = f1.add(f2);
- Assert.assertEquals(Integer.MIN_VALUE + 1, f.getNumerator());
- Assert.assertEquals(3, f.getDenominator());
+ assertFraction(Integer.MIN_VALUE + 1, 3, f);
}
{
Fraction f1 = Fraction.of(Integer.MAX_VALUE - 1, 1);
Fraction f2 = Fraction.ONE;
Fraction f = f1.add(f2);
- Assert.assertEquals(Integer.MAX_VALUE, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MAX_VALUE, 1, f);
try {
f = f.add(Fraction.ONE); // should overflow
@@ -463,23 +450,20 @@ public class FractionTest {
Fraction f1 = Fraction.of(2, 7);
Fraction f2 = Fraction.ONE;
Fraction f = f1.divide(f2);
- Assert.assertEquals(2, f.getNumerator());
- Assert.assertEquals(7, f.getDenominator());
+ assertFraction(2, 7, f);
}
{
Fraction f1 = Fraction.of(1, Integer.MAX_VALUE);
Fraction f = f1.divide(f1);
- Assert.assertEquals(1, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(1, 1, f);
}
{
Fraction f1 = Fraction.of(Integer.MIN_VALUE, Integer.MAX_VALUE);
Fraction f2 = Fraction.of(1, Integer.MAX_VALUE);
Fraction f = f1.divide(f2);
- Assert.assertEquals(Integer.MIN_VALUE, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MIN_VALUE, 1, f);
try {
f.divide(null);
@@ -506,8 +490,7 @@ public class FractionTest {
{
Fraction f1 = Fraction.of(6, 35);
Fraction f = f1.divide(15);
- Assert.assertEquals(2, f.getNumerator());
- Assert.assertEquals(175, f.getDenominator());
+ assertFraction(2, 175, f);
}
}
@@ -527,8 +510,7 @@ public class FractionTest {
Fraction f1 = Fraction.of(Integer.MAX_VALUE, 1);
Fraction f2 = Fraction.of(Integer.MIN_VALUE, Integer.MAX_VALUE);
Fraction f = f1.multiply(f2);
- Assert.assertEquals(Integer.MIN_VALUE, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MIN_VALUE, 1, f);
try {
f.multiply(null);
@@ -539,8 +521,7 @@ public class FractionTest {
{
Fraction f1 = Fraction.of(6, 35);
Fraction f = f1.multiply(15);
- Assert.assertEquals(18, f.getNumerator());
- Assert.assertEquals(7, f.getDenominator());
+ assertFraction(18, 7, f);
}
}
@@ -596,16 +577,14 @@ public class FractionTest {
Fraction f1 = Fraction.of(1, 32768 * 3);
Fraction f2 = Fraction.of(1, 59049);
Fraction f = f1.subtract(f2);
- Assert.assertEquals(-13085, f.getNumerator());
- Assert.assertEquals(1934917632, f.getDenominator());
+ assertFraction(-13085, 1934917632, f);
}
{
Fraction f1 = Fraction.of(Integer.MIN_VALUE, 3);
Fraction f2 = Fraction.of(1, 3).negate();
Fraction f = f1.subtract(f2);
- Assert.assertEquals(Integer.MIN_VALUE + 1, f.getNumerator());
- Assert.assertEquals(3, f.getDenominator());
+ assertFraction(Integer.MIN_VALUE + 1, 3, f);
}
{
@@ -613,13 +592,11 @@ public class FractionTest {
{
Fraction f2 = Fraction.ONE;
Fraction f = f1.subtract(f2);
- Assert.assertEquals(Integer.MAX_VALUE-1, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MAX_VALUE-1, 1, f);
}
{
Fraction f = f1.subtract(1);
- Assert.assertEquals(Integer.MAX_VALUE-1, f.getNumerator());
- Assert.assertEquals(1, f.getDenominator());
+ assertFraction(Integer.MAX_VALUE-1, 1, f);
}
}
