From b196ac13abd1fa7e380ef9c507262154b9082023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0m=C3=ADd?= Date: Fri, 27 Oct 2017 23:03:17 +0200 Subject: [PATCH 1/3] Add sportsmen tests --- .../muni/pa165/dao/SportsMenDaoImplTest.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java index 105ad9a..2e3ed49 100644 --- a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java +++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java @@ -5,7 +5,6 @@ import cz.fi.muni.pa165.enums.Gendre; import cz.fi.muni.pa165.enums.Role; import org.springframework.beans.factory.annotation.Autowired; -import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -13,16 +12,15 @@ import java.util.List; import java.util.Set; -import static org.assertj.core.api.Assertions.assertThat; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.*; /** * @author Martin Šmíd */ public class SportsMenDaoImplTest extends BaseDaoImplTest { + @Autowired - private SportsMenDao sportsMenDao; + SportsMenDao sportsMenDao; @Autowired private CompetitionDao competitionDao; @@ -64,9 +62,9 @@ public void testAddToCompetition() { Competition foundCompetition = competitionDao.findById(competition.getId()); Set sportsmenInComp = foundCompetition.getSportsMen(); - Assert.assertTrue(sportsmen.getCompetitions().contains(competition)); - Assert.assertEquals(sportsmenInComp.size(), 1); - Assert.assertTrue(sportsmenInComp.contains(sportsmen)); + assertTrue(sportsmen.getCompetitions().contains(competition)); + assertEquals(sportsmenInComp.size(), 1); + assertTrue(sportsmenInComp.contains(sportsmen)); } @Test @@ -79,22 +77,22 @@ public void testRemoveFromCompetition() { sportsMenDao.create(sportsmen); sportsMenDao.removeFromCompetition(competition, sportsmen); - Assert.assertEquals(sportsMenDao.findById(sportsmen.getId()).getCompetitions().size(), 0); + assertEquals(sportsMenDao.findById(sportsmen.getId()).getCompetitions().size(), 0); sportsMenDao.addToCompetition(competition, sportsmen); sportsMenDao.addToCompetition(competition1, sportsmen); sportsMenDao.removeFromCompetition(competition, sportsmen); Competition found = competitionDao.findById(competition.getId()); - Assert.assertNull(found); - Assert.assertEquals(sportsmen.getCompetitions().size(), 1); + + assertEquals(sportsmen.getCompetitions().size(), 1); found = competitionDao.findById(competition1.getId()); - Assert.assertNotNull(found); + assertNotNull(found); Set sportsmenInComp = found.getSportsMen(); - Assert.assertTrue(sportsmen.getCompetitions().contains(competition)); - Assert.assertEquals(sportsmenInComp.size(), 1); - Assert.assertTrue(sportsmenInComp.contains(sportsmen)); + assertTrue(sportsmen.getCompetitions().contains(competition)); + assertEquals(sportsmenInComp.size(), 1); + assertTrue(sportsmenInComp.contains(sportsmen)); } @Test From 0708b5f0adc0464633d2bd3f274c4a2ebe20e866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0m=C3=ADd?= Date: Fri, 27 Oct 2017 23:07:41 +0200 Subject: [PATCH 2/3] Remove assertNull --- .../java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java index 2e3ed49..60fb1f7 100644 --- a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java +++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java @@ -83,11 +83,9 @@ public void testRemoveFromCompetition() { sportsMenDao.addToCompetition(competition1, sportsmen); sportsMenDao.removeFromCompetition(competition, sportsmen); - Competition found = competitionDao.findById(competition.getId()); - assertEquals(sportsmen.getCompetitions().size(), 1); - found = competitionDao.findById(competition1.getId()); - assertNotNull(found); + Competition found = competitionDao.findById(competition1.getId()); + Set sportsmenInComp = found.getSportsMen(); assertTrue(sportsmen.getCompetitions().contains(competition)); From 9d91bdd442f1ab5a776dc16bf0b654f6b0c7fe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0m=C3=ADd?= Date: Fri, 27 Oct 2017 23:17:02 +0200 Subject: [PATCH 3/3] Fix competition variable --- .../test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java index 60fb1f7..ecbc389 100644 --- a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java +++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java @@ -88,7 +88,7 @@ public void testRemoveFromCompetition() { Set sportsmenInComp = found.getSportsMen(); - assertTrue(sportsmen.getCompetitions().contains(competition)); + assertTrue(sportsmen.getCompetitions().contains(competition1)); assertEquals(sportsmenInComp.size(), 1); assertTrue(sportsmenInComp.contains(sportsmen)); }