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 e8a071ee1f664e3b855c734e528d1dcda25472ee Author: Eitan Adler <[email protected]> AuthorDate: Sun Jun 9 22:27:48 2019 -0700 Order of arguments --- .../commons/numbers/combinatorics/BinomialCoefficientTest.java | 2 +- .../numbers/combinatorics/LogBinomialCoefficientTest.java | 2 +- .../java/org/apache/commons/numbers/complex/ComplexTest.java | 8 ++++---- .../org/apache/commons/numbers/fraction/BigFractionTest.java | 4 ++-- .../java/org/apache/commons/numbers/fraction/FractionTest.java | 8 ++++---- .../org/apache/commons/numbers/primes/SmallPrimesTest.java | 6 +++--- .../org/apache/commons/numbers/rootfinder/BrentSolverTest.java | 10 +++++----- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java index ad87d12..9c1dde2 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java @@ -37,7 +37,7 @@ public class BinomialCoefficientTest { /** Verify that b(0,0) = 1 */ @Test public void test0Choose0() { - Assertions.assertEquals(BinomialCoefficient.value(0, 0), 1); + Assertions.assertEquals(1, BinomialCoefficient.value(0, 0)); } @Test diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/LogBinomialCoefficientTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/LogBinomialCoefficientTest.java index 22d3124..1e1a8f5 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/LogBinomialCoefficientTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/LogBinomialCoefficientTest.java @@ -27,7 +27,7 @@ public class LogBinomialCoefficientTest { /** Verify that b(0,0) = 1 */ @Test public void test0Choose0() { - Assert.assertEquals(LogBinomialCoefficient.value(0, 0), 0d, 0); + Assert.assertEquals(0d, LogBinomialCoefficient.value(0, 0), 0); } @Test 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 65bc505..014aeb6 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 @@ -96,7 +96,7 @@ public class ComplexTest { Complex x = Complex.ofCartesian(1, 1); Complex z = Complex.ofCartesian(inf, 0); Complex w = x.add(z); - Assertions.assertEquals(w.getImaginary(), 1, 0); + Assertions.assertEquals(1, w.getImaginary(), 0); Assertions.assertEquals(inf, w.getReal(), 0); x = Complex.ofCartesian(neginf, 0); @@ -182,14 +182,14 @@ public class ComplexTest { public void testDivideZero() { Complex x = Complex.ofCartesian(3.0, 4.0); Complex z = x.divide(Complex.ZERO); - Assertions.assertEquals(z, Complex.INF); + Assertions.assertEquals(Complex.INF, z); } @Test public void testDivideZeroZero() { Complex x = Complex.ofCartesian(0.0, 0.0); Complex z = x.divide(Complex.ZERO); - Assertions.assertEquals(z, NAN); + Assertions.assertEquals(NAN, z); } @Test @@ -346,7 +346,7 @@ public class ComplexTest { Complex x = Complex.ofCartesian(1, 1); Complex z = Complex.ofCartesian(neginf, 0); Complex w = x.subtract(z); - Assertions.assertEquals(w.getImaginary(), 1, 0); + Assertions.assertEquals(1, w.getImaginary(), 0); Assertions.assertEquals(inf, w.getReal(), 0); x = Complex.ofCartesian(neginf, 0); 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 671164d..52dd953 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 @@ -618,8 +618,8 @@ public class BigFractionTest { } catch (ArithmeticException ex) { // expected } - Assert.assertEquals(BigFraction.getReducedFraction(2, Integer.MIN_VALUE).getNumeratorAsInt(), -1); - Assert.assertEquals(BigFraction.getReducedFraction(1, -1).getNumeratorAsInt(), -1); + Assert.assertEquals(-1, BigFraction.getReducedFraction(2, Integer.MIN_VALUE).getNumeratorAsInt()); + Assert.assertEquals(-1, BigFraction.getReducedFraction(1, -1).getNumeratorAsInt()); } @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 557895e..30c9d33 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 @@ -604,10 +604,10 @@ public class FractionTest { } catch (ArithmeticException ignored) { // expected } - Assert.assertEquals(Fraction.getReducedFraction - (2, Integer.MIN_VALUE).getNumerator(),-1); - Assert.assertEquals(Fraction.getReducedFraction - (1, -1).getNumerator(), -1); + Assert.assertEquals(-1, Fraction.getReducedFraction + (2, Integer.MIN_VALUE).getNumerator()); + Assert.assertEquals(-1, Fraction.getReducedFraction + (1, -1).getNumerator()); } @Test diff --git a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java index 06023c5..a4fdab5 100644 --- a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java +++ b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java @@ -59,7 +59,7 @@ public class SmallPrimesTest { final int penultimatePrime = SmallPrimes.PRIMES[SmallPrimes.PRIMES.length-2]; final int result = SmallPrimes.smallTrialDivision(penultimatePrime*SmallPrimes.PRIMES_LAST, factors); Assertions.assertEquals(1, result); - Assertions.assertEquals(Arrays.asList(penultimatePrime, SmallPrimes.PRIMES_LAST), factors); + Assertions.assertEquals(factors, Arrays.asList(penultimatePrime, SmallPrimes.PRIMES_LAST)); } @Test @@ -83,7 +83,7 @@ public class SmallPrimesTest { final List<Integer> factors = new ArrayList<Integer>(); final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0]*LARGE_PRIME[1], Integer.MAX_VALUE, factors); Assertions.assertEquals(LARGE_PRIME[1], result); - Assertions.assertEquals(Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[1]), factors); + Assertions.assertEquals(factors, Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[1])); } @Test @@ -91,7 +91,7 @@ public class SmallPrimesTest { final List<Integer> factors = new ArrayList<Integer>(); final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0]*LARGE_PRIME[0], Integer.MAX_VALUE, factors); Assertions.assertEquals(LARGE_PRIME[0], result); - Assertions.assertEquals(Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[0]), factors); + Assertions.assertEquals(factors, Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[0])); } @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 37f0126..84a2e97 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 @@ -42,13 +42,13 @@ public class BrentSolverTest { // Somewhat benign interval. The function is monotonous. f = new MonitoredFunction(func); result = solver.findRoot(f, 3, 4); - Assertions.assertEquals(result, Math.PI, DEFAULT_ABSOLUTE_ACCURACY); + Assertions.assertEquals(Math.PI, result, DEFAULT_ABSOLUTE_ACCURACY); Assertions.assertTrue(f.getCallsCount() <= 7); // Larger and somewhat less benign interval. The function is grows first. f = new MonitoredFunction(func); result = solver.findRoot(f, 1, 4); - Assertions.assertEquals(result, Math.PI, DEFAULT_ABSOLUTE_ACCURACY); + Assertions.assertEquals(Math.PI, result, DEFAULT_ABSOLUTE_ACCURACY); Assertions.assertTrue(f.getCallsCount() <= 8); } @@ -73,21 +73,21 @@ public class BrentSolverTest { // the root in the first iteration. f = new MonitoredFunction(func); result = solver.findRoot(f, -0.2, 0.2); - Assertions.assertEquals(result, 0, DEFAULT_ABSOLUTE_ACCURACY); + Assertions.assertEquals(0, result, DEFAULT_ABSOLUTE_ACCURACY); Assertions.assertTrue(f.getCallsCount() <= 3); // 1 iterations on i586 JDK 1.4.1. // Asymmetric bracket around 0. Contains extremum. f = new MonitoredFunction(func); result = solver.findRoot(f, -0.1, 0.3); - Assertions.assertEquals(result, 0, DEFAULT_ABSOLUTE_ACCURACY); + Assertions.assertEquals(0, result, DEFAULT_ABSOLUTE_ACCURACY); // 5 iterations on i586 JDK 1.4.1. Assertions.assertTrue(f.getCallsCount() <= 7); // Large bracket around 0. Contains two extrema. f = new MonitoredFunction(func); result = solver.findRoot(f, -0.3, 0.45); - Assertions.assertEquals(result, 0, DEFAULT_ABSOLUTE_ACCURACY); + Assertions.assertEquals(0, result, DEFAULT_ABSOLUTE_ACCURACY); // 6 iterations on i586 JDK 1.4.1. Assertions.assertTrue(f.getCallsCount() <= 8);
