From 9c20249ba95722adccc6b74a0c9364bc721983d4 Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Sat, 23 Feb 2008 18:55:59 +0000 Subject: [PATCH] =?UTF-8?q?Correction=20apr=C3=A8s=20ajout=20d'attribut=20?= =?UTF-8?q?pour=20la=20conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YACOSTest/src/dbFiller/Filler.java | 16 ++++++++-- .../yacos/tests/core/ArticleManagerTest.java | 8 ++++- .../tests/core/ConferenceManagerTest.java | 32 ++++++++++++++++--- .../tests/core/EvaluationManagerTest.java | 8 ++++- .../yacos/tests/core/InvitationTokenTest.java | 16 ++++++++-- .../org/yacos/tests/core/UserManagerTest.java | 8 ++++- .../src/org/yacos/tests/core/UserTest.java | 8 ++++- 7 files changed, 84 insertions(+), 12 deletions(-) diff --git a/YACOSTest/src/dbFiller/Filler.java b/YACOSTest/src/dbFiller/Filler.java index 82d1b2f..f09690c 100644 --- a/YACOSTest/src/dbFiller/Filler.java +++ b/YACOSTest/src/dbFiller/Filler.java @@ -55,8 +55,20 @@ public class Filler { // add two conference cm.addConferenceCreationToken("chairman"); cm.addConferenceCreationToken("admin"); - conf = cm.addConference("Conf 1","chairman","Je suis une conf","J'aime le cafe",new Date(),new Date(),new Date(),new Date(),new Date()); - conf2 = cm.addConference("Conf 2","admin","Je suis un schtroumpf","J'aime la salsepareille",new Date(),new Date(),new Date(),new Date(),new Date()); + conf = cm.addConference("Conf 1","chairman","Je suis une conf","J'aime le cafe",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + true, + false, + true, + false, + "Other infos"); + conf2 = cm.addConference("Conf 2","admin","Je suis un schtroumpf","J'aime la salsepareille",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); // Add role for users diff --git a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java index 6e35385..04d6100 100644 --- a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java @@ -55,7 +55,13 @@ public class ArticleManagerTest { um.addUser("articleManagerTestChairman",User.hashPassword("pw"),"maxime","dagn","ipint", "articleManagerTestChairman@yacos.com"); //ajout d'une conf cm.addConferenceCreationToken("articleManagerTestChairman"); - conf = cm.addConference("titi","articleManagerTestChairman","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + conf = cm.addConference("titi","articleManagerTestChairman","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); assertEquals("titi", cm.getConference(conf.getId()).getTitle());; //ajout d'un article diff --git a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java index 672707d..d586b14 100644 --- a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java @@ -44,14 +44,26 @@ public class ConferenceManagerTest { um.getUser("max"); } cm.addConferenceCreationToken("max"); - conf = cm.addConference("titre","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + conf = cm.addConference("titre","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); id = conf.getId(); } @Test public void addConferenceTest() throws NoConferenceCreationTokenLeftException{ cm.addConferenceCreationToken("max"); - conf = cm.addConference("titi","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + conf = cm.addConference("titi","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); assertEquals("titi", cm.getConference(conf.getId()).getTitle()); cm.remove(conf.getId()); } @@ -76,13 +88,25 @@ public class ConferenceManagerTest { conf = cm.getConference(id); cm.remove(conf.getId()); cm.addConferenceCreationToken("max"); - cm.addConference("titre","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + cm.addConference("titre","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); } @Test public void getConferencesTest() throws NoConferenceCreationTokenLeftException{ cm.addConferenceCreationToken("max"); - conf = cm.addConference("titre2","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + conf = cm.addConference("titre2","max","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); List list = cm.getConferences(); assertFalse("liste vide",list.isEmpty()); cm.remove(conf.getId()); diff --git a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java index 9b8da54..3589019 100644 --- a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java @@ -59,7 +59,13 @@ public class EvaluationManagerTest { um.addUser("evaluationManagerTest2", "pw", "first", "last", "yacos", "evaluationManagerTest@yacos.com"); } cm.addConferenceCreationToken("evaluationManagerTest"); - Conference conf = cm.addConference("titre","evaluationManagerTest","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + Conference conf = cm.addConference("titre","evaluationManagerTest","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); confId = conf.getId(); Criterion crit = em.addCriterion("name", 0, 4, confId); critId = crit.getId(); diff --git a/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java b/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java index 1eda274..3cb73eb 100644 --- a/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java +++ b/YACOSTest/src/org/yacos/tests/core/InvitationTokenTest.java @@ -53,7 +53,13 @@ public class InvitationTokenTest { new Date(), new Date(), new Date(), - new Date()); + new Date(), + 0, + false, + false, + false, + false, + "Other infos"); testConferenceId = conf.getId(); } @@ -89,7 +95,13 @@ public class InvitationTokenTest { new Date(), new Date(), new Date(), - new Date()); + new Date(), + 0, + false, + false, + false, + false, + "Other infos"); confManager.addInvitationToken("InvitationToken@test.com", RoleType.AUTHOR, testConferenceId); confManager.addInvitationToken("InvitationToken@test.com", RoleType.REFEREE, testConferenceId); diff --git a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java index 9986a63..84d35cd 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java @@ -49,7 +49,13 @@ public class UserManagerTest { conf_id = 1; }else{ cm.addConferenceCreationToken("userManagerTestChairman"); - Conference conf = cm.addConference("titi","articleManagerTestChairman","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); + Conference conf = cm.addConference("titi","articleManagerTestChairman","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date(), + 0, + false, + false, + false, + false, + "Other infos"); conf_id = conf.getId(); } } diff --git a/YACOSTest/src/org/yacos/tests/core/UserTest.java b/YACOSTest/src/org/yacos/tests/core/UserTest.java index 55475ab..45054a9 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserTest.java @@ -49,7 +49,13 @@ public class UserTest { dateArticles, dateArticles, dateArticles, - dateArticles); + dateArticles, + 0, + false, + false, + false, + false, + "Other infos"); }