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 c53efde09f2d18bf7a8f13e3246994aab6311001
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Jun 20 08:13:32 2021 +0200
Replace assert by simpler but equivalent calls.
---
.../org/apache/commons/numbers/angle/AngleTest.java | 6 +++---
.../numbers/arrays/MultidimensionalCounterTest.java | 3 +--
.../commons/numbers/arrays/SortInPlaceTest.java | 19 +++++++++----------
.../apache/commons/numbers/complex/ComplexTest.java | 4 ++--
.../org/apache/commons/numbers/field/FP64Test.java | 12 ++++++------
.../commons/numbers/fraction/BigFractionTest.java | 8 ++++----
.../apache/commons/numbers/fraction/FractionTest.java | 8 ++++----
.../commons/numbers/quaternion/QuaternionTest.java | 2 +-
8 files changed, 30 insertions(+), 32 deletions(-)
diff --git
a/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/AngleTest.java
b/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/AngleTest.java
index ce1c942..2f5367f 100644
---
a/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/AngleTest.java
+++
b/commons-numbers-angle/src/test/java/org/apache/commons/numbers/angle/AngleTest.java
@@ -60,19 +60,19 @@ class AngleTest {
Assertions.assertEquals(Angle.Turn.of(value), asTurn);
Assertions.assertEquals(asTurn, asTurn);
Assertions.assertNotEquals(asTurn, Angle.Turn.of(nextValue));
- Assertions.assertFalse(asTurn.equals(null));
+ Assertions.assertNotEquals(asTurn, null);
final Angle.Rad asRad = Angle.Rad.of(value);
Assertions.assertEquals(Angle.Rad.of(value), asRad);
Assertions.assertEquals(asRad, asRad);
Assertions.assertNotEquals(asRad, Angle.Rad.of(nextValue));
- Assertions.assertFalse(asRad.equals(null));
+ Assertions.assertNotEquals(asRad, null);
final Angle.Deg asDeg = Angle.Deg.of(value);
Assertions.assertEquals(Angle.Deg.of(value), asDeg);
Assertions.assertEquals(asDeg, asDeg);
Assertions.assertNotEquals(asDeg, Angle.Deg.of(nextValue));
- Assertions.assertFalse(asDeg.equals(null));
+ Assertions.assertNotEquals(asDeg, null);
Assertions.assertNotEquals(asDeg, asTurn);
Assertions.assertNotEquals(asTurn, asRad);
diff --git
a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/MultidimensionalCounterTest.java
b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/MultidimensionalCounterTest.java
index 62afd23..50a9381 100644
---
a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/MultidimensionalCounterTest.java
+++
b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/MultidimensionalCounterTest.java
@@ -133,8 +133,7 @@ class MultidimensionalCounterTest {
for (int i = 0; i < counter.getSize(); i++) {
cmIter.next();
- Assertions.assertTrue(Arrays.equals(cmIter.getCounts(),
- counter.toMulti(i)));
+ Assertions.assertArrayEquals(cmIter.getCounts(),
counter.toMulti(i));
}
Assertions.assertFalse(cmIter.hasNext());
diff --git
a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/SortInPlaceTest.java
b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/SortInPlaceTest.java
index 184abb5..960f01a 100644
---
a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/SortInPlaceTest.java
+++
b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/SortInPlaceTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.numbers.arrays;
-import java.util.Arrays;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -38,9 +37,9 @@ class SortInPlaceTest {
final double[] yE = {9, 1, 4, 16, 25};
final double[] zE = {27, 1, 8, 64, -125};
- Assertions.assertTrue(Arrays.equals(xE, x));
- Assertions.assertTrue(Arrays.equals(yE, y));
- Assertions.assertTrue(Arrays.equals(zE, z));
+ Assertions.assertArrayEquals(xE, x);
+ Assertions.assertArrayEquals(yE, y);
+ Assertions.assertArrayEquals(zE, z);
}
@Test
@@ -55,9 +54,9 @@ class SortInPlaceTest {
final double[] yE = {25, 16, 4, 1, 9};
final double[] zE = {-125, 64, 8, 1, 27};
- Assertions.assertTrue(Arrays.equals(xE, x));
- Assertions.assertTrue(Arrays.equals(yE, y));
- Assertions.assertTrue(Arrays.equals(zE, z));
+ Assertions.assertArrayEquals(xE, x);
+ Assertions.assertArrayEquals(yE, y);
+ Assertions.assertArrayEquals(zE, z);
}
// Example in Javadoc.
@@ -73,9 +72,9 @@ class SortInPlaceTest {
final double[] yE = {2, 3, 1};
final double[] zE = {5, 7, 0};
- Assertions.assertTrue(Arrays.equals(xE, x));
- Assertions.assertTrue(Arrays.equals(yE, y));
- Assertions.assertTrue(Arrays.equals(zE, z));
+ Assertions.assertArrayEquals(xE, x);
+ Assertions.assertArrayEquals(yE, y);
+ Assertions.assertArrayEquals(zE, z);
}
@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 4e2ba6c..9d7c23a 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
@@ -1722,13 +1722,13 @@ class ComplexTest {
@Test
void testEqualsWithNull() {
final Complex x = Complex.ofCartesian(3.0, 4.0);
- Assertions.assertFalse(x.equals(null));
+ Assertions.assertNotEquals(x, null);
}
@Test
void testEqualsWithAnotherClass() {
final Complex x = Complex.ofCartesian(3.0, 4.0);
- Assertions.assertFalse(x.equals(new Object()));
+ Assertions.assertNotEquals(x, new Object());
}
@Test
diff --git
a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FP64Test.java
b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FP64Test.java
index 4b47f86..cfd820f 100644
---
a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FP64Test.java
+++
b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FP64Test.java
@@ -43,14 +43,14 @@ class FP64Test {
final FP64 b = FP64.of(4.56);
// Same instance
- Assertions.assertTrue(a.equals(a));
+ Assertions.assertEquals(a, a);
// Same value
- Assertions.assertTrue(a.equals(FP64.of(a.doubleValue())));
+ Assertions.assertEquals(a, FP64.of(a.doubleValue()));
// Different value
- Assertions.assertFalse(a.equals(b));
+ Assertions.assertNotEquals(a, b);
// Different object
- Assertions.assertFalse(a.equals(new Object()));
- Assertions.assertFalse(a.equals(null));
+ Assertions.assertNotEquals(a, new Object());
+ Assertions.assertNotEquals(a, null);
}
@Test
@@ -103,6 +103,6 @@ class FP64Test {
Assertions.assertTrue(FP64.of(1).compareTo(FP64.of(2)) < 0);
final double v = 123.45;
- Assertions.assertTrue(FP64.of(v).compareTo(FP64.of(v)) == 0);
+ Assertions.assertEquals(0, FP64.of(v).compareTo(FP64.of(v)));
}
}
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 594ace9..d9419e2 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
@@ -625,10 +625,10 @@ class BigFractionTest {
@Test
void testEqualsAndHashCode() {
final BigFraction zero = BigFraction.of(0, 1);
- Assertions.assertTrue(zero.equals(zero));
- Assertions.assertFalse(zero.equals(null));
- Assertions.assertFalse(zero.equals(new Object()));
- Assertions.assertFalse(zero.equals(Double.valueOf(0)));
+ Assertions.assertEquals(zero, zero);
+ Assertions.assertNotEquals(null, zero);
+ Assertions.assertNotEquals(zero, new Object());
+ Assertions.assertNotEquals(zero, Double.valueOf(0));
// Equal to same rational number
final BigFraction zero2 = BigFraction.of(0, 2);
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 478c196..beaf7a9 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
@@ -463,10 +463,10 @@ class FractionTest {
@Test
void testEqualsAndHashCode() {
final Fraction zero = Fraction.of(0, 1);
- Assertions.assertTrue(zero.equals(zero));
- Assertions.assertFalse(zero.equals(null));
- Assertions.assertFalse(zero.equals(new Object()));
- Assertions.assertFalse(zero.equals(Double.valueOf(0)));
+ Assertions.assertEquals(zero, zero);
+ Assertions.assertNotEquals(zero, null);
+ Assertions.assertNotEquals(zero, new Object());
+ Assertions.assertNotEquals(zero, Double.valueOf(0));
// Equal to same rational number
final Fraction zero2 = Fraction.of(0, 2);
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 ac25205..92f835c 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
@@ -378,7 +378,7 @@ class QuaternionTest {
final Quaternion q3 = Quaternion.of(one, Math.nextUp(one), one, one);
Assertions.assertNotEquals(q3, q1);
- Assertions.assertFalse(q3.equals("bar"));
+ Assertions.assertNotEquals(q3, "bar");
}
@Test
