Author: fdesbois Date: 2009-12-22 09:35:04 +0000 (Tue, 22 Dec 2009) New Revision: 145 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java Log: Resolve Issue #1961 : Delete SampleRow problem Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2009-12-21 23:11:23 UTC (rev 144) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2009-12-22 09:35:04 UTC (rev 145) @@ -306,8 +306,10 @@ SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); - dao.delete(sampleRow); + SampleRow row = dao.findByTopiaId(sampleRow.getTopiaId()); + dao.delete(row); + transaction.commitTransaction(); transaction.closeContext(); } catch (Exception eee) { Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2009-12-21 23:11:23 UTC (rev 144) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2009-12-22 09:35:04 UTC (rev 145) @@ -358,7 +358,7 @@ System.out.println("getSampleRow"); } - //@Test + @Test public void testDeleteSampleRow() throws Exception { log.info("deleteSampleRow"); @@ -392,13 +392,15 @@ /** EXEC METHOD **/ service.deleteSampleRow(row); + transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); row = rowDAO.findByCode("2010_1"); assertNull(row); - transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); ElligibleBoatDAO elligibleDAO = SuiviObsmerModelDAOHelper.getElligibleBoatDAO(transaction); List<ElligibleBoat> elligibles = elligibleDAO.findAll(); assertEquals(0, elligibles.size()); + transaction.closeContext(); } @Test