Author: bleny Date: 2011-01-10 09:21:32 +0000 (Mon, 10 Jan 2011) New Revision: 905 Log: fix tests after refactoring contact creation Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 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-01-10 08:46:21 UTC (rev 904) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-01-10 09:21:32 UTC (rev 905) @@ -27,6 +27,7 @@ import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceSampling; @@ -131,7 +132,7 @@ serviceSampling.createUpdateSampleRow(row, boats, new SampleRowLogImpl()); ServiceContact serviceContact = manager.getServiceContact(); - Contact contact1 = serviceContact.getNewContact(user, row, boat); + Contact contact1 = serviceContact.getNewContact(ObsProgram.OBSMER, user, row, boat); contact1.setContactState(ContactState.CONTACT_START); serviceContact.saveContact(contact1, false); @@ -231,7 +232,7 @@ ServiceContact serviceContact = manager.getServiceContact(); // First contact : OK - Contact contact1 = serviceContact.getNewContact(user, row, boat); + Contact contact1 = serviceContact.getNewContact(ObsProgram.OBSMER, user, row, boat); contact1.setContactState(ContactState.BOARDING_DONE); Date begin = DateUtil.createDate(3, 5, 2010); contact1.setObservationBeginDate(begin); @@ -244,7 +245,7 @@ int result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact2 = serviceContact.getNewContact(user, row, boat); + Contact contact2 = serviceContact.getNewContact(ObsProgram.OBSMER, user, row, boat); // Second contact with ValidationProgram = FALSE contact2.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 8, 2010); @@ -256,7 +257,7 @@ result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact3 = serviceContact.getNewContact(user, row, boat); + Contact contact3 = serviceContact.getNewContact(ObsProgram.OBSMER, user, row, boat); // Third contact with tideBeginDate < fromDate contact3.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); @@ -267,7 +268,7 @@ result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact4 = serviceContact.getNewContact(user2, row2, boat); + Contact contact4 = serviceContact.getNewContact(ObsProgram.OBSMER, user2, row2, boat); // Fourth contact : OK with an other company contact4.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 5, 2010); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-01-10 08:46:21 UTC (rev 904) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-01-10 09:21:32 UTC (rev 905) @@ -297,7 +297,7 @@ transaction.closeContext(); ServiceContact serviceContact = manager.getServiceContact(); - Contact contact1 = serviceContact.getNewContact(user, row, boat); + Contact contact1 = serviceContact.getNewContact(ObsProgram.OBSMER, user, row, boat); contact1.setContactState(ContactState.CONTACT_START); serviceContact.saveContact(contact1, false); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-10 08:46:21 UTC (rev 904) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-10 09:21:32 UTC (rev 905) @@ -28,6 +28,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; +import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; @@ -675,7 +676,7 @@ prepareData(true, true); // Don't use a mock in this case - Contact newContact = service.getNewContact(observer, sampleRow, boat); + Contact newContact = service.getNewContact(ObsProgram.OBSVENTE, observer, sampleRow, boat); newContact.setTopiaCreateDate(DateUtil.createDate(2, 3, 2010)); /** EXEC METHOD **/