From 59747b97f5b21c233d394e797972417801a6ba44 Mon Sep 17 00:00:00 2001
From: birkon <birkon@stud.ntnu.no>
Date: Tue, 2 May 2023 14:21:21 +0200
Subject: [PATCH] fixed tests
---
.../v233/SmartMat/entity/group/Group.java | 4 ++--
.../v233/SmartMat/entity/user/User.java | 2 +-
.../repository/group/GroupRepositoryTest.java | 18 ++++++++----------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
index 51dc151a..346ccd7f 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
@@ -57,8 +57,8 @@ public class Group {
@OneToMany(cascade = {CascadeType.ALL},
- fetch = FetchType.LAZY, mappedBy = "group"
- , orphanRemoval = true
+ fetch = FetchType.LAZY, mappedBy = "group",
+ orphanRemoval = true
)
@JsonIgnoreProperties("group")
private List<UserGroupAsso> user = new ArrayList<>();
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index a3cb4f8f..88646b27 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -55,7 +55,7 @@ public class User implements UserDetails {
private Date dateOfBirth;
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true, mappedBy = "user")
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "user")
@JsonIgnore
private List<UserGroupAsso> group;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
index 69cd0518..52d6a293 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
@@ -106,24 +106,22 @@ public class GroupRepositoryTest {
@Test
void groupShouldHaveAchivments(){
- Optional<Group> tempGroupe = groupRepository.findByGroupName("test");
-
-
- assertTrue(tempGroupe.isPresent());
+ Group tempgroup = Group.builder().groupName("testiossxjak").build();
Achievement tempAchievement = Achievement.builder().achievementName("test2").build();
- Group tempGroup = tempGroupe.get();
+ tempgroup.setAchievements(new ArrayList<>(Collections.singletonList(tempAchievement)));
+ groupRepository.save(tempgroup);
- tempGroup.setAchievements(new ArrayList<>(Collections.singletonList(tempAchievement)));
+ Optional<Group> tempGroupe = groupRepository.findByGroupName("testiossxjak");
- groupRepository.save(tempGroup);
- assertTrue(groupRepository.findByGroupName("test").isPresent());
+ assertTrue(tempGroupe.isPresent());
+
- assertTrue(groupRepository.findByGroupName("test").get().getAchievements().contains(tempAchievement));
+ assertTrue(tempGroupe.get().getAchievements().contains(tempAchievement));
- assertNull(groupRepository.findByGroupName("test").get().getAchievements().get(0).getGroups());
+ assertNull(tempGroupe.get().getAchievements().get(0).getGroups());
}
--
GitLab