Author: bleny Date: 2011-07-26 08:43:57 +0000 (Tue, 26 Jul 2011) New Revision: 1387 Log: fix tests ; add missing values in i18n Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-07-26 08:43:57 UTC (rev 1387) @@ -131,6 +131,7 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' wao.business.contact.validation.commentMissingForState=You must give a comment for state '%s' wao.business.contact.validation.contactStateMotifMissing=You must precise a motif for the refusal +wao.business.contact.validation.contactStateMotifUnwanted=You must not give a motif wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating wao.business.contact.validation.missingHoursOfBeginEndObservation=You must provide accurate time for the beginning and the end of observation wao.business.entity.UserProfile.description=%s on %s%s Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-07-26 08:43:57 UTC (rev 1387) @@ -132,6 +132,7 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' wao.business.contact.validation.commentMissingForState=Il faut préciser un commentaire pour l'état '%s' wao.business.contact.validation.contactStateMotifMissing=Il faut préciser un motif de refus +wao.business.contact.validation.contactStateMotifUnwanted=Il ne faut pas préciser de motif de refus wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut préciser la qualité de la donnée avant de valider wao.business.contact.validation.missingHoursOfBeginEndObservation=Il faut préciser les heures exactes de début et de fin d'observation wao.business.entity.UserProfile.description=%s sur %s%s Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-07-26 08:43:57 UTC (rev 1387) @@ -102,7 +102,6 @@ contact1.setContactState(ContactState.CONTACT_DEFINITELY_REFUSED); contact1.setContactStateMotif(obsMerFixtures.defaultContactStateMotif()); - contact1.setComment("why contact was definitely refused"); contact1.setDataReliability(DataReliability.RELIABLE); contact1.setValidationProgram(Boolean.TRUE); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); @@ -112,6 +111,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_DONE); + contact1.setContactStateMotif(null); contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010)); contact1.setObservationEndDate(DateUtil.createDate(4, 3, 2010)); contact1.setMainObserver(obsMerFixtures.jeanMichmuche()); @@ -122,6 +122,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_CANCELLED); + contact1.setContactStateMotif(null); contact1.setComment("why it was cancelled"); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); @@ -130,6 +131,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.CONTACT_REFUSED); + contact1.setContactStateMotif(obsMerFixtures.defaultContactStateMotif()); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion());