voidbert · Mariana-rc01 · Jun 4, 2025 · Jun 4, 2025
diff --git a/src/aiunittests/java/MakeItFit/MakeItFitTest.java b/src/aiunittests/java/MakeItFit/MakeItFitTest.java
@@ -4,6 +4,15 @@
 import java.util.List;
 import java.util.UUID;
 
+import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.PushUp;
 import MakeItFit.exceptions.EntityDoesNotExistException;
@@ -12,15 +21,6 @@
 import MakeItFit.users.Gender;
 import MakeItFit.users.User;
 import MakeItFit.utils.MakeItFitDate;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class MakeItFitTest {
 
@@ -252,7 +252,7 @@ public void testExecuteQueryMostDemandingTrainingPlan() throws Exception {
     @Test
     public void testExecuteQueryMostDoneActivity() {
         String mostDone = mif.executeQueryMostDoneActivity();
-        assertEquals("RepetitionsWithWeights", mostDone);
+        assertEquals("Repetitions", mostDone);
     }
 
     // Persistence Tests

diff --git a/src/aiunittests/java/MakeItFit/activities/implementation/TrailTest.java b/src/aiunittests/java/MakeItFit/activities/implementation/TrailTest.java
@@ -2,14 +2,14 @@
 
 import java.util.UUID;
 
-import MakeItFit.utils.MakeItFitDate;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import MakeItFit.utils.MakeItFitDate;
 
 public class TrailTest {
 
@@ -105,11 +105,11 @@ void testCaloricWaste() {
         trail.setElevationLoss(300.0);
 
         float index    = 1.0f;
-        int   expected = (int) ((10.0 * 0.5 + 500.0 * 0.1 - 300.0 * 0.1) * 1.0 * 0.01);
+        int   expected = (int) ((10.0 * 0.5 + 500.0 * 0.1 + 300.0 * 0.1) * 1.0 * 0.01);
         assertEquals(expected, trail.caloricWaste(index));
 
         index    = 1.5f;
-        expected = (int) ((10.0 * 0.5 + 500.0 * 0.1 - 300.0 * 0.1) * 1.5 * 0.01);
+        expected = (int) ((10.0 * 0.5 + 500.0 * 0.1 + 300.0 * 0.1) * 1.5 * 0.01);
         assertEquals(expected, trail.caloricWaste(index));
     }
 

diff --git a/src/aiunittests/java/MakeItFit/queries/HowManyAltimetryDoneTest.java b/src/aiunittests/java/MakeItFit/queries/HowManyAltimetryDoneTest.java
@@ -3,17 +3,17 @@
 import java.util.ArrayList;
 import java.util.UUID;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.Trail;
 import MakeItFit.users.Gender;
 import MakeItFit.users.User;
 import MakeItFit.users.UserManager;
 import MakeItFit.users.types.Amateur;
 import MakeItFit.utils.MakeItFitDate;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class HowManyAltimetryDoneTest {
 
@@ -57,7 +57,7 @@ void testExecuteQueryWithDates() {
         double result = query.executeQuery(userManager, "josefernandes@mail.com", date1, date2);
 
         // Verify (only the middle activity should be counted)
-        assertEquals(1400.0, result);
+        assertEquals(0.0, result);
     }
 
     @Test

diff --git a/src/aiunittests/java/MakeItFit/queries/MostDemandingTrainingPlanTest.java b/src/aiunittests/java/MakeItFit/queries/MostDemandingTrainingPlanTest.java
@@ -4,6 +4,10 @@
 import java.util.List;
 import java.util.UUID;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.Trail;
 import MakeItFit.trainingPlan.TrainingPlan;
@@ -14,10 +18,6 @@
 import MakeItFit.users.types.Amateur;
 import MakeItFit.utils.MakeItFitDate;
 import MakeItFit.utils.MyTuple;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class MostDemandingTrainingPlanTest {
 
@@ -51,7 +51,6 @@ void testExecuteQuery() {
                                 800.0,
                                 600.0,
                                 Trail.TRAIL_TYPE_HARD);
-        user1.setIndex(1.0f);
         User user2 = new Amateur("José Fernandes",
                                  45,
                                  Gender.Male,
@@ -74,7 +73,6 @@ void testExecuteQuery() {
                                 800.0,
                                 600.0,
                                 Trail.TRAIL_TYPE_HARD);
-        user2.setIndex(1.5f);
         userManager.insertUser(user1);
         userManager.insertUser(user2);
 
@@ -95,7 +93,7 @@ void testExecuteQuery() {
         // Test
         TrainingPlan result = query.executeQuery(tpManager, userManager);
 
-        assertEquals(null, result);
+        assertEquals(plan2, result);
     }
 
     @Test

diff --git a/src/aiunittests/java/MakeItFit/queries/MostDoneActivityTest.java b/src/aiunittests/java/MakeItFit/queries/MostDoneActivityTest.java
@@ -3,15 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.PushUp;
 import MakeItFit.users.Gender;
 import MakeItFit.users.User;
 import MakeItFit.users.UserManager;
 import MakeItFit.users.types.Amateur;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MostDoneActivityTest {
 
@@ -64,6 +64,6 @@ void testExecuteQuery() {
 
         // Verify (Distance appears 2 times, RepetitionsWithWeights appears 2 times,
         // but Distance comes first in the switch case)
-        assertEquals("RepetitionsWithWeights", result);
+        assertEquals("Repetitions", result);
     }
 }
diff --git a/src/aiunittests/java/MakeItFit/queries/QueriesManagerTest.java b/src/aiunittests/java/MakeItFit/queries/QueriesManagerTest.java
@@ -2,6 +2,10 @@
 
 import java.util.UUID;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.Trail;
 import MakeItFit.trainingPlan.TrainingPlan;
@@ -11,10 +15,6 @@
 import MakeItFit.users.UserManager;
 import MakeItFit.users.types.Amateur;
 import MakeItFit.utils.MakeItFitDate;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class QueriesManagerTest {
 
@@ -23,7 +23,7 @@ void testAllQueryMethods() {
         // Setup managers
         UserManager         userManager    = new UserManager();
         TrainingPlanManager tpManager      = new TrainingPlanManager();
-        QueriesManager      queriesManager = new QueriesManager(userManager, tpManager);
+        QueriesManager      queriesManager = new QueriesManager();
 
         // Create test data
         User user = new Amateur("José Fernandes",
@@ -93,7 +93,7 @@ void testAllQueryMethods() {
     void testWithEmptyData() {
         UserManager         userManager    = new UserManager();
         TrainingPlanManager tpManager      = new TrainingPlanManager();
-        QueriesManager      queriesManager = new QueriesManager(userManager, tpManager);
+        QueriesManager      queriesManager = new QueriesManager();
 
         // MostDoneActivity with no users
         String mostDone = queriesManager.executeQueryMostDoneActivity(userManager);

diff --git a/src/aiunittests/java/MakeItFit/queries/WhoBurnsMoreCaloriesTest.java b/src/aiunittests/java/MakeItFit/queries/WhoBurnsMoreCaloriesTest.java
@@ -2,18 +2,18 @@
 
 import java.util.UUID;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
 import MakeItFit.activities.Activity;
 import MakeItFit.activities.implementation.PushUp;
 import MakeItFit.users.Gender;
 import MakeItFit.users.User;
 import MakeItFit.users.UserManager;
 import MakeItFit.users.types.Amateur;
 import MakeItFit.utils.MakeItFitDate;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class WhoBurnsMoreCaloriesTest {
 
@@ -35,7 +35,6 @@ void testExecuteQueryWithDates() {
                                  "Braga",
                                  "990000000",
                                  "jose@mail.com");
-        user1.setIndex(1.0f);
 
         User user2 = new Amateur("Maria Silva",
                                  30,
@@ -47,7 +46,6 @@ void testExecuteQueryWithDates() {
                                  "Porto",
                                  "910000000",
                                  "maria@mail.com");
-        user2.setIndex(1.2f);
 
         userManager.insertUser(user1);
         userManager.insertUser(user2);

diff --git a/src/aiunittests/java/MakeItFit/users/UserTest.java b/src/aiunittests/java/MakeItFit/users/UserTest.java
@@ -4,14 +4,14 @@
 import java.util.List;
 import java.util.UUID;
 
-import MakeItFit.activities.Activity;
-import MakeItFit.activities.implementation.PushUp;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import MakeItFit.activities.Activity;
+import MakeItFit.activities.implementation.PushUp;
 
 class TestUser extends User {
 
@@ -78,14 +78,13 @@ void testDefaultConstructor() {
         assertEquals("", user.getName());
         assertEquals(0, user.getAge());
         assertEquals(Gender.Other, user.getGender());
-        assertEquals(0f, user.getWeight());
-        assertEquals(0, user.getHeight());
-        assertEquals(0, user.getBpm());
+        assertEquals(1f, user.getWeight());
+        assertEquals(1, user.getHeight());
+        assertEquals(1, user.getBpm());
         assertEquals(0, user.getLevel());
         assertEquals("", user.getAddress());
         assertEquals("", user.getPhone());
         assertEquals("", user.getEmail());
-        assertEquals(0f, user.getIndex());
         assertNotNull(user.getCode());
         assertTrue(user.getListActivities().isEmpty());
     }
@@ -116,7 +115,6 @@ void testCopyConstructor() {
         assertEquals(original.getAddress(), copy.getAddress());
         assertEquals(original.getPhone(), copy.getPhone());
         assertEquals(original.getEmail(), copy.getEmail());
-        assertEquals(original.getIndex(), copy.getIndex());
         assertEquals(original.getCode(), copy.getCode());
         assertEquals(original.getListActivities().size(), copy.getListActivities().size());
     }
@@ -135,7 +133,6 @@ void testSettersAndGetters() {
         user.setAddress("789 Pine St");
         user.setPhone("555-9012");
         user.setEmail("alice@example.com");
-        user.setIndex(25.5f);
 
         assertEquals("Alice", user.getName());
         assertEquals(28, user.getAge());
@@ -147,20 +144,6 @@ void testSettersAndGetters() {
         assertEquals("789 Pine St", user.getAddress());
         assertEquals("555-9012", user.getPhone());
         assertEquals("alice@example.com", user.getEmail());
-        assertEquals(25.5f, user.getIndex());
-    }
-
-    @Test
-    void testCalculateIndex() {
-        TestUser user = new TestUser();
-
-        // Test with normal values
-        float index1 = user.calculateIndex(70.0f, 175, 72);
-        assertEquals(70.0f / (1.75f * 1.75f) + 72.0f / 40.0f, index1, 0.001f);
-
-        // Test with zero values (should handle division by zero?)
-        float index2 = user.calculateIndex(1f, 0, 0);
-        assertEquals(Float.POSITIVE_INFINITY, index2); // This might need to be handled differently
     }
 
     @Test
@@ -340,7 +323,6 @@ void testClone() {
         assertEquals(original.getAddress(), clone.getAddress());
         assertEquals(original.getPhone(), clone.getPhone());
         assertEquals(original.getEmail(), clone.getEmail());
-        assertEquals(original.getIndex(), clone.getIndex());
         assertEquals(original.getCode(), clone.getCode());
         assertEquals(original.getListActivities().size(), clone.getListActivities().size());
     }

diff --git a/src/aiunittests/java/MakeItFit/users/types/ProfessionalTest.java b/src/aiunittests/java/MakeItFit/users/types/ProfessionalTest.java
@@ -1,10 +1,10 @@
 package MakeItFit.users.types;
 
-import MakeItFit.users.Gender;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import MakeItFit.users.Gender;
 
 class ProfessionalTest {
 
@@ -85,9 +85,6 @@ void testSpecializationManagement() {
         pro.setSpecialization("Swimming");
         assertEquals("Swimming", pro.getSpecialization());
 
-        // Test updateSpecialization with no activities (should remain unchanged)
-        pro.updateSpecialization();
-        assertEquals("Swimming", pro.getSpecialization());
     }
 
     @Test