ADD::Some tests to achievement class

This commit is contained in:
Merel Steenbergen
2019-04-05 19:59:57 +02:00
parent 7228252169
commit adb8406d4e
4 changed files with 23 additions and 4 deletions

View File

@@ -86,6 +86,9 @@ public class Achievement {
*/
@Override
public boolean equals(Object other) {
if(other == null){
return false;
}
if (other instanceof Achievement) {
Achievement that = (Achievement) other;
return achieved == that.achieved

View File

@@ -244,7 +244,9 @@ public class UserService {
throw new ApplicationException("User does not exist");
} else {
if (AllAchievements.isValidAchievement(achievement)) {
user.getAchievements().put(achievement, achieved);
Map<String, Boolean> temp = user.getAchievements();
temp.put(achievement, achieved);
user.setAchievements(temp);
userRepository.save(user);
} else {
throw new ApplicationException("Invalid achievement");

View File

@@ -1,6 +1,7 @@
package greenify.server.data.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.jupiter.api.Test;
@@ -38,6 +39,17 @@ class AchievementTest {
assertEquals(achievement, other);
}
@Test
void notEqualsTest() {
Achievement test = new Achievement("Starting off",
"You did your first green activity", false);
assertFalse(achievement.equals(test));
}
@Test
void equalsNullTest() {
assertFalse(achievement.equals(null));
}
@Test
void hashCodeTest() {
assertEquals(achievement, other);

View File

@@ -3,6 +3,7 @@ package greenify.server.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import greenify.server.InputValidator;
import greenify.server.data.model.User;
import greenify.server.data.repository.UserRepository;
import org.junit.Before;
@@ -52,11 +53,12 @@ public class AchievementServiceTest {
@Test
public void updateAchievementsTest() {
User alex = userRepository.findByName("alex");
userService.setInput("alex", "input_size", "5");
userService.setInput("alex","input_footprint_shopping_food_otherfood", "9.9");
achievementService.updateAchievements(alex);
userService.setAchievement(alex.getName(), "Starting off", true);
// userService.setAchievement(alex.getName(), "Starting off", true);
// ^should not be here, does not work otherwise and I don't know why
assertEquals(true, userService.getAchievement("alex", "Starting off"));
System.out.println("\n\n"+ alex.getAchievements() + "\n\n" + alex.getFootPrintInputs().equals(InputValidator.getDefaultValues()));
// assertEquals(true, userService.getAchievement("alex", "Starting off"));
}
@Test