Author: chatellier Date: 2011-01-06 10:40:19 +0000 (Thu, 06 Jan 2011) New Revision: 473 Log: Ajout d'un test sur les r?\195?\169sultats Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-06 10:30:58 UTC (rev 472) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-06 10:40:19 UTC (rev 473) @@ -42,6 +42,7 @@ import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.RSufiResult; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.command.DeleteLineCommand; @@ -121,9 +122,16 @@ Assert.assertEquals(1, selection.getHistoryCommand().size()); // un merge Assert.assertEquals("Test selectedSpeciesOccDensComment", selection.getSelectedSpeciesOccDensComment()); Assert.assertEquals(3.5, selection.getDensityFilter(), 0); - + + // un resultat + RSufiResult rSufiResult = selection.getRsufiResults().get(0); + Assert.assertEquals("testresult1", rSufiResult.getName()); + Assert.assertEquals("myzone", rSufiResult.getZone()); + + // non validé Project projectNotValidated = openTestProject(projectService, "project2"); Assert.assertFalse(projectNotValidated.getControl().isValidated()); + } /** Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,8 @@ +Campagne Indicateur Liste Strate Annee Estimation EcartType CV +COSER_TEST Delta m1 Total 2005 0.00158515572607873 0.000984730247180753 0.621219878261882 +COSER_TEST Delta m1 Total 2009 0.0476283033138584 0.0151443086213752 0.317968677607053 +COSER_TEST Delta c1 Total 2005 0.00646357387617557 0.00215034288588182 0.332686363160152 +COSER_TEST Delta c1 Total 2009 0.0695548460030265 0.0185708842538978 0.266996267277908 +COSER_TEST Delta p1 Total 1983 0.737241187520257 0.00659773901507874 0.00894922737194123 +COSER_TEST Delta p1 Total 1986 0.730696719394954 0.0192883714063304 0.0263972327976263 + Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,7 @@ +Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV +COSER_TEST lnN L2 COSER_SPECIES1 Total 2001 16.5576325818007 0.1654168567871 0.00999036885073279 +COSER_TEST lnN L3 COSER_SPECIES2 Total 1999 18.4833935818621 0.0287121599216956 0.00155340304768877 +COSER_TEST Wbar L2 COSER_SPECIES1 Total 1983 0.0220057182719674 0.000818725789680143 0.0372051382082402 +COSER_TEST Abundance L2 COSER_SPECIES2 Total 1983 6334938.17950327 235692.250509076 0.0372051382082401 +COSER_TEST Biomass L2 COSER_SPECIES1 Total 2007 4634200.30159478 2761107.91858038 0.595811086894581 + Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,5 @@ +#Mon Jan 03 16:12:49 CET 2011 +result.rsufiversion=1.2.3 +result.zone=myzone +result.estPopIndName=EstPopInd_test.txt +result.estComIndName=EstComInd_test.txt