#79 Improve some classes coverage

introfog · introfog · commit cd7e072c7f0a · 2020-09-02T20:31:56.000+03:00
* Add new equals tests
* Add private constructor to MathPIE and make MathPIE final
* Change broad phase tests category
* Improve IShape#equals logic
* Improve some unit tests
* Add some other minor improvements
diff --git a/core/src/main/java/com/github/introfog/pie/core/math/MathPIE.java b/core/src/main/java/com/github/introfog/pie/core/math/MathPIE.java
@@ -16,7 +16,11 @@
 package com.github.introfog.pie.core.math;
 
 // TODO Change class to context or property class
-public class MathPIE {
+public final class MathPIE {
+    private MathPIE() {
+        // Empty constructor
+    }
+
     public static final float STATIC_BODY_DENSITY = 0f;
 
     public static final int MAX_POLY_VERTEX_COUNT = 64;
diff --git a/core/src/main/java/com/github/introfog/pie/core/shape/Circle.java b/core/src/main/java/com/github/introfog/pie/core/shape/Circle.java
@@ -17,7 +17,6 @@
 
 import com.github.introfog.pie.core.Body;
 
-import java.util.Objects;
 import java.util.StringJoiner;
 
 public class Circle extends IShape {
@@ -56,7 +55,7 @@ protected void computeMassAndInertia() {
         float mass = (float) Math.PI * radius * radius * body.density;
         body.invertedMass = (mass == 0f) ? 0f : 1f / mass;
 
-        float inertia = radius * radius / body.invertedMass;
+        float inertia = radius * radius / (body.invertedMass == 0 ? 1 : body.invertedMass);
         body.invertedInertia = (inertia != 0.0f) ? 1.0f / inertia : 0.0f;
     }
 }
diff --git a/core/src/main/java/com/github/introfog/pie/core/shape/IShape.java b/core/src/main/java/com/github/introfog/pie/core/shape/IShape.java
@@ -81,14 +81,9 @@ public final void applyImpulse(Vector2f impulse, Vector2f contactVector) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        IShape shape = (IShape) o;
-        return shapeId == shape.shapeId;
+        // In general, consider shapes the same only when they refer to the
+        // same object in memory, this is provided by the shapeId variable
+        return this == o;
     }
 
     @Override
diff --git a/core/src/test/java/com/github/introfog/pie/core/BodyTest.java b/core/src/test/java/com/github/introfog/pie/core/BodyTest.java
@@ -60,16 +60,16 @@ public void equalsAndHashCodeToAnotherEqualBodyTest() {
     @Test
     public void equalsAndHashCodeToAnotherNotEqualBodyTest() {
         Body first = new Body(0.1f, 0.2f, 0.3f, 0.4f);
-        Body second = new Body(0.2f, 0.2f, 0.3f, 1.8f);
+        Body second = new Body(0.2f, 0.2f, 0.3f, 0.4f);
         PIETest.checkEqualsAndHashCodeMethods(first, second, false);
 
-        second = new Body(0.1f, 0.3f, 0.3f, 1.8f);
+        second = new Body(0.1f, 0.3f, 0.3f, 0.4f);
         PIETest.checkEqualsAndHashCodeMethods(first, second, false);
 
-        second = new Body(0.1f, 0.2f, 0.4f, 1.8f);
+        second = new Body(0.1f, 0.2f, 0.4f, 0.4f);
         PIETest.checkEqualsAndHashCodeMethods(first, second, false);
 
-        second = new Body(0.1f, 0.2f, 0.3f, 1.9f);
+        second = new Body(0.1f, 0.2f, 0.3f, 0.5f);
         PIETest.checkEqualsAndHashCodeMethods(first, second, false);
     }
 
@@ -80,6 +80,13 @@ public void equalsToNullTest() {
         Assert.assertFalse(body.equals(null));
     }
 
+    @Test
+    public void equalsToAnotherClassTest() {
+        Body body = new Body(0.1f, 0.2f, 0.3f, 0.4f);
+
+        Assert.assertFalse(body.equals(""));
+    }
+
     @Test
     public void toStringTest() {
         Body body = new Body(0.1634345f, 0.2f, 0.3f, 0.4f);
diff --git a/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/AbstractBroadPhaseTest.java b/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/AbstractBroadPhaseTest.java
@@ -21,15 +21,15 @@
 import com.github.introfog.pie.core.shape.IShape;
 import com.github.introfog.pie.core.util.ShapePair;
 import com.github.introfog.pie.test.PIETest;
-import com.github.introfog.pie.test.annotations.AlgorithmicTest;
+import com.github.introfog.pie.test.annotations.UnitTest;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(AlgorithmicTest.class)
+@Category(UnitTest.class)
 public abstract class AbstractBroadPhaseTest extends PIETest {
     @Test
     public void addShapeMethodTest() {
diff --git a/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/BruteForceMethodTest.java b/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/BruteForceMethodTest.java
@@ -15,11 +15,11 @@
  */
 package com.github.introfog.pie.core.collisions.broadphase;
 
-import com.github.introfog.pie.test.annotations.AlgorithmicTest;
+import com.github.introfog.pie.test.annotations.UnitTest;
 
 import org.junit.experimental.categories.Category;
 
-@Category(AlgorithmicTest.class)
+@Category(UnitTest.class)
 public class BruteForceMethodTest extends AbstractBroadPhaseTest {
     @Override
     protected AbstractBroadPhase getBroadPhaseMethod() {
diff --git a/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/SpatialHashingMethodTest.java b/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/SpatialHashingMethodTest.java
@@ -21,15 +21,15 @@
 import com.github.introfog.pie.core.shape.IShape;
 import com.github.introfog.pie.core.shape.Polygon;
 import com.github.introfog.pie.core.util.ShapePair;
-import com.github.introfog.pie.test.annotations.AlgorithmicTest;
+import com.github.introfog.pie.test.annotations.UnitTest;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(AlgorithmicTest.class)
+@Category(UnitTest.class)
 public class SpatialHashingMethodTest extends AbstractBroadPhaseTest {
     @Override
     protected AbstractBroadPhase getBroadPhaseMethod() {
diff --git a/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/SweepAndPruneMethodTest.java b/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/SweepAndPruneMethodTest.java
@@ -15,8 +15,16 @@
  */
 package com.github.introfog.pie.core.collisions.broadphase;
 
+import com.github.introfog.pie.core.math.MathPIE;
+import com.github.introfog.pie.core.shape.Circle;
+import com.github.introfog.pie.core.shape.IShape;
+import com.github.introfog.pie.core.util.ShapePair;
+import com.github.introfog.pie.core.util.TestUtil;
 import com.github.introfog.pie.test.annotations.AlgorithmicTest;
 
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 @Category(AlgorithmicTest.class)
@@ -25,4 +33,48 @@ public class SweepAndPruneMethodTest extends AbstractBroadPhaseTest {
     protected AbstractBroadPhase getBroadPhaseMethod() {
         return new SweepAndPruneMethod();
     }
+
+    @Test
+    public void yAxisTest() {
+        IShape c1 = new Circle(2f, 0, 0, MathPIE.STATIC_BODY_DENSITY, 0f);
+        IShape c2 = new Circle(2f, 0, 2, MathPIE.STATIC_BODY_DENSITY, 0f);
+        IShape c3 = new Circle(2f, 5, 10, MathPIE.STATIC_BODY_DENSITY, 0f);
+
+        List<IShape> shapes = new ArrayList<>();
+        shapes.add(c1);
+        shapes.add(c2);
+        shapes.add(c3);
+        AbstractBroadPhase broadPhaseMethod = getBroadPhaseMethod();
+        broadPhaseMethod.setShapes(shapes);
+
+        List<ShapePair> cmpShapePairs = new ArrayList<>(1);
+
+        cmpShapePairs.add(new ShapePair(c1, c2));
+        TestUtil.assertEqualsShapePairsList(cmpShapePairs, broadPhaseMethod.calculateAabbCollisions());
+        // The test is designed so that after the first iteration, the SweepAndPrune method will work along the Y-axis
+        TestUtil.assertEqualsShapePairsList(cmpShapePairs, broadPhaseMethod.calculateAabbCollisions());
+    }
+
+    @Test
+    public void intersectedByCurrentAxisButNotIntersectedByOtherAxisTest() {
+        // The test reproduces the situation when shape intersect along the axis
+        // that is current in the SAP method, but do not intersect along the other axis
+        IShape c1 = new Circle(2f, 0, 0, MathPIE.STATIC_BODY_DENSITY, 0f);
+        IShape c2 = new Circle(2f, 0, 5, MathPIE.STATIC_BODY_DENSITY, 0f);
+        IShape c3 = new Circle(2f, 5, 5, MathPIE.STATIC_BODY_DENSITY, 0f);
+        IShape c4 = new Circle(2f, 0, 10, MathPIE.STATIC_BODY_DENSITY, 0f);
+
+        List<IShape> shapes = new ArrayList<>();
+        shapes.add(c1);
+        shapes.add(c2);
+        shapes.add(c3);
+        shapes.add(c4);
+        AbstractBroadPhase broadPhaseMethod = getBroadPhaseMethod();
+        broadPhaseMethod.setShapes(shapes);
+
+        List<ShapePair> cmpShapePairs = new ArrayList<>(1);
+
+        TestUtil.assertEqualsShapePairsList(cmpShapePairs, broadPhaseMethod.calculateAabbCollisions());
+        TestUtil.assertEqualsShapePairsList(cmpShapePairs, broadPhaseMethod.calculateAabbCollisions());
+    }
 }
diff --git a/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/aabbtree/AABBTreeMethodTest.java b/core/src/test/java/com/github/introfog/pie/core/collisions/broadphase/aabbtree/AABBTreeMethodTest.java
@@ -20,15 +20,15 @@
 import com.github.introfog.pie.core.math.MathPIE;
 import com.github.introfog.pie.core.math.Vector2f;
 import com.github.introfog.pie.core.shape.Circle;
-import com.github.introfog.pie.test.annotations.AlgorithmicTest;
+import com.github.introfog.pie.test.annotations.UnitTest;
 
 import java.lang.reflect.Field;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(AlgorithmicTest.class)
+@Category(UnitTest.class)
 public class AABBTreeMethodTest extends AbstractBroadPhaseTest {
     @Override
     protected AbstractBroadPhase getBroadPhaseMethod() {
diff --git a/core/src/test/java/com/github/introfog/pie/core/math/MathPIETest.java b/core/src/test/java/com/github/introfog/pie/core/math/MathPIETest.java
@@ -24,6 +24,12 @@
 
 @Category(UnitTest.class)
 public class MathPIETest extends PIETest {
+    @Test(expected = IllegalAccessException.class)
+    public void constructorTest() throws IllegalAccessException, InstantiationException {
+        MathPIE.class.newInstance();
+        Assert.fail("Utility class constructor should be private");
+    }
+
     @Test
     public void fastFloorTest() {
         Assert.assertEquals(1.0, MathPIE.fastFloor(1.0000001f), PIETest.FLOAT_EPSILON_COMPARISON);
diff --git a/core/src/test/java/com/github/introfog/pie/core/math/Vector2fTest.java b/core/src/test/java/com/github/introfog/pie/core/math/Vector2fTest.java
@@ -79,6 +79,13 @@ public void equalsToNullTest() {
         Assert.assertFalse(vec.equals(null));
     }
 
+    @Test
+    public void equalsToAnotherClassTest() {
+        Vector2f vec = new Vector2f(0.1f, 0.2f);
+
+        Assert.assertFalse(vec.equals(""));
+    }
+
     @Test
     public void toStringTest() {
         Vector2f vec = new Vector2f(0.1f, 0.2f);
diff --git a/core/src/test/java/com/github/introfog/pie/core/shape/AABBTest.java b/core/src/test/java/com/github/introfog/pie/core/shape/AABBTest.java
@@ -93,6 +93,13 @@ public void isContainedTest() {
         // AABBs are intersect
         Assert.assertFalse(AABB.isContained(a, b));
 
+        a.min.set(0, 0);
+        a.max.set(7, 10);
+        b.min.set(2, 7);
+        b.max.set(5, 11);
+        // AABBs are intersect
+        Assert.assertFalse(AABB.isContained(a, b));
+
         a.min.set(0, 0);
         a.max.set(10, 10);
         b.min.set(1, 1);
diff --git a/core/src/test/java/com/github/introfog/pie/core/shape/CircleTest.java b/core/src/test/java/com/github/introfog/pie/core/shape/CircleTest.java
@@ -27,13 +27,9 @@
 
 @Category(UnitTest.class)
 public class CircleTest extends PIETest {
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
-    @Test
+    @Test(expected = RuntimeException.class)
     public void paramConstructorWithNegativeRadiusTest() {
-        junitExpectedException.expect(RuntimeException.class);
-        Circle circle = new Circle(-0.01f, 1, 3, 0.1f, 0.2f);
+        new Circle(-0.01f, 1, 3, 0.1f, 0.2f);
     }
 
     @Test
@@ -58,8 +54,7 @@ public void computeAABBTest() {
     public void equalsAndHashCodeItselfTest() {
         Circle circle = new Circle(10, 1, 3, 0.1f, 0.2f);
 
-        Assert.assertTrue(circle.equals(circle));
-        Assert.assertEquals(circle.hashCode(), circle.hashCode());
+        PIETest.checkEqualsAndHashCodeMethods(circle, circle, true);
     }
 
     @Test
@@ -77,6 +72,13 @@ public void equalsToNullTest() {
         Assert.assertFalse(circle.equals(null));
     }
 
+    @Test
+    public void equalsToAnotherClassTest() {
+        Circle circle = new Circle(10, 1, 3, 0.1f, 0.2f);
+
+        Assert.assertFalse(circle.equals(""));
+    }
+
     @Test
     public void computeMassAndInertiaTest() {
         Circle circle = new Circle(10, 0, 0, (float) (1 / Math.PI), 0);
@@ -85,6 +87,14 @@ public void computeMassAndInertiaTest() {
         Assert.assertEquals(1f / 10000f, circle.body.invertedInertia, PIETest.FLOAT_EPSILON_COMPARISON);
     }
 
+    @Test
+    public void computeMassAndInertiaZeroCircleTest() {
+        Circle circle = new Circle(0, 0, 0, (float) (1 / Math.PI), 0);
+
+        Assert.assertEquals(0, circle.body.invertedMass, PIETest.FLOAT_EPSILON_COMPARISON);
+        Assert.assertEquals(0, circle.body.invertedInertia, PIETest.FLOAT_EPSILON_COMPARISON);
+    }
+
     @Test
     public void toStringTest() {
         Circle circle = new Circle(10.2f, 12.45f, 433.456215f, (float) (1 / Math.PI), 0);
diff --git a/core/src/test/java/com/github/introfog/pie/core/shape/IShapeTest.java b/core/src/test/java/com/github/introfog/pie/core/shape/IShapeTest.java
@@ -21,6 +21,7 @@
 import com.github.introfog.pie.test.annotations.UnitTest;
 
 import java.lang.reflect.Field;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/core/src/test/java/com/github/introfog/pie/core/shape/PolygonTest.java b/core/src/test/java/com/github/introfog/pie/core/shape/PolygonTest.java
@@ -123,10 +123,6 @@ public void verticesInCircleTest() {
 
     @Test
     public void aLotOfVerticesExceptionTest() {
-        // TODO use custom PIE exception
-        junitExpectedException.expect(RuntimeException.class);
-        junitExpectedException.expectMessage("Error. Too many vertices in polygon.");
-
         float radius = 10;
         int verticesInCircle = MathPIE.MAX_POLY_VERTEX_COUNT + 1;
         Vector2f[] vertices = Vector2f.arrayOf(verticesInCircle + 1);
@@ -137,6 +133,10 @@ public void aLotOfVerticesExceptionTest() {
             vertices[i].set(cos * radius, sin * radius);
         }
         vertices[verticesInCircle].set(0, 0);
+
+        // TODO use custom PIE exception
+        junitExpectedException.expect(RuntimeException.class);
+        junitExpectedException.expectMessage("Error. Too many vertices in polygon.");
         new Polygon(0.1f, 0.2f, 0, 0, vertices);
     }
 
@@ -160,7 +160,14 @@ public void notEqualsAndHashCodeToAnotherEqualCircleTest() {
     public void equalsToNullTest() {
         Polygon polygon = Polygon.generateRectangle(10, 1, 3, 4, 0.1f, 0.2f);
 
-        Assert.assertNotEquals(null, polygon);
+        Assert.assertFalse(polygon.equals(null));
+    }
+
+    @Test
+    public void equalsToAnotherClassTest() {
+        Polygon polygon = Polygon.generateRectangle(10, 1, 3, 4, 0.1f, 0.2f);
+
+        Assert.assertFalse(polygon.equals(""));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`
`18`	`18`	`import com.github.introfog.pie.core.Body;`
`19`	`19`
`20`		`-import java.util.Objects;`
`21`	`20`	`import java.util.StringJoiner;`
`22`	`21`
`23`	`22`	`public class Circle extends IShape {`
`@@ -56,7 +55,7 @@ protected void computeMassAndInertia() {`
`56`	`55`	`float mass = (float) Math.PI * radius * radius * body.density;`
`57`	`56`	`body.invertedMass = (mass == 0f) ? 0f : 1f / mass;`
`58`	`57`
`59`		`- float inertia = radius * radius / body.invertedMass;`
	`58`	`+ float inertia = radius * radius / (body.invertedMass == 0 ? 1 : body.invertedMass);`
`60`	`59`	`body.invertedInertia = (inertia != 0.0f) ? 1.0f / inertia : 0.0f;`
`61`	`60`	`}`
`62`	`61`	`}`