This is an automated email from the ASF dual-hosted git repository. mattjuntunen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-geometry.git
commit 7f8c326fc32387789f4d16b0d445c3f26ad0925c Author: Matt Juntunen <mattjuntu...@apache.org> AuthorDate: Fri Dec 18 07:46:17 2020 -0500 fixing test docs, formatting, and compile errors --- .../commons/geometry/core/GeometryTestUtils.java | 18 ++++++------ .../core/internal/IteratorTransformTest.java | 1 - .../AbstractConvexHyperplaneBoundedRegionTest.java | 2 -- .../geometry/enclosing/EnclosingBallTest.java | 1 - .../oned/AffineTransformMatrix1DTest.java | 1 - .../geometry/euclidean/oned/IntervalTest.java | 1 - .../geometry/euclidean/oned/Vector1DTest.java | 1 - .../threed/AffineTransformMatrix3DTest.java | 1 - .../geometry/euclidean/threed/Bounds3DTest.java | 1 - .../euclidean/threed/EmbeddingPlaneTest.java | 1 - .../geometry/euclidean/threed/PlaneTest.java | 1 - .../geometry/euclidean/threed/PlanesTest.java | 1 - .../euclidean/threed/RegionBSPTree3DTest.java | 1 - .../euclidean/threed/SimpleTriangle3DTest.java | 1 - .../euclidean/threed/SphericalCoordinatesTest.java | 1 - .../geometry/euclidean/threed/Vector3DTest.java | 3 -- .../threed/VertexListConvexPolygon3DTest.java | 1 - .../geometry/euclidean/threed/line/Line3DTest.java | 1 - .../threed/mesh/SimpleTriangleMeshTest.java | 1 - .../threed/rotation/QuaternionRotationTest.java | 2 -- .../euclidean/threed/shape/ParallelepipedTest.java | 1 - .../euclidean/threed/shape/SphereTest.java | 1 - .../twod/AffineTransformMatrix2DTest.java | 1 - .../geometry/euclidean/twod/Bounds2DTest.java | 1 - .../geometry/euclidean/twod/ConvexAreaTest.java | 1 - .../euclidean/twod/EmbeddedTreeLineSubsetTest.java | 1 - .../euclidean/twod/PolarCoordinatesTest.java | 1 - .../euclidean/twod/RegionBSPTree2DTest.java | 1 - .../geometry/euclidean/twod/Vector2DTest.java | 1 - .../geometry/euclidean/twod/path/LinePathTest.java | 1 - .../euclidean/twod/rotation/Rotation2DTest.java | 1 - .../geometry/euclidean/twod/shape/CircleTest.java | 1 - .../euclidean/twod/shape/ParallelogramTest.java | 1 - .../io/threed/obj/OBJModelIOHandlerTest.java | 8 +++--- .../examples/io/threed/obj/OBJReaderTest.java | 33 ++++++---------------- .../hull/euclidean/twod/ConvexHull2DTest.java | 1 - .../hull/euclidean/twod/MonotoneChainTest.java | 1 - .../spherical/oned/AngularIntervalTest.java | 1 - .../geometry/spherical/oned/Point1STest.java | 1 - .../geometry/spherical/twod/ConvexArea2STest.java | 1 - .../geometry/spherical/twod/GreatArcTest.java | 1 - .../geometry/spherical/twod/GreatCircleTest.java | 1 - .../spherical/twod/RegionBSPTree2STest.java | 1 - 43 files changed, 20 insertions(+), 83 deletions(-) diff --git a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/GeometryTestUtils.java b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/GeometryTestUtils.java index fe21385..23774b9 100644 --- a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/GeometryTestUtils.java +++ b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/GeometryTestUtils.java @@ -27,7 +27,6 @@ import org.junit.jupiter.api.function.Executable; /** Class containing various geometry-related test utilities. */ - public final class GeometryTestUtils { /** Utility class; no instantiation. */ @@ -51,25 +50,24 @@ public final class GeometryTestUtils { Assertions.assertTrue(value < 0, msg); } - /** Asserts that the given Executable throws an exception of the given type. If - * {@code message} is not null, the exception message is asserted to equal the - * given value. + /** Asserts that the Executable throws an exception matching the given type and message. * @param executable the Executable instance * @param exceptionType the expected exception type - * @param message the expected exception message + * @param message the expected exception message; may be null */ - public static <T extends Throwable> void assertThrowsWithMessage(final Executable executable, final Class<T> exceptionType, final String message) { + public static <T extends Throwable> void assertThrowsWithMessage(final Executable executable, + final Class<T> exceptionType, final String message) { Assertions.assertEquals(message, Assertions.assertThrows(exceptionType, executable).getMessage()); } - /** Asserts that the given Executable throws an exception of the given type. If - * {@code pattern} is not null, the exception message is asserted to match the - * given regex. + /** Asserts that the Executable throws an exception of the given type with a non-null message matching + * the specified regex pattern. * @param executable the Executable instance * @param exceptionType the expected exception type * @param pattern regex pattern to match */ - public static <T extends Throwable> void assertThrowsWithMessage(final Executable executable, final Class<T> exceptionType, final Pattern pattern) { + public static <T extends Throwable> void assertThrowsWithMessage(final Executable executable, + final Class<T> exceptionType, final Pattern pattern) { final String message = Assertions.assertThrows(exceptionType, executable).getMessage(); Assertions.assertTrue(pattern.matcher(message).matches(), "Expected exception message to match /" + pattern + "/ but was [" + message + "]"); diff --git a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/IteratorTransformTest.java b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/IteratorTransformTest.java index c52f1fc..cb8a019 100644 --- a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/IteratorTransformTest.java +++ b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/IteratorTransformTest.java @@ -26,7 +26,6 @@ import java.util.NoSuchElementException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class IteratorTransformTest { @Test diff --git a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/partitioning/AbstractConvexHyperplaneBoundedRegionTest.java b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/partitioning/AbstractConvexHyperplaneBoundedRegionTest.java index f537c1f..b018d21 100644 --- a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/partitioning/AbstractConvexHyperplaneBoundedRegionTest.java +++ b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/partitioning/AbstractConvexHyperplaneBoundedRegionTest.java @@ -33,7 +33,6 @@ import org.apache.commons.geometry.core.partitioning.test.TestTransform2D; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class AbstractConvexHyperplaneBoundedRegionTest { @Test @@ -636,7 +635,6 @@ public class AbstractConvexHyperplaneBoundedRegionTest { TestLine.Y_AXIS, new TestLine(new TestPoint2D(1, 0), new TestPoint2D(0, -1)), new TestLine(new TestPoint2D(1, 0), new TestPoint2D(0, -2))))); - } @Test diff --git a/commons-geometry-enclosing/src/test/java/org/apache/commons/geometry/enclosing/EnclosingBallTest.java b/commons-geometry-enclosing/src/test/java/org/apache/commons/geometry/enclosing/EnclosingBallTest.java index 566d356..130b7da 100644 --- a/commons-geometry-enclosing/src/test/java/org/apache/commons/geometry/enclosing/EnclosingBallTest.java +++ b/commons-geometry-enclosing/src/test/java/org/apache/commons/geometry/enclosing/EnclosingBallTest.java @@ -27,7 +27,6 @@ import org.apache.commons.geometry.euclidean.twod.Vector2D; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class EnclosingBallTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/AffineTransformMatrix1DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/AffineTransformMatrix1DTest.java index dd2c0df..4926159 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/AffineTransformMatrix1DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/AffineTransformMatrix1DTest.java @@ -24,7 +24,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class AffineTransformMatrix1DTest { private static final double EPS = 1e-12; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/IntervalTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/IntervalTest.java index d40691b..ae2aaf8 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/IntervalTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/IntervalTest.java @@ -25,7 +25,6 @@ import org.apache.commons.geometry.euclidean.EuclideanTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class IntervalTest { private static final double TEST_EPS = 1e-15; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java index 085eb9d..b44edfe 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java @@ -27,7 +27,6 @@ import org.apache.commons.numbers.core.Precision; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Vector1DTest { private static final double TEST_TOLERANCE = 1e-15; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/AffineTransformMatrix3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/AffineTransformMatrix3DTest.java index 525aae7..744c626 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/AffineTransformMatrix3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/AffineTransformMatrix3DTest.java @@ -29,7 +29,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class AffineTransformMatrix3DTest { private static final double EPS = 1e-12; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Bounds3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Bounds3DTest.java index 636de3f..cd994e4 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Bounds3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Bounds3DTest.java @@ -31,7 +31,6 @@ import org.apache.commons.geometry.euclidean.threed.shape.Parallelepiped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Bounds3DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/EmbeddingPlaneTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/EmbeddingPlaneTest.java index 2deaf74..1d5dd20 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/EmbeddingPlaneTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/EmbeddingPlaneTest.java @@ -28,7 +28,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class EmbeddingPlaneTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlaneTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlaneTest.java index 8254e04..72522a7 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlaneTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlaneTest.java @@ -32,7 +32,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class PlaneTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlanesTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlanesTest.java index 2f08f97..78d1e0e 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlanesTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/PlanesTest.java @@ -40,7 +40,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class PlanesTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/RegionBSPTree3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/RegionBSPTree3DTest.java index 7eae12e..12519b6 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/RegionBSPTree3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/RegionBSPTree3DTest.java @@ -44,7 +44,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class RegionBSPTree3DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SimpleTriangle3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SimpleTriangle3DTest.java index 497512a..5257950 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SimpleTriangle3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SimpleTriangle3DTest.java @@ -32,7 +32,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class SimpleTriangle3DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SphericalCoordinatesTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SphericalCoordinatesTest.java index 25068bb..4fd9193 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SphericalCoordinatesTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/SphericalCoordinatesTest.java @@ -23,7 +23,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class SphericalCoordinatesTest { private static final double EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java index b378665..daec297 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java @@ -61,14 +61,11 @@ public class Vector3DTest { @Test public void testConstants_normalize() { // act/assert - - Assertions.assertThrows(IllegalArgumentException.class, Vector3D.ZERO::normalize); Assertions.assertThrows(IllegalArgumentException.class, Vector3D.NaN::normalize); Assertions.assertThrows(IllegalArgumentException.class, Vector3D.POSITIVE_INFINITY::normalize); Assertions.assertThrows(IllegalArgumentException.class, Vector3D.NEGATIVE_INFINITY::normalize); - Assertions.assertSame(Vector3D.Unit.PLUS_X, Vector3D.Unit.PLUS_X.normalize()); Assertions.assertSame(Vector3D.Unit.MINUS_X, Vector3D.Unit.MINUS_X.normalize()); diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/VertexListConvexPolygon3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/VertexListConvexPolygon3DTest.java index ef5a7dc..c8f323e 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/VertexListConvexPolygon3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/VertexListConvexPolygon3DTest.java @@ -34,7 +34,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class VertexListConvexPolygon3DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/line/Line3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/line/Line3DTest.java index b0f6e23..6ecd991 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/line/Line3DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/line/Line3DTest.java @@ -29,7 +29,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Line3DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/mesh/SimpleTriangleMeshTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/mesh/SimpleTriangleMeshTest.java index 89189b4..4c3c18e 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/mesh/SimpleTriangleMeshTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/mesh/SimpleTriangleMeshTest.java @@ -40,7 +40,6 @@ import org.apache.commons.geometry.euclidean.threed.shape.Parallelepiped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class SimpleTriangleMeshTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/rotation/QuaternionRotationTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/rotation/QuaternionRotationTest.java index 74e4752..40c9f17 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/rotation/QuaternionRotationTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/rotation/QuaternionRotationTest.java @@ -35,7 +35,6 @@ import org.apache.commons.rng.simple.RandomSource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class QuaternionRotationTest { private static final double EPS = 1e-12; @@ -250,7 +249,6 @@ public class QuaternionRotationTest { @Test public void testFromAxisAngle_invalidAxisNorm() { // act/assert - Assertions.assertThrows(IllegalArgumentException.class, () -> QuaternionRotation.fromAxisAngle(Vector3D.ZERO, PlaneAngleRadians.PI_OVER_TWO)); Assertions.assertThrows(IllegalArgumentException.class, () -> QuaternionRotation.fromAxisAngle(Vector3D.NaN, PlaneAngleRadians.PI_OVER_TWO)); Assertions.assertThrows(IllegalArgumentException.class, () -> QuaternionRotation.fromAxisAngle(Vector3D.POSITIVE_INFINITY, PlaneAngleRadians.PI_OVER_TWO)); diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/ParallelepipedTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/ParallelepipedTest.java index 47545fd..2e90803 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/ParallelepipedTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/ParallelepipedTest.java @@ -34,7 +34,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class ParallelepipedTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/SphereTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/SphereTest.java index 0108da0..51cb67d 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/SphereTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/shape/SphereTest.java @@ -44,7 +44,6 @@ import org.apache.commons.rng.simple.RandomSource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class SphereTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/AffineTransformMatrix2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/AffineTransformMatrix2DTest.java index e17ee8f..85f3eef 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/AffineTransformMatrix2DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/AffineTransformMatrix2DTest.java @@ -27,7 +27,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class AffineTransformMatrix2DTest { private static final double EPS = 1e-12; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Bounds2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Bounds2DTest.java index b36ac2f..67561ef 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Bounds2DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Bounds2DTest.java @@ -31,7 +31,6 @@ import org.apache.commons.geometry.euclidean.twod.shape.Parallelogram; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Bounds2DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/ConvexAreaTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/ConvexAreaTest.java index 634c60c..113795c 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/ConvexAreaTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/ConvexAreaTest.java @@ -35,7 +35,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class ConvexAreaTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/EmbeddedTreeLineSubsetTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/EmbeddedTreeLineSubsetTest.java index cdf5704..652a914 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/EmbeddedTreeLineSubsetTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/EmbeddedTreeLineSubsetTest.java @@ -30,7 +30,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class EmbeddedTreeLineSubsetTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/PolarCoordinatesTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/PolarCoordinatesTest.java index a5e9be9..acc8899 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/PolarCoordinatesTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/PolarCoordinatesTest.java @@ -23,7 +23,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class PolarCoordinatesTest { private static final double EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/RegionBSPTree2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/RegionBSPTree2DTest.java index 341476f..93a11be 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/RegionBSPTree2DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/RegionBSPTree2DTest.java @@ -40,7 +40,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class RegionBSPTree2DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java index 4231fec..07eba28 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java @@ -31,7 +31,6 @@ import org.apache.commons.numbers.core.Precision; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Vector2DTest { private static final double EPS = Math.ulp(1d); diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/path/LinePathTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/path/LinePathTest.java index a492dd3..5f23e92 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/path/LinePathTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/path/LinePathTest.java @@ -43,7 +43,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class LinePathTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/rotation/Rotation2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/rotation/Rotation2DTest.java index 84c34f4..19d8281 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/rotation/Rotation2DTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/rotation/Rotation2DTest.java @@ -32,7 +32,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Rotation2DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/CircleTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/CircleTest.java index 4b54709..e818221 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/CircleTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/CircleTest.java @@ -37,7 +37,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class CircleTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/ParallelogramTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/ParallelogramTest.java index d151acd..c2d15b6 100644 --- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/ParallelogramTest.java +++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/shape/ParallelogramTest.java @@ -30,7 +30,6 @@ import org.apache.commons.geometry.euclidean.twod.rotation.Rotation2D; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class ParallelogramTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJModelIOHandlerTest.java b/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJModelIOHandlerTest.java index 5c2513e..845307b 100644 --- a/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJModelIOHandlerTest.java +++ b/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJModelIOHandlerTest.java @@ -97,9 +97,9 @@ public class OBJModelIOHandlerTest { final File file = new File("doesnotexist.obj"); // act/assert - GeometryTestUtils.assertThrows(() -> { + Assertions.assertThrows(UncheckedIOException.class, () -> { handler.read("obj", file, TEST_PRECISION); - }, UncheckedIOException.class); + }); } @Test @@ -178,9 +178,9 @@ public class OBJModelIOHandlerTest { ); // act/assert - GeometryTestUtils.assertThrows(() -> { + Assertions.assertThrows(UncheckedIOException.class, () -> { handler.write(src, "OBJ", out); - }, UncheckedIOException.class); + }); } @Test diff --git a/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJReaderTest.java b/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJReaderTest.java index 95fd42e..a568ffc 100644 --- a/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJReaderTest.java +++ b/commons-geometry-examples/examples-io/src/test/java/org/apache/commons/geometry/examples/io/threed/obj/OBJReaderTest.java @@ -19,7 +19,6 @@ package org.apache.commons.geometry.examples.io.threed.obj; import java.io.File; import java.io.IOException; import java.io.StringReader; -import java.io.UncheckedIOException; import java.net.URL; import org.apache.commons.geometry.core.GeometryTestUtils; @@ -163,20 +162,12 @@ public class OBJReaderTest { "f 1 2 3\n"; // act/assert - GeometryTestUtils.assertThrows(() -> { - try { - reader.readTriangleMesh(new StringReader(badNumber), TEST_PRECISION); - } catch (final IOException exc) { - throw new UncheckedIOException(exc); - } - }, NumberFormatException.class); + Assertions.assertThrows(NumberFormatException.class, () -> { + reader.readTriangleMesh(new StringReader(badNumber), TEST_PRECISION); + }); GeometryTestUtils.assertThrowsWithMessage(() -> { - try { - reader.readTriangleMesh(new StringReader(notEnoughVertices), TEST_PRECISION); - } catch (final IOException exc) { - throw new UncheckedIOException(exc); - } + reader.readTriangleMesh(new StringReader(notEnoughVertices), TEST_PRECISION); }, IllegalArgumentException.class, "Invalid vertex definition: at least 3 fields required but found only 2"); } @@ -196,20 +187,12 @@ public class OBJReaderTest { "f 1 2\n"; // act/assert - GeometryTestUtils.assertThrows(() -> { - try { - reader.readTriangleMesh(new StringReader(badNumber), TEST_PRECISION); - } catch (final IOException exc) { - throw new UncheckedIOException(exc); - } - }, NumberFormatException.class); + Assertions.assertThrows(NumberFormatException.class, () -> { + reader.readTriangleMesh(new StringReader(badNumber), TEST_PRECISION); + }); GeometryTestUtils.assertThrowsWithMessage(() -> { - try { - reader.readTriangleMesh(new StringReader(notEnoughIndices), TEST_PRECISION); - } catch (final IOException exc) { - throw new UncheckedIOException(exc); - } + reader.readTriangleMesh(new StringReader(notEnoughIndices), TEST_PRECISION); }, IllegalArgumentException.class, "Invalid face definition: at least 3 fields required but found only 2"); } diff --git a/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/ConvexHull2DTest.java b/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/ConvexHull2DTest.java index 937f25b..7911bd5 100644 --- a/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/ConvexHull2DTest.java +++ b/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/ConvexHull2DTest.java @@ -30,7 +30,6 @@ import org.apache.commons.geometry.euclidean.twod.path.LinePath; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class ConvexHull2DTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/MonotoneChainTest.java b/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/MonotoneChainTest.java index a13c52d..dc9740e 100644 --- a/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/MonotoneChainTest.java +++ b/commons-geometry-hull/src/test/java/org/apache/commons/geometry/hull/euclidean/twod/MonotoneChainTest.java @@ -24,7 +24,6 @@ import org.apache.commons.geometry.euclidean.twod.Vector2D; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - /** * Test class for MonotoneChain. */ diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/AngularIntervalTest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/AngularIntervalTest.java index b93ea0b..80bbf21 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/AngularIntervalTest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/AngularIntervalTest.java @@ -28,7 +28,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class AngularIntervalTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/Point1STest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/Point1STest.java index 8809632..5c922e4 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/Point1STest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/Point1STest.java @@ -28,7 +28,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class Point1STest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/ConvexArea2STest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/ConvexArea2STest.java index 8d9430f..78c38a1 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/ConvexArea2STest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/ConvexArea2STest.java @@ -34,7 +34,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class ConvexArea2STest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatArcTest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatArcTest.java index da3c941..4a99dd3 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatArcTest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatArcTest.java @@ -31,7 +31,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class GreatArcTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatCircleTest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatCircleTest.java index 47d1a81..b544081 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatCircleTest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/GreatCircleTest.java @@ -30,7 +30,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class GreatCircleTest { private static final double TEST_EPS = 1e-10; diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/RegionBSPTree2STest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/RegionBSPTree2STest.java index 40f706a..867d4d8 100644 --- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/RegionBSPTree2STest.java +++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/RegionBSPTree2STest.java @@ -36,7 +36,6 @@ import org.apache.commons.numbers.angle.PlaneAngleRadians; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - public class RegionBSPTree2STest { private static final double TEST_EPS = 1e-10;