diff --git a/src/main/java/MakeItFit/activities/implementation/Trail.java b/src/main/java/MakeItFit/activities/implementation/Trail.java index 5336025..2244bcf 100644 --- a/src/main/java/MakeItFit/activities/implementation/Trail.java +++ b/src/main/java/MakeItFit/activities/implementation/Trail.java @@ -121,7 +121,8 @@ public void calculateCaloricWaste(float index) { * @return The calculated caloric waste as an integer. */ public int caloricWaste(float index) { - return (int) ((getDistance() * 0.5 + getElevationGain() * 0.1 - getElevationLoss() * 0.1) * + // Fix calories calculation formula + return (int) ((getDistance() * 0.5 + getElevationGain() * 0.1 + getElevationLoss() * 0.1) * index * 0.01); } diff --git a/src/unittests/java/MakeItFit/activities/implementation/RunningTest.java b/src/unittests/java/MakeItFit/activities/implementation/RunningTest.java index 52f2aee..b2446a6 100644 --- a/src/unittests/java/MakeItFit/activities/implementation/RunningTest.java +++ b/src/unittests/java/MakeItFit/activities/implementation/RunningTest.java @@ -6,7 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class RunningTest { private Running running; @@ -81,6 +84,13 @@ void testEquals() { new Running(userCode, date, 45, "Warming", "Just for 45 minutes", 5000.0, 12.0); assertFalse(running.equals(diff)); assertFalse(running.equals(null)); + Running diffSpeed = + new Running(userCode, date, 45, "Warming", "Just for 45 minutes", 5000.0, 13.0); + assertFalse(running.equals(diffSpeed)); + + Running diffInSpeed = + new Running(userCode, date, 50, "Warming", "Just for 45 minutes", 5000.0, 10.0); + assertFalse(running.equals(diffInSpeed)); } @Test diff --git a/src/unittests/java/MakeItFit/activities/implementation/TrailTest.java b/src/unittests/java/MakeItFit/activities/implementation/TrailTest.java index caa194f..14b416f 100644 --- a/src/unittests/java/MakeItFit/activities/implementation/TrailTest.java +++ b/src/unittests/java/MakeItFit/activities/implementation/TrailTest.java @@ -6,8 +6,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static MakeItFit.activities.implementation.Trail.*; -import static org.junit.jupiter.api.Assertions.*; +import static MakeItFit.activities.implementation.Trail.TRAIL_TYPE_EASY; +import static MakeItFit.activities.implementation.Trail.TRAIL_TYPE_HARD; +import static MakeItFit.activities.implementation.Trail.TRAIL_TYPE_MEDIUM; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TrailTest { private Trail trail; @@ -75,7 +80,7 @@ void testSetTrailType() { @Test void testCalculateCaloricWaste() { float index = 2.0f; - int expected = (int) ((10000 * 0.5 + 500 * 0.1 - 200 * 0.1) * index * 0.01); + int expected = (int) ((10000 * 0.5 + 500 * 0.1 + 200 * 0.1) * index * 0.01); trail.calculateCaloricWaste(index); assertEquals(expected, trail.getCaloricWaste()); } @@ -83,7 +88,7 @@ void testCalculateCaloricWaste() { @Test void testCaloricWasteMethod() { float index = 1.5f; - int expected = (int) ((10000 * 0.5 + 500 * 0.1 - 200 * 0.1) * index * 0.01); + int expected = (int) ((10000 * 0.5 + 500 * 0.1 + 200 * 0.1) * index * 0.01); assertEquals(expected, trail.caloricWaste(index)); } @@ -118,6 +123,17 @@ void testEquals() { TRAIL_TYPE_HARD); assertFalse(trail.equals(diff)); assertFalse(trail.equals(null)); + + Trail diff2 = new Trail(userCode, + date, + 91, + "Easy peasy lemon squeezy", + "Trail", + 10000, + 500, + 200, + TRAIL_TYPE_EASY); + assertFalse(trail.equals(diff2)); } @Test diff --git a/src/unittests/java/MakeItFit/activities/types/DistanceWithAltimetryTest.java b/src/unittests/java/MakeItFit/activities/types/DistanceWithAltimetryTest.java index 9069cce..99f2d12 100644 --- a/src/unittests/java/MakeItFit/activities/types/DistanceWithAltimetryTest.java +++ b/src/unittests/java/MakeItFit/activities/types/DistanceWithAltimetryTest.java @@ -6,7 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DistanceWithAltimetryTest { private TestDistanceWithAltimetry activity; @@ -96,6 +99,26 @@ void testEquals() { 200.0); assertFalse(activity.equals(null)); assertFalse(activity.equals(different)); + + TestDistanceWithAltimetry diff2 = new TestDistanceWithAltimetry(userCode, + date, + 91, + "Biking", + "Bom Jesus Biking", + 12345.0, + 234.0, + 200.0); + assertFalse(activity.equals(diff2)); + + TestDistanceWithAltimetry diff3 = new TestDistanceWithAltimetry(userCode, + date, + 90, + "Biking", + "Bom Jesus Biking", + 12345.0, + 234.0, + 210.0); + assertFalse(activity.equals(diff3)); } @Test diff --git a/src/unittests/java/MakeItFit/activities/types/RepetitionsTest.java b/src/unittests/java/MakeItFit/activities/types/RepetitionsTest.java index 43160f2..e0947b0 100644 --- a/src/unittests/java/MakeItFit/activities/types/RepetitionsTest.java +++ b/src/unittests/java/MakeItFit/activities/types/RepetitionsTest.java @@ -2,11 +2,14 @@ import java.util.UUID; -import MakeItFit.utils.MakeItFitDate; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import MakeItFit.utils.MakeItFitDate; public class RepetitionsTest { private TestRepetitions activity; @@ -34,9 +37,9 @@ void testGetters() { @Test void testSetters() { activity.setRepetitions(20); - activity.setSeries(5); + activity.setSeries(6); assertEquals(20, activity.getRepetitions()); - assertEquals(5, activity.getSeries()); + assertEquals(6, activity.getSeries()); } @Test @@ -73,6 +76,9 @@ void testEquals() { TestRepetitions diff = new TestRepetitions(userCode, date, 5, "Abs", "Plank", 12, 4); assertFalse(activity.equals(diff)); assertFalse(activity.equals(null)); + + TestRepetitions diff2 = new TestRepetitions(userCode, date, 5, "Abs", "Plank", 15, 5); + assertFalse(activity.equals(diff2)); } @Test diff --git a/src/unittests/java/MakeItFit/activities/types/RepetitionsWithWeightsTest.java b/src/unittests/java/MakeItFit/activities/types/RepetitionsWithWeightsTest.java index 2f9887c..b073460 100644 --- a/src/unittests/java/MakeItFit/activities/types/RepetitionsWithWeightsTest.java +++ b/src/unittests/java/MakeItFit/activities/types/RepetitionsWithWeightsTest.java @@ -6,7 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class RepetitionsWithWeightsTest { private TestRepetitionsWithWeights activity;