diff --git a/YACOSTest/src/dbFiller/Filler.java b/YACOSTest/src/dbFiller/Filler.java index 263853c..c5c3e43 100644 --- a/YACOSTest/src/dbFiller/Filler.java +++ b/YACOSTest/src/dbFiller/Filler.java @@ -9,10 +9,8 @@ import javax.naming.NamingException; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; -import org.yacos.core.article.Preference.PreferenceType; import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; -import org.yacos.core.evaluation.Criterion; import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; import org.yacos.core.exceptions.PKAlreadyUsedException; @@ -60,7 +58,10 @@ public class Filler { // Add role for users // admin - + cm.addRole(RoleType.CHAIRMAN, admin.getLogin(), conf.getId()); + cm.addRole(RoleType.PCMEMBER, admin.getLogin(), conf.getId()); + cm.addRole(RoleType.REFEREE, admin.getLogin(), conf.getId()); + cm.addRole(RoleType.AUTHOR, admin.getLogin(), conf.getId()); // chairman cm.addRole(RoleType.CHAIRMAN, chairman.getLogin(), conf.getId()); cm.addRole(RoleType.PCMEMBER, chairman.getLogin(), conf.getId()); @@ -98,17 +99,12 @@ public class Filler { // ajout de critere - Criterion c; - - c = em.addCriterion("Les schtroumpfs sont-ils bons ?", 1, 5, 1); - c = em.addCriterion("Les gaulois sont-ils fous ?", 1, 4, 1); - c = em.addCriterion("Un nain est-il vraiment petit ?", 1, 5, 2); - c = em.addCriterion("Un chien peut-il se transformer en chat ?", 1, 4, 2); - + em.addCriterion("Les schtroumpfs sont-ils bons ?", 1, 5, 1); + em.addCriterion("Les gaulois sont-ils fous ?", 1, 4, 1); + em.addCriterion("Un nain est-il vraiment petit ?", 1, 5, 2); + em.addCriterion("Un chien peut-il se transformer en chat ?", 1, 4, 2); System.out.println("--> FIN OK"); } - - } diff --git a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java index 49a130f..ea0bbb5 100644 --- a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java @@ -1,7 +1,10 @@ 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 static org.junit.Assert.assertNull; import java.util.ArrayList; import java.util.Date; diff --git a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java index 3b962a5..4ef93d2 100644 --- a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java @@ -1,6 +1,9 @@ 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 static org.junit.Assert.assertTrue; import java.util.Date; import java.util.List; @@ -9,7 +12,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java index 57d54d3..079ba76 100644 --- a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java @@ -1,9 +1,12 @@ 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 static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; -import java.util.Date; import java.util.List; import javax.naming.Context; @@ -16,7 +19,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; -import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.evaluation.Criterion; import org.yacos.core.evaluation.IEvaluationManager; @@ -25,6 +27,7 @@ import org.yacos.core.evaluation.Report; import org.yacos.core.exceptions.PKAlreadyUsedException; import org.yacos.core.users.IUserManager; +@SuppressWarnings("unused") public class EvaluationManagerTest { private static IEvaluationManager em; diff --git a/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java b/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java index 80ad23c..77df111 100644 --- a/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java +++ b/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java @@ -4,10 +4,14 @@ package org.yacos.tests.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Date; import java.util.List; + import javax.naming.Context; import javax.naming.InitialContext; diff --git a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java index 8f9717c..0045413 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java @@ -110,6 +110,7 @@ public class UserManagerTest { @Test public void getUserByRoleType(){ + @SuppressWarnings("unused") Role role = cm.addRole(RoleType.PCMEMBER, "truc", conf_id); List list = um.getUsers(conf_id,RoleType.PCMEMBER); assertFalse(list.isEmpty()); diff --git a/YACOSTest/src/org/yacos/tests/core/UserTest.java b/YACOSTest/src/org/yacos/tests/core/UserTest.java index 27f490a..040f39d 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserTest.java @@ -1,6 +1,11 @@ package org.yacos.tests.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.Date; import java.util.List;