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 74c8a9c753fc531c96eb6a9263adc4e3aa9aef96 Author: Eitan Adler <[email protected]> AuthorDate: Sun Jun 9 22:44:41 2019 -0700 One more step --- .../java/org/apache/commons/numbers/angle/PlaneAngleTest.java | 6 +++--- .../java/org/apache/commons/numbers/fraction/Fraction.java | 2 +- .../org/apache/commons/numbers/quaternion/QuaternionTest.java | 8 ++++---- .../org/apache/commons/numbers/rootfinder/BrentSolverTest.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 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 54ddddd..98e315a 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 @@ -162,20 +162,20 @@ public class PlaneAngleTest { final double value = 12345.6789; final PlaneAngle a = PlaneAngle.ofRadians(value); final PlaneAngle b = PlaneAngle.ofRadians(value); - Assert.assertEquals(a, b); + Assertions.assertEquals(a, b); } @Test public void testEquals2() { final PlaneAngle a = PlaneAngle.ofRadians(153768.373486587); final PlaneAngle b = null; - Assert.assertNotEquals(a, b); + Assertions.assertNotEquals(b, a); } @Test public void testEquals3() { final double value = 0.987654321; final PlaneAngle a = PlaneAngle.ofRadians(value); final PlaneAngle b = PlaneAngle.ofRadians(value + 1e-16); - Assert.assertNotEquals(a, b); + Assertions.assertNotEquals(a, b); } @Test diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java index 74beb3b..fad2d50 100644 --- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java +++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java @@ -286,7 +286,7 @@ public class Fraction public int compareTo(Fraction object) { long nOd = ((long) numerator) * object.denominator; long dOn = ((long) denominator) * object.numerator; - return (nOd < dOn) ? -1 : ((nOd > dOn) ? +1 : 0); + return (nOd < dOn) ? -1 : ((nOd > dOn) ? +1 : 0); } /** 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 31e6852..b2f7a82 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.assertSame(Quaternion.ONE.normalize(), Quaternion.ONE); + Assertions.assertSame(Quaternion.ONE, Quaternion.ONE.normalize()); Assertions.assertEquals(1, Quaternion.I.norm(), 0d); - Assertions.assertSame(Quaternion.I.normalize(), Quaternion.I); + Assertions.assertSame(Quaternion.I, Quaternion.I.normalize()); Assertions.assertEquals(1, Quaternion.J.norm(), 0d); - Assertions.assertSame(Quaternion.J.normalize(), Quaternion.J); + Assertions.assertSame(Quaternion.J, Quaternion.J.normalize()); Assertions.assertEquals(1, Quaternion.K.norm(), 0d); - Assertions.assertSame(Quaternion.K.normalize(), Quaternion.K); + Assertions.assertSame(Quaternion.K, Quaternion.K.normalize()); } @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 8dd5a4f..ef1ee7d 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.assertNotEquals(ex.getMessage().indexOf("too many calls"), -1); + Assertions.assertNotEquals(-1, ex.getMessage().indexOf("too many calls")); } } @@ -195,21 +195,21 @@ public class BrentSolverTest { Assertions.fail("Expecting bad interval condition"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertNotEquals(ex.getMessage().indexOf(" > "), -1); + Assertions.assertNotEquals(-1, ex.getMessage().indexOf(" > ")); } try { // No bracketing. solver.findRoot(f, 1, 1.5); Assertions.fail("Expecting non-bracketing condition"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertNotEquals(ex.getMessage().indexOf("No bracketing"), -1); + Assertions.assertNotEquals(-1, ex.getMessage().indexOf("No bracketing")); } 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.assertNotEquals(ex.getMessage().indexOf("No bracketing"), -1); + Assertions.assertNotEquals(-1, ex.getMessage().indexOf("No bracketing")); } } @@ -226,7 +226,7 @@ public class BrentSolverTest { Assertions.fail("an out of range condition was expected"); } catch (SolverException ex) { // Ensure expected error condition. - Assertions.assertNotEquals(ex.getMessage().indexOf("out of range"), -1); + Assertions.assertNotEquals(-1, ex.getMessage().indexOf("out of range")); } }
