Author: bleny Date: 2011-03-28 13:04:38 +0000 (Mon, 28 Mar 2011) New Revision: 1103 Log: add main fonctionnal test for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 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/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-28 13:04:38 UTC (rev 1103) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.FacadeRowImpl; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.bean.SamplingFilterValuesImpl; import fr.ifremer.wao.bean.SamplingStrategy; @@ -1365,4 +1366,11 @@ return result; } + + @Override + protected SamplingFilter executeNewSamplingFilter(TopiaContext transaction, ConnectedUser connectedUser) { + SamplingFilter samplingFilter = new SamplingFilterImpl(); + samplingFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); + return samplingFilter; + } } 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-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-28 13:04:38 UTC (rev 1103) @@ -206,6 +206,7 @@ wao.error.serviceSampling.getSampleRowsByFilter= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats= wao.error.serviceSynthesis.getComplianceBoardingIndicator= 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-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-28 13:04:38 UTC (rev 1103) @@ -206,6 +206,7 @@ wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-28 13:04:38 UTC (rev 1103) @@ -61,10 +61,6 @@ private WaoContextImpl context; - public TestManager() { - - } - public void start() throws WaoException { if (log.isDebugEnabled()) { log.debug("## TEST START");