Author: tchemit Date: 2014-04-08 18:28:52 +0200 (Tue, 08 Apr 2014) New Revision: 1868 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1868 Log: refs #4487 fix contacts import tests Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java trunk/wao-services/src/test/resources/import/contacts.csv Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-04-08 16:24:07 UTC (rev 1867) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-04-08 16:28:52 UTC (rev 1868) @@ -140,20 +140,8 @@ } public AuthenticatedWaoUser admin() { -// WaoUserTopiaDao waoUserDao = serviceContext.getPersistenceContext().getWaoUserDao(); WaoUser admin = getWaoUser("admin"); UserProfile userProfile = getUserProfile("admin"); -// admin.setCompany(ifremer()); -// admin.setLogin("admin"); -// admin.setActive(true); -// UserProfileTopiaDao userProfileDao = serviceContext.getPersistenceContext().getUserProfileDao(); -// UserProfile userProfile = new UserProfileImpl(); -// userProfile.setUserRole(UserRole.ADMIN); -// userProfile.setObsProgram(ObsProgram.OBSMER); -// userProfile.setCanWrite(true); -// userProfileDao.create(userProfile); -// admin.addUserProfile(userProfile); -// waoUserDao.create(admin); AuthenticatedWaoUser authenticatedWaoUser = new AuthenticatedWaoUser(admin, userProfile); return authenticatedWaoUser; } @@ -161,19 +149,6 @@ public AuthenticatedWaoUser jmichmuche() { WaoUser jmichmuche = getWaoUser("jmichmuche"); UserProfile userProfile = getUserProfile("jmichmuche"); -// WaoUserTopiaDao waoUserDao = serviceContext.getPersistenceContext().getWaoUserDao(); -// WaoUser jmichmuche = new WaoUserImpl(); -// jmichmuche.setCompany(ifremer()); -// jmichmuche.setLogin("jmichmuche"); -// jmichmuche.setActive(true); -// UserProfileTopiaDao userProfileDao = serviceContext.getPersistenceContext().getUserProfileDao(); -// UserProfile userProfile = new UserProfileImpl(); -// userProfile.setUserRole(UserRole.COORDINATOR); -// userProfile.setObsProgram(ObsProgram.OBSMER); -// userProfile.setCanWrite(true); -// userProfileDao.create(userProfile); -// jmichmuche.addUserProfile(userProfile); -// waoUserDao.create(jmichmuche); AuthenticatedWaoUser authenticatedWaoUser = new AuthenticatedWaoUser(jmichmuche, userProfile); return authenticatedWaoUser; } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java 2014-04-08 16:24:07 UTC (rev 1867) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java 2014-04-08 16:28:52 UTC (rev 1868) @@ -29,9 +29,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.DateUtil; import java.io.InputStream; @@ -72,16 +72,18 @@ ObsMerContactsList contactsList = service.getContactsList(filter, pager); } - //FIXME finish to code samplingPlan import to make this works - @Ignore @Test public void testImportContacts() { fixtures.samplingPlan(); fixtures.jmichmuche(); fixtures.navires(); + // today must be after the observation end date + serviceContext.setDate(DateUtil.createDate(1, 2, 2011)); + InputStream input = null; try { + Assert.assertEquals(0, service.getContactDao().count()); input = getClass().getResourceAsStream("/import/contacts.csv"); service.importContacts(fixtures.admin(), input); Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-04-08 16:24:07 UTC (rev 1867) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-04-08 16:28:52 UTC (rev 1868) @@ -26,6 +26,7 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.AbstractWaoServiceTest; +import fr.ifremer.wao.services.FakeWaoServiceContext; import fr.ifremer.wao.services.ObsMerFixtures; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -160,6 +161,12 @@ @Test public void testRecomputeSampleRowEstimatedAndRealTides() throws Exception { + FakeWaoServiceContext serviceContext = newServiceContext(); + + // today must be after the observation end date (for contacts import) + serviceContext.setDate(DateUtil.createDate(1, 2, 2011)); + fixtures = new ObsMerFixtures(serviceContext); + fixtures.contacts(); SampleRow sampleRow = serviceContext.getPersistenceContext().getSampleRowDao().forCodeEquals("2010_M0011").findUnique(); Modified: trunk/wao-services/src/test/resources/import/contacts.csv =================================================================== --- trunk/wao-services/src/test/resources/import/contacts.csv 2014-04-08 16:24:07 UTC (rev 1867) +++ trunk/wao-services/src/test/resources/import/contacts.csv 2014-04-08 16:28:52 UTC (rev 1868) @@ -1,2 +1,3 @@ CONTACT_ID;CONTACT_DATE_CREATION;CONTACT_OBSERVATEUR_PRINCIPAL;CONTACT_OBSERVATEURS_SECONDAIRES;CONTACT_ETAT;CONTACT_DEBUT_OBSERVATION;CONTACT_FIN_OBSERVATION;CONTACT_SAISIE_DONNEES;CONTACT_COMMENTAIRE_OBSERVATEUR;CONTACT_COMMENTAIRE_COORDINATEUR;CONTACT_COMMENTAIRE_PROGRAMME;PLAN_CODE;NAVIRE_IMMATRICULATION;CONTACT_VALIDATION_SOCIETE;CONTACT_VALIDATION_PROGRAMME;CONTACT_QUALITE_DONNEE;CONTACT_OBSERVATION_MAMMIFERE;CONTACT_CAPTURE_ACCIDENTELLE;CONTACT_ETAT_MOTIF_CODE;CONTACT_ETAT_MOTIF_NOM;CONTACT_TRANSMISSION_RESTITUTION;CONTACT_DONNEES_ALLEGRO_VALIDEES -;01/03/2011 10:24;jmichmuche;;CONTACT_DEFINITELY_REFUSED;;;;ne veut plus collaborer;;;2010_M0001;174258;?;?;UNKNOWN;N;N;REFUS_PROFESSION;;; +;01/03/2011 10:24;jmichmuche;;Refus définitif;;;;ne veut plus collaborer;;;2010_M0001;174258;?;?;Inconnue;N;N;REFUS_PROFESSION;;; +;01/03/2011 10:24;jmichmuche;;Observation réalisée;01/11/2010 10:24;02/11/2010 10:24;;ne veut plus collaborer;;;2010_M0001;174258;?;?;Inconnue;N;N;;;;