Merge branch 'master' into sportEventTest

jiritobias · Oct 27, 2017 · ab536da · ab536da
2 parents 0265c9d + 0679576
commit ab536da
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 35 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
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
@@ -5,24 +5,22 @@
 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;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-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;
@@ -49,6 +47,7 @@ public void testCreate() {
 
         User found = sportsMenDao.findById(sportsmen.getId());
         assertNotNull(found);
+        assertEquals(sportsMenDao.findAll().size(), 1);
         assertEquals(found, sportsmen);
     }
 
@@ -63,9 +62,9 @@ public void testAddToCompetition() {
         Competition foundCompetition = competitionDao.findById(competition.getId());
         Set<User> 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
@@ -78,32 +77,20 @@ 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);
-        found = competitionDao.findById(competition1.getId());
-        Assert.assertNotNull(found);
+        assertEquals(sportsmen.getCompetitions().size(), 1);
+        Competition found = competitionDao.findById(competition1.getId());
+
         Set<User> sportsmenInComp = found.getSportsMen();
 
-        Assert.assertTrue(sportsmen.getCompetitions().contains(competition));
-        Assert.assertEquals(sportsmenInComp.size(), 1);
-        Assert.assertTrue(sportsmenInComp.contains(sportsmen));
-    }
-
-    @Test
-    public void testAddToTeam() {
-
-    }
-
-    @Test
-    public void testRemoveFromTeam() {
-
+        assertTrue(sportsmen.getCompetitions().contains(competition1));
+        assertEquals(sportsmenInComp.size(), 1);
+        assertTrue(sportsmenInComp.contains(sportsmen));
     }
 
     @Test