YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java

@@ -1,6 +1,8 @@
 package org.yacos.tests.core;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.Date;
 import java.util.List;
@@ -9,6 +11,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,26 +40,53 @@ public class EvaluationManagerTest {
 		confId = conf.getId();		
 	}
 	
+	@After
+	public void cleanDB(){
+		cm.remove(confId);
+	}
+	
 	
 	@Test
 	public void addCriterionsTest() {
-		Criterion crit;
+		Criterion crit = em.addCriterion("name", 0, 4, confId);
-		crit = em.addCriterion("name", 0, 4, confId);
 		assertNotNull(crit);
-		assertEquals(crit.getName(), em.getCriterion(crit.getId()));
+		assertEquals(crit.getName(), em.getCriterion(crit.getId()).getName());
 	}
 	
 	@Test
-	public void getCriterionsTest(){
+	public void getCriterionTest(){
+		Criterion crit = em.getCriterion(1);
+		assertNotNull(crit);
+	}
 	
+	@Test
+	public void getCriterionsTest() throws NamingException{
+		em.addCriterion("name", 0, 4, confId);
 		List<Criterion> list = em.getCriterions(confId);
 		assertFalse("liste vide",list.isEmpty());
 	}
 	
 	@Test
-	public void AddEvaluationTest(){
+	public void updateCriterionTest(){
+		Criterion crit = em.addCriterion("name", 0, 4, confId);
+		crit.setName("autre");
+		em.updateCriterion(crit);
+		crit = em.getCriterion(crit.getId());
+		assertEquals("autre", crit.getName());
+	}
 	
-		assertEquals("null","null");
+	@Test
+	public void removeCriterion(){
+		Criterion crit = em.addCriterion("name", 0, 4, confId);
+		em.removeCriterion(crit.getId());
+	}
+	
+	@Test
+	public void AddReportTest(){
+		//TODO
+		//Report report = em.addReport(articleId);
+		//assertNotNull();
+		//assertEquals(report.getCommentAuthor(), em.getReport(report.getId()).getCommentAuthor());
 		
 	}