Author: bleny Date: 2012-11-22 22:45:18 +0100 (Thu, 22 Nov 2012) New Revision: 1633 Url: http://forge.codelutin.com/repositories/revision/wao/1633 Log: fix tests Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -96,6 +96,10 @@ return getWaoUser("jmichmuche", "mdp", "Jean", "Michmuche", tartanpion()); } + public WaoUser jacquesMichmuche() { + return getWaoUser("j.michmuche", "mdp", "Jacques", "Michmuche", tartanpion()); + } + public WaoUser billMurray() { return getWaoUser("BillMurray", "mdp", "Bill", "Murray", bis()); } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -85,7 +85,7 @@ Contact contact = obsMerFixtures.defaultContact(); WaoUser observer1 = obsMerFixtures.jeanMichmuche(); - WaoUser observer2 = obsMerFixtures.billMurray(); + WaoUser observer2 = obsMerFixtures.jacquesMichmuche(); contact.addSecondaryObservers(observer1); contact.addSecondaryObservers(observer2); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -154,6 +154,7 @@ } SampleRow row = serviceSampling.newSampleRow(obsMerFixtures.jeanMichmucheAsAdmin()); + row.setCompany(obsMerFixtures.homerSimpson().getCompany()); row.setCode("2010_03"); row.setNbObservants(3); row.setAverageTideTime(2.5); Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:45:18 UTC (rev 1633) @@ -1,6 +1,6 @@ "PLAN_CODE";"SOCIETE_NOM";"PECHE_DIVISION";"PECHE_AUTRE";"METIER_CODE_DCF5";"METIER_MAILLAGE";"METIER_TAILLE";"METIER_AUTRE";"METIER_LIBELLE";"METIER_ESPECES";"PROGRAMME_CODE";"PROGRAMME_DEBUT";"PROGRAMME_FIN";"12/2009";"01/2010";"02/2010";"03/2010";"04/2010";"05/2010";"06/2010";"07/2010";"08/2010";"09/2010";"10/2010";"11/2010";"12/2010";"01/2011";"02/2011";"03/2011";"PLAN_DUREE_MOY";"PLAN_NB_OBSERV";"PLAN_COMMENT";"TAUX_COUVERTURE_APPLIQUE" "2010_M0001";"TARTANPION";"IId / I";;"DRB_ALG";;;;;;"MA-2009";"03/2010";"01/2011";;;;0;0;0;0;0;0;0;2;0;0;4;;;"1.5";1;"Un petit commentaire";5 -"2010_M0002";;"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 +"2010_M0002";"TARTANPION";"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 "2010_M0003";;"IId / IV";;"DRH";;;;"balottage en plein air";"divers choses visqueuses";"MA-2009";"03/2010";"01/2011";;;;0;22;0;0;25;0;0;21;0;0;25;;;2;1;;5 "2009_M0001";;"IId / IV";;"GTR_DEF et GNS_DEF";"110-119";;;"Fileyage à poissons tubes";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;1;1;2;1;1;1;1;1;2;;;;;;1;1;;5 "2009_M0002";;"IId";;"GTR_DEF et GNS_DEF";"9888-99";;;"Fileyage à sirènes ";"nymphes";"PPP2010";"12/2009";"10/2010";1;1;1;2;3;4;4;4;4;3;3;;;;;;1;1;;10