You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2019/06/18 13:17:00 UTC
[commons-numbers] 15/34: Migrate commons-numbers-complex-streams to
JUnit 5
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 773f4d7975d99bd230c0338c9d84b0d18e293886
Author: Schamschi <he...@gmx.at>
AuthorDate: Sun Jun 9 15:10:13 2019 +0200
Migrate commons-numbers-complex-streams to JUnit 5
Migrate the following classes:
ComplexUtilsTest
TestUtils
---
.../numbers/complex/streams/ComplexUtilsTest.java | 15 +++++++--------
.../commons/numbers/complex/streams/TestUtils.java | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/ComplexUtilsTest.java b/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/ComplexUtilsTest.java
index dba04a5..fc1fec2 100644
--- a/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/ComplexUtilsTest.java
+++ b/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/ComplexUtilsTest.java
@@ -19,7 +19,6 @@ package org.apache.commons.numbers.complex.streams;
import org.apache.commons.numbers.complex.Complex;
-import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -266,9 +265,9 @@ public class ComplexUtilsTest {
theta1D[5-i] = theta1D[5 + i + 1] - pi/6;
}
Complex[] observed1D = ComplexUtils.polar2Complex(r1D, theta1D);
- Assert.assertEquals(r1D.length, observed1D.length);
+ Assertions.assertEquals(r1D.length, observed1D.length);
for (int i = 0; i < r1D.length; i++) {
- Assert.assertEquals(ComplexUtils.polar2Complex(r1D[i], theta1D[i]), observed1D[i]);
+ Assertions.assertEquals(ComplexUtils.polar2Complex(r1D[i], theta1D[i]), observed1D[i]);
}
// 2D
@@ -281,7 +280,7 @@ public class ComplexUtilsTest {
}
}
Complex[][] observed2D = ComplexUtils.polar2Complex(r2D, theta2D);
- Assert.assertEquals(r2D.length, observed2D.length);
+ Assertions.assertEquals(r2D.length, observed2D.length);
for (int i = 0; i < r2D.length; i++) {
TestUtils.assertSame(msg, ComplexUtils.polar2Complex(r2D[i], theta2D[i]), observed2D[i]);
}
@@ -298,7 +297,7 @@ public class ComplexUtilsTest {
}
}
Complex[][][] observed3D = ComplexUtils.polar2Complex(r3D, theta3D);
- Assert.assertEquals(r3D.length, observed3D.length);
+ Assertions.assertEquals(r3D.length, observed3D.length);
for (int i = 0; i < r3D.length; i++) {
TestUtils.assertSame(msg, ComplexUtils.polar2Complex(r3D[i], theta3D[i]), observed3D[i]);
}
@@ -362,7 +361,7 @@ public class ComplexUtilsTest {
final Complex[] complex = ComplexUtils.real2Complex(real);
for (int i = 0; i < real.length; i++) {
- Assert.assertEquals(real[i], complex[i].getReal(), 0d);
+ Assertions.assertEquals(real[i], complex[i].getReal(), 0d);
}
}
@@ -755,7 +754,7 @@ public class ComplexUtilsTest {
public void testAbs() {
setArrays();
double[] observed = ComplexUtils.abs(c);
- Assert.assertEquals(c.length, observed.length);
+ Assertions.assertEquals(c.length, observed.length);
for (int i = 0; i < c.length; i++) {
TestUtils.assertEquals(c[i].abs(), observed[i], 0);
}
@@ -765,7 +764,7 @@ public class ComplexUtilsTest {
public void testArg() {
setArrays();
double[] observed = ComplexUtils.arg(c);
- Assert.assertEquals(c.length, observed.length);
+ Assertions.assertEquals(c.length, observed.length);
for (int i = 0; i < c.length; i++) {
TestUtils.assertEquals(c[i].getArgument(), observed[i], 0);
}
diff --git a/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/TestUtils.java b/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/TestUtils.java
index 1daa267..92088e5 100644
--- a/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/TestUtils.java
+++ b/commons-numbers-complex-streams/src/test/java/org/apache/commons/numbers/complex/streams/TestUtils.java
@@ -20,7 +20,7 @@ package org.apache.commons.numbers.complex.streams;
import org.apache.commons.numbers.complex.Complex;
import org.apache.commons.numbers.core.Precision;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
/**
* Test utilities.
@@ -49,10 +49,10 @@ class TestUtils {
public static void assertEquals(String msg, double expected, double actual, double delta) {
// check for NaN
if(Double.isNaN(expected)){
- Assert.assertTrue((msg == null ? "" : msg + "\n") + actual + " is not NaN.",
- Double.isNaN(actual));
+ Assertions.assertTrue(Double.isNaN(actual),
+ (msg == null ? "" : msg + "\n") + actual + " is not NaN.");
} else {
- Assert.assertEquals(msg, expected, actual, delta);
+ Assertions.assertEquals(expected, actual, delta, msg);
}
}
@@ -109,7 +109,7 @@ class TestUtils {
* both NaN or infinities of same sign, or identical floating point values.
*/
public static void assertSame(double expected, double actual) {
- Assert.assertEquals(expected, actual, 0);
+ Assertions.assertEquals(expected, actual, 0);
}
/**
@@ -126,8 +126,8 @@ class TestUtils {
* differ by at most delta. Also ensures that NaN / infinite components match.
*/
public static void assertEquals(Complex expected, Complex actual, double delta) {
- Assert.assertEquals("Real Values Differ", expected.getReal(), actual.getReal(), delta);
- Assert.assertEquals("Imaginary Values Differ", expected.getImaginary(), actual.getImaginary(), delta);
+ Assertions.assertEquals(expected.getReal(), actual.getReal(), delta, "Real Values Differ");
+ Assertions.assertEquals(expected.getImaginary(), actual.getImaginary(), delta, "Imaginary Values Differ");
}
/** verifies that two arrays are close (sup norm) */
@@ -147,7 +147,7 @@ class TestUtils {
}
}
if (failure) {
- Assert.fail(out.toString());
+ Assertions.fail(out.toString());
}
}
@@ -200,7 +200,7 @@ class TestUtils {
}
}
if (failure) {
- Assert.fail(out.toString());
+ Assertions.fail(out.toString());
}
}
@@ -246,7 +246,7 @@ class TestUtils {
}
}
if (failure) {
- Assert.fail(out.toString());
+ Assertions.fail(out.toString());
}
}
@@ -315,7 +315,7 @@ class TestUtils {
out.append("Arrays not same length. \n");
out.append("expected has length ").append(expectedLength);
out.append(" observed has length = ").append(observedLength);
- Assert.fail(out.toString());
+ Assertions.fail(out.toString());
}
}