Author: bleny Date: 2011-05-23 13:20:25 +0000 (Mon, 23 May 2011) New Revision: 1290 Log: code style ; add test for synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -81,11 +81,12 @@ indexedObservationUnits.put(regionCode, unitCodesToDivision); } - if (log.isDebugEnabled()) { + if (log.isTraceEnabled()) { for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { - log.debug(entry.getKey()); + log.trace(entry.getKey()); for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { - log.debug(" -> " + unitCodesToDivision.getKey() + " -> " + unitCodesToDivision.getValue()); + log.trace(" -> " + unitCodesToDivision.getKey() + " -> " + + unitCodesToDivision.getValue()); } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -23,7 +23,6 @@ */ package fr.ifremer.wao.service; -import fr.ifremer.wao.AbstractServiceTest; import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.bean.BoatFilter; @@ -555,5 +554,10 @@ log.debug(contactStateStatistic.getCompanyName() + " -> " + contactStateStatistic.getData()); } + ContactStateStatistics contactStateStatistic = contactStateStatistics. + iterator().next(); + Assert.assertEquals("Code Lutin", contactStateStatistic.getCompanyName()); + Assert.assertEquals(2, contactStateStatistic.getData().get + (ContactState.OBSERVATION_DONE).intValue()); } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-05-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -257,9 +257,8 @@ public void testGetSampleRowsOrderedByFishingZone() throws Exception { log.info("getSampleRowsOrderedByFishingZone"); + /** PREPARE DATA **/ - /** PREPARE DATA **/ - TopiaContext transaction = manager.getContext().beginTransaction(); List<FishingZone> zones = prepareFishingZones(transaction); @@ -527,15 +526,16 @@ ConnectedUser connectedUser = getConnectedUser(observer, UserRole.OBSERVER, ObsProgram.OBSMER); manager.getServiceContact().saveContact(connectedUser, contact, false); - boolean errorCatched = false; try { serviceSampling.deleteSampleRow(row); - Assert.fail(); + Assert.fail("deleting a sample-row with associated contact should" + + " not be permitted"); } catch (WaoBusinessException eee) { - log.debug("Business error", eee); - errorCatched = true; + if (log.isTraceEnabled()) { + log.trace("exception raised while trying to delete sample row", + eee); + } } - Assert.assertTrue(errorCatched); } @Test