From e69cbea8aa924a3c0b4fe2b907c2a22ba6834f6c Mon Sep 17 00:00:00 2001 From: tbilos Date: Sun, 27 Mar 2022 21:51:26 +0200 Subject: [PATCH 1/4] base for tests --- .../dao/AgentAssignmentDaoTest.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java new file mode 100644 index 00000000..0eca87a0 --- /dev/null +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java @@ -0,0 +1,43 @@ +package cz.fi.muni.pa165.seminar4.group7.secretservice.dao; + +import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.AgentAssignment; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.*; + +@SpringBootTest +public class AgentAssignmentDaoTest { + + @Autowired + private AgentAssignmentDao agentAssignmentDao; + + @BeforeEach + public void deleteAll() { + agentAssignmentDao.deleteAll(); + } + + @Test + public void testEmpty() { + assertThat(agentAssignmentDao.findAll()).hasSize(0); + } + + @Test + public void create() { + var agentAssignment = new AgentAssignment(); + agentAssignmentDao.save(agentAssignment); + + var tmp = agentAssignmentDao.findById(agentAssignment.getId()); + assertThat(tmp).isPresent(); + } + + @Test + public void delete() { + var agentAssignment = new AgentAssignment(); + agentAssignmentDao.save(agentAssignment); + agentAssignmentDao.deleteById(agentAssignment.getId()); + assertThat(agentAssignmentDao.findAll()).hasSize(0); + } +} -- GitLab From c8cbaccce09bdafb74cc7048545981e94944a54a Mon Sep 17 00:00:00 2001 From: tbilos Date: Sun, 27 Mar 2022 22:11:00 +0200 Subject: [PATCH 2/4] all tests --- .../dao/AgentAssignmentDaoTest.java | 28 +++++++++++++++++++ .../group7/secretservice/dao/AgentTest.java | 3 ++ 2 files changed, 31 insertions(+) diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java index 0eca87a0..ced4b2bc 100644 --- a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java @@ -1,6 +1,7 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.dao; import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.AgentAssignment; +import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.PerformanceEvaluation; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -8,6 +9,9 @@ import org.springframework.boot.test.context.SpringBootTest; import static org.assertj.core.api.Assertions.*; +/** + * @author Tomáš Biloš + */ @SpringBootTest public class AgentAssignmentDaoTest { @@ -40,4 +44,28 @@ public class AgentAssignmentDaoTest { agentAssignmentDao.deleteById(agentAssignment.getId()); assertThat(agentAssignmentDao.findAll()).hasSize(0); } + + @Test + public void addPerformanceEvaluation() { + var agentAssignment = new AgentAssignment(); + agentAssignment.addPerformanceEvaluation(new PerformanceEvaluation()); + agentAssignmentDao.save(agentAssignment); + + var agentAssignment2 = agentAssignmentDao.findById(agentAssignment.getId()); + assertThat(agentAssignment2).isPresent(); + assertThat(agentAssignment2.get().getPerformanceEvaluations()).hasSize(1); + } + + @Test + public void removePerformanceEvaluation() { + var agentAssignment = new AgentAssignment(); + var perfEval = new PerformanceEvaluation(); + agentAssignment.addPerformanceEvaluation(new PerformanceEvaluation()); + agentAssignmentDao.save(agentAssignment); + + agentAssignment.removePerformanceEvaluation(perfEval); + var agentAssignment2 = agentAssignmentDao.findById(agentAssignment.getId()); + assertThat(agentAssignment2).isPresent(); + assertThat(agentAssignment2.get().getPerformanceEvaluations()).isEmpty(); + } } diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentTest.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentTest.java index 428c0ea8..06aea0e5 100644 --- a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentTest.java +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentTest.java @@ -12,6 +12,9 @@ import javax.transaction.Transactional; import static org.assertj.core.api.Assertions.*; +/** + * @author Tomáš Biloš + */ @SpringBootTest @Transactional public class AgentTest { -- GitLab From fdb7c53e887d0ff76dff271c2d0627824bde6681 Mon Sep 17 00:00:00 2001 From: tbilos Date: Sun, 27 Mar 2022 22:19:12 +0200 Subject: [PATCH 3/4] fix test --- .../group7/secretservice/entity/AgentAssignment.java | 2 +- .../secretservice/dao/AgentAssignmentDaoTest.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/AgentAssignment.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/AgentAssignment.java index b94a3538..963e5932 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/AgentAssignment.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/AgentAssignment.java @@ -38,7 +38,7 @@ public class AgentAssignment extends BaseEntity { @ManyToOne private Agent agent; - @OneToMany + @OneToMany(cascade = CascadeType.ALL) @Setter(AccessLevel.NONE) private Set performanceEvaluations = new HashSet<>(); diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java index ced4b2bc..78df90c8 100644 --- a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java @@ -7,6 +7,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import javax.transaction.Transactional; + import static org.assertj.core.api.Assertions.*; /** @@ -46,6 +48,7 @@ public class AgentAssignmentDaoTest { } @Test + @Transactional public void addPerformanceEvaluation() { var agentAssignment = new AgentAssignment(); agentAssignment.addPerformanceEvaluation(new PerformanceEvaluation()); @@ -57,15 +60,18 @@ public class AgentAssignmentDaoTest { } @Test + @Transactional public void removePerformanceEvaluation() { var agentAssignment = new AgentAssignment(); var perfEval = new PerformanceEvaluation(); - agentAssignment.addPerformanceEvaluation(new PerformanceEvaluation()); + agentAssignment.addPerformanceEvaluation(perfEval); agentAssignmentDao.save(agentAssignment); agentAssignment.removePerformanceEvaluation(perfEval); + agentAssignmentDao.save(agentAssignment); + var agentAssignment2 = agentAssignmentDao.findById(agentAssignment.getId()); assertThat(agentAssignment2).isPresent(); - assertThat(agentAssignment2.get().getPerformanceEvaluations()).isEmpty(); + assertThat(agentAssignment2.get().getPerformanceEvaluations()).hasSize(0); } } -- GitLab From 4fff50e3d17181d09cf6c33132f553b9751c1af1 Mon Sep 17 00:00:00 2001 From: tbilos Date: Sun, 27 Mar 2022 22:38:21 +0200 Subject: [PATCH 4/4] rename test --- ...gnmentDaoTest.java => AgentAssignmentTest.java} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/{AgentAssignmentDaoTest.java => AgentAssignmentTest.java} (90%) diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentTest.java similarity index 90% rename from src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java rename to src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentTest.java index 78df90c8..999cb2ea 100644 --- a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentDaoTest.java +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/AgentAssignmentTest.java @@ -15,23 +15,23 @@ import static org.assertj.core.api.Assertions.*; * @author Tomáš Biloš */ @SpringBootTest -public class AgentAssignmentDaoTest { +class AgentAssignmentTest { @Autowired private AgentAssignmentDao agentAssignmentDao; @BeforeEach - public void deleteAll() { + void deleteAll() { agentAssignmentDao.deleteAll(); } @Test - public void testEmpty() { + void testEmpty() { assertThat(agentAssignmentDao.findAll()).hasSize(0); } @Test - public void create() { + void create() { var agentAssignment = new AgentAssignment(); agentAssignmentDao.save(agentAssignment); @@ -40,7 +40,7 @@ public class AgentAssignmentDaoTest { } @Test - public void delete() { + void delete() { var agentAssignment = new AgentAssignment(); agentAssignmentDao.save(agentAssignment); agentAssignmentDao.deleteById(agentAssignment.getId()); @@ -49,7 +49,7 @@ public class AgentAssignmentDaoTest { @Test @Transactional - public void addPerformanceEvaluation() { + void addPerformanceEvaluation() { var agentAssignment = new AgentAssignment(); agentAssignment.addPerformanceEvaluation(new PerformanceEvaluation()); agentAssignmentDao.save(agentAssignment); @@ -61,7 +61,7 @@ public class AgentAssignmentDaoTest { @Test @Transactional - public void removePerformanceEvaluation() { + void removePerformanceEvaluation() { var agentAssignment = new AgentAssignment(); var perfEval = new PerformanceEvaluation(); agentAssignment.addPerformanceEvaluation(perfEval); -- GitLab