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 de949a139839afd9be005c4fcbba47d323dea7ac Author: Eitan Adler <[email protected]> AuthorDate: Sun Jun 9 22:28:24 2019 -0700 Simplify junit --- .../commons/numbers/angle/PlaneAngleTest.java | 6 +-- .../numbers/combinatorics/CombinationsTest.java | 2 +- .../commons/numbers/complex/ComplexTest.java | 44 +++++++++++----------- .../commons/numbers/core/ArithmeticUtilsTest.java | 2 +- .../apache/commons/numbers/core/PrecisionTest.java | 8 ++-- .../commons/numbers/fraction/BigFractionTest.java | 14 +++---- .../commons/numbers/fraction/FractionTest.java | 16 ++++---- .../commons/numbers/quaternion/QuaternionTest.java | 38 +++++++++---------- .../numbers/rootfinder/BrentSolverTest.java | 10 ++--- 9 files changed, 70 insertions(+), 70 deletions(-) diff --git a/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/PlaneAngleTest.java b/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/PlaneAngleTest.java index a33b3a6..48e7f21 100644 --- a/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/PlaneAngleTest.java +++ b/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/PlaneAngleTest.java @@ -161,20 +161,20 @@ public class PlaneAngleTest { final double value = 12345.6789; final PlaneAngle a = PlaneAngle.ofRadians(value); final PlaneAngle b = PlaneAngle.ofRadians(value); - Assert.assertTrue(a.equals(b)); + Assert.assertEquals(a, b); } @Test public void testEquals2() { final PlaneAngle a = PlaneAngle.ofRadians(153768.373486587); final PlaneAngle b = null; - Assert.assertFalse(a.equals(b)); + Assert.assertNotEquals(a, b); } @Test public void testEquals3() { final double value = 0.987654321; final PlaneAngle a = PlaneAngle.ofRadians(value); final PlaneAngle b = PlaneAngle.ofRadians(value + 1e-16); - Assert.assertFalse(a.equals(b)); + Assert.assertNotEquals(a, b); } @Test diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java index ee27e89..0b768c2 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java @@ -175,7 +175,7 @@ public class CombinationsTest { // Check that the sequence of iterates is ordered. if (lastIterate != null) { - Assertions.assertTrue(comp.compare(iterate, lastIterate) == 1); + Assertions.assertEquals(1, comp.compare(iterate, lastIterate)); } // Check that each iterate is ordered. diff --git a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java index 014aeb6..9dff601 100644 --- a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java +++ b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java @@ -384,7 +384,7 @@ public class ComplexTest { @Test public void testEqualsNull() { Complex x = Complex.ofCartesian(3.0, 4.0); - Assertions.assertFalse(x.equals(null)); + Assertions.assertNotEquals(null, x); } @Test @@ -404,13 +404,13 @@ public class ComplexTest { @Test public void testEqualsClass() { Complex x = Complex.ofCartesian(3.0, 4.0); - Assertions.assertFalse(x.equals(this)); + Assertions.assertNotEquals(x, this); } @Test public void testEqualsSame() { Complex x = Complex.ofCartesian(3.0, 4.0); - Assertions.assertTrue(x.equals(x)); + Assertions.assertEquals(x, x); } @Test @@ -421,7 +421,7 @@ public class ComplexTest { final Complex x = Complex.ofCartesian(re, im); Complex y = Complex.ofCartesian(re, im); - Assertions.assertTrue(x.equals(y)); + Assertions.assertEquals(x, y); Assertions.assertTrue(Complex.equals(x, y)); final int maxUlps = 5; @@ -494,30 +494,30 @@ public class ComplexTest { public void testEqualsTrue() { Complex x = Complex.ofCartesian(3.0, 4.0); Complex y = Complex.ofCartesian(3.0, 4.0); - Assertions.assertTrue(x.equals(y)); + Assertions.assertEquals(x, y); } @Test public void testEqualsRealDifference() { Complex x = Complex.ofCartesian(0.0, 0.0); Complex y = Complex.ofCartesian(0.0 + Double.MIN_VALUE, 0.0); - Assertions.assertFalse(x.equals(y)); + Assertions.assertNotEquals(x, y); } @Test public void testEqualsImaginaryDifference() { Complex x = Complex.ofCartesian(0.0, 0.0); Complex y = Complex.ofCartesian(0.0, 0.0 + Double.MIN_VALUE); - Assertions.assertFalse(x.equals(y)); + Assertions.assertNotEquals(x, y); } @Test public void testHashCode() { Complex x = Complex.ofCartesian(0.0, 0.0); Complex y = Complex.ofCartesian(0.0, 0.0 + Double.MIN_VALUE); - Assertions.assertFalse(x.hashCode()==y.hashCode()); + Assertions.assertNotEquals(x.hashCode(), y.hashCode()); y = Complex.ofCartesian(0.0 + Double.MIN_VALUE, 0.0); - Assertions.assertFalse(x.hashCode()==y.hashCode()); + Assertions.assertNotEquals(x.hashCode(), y.hashCode()); Complex realNaN = Complex.ofCartesian(Double.NaN, 0.0); Complex imaginaryNaN = Complex.ofCartesian(0.0, Double.NaN); Assertions.assertEquals(realNaN.hashCode(), imaginaryNaN.hashCode()); @@ -531,12 +531,12 @@ public class ComplexTest { x = Complex.ofCartesian(0.0, 0.0); y = Complex.ofCartesian(0.0, -0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); x = Complex.ofCartesian(0.0, 0.0); y = Complex.ofCartesian(-0.0, 0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); } @Test @@ -840,16 +840,16 @@ public class ComplexTest { @Test public void testParse() { - Assertions.assertTrue(Complex.ZERO.equals(Complex.parse(Complex.ZERO.toString()))); - Assertions.assertTrue(Complex.ONE.equals(Complex.parse(Complex.ONE.toString()))); - Assertions.assertTrue(Complex.I.equals(Complex.parse(Complex.I.toString()))); - Assertions.assertTrue(Complex.INF.equals(Complex.parse(Complex.INF.toString()))); - Assertions.assertTrue(NAN.equals(Complex.parse(NAN.toString()))); - Assertions.assertTrue(oneInf.equals(Complex.parse(oneInf.toString()))); - Assertions.assertTrue(negInfZero.equals(Complex.parse(negInfZero.toString()))); - Assertions.assertTrue(Complex.ofReal(pi).equals(Complex.parse(Complex.ofReal(pi).toString()))); - Assertions.assertTrue(Complex.ofPolar(2, pi).equals(Complex.parse(Complex.ofPolar(2, pi).toString()))); - Assertions.assertTrue(Complex.ofCis(pi).equals(Complex.parse(Complex.ofCis(pi).toString()))); + Assertions.assertEquals(Complex.ZERO, Complex.parse(Complex.ZERO.toString())); + Assertions.assertEquals(Complex.ONE, Complex.parse(Complex.ONE.toString())); + Assertions.assertEquals(Complex.I, Complex.parse(Complex.I.toString())); + Assertions.assertEquals(Complex.INF, Complex.parse(Complex.INF.toString())); + Assertions.assertEquals(NAN, Complex.parse(NAN.toString())); + Assertions.assertEquals(oneInf, Complex.parse(oneInf.toString())); + Assertions.assertEquals(negInfZero, Complex.parse(negInfZero.toString())); + Assertions.assertEquals(Complex.ofReal(pi), Complex.parse(Complex.ofReal(pi).toString())); + Assertions.assertEquals(Complex.ofPolar(2, pi), Complex.parse(Complex.ofPolar(2, pi).toString())); + Assertions.assertEquals(Complex.ofCis(pi), Complex.parse(Complex.ofCis(pi).toString())); } @Test @@ -900,6 +900,6 @@ public class ComplexTest { final double re = 1.234; final double im = 5.678; final String str = "( " + re + " , " + im + " )"; - Assertions.assertTrue(Complex.ofCartesian(re, im).equals(Complex.parse(str))); + Assertions.assertEquals(Complex.ofCartesian(re, im), Complex.parse(str)); } } diff --git a/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/ArithmeticUtilsTest.java b/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/ArithmeticUtilsTest.java index 1ff7937..ea4fd30 100644 --- a/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/ArithmeticUtilsTest.java +++ b/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/ArithmeticUtilsTest.java @@ -559,7 +559,7 @@ public class ArithmeticUtilsTest { } for (int i = 0; i < expected.length; i++) { final boolean actual = ArithmeticUtils.isPowerOfTwo(i); - Assertions.assertTrue(actual == expected[i], Integer.toString(i)); + Assertions.assertEquals(actual, expected[i], Integer.toString(i)); } } diff --git a/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/PrecisionTest.java b/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/PrecisionTest.java index 07f7634..9433a63 100644 --- a/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/PrecisionTest.java +++ b/commons-numbers-core/src/test/java/org/apache/commons/numbers/core/PrecisionTest.java @@ -64,8 +64,8 @@ public class PrecisionTest { Assertions.assertTrue(Precision.equalsIncludingNaN(testArray[i], testArray[j])); Assertions.assertTrue(Precision.equalsIncludingNaN(testArray[j], testArray[i])); } else { - Assertions.assertTrue(!Precision.equalsIncludingNaN(testArray[i], testArray[j])); - Assertions.assertTrue(!Precision.equalsIncludingNaN(testArray[j], testArray[i])); + Assertions.assertFalse(Precision.equalsIncludingNaN(testArray[i], testArray[j])); + Assertions.assertFalse(Precision.equalsIncludingNaN(testArray[j], testArray[i])); } } } @@ -417,10 +417,10 @@ public class PrecisionTest { Double.POSITIVE_INFINITY); // a) 1 + EPSILON is equal to 1. - Assertions.assertTrue(1 + Precision.EPSILON == 1); + Assertions.assertEquals(1, 1 + Precision.EPSILON); // b) 1 + "the number after EPSILON" is not equal to 1. - Assertions.assertFalse(1 + afterEpsilon == 1); + Assertions.assertNotEquals(1, 1 + afterEpsilon, 0.0); } @Test 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 52dd953..0f154b9 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 @@ -596,22 +596,22 @@ public class BigFractionTest { public void testEqualsAndHashCode() { BigFraction zero = BigFraction.of(0, 1); BigFraction nullFraction = null; - Assert.assertTrue(zero.equals(zero)); - Assert.assertFalse(zero.equals(nullFraction)); - Assert.assertFalse(zero.equals(Double.valueOf(0))); + Assert.assertEquals(zero, zero); + Assert.assertNotEquals(zero, nullFraction); + Assert.assertNotEquals(zero, Double.valueOf(0), 0.0); BigFraction zero2 = BigFraction.of(0, 2); - Assert.assertTrue(zero.equals(zero2)); + Assert.assertEquals(zero, zero2); Assert.assertEquals(zero.hashCode(), zero2.hashCode()); BigFraction one = BigFraction.of(1, 1); Assert.assertFalse((one.equals(zero) || zero.equals(one))); - Assert.assertTrue(one.equals(BigFraction.ONE)); + Assert.assertEquals(one, BigFraction.ONE); } @Test public void testGetReducedFraction() { BigFraction threeFourths = BigFraction.of(3, 4); - Assert.assertTrue(threeFourths.equals(BigFraction.getReducedFraction(6, 8))); - Assert.assertTrue(BigFraction.ZERO.equals(BigFraction.getReducedFraction(0, -1))); + Assert.assertEquals(threeFourths, BigFraction.getReducedFraction(6, 8)); + Assert.assertEquals(BigFraction.ZERO, BigFraction.getReducedFraction(0, -1)); try { BigFraction.getReducedFraction(1, 0); Assert.fail("expecting ArithmeticException"); 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 30c9d33..0b95245 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 @@ -247,11 +247,11 @@ public class FractionTest { public void testMath1261() { final Fraction a = Fraction.of(Integer.MAX_VALUE, 2); final Fraction b = a.multiply(2); - Assert.assertTrue(b.equals(Fraction.of(Integer.MAX_VALUE))); + Assert.assertEquals(b, Fraction.of(Integer.MAX_VALUE)); final Fraction c = Fraction.of(2, Integer.MAX_VALUE); final Fraction d = c.divide(2); - Assert.assertTrue(d.equals(Fraction.of(1, Integer.MAX_VALUE))); + Assert.assertEquals(d, Fraction.of(1, Integer.MAX_VALUE)); } @Test @@ -583,11 +583,11 @@ public class FractionTest { public void testEqualsAndHashCode() { Fraction zero = Fraction.of(0,1); Fraction nullFraction = null; - Assert.assertTrue( zero.equals(zero)); - Assert.assertFalse(zero.equals(nullFraction)); - Assert.assertFalse(zero.equals(Double.valueOf(0))); + Assert.assertEquals(zero, zero); + Assert.assertNotEquals(zero, nullFraction); + Assert.assertNotEquals(zero, Double.valueOf(0), 0.0); Fraction zero2 = Fraction.of(0,2); - Assert.assertTrue(zero.equals(zero2)); + Assert.assertEquals(zero, zero2); Assert.assertEquals(zero.hashCode(), zero2.hashCode()); Fraction one = Fraction.of(1,1); Assert.assertFalse((one.equals(zero) ||zero.equals(one))); @@ -596,8 +596,8 @@ public class FractionTest { @Test public void testGetReducedFraction() { Fraction threeFourths = Fraction.of(3, 4); - Assert.assertTrue(threeFourths.equals(Fraction.getReducedFraction(6, 8))); - Assert.assertTrue(Fraction.ZERO.equals(Fraction.getReducedFraction(0, -1))); + Assert.assertEquals(threeFourths, Fraction.getReducedFraction(6, 8)); + Assert.assertEquals(Fraction.ZERO, Fraction.getReducedFraction(0, -1)); try { Fraction.getReducedFraction(1, 0); Assert.fail("expecting ArithmeticException"); diff --git a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java index f82e6b7..31e6852 100644 --- a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java +++ b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java @@ -35,16 +35,16 @@ public class QuaternionTest { @Test public void testUnitQuaternions() { Assertions.assertEquals(1, Quaternion.ONE.norm(), 0d); - Assertions.assertTrue(Quaternion.ONE.normalize() == Quaternion.ONE); + Assertions.assertSame(Quaternion.ONE.normalize(), Quaternion.ONE); Assertions.assertEquals(1, Quaternion.I.norm(), 0d); - Assertions.assertTrue(Quaternion.I.normalize() == Quaternion.I); + Assertions.assertSame(Quaternion.I.normalize(), Quaternion.I); Assertions.assertEquals(1, Quaternion.J.norm(), 0d); - Assertions.assertTrue(Quaternion.J.normalize() == Quaternion.J); + Assertions.assertSame(Quaternion.J.normalize(), Quaternion.J); Assertions.assertEquals(1, Quaternion.K.norm(), 0d); - Assertions.assertTrue(Quaternion.K.normalize() == Quaternion.K); + Assertions.assertSame(Quaternion.K.normalize(), Quaternion.K); } @Test @@ -330,7 +330,7 @@ public class QuaternionTest { Assertions.assertEquals(1, versor.norm(), 0); - Assertions.assertTrue(versor.normalize() == versor); + Assertions.assertSame(versor.normalize(), versor); } @Test @@ -370,24 +370,24 @@ public class QuaternionTest { public final void testObjectEquals() { final double one = 1; final Quaternion q1 = Quaternion.of(one, one, one, one); - Assertions.assertTrue(q1.equals(q1)); + Assertions.assertEquals(q1, q1); final Quaternion q2 = Quaternion.of(one, one, one, one); - Assertions.assertTrue(q2.equals(q1)); + Assertions.assertEquals(q2, q1); final Quaternion q3 = Quaternion.of(one, Math.nextUp(one), one, one); - Assertions.assertFalse(q3.equals(q1)); + Assertions.assertNotEquals(q3, q1); - Assertions.assertFalse(q3.equals("bar")); + Assertions.assertNotEquals("bar", q3); } @Test public void testHashCode() { Quaternion x = Quaternion.of(0.0, 0.0, 0.0, 0.0); Quaternion y = Quaternion.of(0.0, 0.0 + Double.MIN_VALUE, 0.0, 0.0); - Assertions.assertFalse(x.hashCode()==y.hashCode()); + Assertions.assertNotEquals(x.hashCode(), y.hashCode()); y = Quaternion.of(0.0 + Double.MIN_VALUE, 0.0, 0.0, 0.0); - Assertions.assertFalse(x.hashCode()==y.hashCode()); + Assertions.assertNotEquals(x.hashCode(), y.hashCode()); // "equals" and "hashCode" must be compatible: if two objects have // different hash codes, "equals" must return false. @@ -396,22 +396,22 @@ public class QuaternionTest { x = Quaternion.of(0.0, 0.0, 0.0, 0.0); y = Quaternion.of(-0.0, 0.0, 0.0, 0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); x = Quaternion.of(0.0, 0.0, 0.0, 0.0); y = Quaternion.of(0.0, -0.0, 0.0, 0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); x = Quaternion.of(0.0, 0.0, 0.0, 0.0); y = Quaternion.of(0.0, 0.0, -0.0, 0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); x = Quaternion.of(0.0, 0.0, 0.0, 0.0); y = Quaternion.of(0.0, 0.0, 0.0, -0.0); Assertions.assertTrue(x.hashCode() != y.hashCode()); - Assertions.assertFalse(x.equals(y), msg); + Assertions.assertNotEquals(x, y, msg); } @Test @@ -485,7 +485,7 @@ public class QuaternionTest { Quaternion expected = Quaternion.of(0.5, -0.5, -0.5, 0.5); assertEquals(q, expected, EPS); - Assertions.assertTrue(q.positivePolarForm() == q); + Assertions.assertSame(q.positivePolarForm(), q); } @Test @@ -494,7 +494,7 @@ public class QuaternionTest { Quaternion expected = Quaternion.of(0.5, -0.5, 0.5, -0.5); assertEquals(q, expected, EPS); - Assertions.assertTrue(q.positivePolarForm() == q); + Assertions.assertSame(q.positivePolarForm(), q); } @Test @@ -502,7 +502,7 @@ public class QuaternionTest { Quaternion q = Quaternion.of(123, 45, 67, 89).normalize().positivePolarForm(); Assertions.assertTrue(q.getW() >= 0); - Assertions.assertTrue(q.positivePolarForm() == q); + Assertions.assertSame(q.positivePolarForm(), q); } @Test @@ -510,7 +510,7 @@ public class QuaternionTest { Quaternion q = Quaternion.of(123, 45, 67, 89).normalize().negate().positivePolarForm(); Assertions.assertTrue(q.getW() >= 0); - Assertions.assertTrue(q.positivePolarForm() == q); + Assertions.assertSame(q.positivePolarForm(), q); } @Test diff --git a/commons-numbers-rootfinder/src/test/java/org/apache/commons/numbers/rootfinder/BrentSolverTest.java b/commons-numbers-rootfinder/src/test/java/org/apache/commons/numbers/rootfinder/BrentSolverTest.java index 84a2e97..8dd5a4f 100644 --- a/commons-numbers-rootfinder/src/test/java/org/apache/commons/numbers/rootfinder/BrentSolverTest.java +++ b/commons-numbers-rootfinder/src/test/java/org/apache/commons/numbers/rootfinder/BrentSolverTest.java @@ -159,7 +159,7 @@ public class BrentSolverTest { } catch (IllegalStateException ex) { // Expected. // Ensure expected error condition. - Assertions.assertFalse(ex.getMessage().indexOf("too many calls") == -1); + Assertions.assertNotEquals(ex.getMessage().indexOf("too many calls"), -1); } } @@ -195,21 +195,21 @@ public class BrentSolverTest { Assertions.fail("Expecting bad interval condition"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertFalse(ex.getMessage().indexOf(" > ") == -1); + Assertions.assertNotEquals(ex.getMessage().indexOf(" > "), -1); } try { // No bracketing. solver.findRoot(f, 1, 1.5); Assertions.fail("Expecting non-bracketing condition"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertFalse(ex.getMessage().indexOf("No bracketing") == -1); + Assertions.assertNotEquals(ex.getMessage().indexOf("No bracketing"), -1); } try { // No bracketing. solver.findRoot(f, 1, 1.2, 1.5); Assertions.fail("Expecting non-bracketing condition"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertFalse(ex.getMessage().indexOf("No bracketing") == -1); + Assertions.assertNotEquals(ex.getMessage().indexOf("No bracketing"), -1); } } @@ -226,7 +226,7 @@ public class BrentSolverTest { Assertions.fail("an out of range condition was expected"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertFalse(ex.getMessage().indexOf("out of range") == -1); + Assertions.assertNotEquals(ex.getMessage().indexOf("out of range"), -1); } }
