Author: chatellier Date: 2010-11-26 10:57:07 +0000 (Fri, 26 Nov 2010) New Revision: 287 Log: Ajout de 2 projets de test et d'un test pour verifier qu'ils sont correctement charg?\195?\169s Added: trunk/coser-business/src/test/resources/projects/ trunk/coser-business/src/test/resources/projects/project2/ trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv trunk/coser-business/src/test/resources/projects/project2/control/ trunk/coser-business/src/test/resources/projects/project2/control/control.properties trunk/coser-business/src/test/resources/projects/project2/control/testcatch_co.csv trunk/coser-business/src/test/resources/projects/project2/control/testhaul_co.csv trunk/coser-business/src/test/resources/projects/project2/control/testlength_co.csv trunk/coser-business/src/test/resources/projects/project2/control/testlength_del.csv trunk/coser-business/src/test/resources/projects/project2/control/teststrata_co.csv trunk/coser-business/src/test/resources/projects/project2/original/ trunk/coser-business/src/test/resources/projects/project2/original/testcatch.csv trunk/coser-business/src/test/resources/projects/project2/original/testhaul.csv trunk/coser-business/src/test/resources/projects/project2/original/testlength.csv trunk/coser-business/src/test/resources/projects/project2/original/teststrata.csv trunk/coser-business/src/test/resources/projects/project2/project.properties trunk/coser-business/src/test/resources/projects/project2/reftaxSpecies.csv trunk/coser-business/src/test/resources/projects/project2/selections/ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testcatch_se.csv trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testhaul_se.csv trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testlength_se.csv trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testselection2.selection trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/teststrata_se.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/control.properties trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testcatch_co.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testhaul_co.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testlength_co.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/teststrata_co.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testcatch.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testhaul.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testlength.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/teststrata.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/project.properties trunk/coser-business/src/test/resources/projects/projectctrvalidated/reftaxSpecies.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testcatch_se.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testhaul_se.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testlength_se.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testselection1.selection trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/teststrata_se.csv Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-26 10:31:48 UTC (rev 286) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2010-11-26 10:57:07 UTC (rev 287) @@ -61,7 +61,7 @@ protected static File testDirectory; @BeforeClass - public static void initConfig() { + public static void initConfig() throws IOException { String tmpDir = System.getProperty("java.io.tmpdir"); testDirectory = new File(tmpDir, "coser"); if (testDirectory.isDirectory()) { @@ -71,6 +71,9 @@ config.setDatabaseDirectory(testDirectory.getAbsolutePath()); I18n.init(Locale.UK); + + FileUtils.copyDirectoryToDirectory(new File("src" + File.separator + + "test" + File.separator + "resources", "projects"), testDirectory); } @AfterClass @@ -127,4 +130,20 @@ } return project; } + + /** + * Ouvre un projet present dans le repertoire de test (copié depuis + * les resources ou créé durant les tests). + * + * @param projectService project service + * @param projectName project name + * @return opened project (control data loaded) + * @throws CoserBusinessException + */ + protected Project openTestProject(ProjectService projectService, String projectName) throws CoserBusinessException { + + Project project = projectService.openProject(projectName); + project = projectService.loadControlData(project); + return project; + } } 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 2010-11-26 10:31:48 UTC (rev 286) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-26 10:57:07 UTC (rev 287) @@ -77,9 +77,8 @@ @Test(expected=CoserBusinessException.class) public void testDuplicatedProject() throws CoserBusinessException { Project p = new Project(); - p.setName("myProject"); + p.setName("project2"); // il existe deja dans src/test/resources projectService.createProject(p, new HashMap<CoserConstants.Category, File>()); - projectService.createProject(p, new HashMap<CoserConstants.Category, File>()); } /** @@ -103,8 +102,31 @@ Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "reftaxSpecies.csv").exists()); } - + /** + * Test que les projets des resources de test sont bien rechargé. + * + * @throws CoserBusinessException + */ + @Test + public void testTestResourcesProjectReloading() throws CoserBusinessException { + Project projectValidated = openTestProject(projectService, "projectctrvalidated"); + // ce projet a un control validé + Assert.assertTrue(projectValidated.getControl().isValidated()); + + // la selection + Selection selection = projectValidated.getSelections().get("testselection1"); + Assert.assertNotNull(selection); + projectService.loadSelectionData(projectValidated, selection); + Assert.assertEquals(1, selection.getHistoryCommand().size()); // un merge + Assert.assertEquals("Test selectedSpeciesOccDensComment", selection.getSelectedSpeciesOccDensComment()); + Assert.assertEquals(3.5, selection.getDensityFilter(), 0); + + Project projectNotValidated = openTestProject(projectService, "project2"); + Assert.assertFalse(projectNotValidated.getControl().isValidated()); + } + + /** * Test que le project est correctement créer (à partir des données * dans /src/test/resources. * Added: trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,4 @@ +"Types";"Commentaire";"NumSys min";"NumSys max" +"Type1";;"00001";"00002" +"Type2";;"00003";"00005" +"Type3";;"00006";"00010" Added: trunk/coser-business/src/test/resources/projects/project2/control/control.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/control.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/control.properties 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,3 @@ +#Fri Nov 26 11:37:55 CET 2010 +control.commands.0=(69fea302-003c-427c-92dd-8f5541864b1c);(DeleteLineCommand);();((category\=LENGTH);(lineNumber\=2)) +control.validated=false Added: trunk/coser-business/src/test/resources/projects/project2/control/testcatch_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/testcatch_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/testcatch_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Number";"Weight" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"234.33";"4.55" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"4.33";"1.12" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"859.04";"22.16" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"251.86";"59.34" +"5";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"407.54";"81.37" +"6";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"472.91";"59.38" +"7";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"38.36";"41.60" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"146.76";"76.15" +"9";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"737.53";"32.27" +"10";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"715.54";"91.42" +"11";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"256.31";"55.32" +"12";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"308.81";"85.96" +"13";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES1";"326.53";"0.55" +"14";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES2";"965.46";"75.30" +"15";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES3";"187.44";"45.04" +"16";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES4";"714.22";"25.60" +"17";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES1";"475.71";"51.42" +"18";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES2";"661.88";"82.41" +"19";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES3";"378.28";"27.32" +"20";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES4";"139.31";"11.74" +"21";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES1";"810.68";"67.38" +"22";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES2";"783.03";"40.36" +"23";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES3";"244.24";"87.85" +"24";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES4";"52.71";"22.93" Added: trunk/coser-business/src/test/resources/projects/project2/control/testhaul_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/testhaul_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/testhaul_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +"coser.business.line";"Survey";"Year";"Haul";"Month";"Stratum";"SweptSurface";"Lat";"Long";"Depth" +"1";"COSER_TEST";"2010";"TRAIT1";"10";"STR1";"0.06";"43.75";"-1.50";"45.50" +"2";"COSER_TEST";"2010";"TRAIT2";"10";"STR2";"0.06";"43.81";"-1.45";"31.00" +"3";"COSER_TEST";"2010";"TRAIT3";"10";"STR3";"0.06";"43.89";"-1.73";"115.00" +"4";"COSER_TEST";"2011";"TRAIT10";"10";"STR4";"0.06";"43.96";"-2.03";"143.00" +"5";"COSER_TEST";"2011";"TRAIT20";"10";"STR5";"0.06";"43.91";"-2.09";"185.00" +"6";"COSER_TEST";"2011";"TRAIT30";"10";"STR6";"0.06";"43.88";"-2.12";"295.00" Added: trunk/coser-business/src/test/resources/projects/project2/control/testlength_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/testlength_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/testlength_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,29 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Sex";"Maturity";"Length";"Number";"Weight";"Age" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"i";"NA";"29.19";"1.00";"0.45";"NA" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"3.00";"0.78";"NA" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"i";"NA";"32.93";"5.00";"0.87";"NA" +"5";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"f";"NA";"26.27";"3.00";"0.03";"NA" +"6";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"m";"NA";"35.25";"4.00";"";"NA" +"7";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"i";"NA";"37.82";"4.00";"0.61";"NA" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"20.07";"2.00";"0.12";"NA" +"9";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"27.18";"2.00";"0.92";"NA" +"10";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"i";"NA";"21.14";"1.00";"0.34";"NA" +"11";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"i";"NA";"1.82";"4.00";"0.1";"NA" +"12";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"i";"NA";"36.55";"4.00";"0.39";"NA" +"13";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"i";"NA";"20.39";"3.00";"0.28";"NA" +"14";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"i";"NA";"19.88";"3.00";"0.31";"NA" +"15";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"i";"NA";"18.16";"1.00";"0.34";"NA" +"16";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"i";"NA";"10.22";"2.00";"0.31";"NA" +"17";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"f";"NA";"33.03";"5.00";"0.26";"NA" +"18";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES1";"i";"NA";"1.00";"4.00";"0.81";"NA" +"19";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES2";"i";"NA";"27.61";"3.00";"NA" +"20";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES3";"i";"NA";"20.44";"3.00";"0.43";"NA" +"21";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES4";"i";"NA";"6.86";"1.00";"0.23";"NA" +"22";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES1";"i";"NA";"15.04";"4.00";"0.95";"NA" +"23";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES2";"i";"NA";"35.03";"1.00";"0.26";"NA" +"24";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES3";"i";"NA";"19.41";"1.00";"0.51";"NA" +"25";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES4";"i";"NA";"24.58";"2.00";"NA" +"26";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES1";"i";"NA";"2.46";"3.00";"0.32";"NA" +"27";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES2";"i";"NA";"18.93";"5.00";"0.22";"NA" +"28";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES3";"i";"NA";"23.77";"5.00";"0.12";"NA" +"29";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES4";"i";"NA";"0.94";"3.00";"0.77";"NA" Added: trunk/coser-business/src/test/resources/projects/project2/control/testlength_del.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/testlength_del.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/testlength_del.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,2 @@ +"Survey";"Year";"Haul";"Species";"Sex";"Maturity";"Length";"Number";"Weight";"Age" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"2.00";"0.34";"NA" Added: trunk/coser-business/src/test/resources/projects/project2/control/teststrata_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/control/teststrata_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/control/teststrata_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +"coser.business.line";"Survey";"Stratum";"Surface" +"1";"COSER_TEST";"STR1";"15909.15" +"2";"COSER_TEST";"STR2";"11184.27" +"3";"COSER_TEST";"STR3";"5200.96" +"4";"COSER_TEST";"STR4";"15573.19" +"5";"COSER_TEST";"STR5";"8625.07" +"6";"COSER_TEST";"STR6";"10.20" +"7";"COSER_TEST";"STR7";"19683.28" +"8";"COSER_TEST";"STR8";"6053.53" +"9";"COSER_TEST";"STR9";"993.49" +"10";"COSER_TEST";"STR10";"5975.14" Added: trunk/coser-business/src/test/resources/projects/project2/original/testcatch.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/original/testcatch.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/original/testcatch.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"Survey";"Year";"Haul";"Species";"Number";"Weight" +COSER_TEST;2010;TRAIT1;COSER_SPECIES1;234.33;4.55 +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;4.33;1.12 +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;859.04;22.16 +COSER_TEST;2010;TRAIT1;COSER_SPECIES4;251.86;59.34 +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;407.54;81.37 +COSER_TEST;2010;TRAIT2;COSER_SPECIES2;472.91;59.38 +COSER_TEST;2010;TRAIT2;COSER_SPECIES3;38.36;41.60 +COSER_TEST;2010;TRAIT2;COSER_SPECIES4;146.76;76.15 +COSER_TEST;2010;TRAIT3;COSER_SPECIES1;737.53;32.27 +COSER_TEST;2010;TRAIT3;COSER_SPECIES2;715.54;91.42 +COSER_TEST;2010;TRAIT3;COSER_SPECIES3;256.31;55.32 +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;308.81;85.96 +COSER_TEST;2011;TRAIT10;COSER_SPECIES1;326.53;0.55 +COSER_TEST;2011;TRAIT10;COSER_SPECIES2;965.46;75.30 +COSER_TEST;2011;TRAIT10;COSER_SPECIES3;187.44;45.04 +COSER_TEST;2011;TRAIT10;COSER_SPECIES4;714.22;25.60 +COSER_TEST;2011;TRAIT20;COSER_SPECIES1;475.71;51.42 +COSER_TEST;2011;TRAIT20;COSER_SPECIES2;661.88;82.41 +COSER_TEST;2011;TRAIT20;COSER_SPECIES3;378.28;27.32 +COSER_TEST;2011;TRAIT20;COSER_SPECIES4;139.31;11.74 +COSER_TEST;2011;TRAIT30;COSER_SPECIES1;810.68;67.38 +COSER_TEST;2011;TRAIT30;COSER_SPECIES2;783.03;40.36 +COSER_TEST;2011;TRAIT30;COSER_SPECIES3;244.24;87.85 +COSER_TEST;2011;TRAIT30;COSER_SPECIES4;52.71;22.93 Added: trunk/coser-business/src/test/resources/projects/project2/original/testhaul.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/original/testhaul.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/original/testhaul.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +Survey;Year;Haul;Month;Stratum;SweptSurface;Lat;Long;Depth +COSER_TEST;2010;TRAIT1;10;STR1;0.06;43.75;-1.50;45.50 +COSER_TEST;2010;TRAIT2;10;STR2;0.06;43.81;-1.45;31.00 +COSER_TEST;2010;TRAIT3;10;STR3;0.06;43.89;-1.73;115.00 +COSER_TEST;2011;TRAIT10;10;STR4;0.06;43.96;-2.03;143.00 +COSER_TEST;2011;TRAIT20;10;STR5;0.06;43.91;-2.09;185.00 +COSER_TEST;2011;TRAIT30;10;STR6;0.06;43.88;-2.12;295.00 Added: trunk/coser-business/src/test/resources/projects/project2/original/testlength.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/original/testlength.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/original/testlength.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,30 @@ +Survey;Year;Haul;Species;Sex;Maturity;Length;Number;Weight;Age +COSER_TEST;2010;TRAIT1;COSER_SPECIES1;i;NA;29.19;1.00;0.45;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;i;NA;19.60;2.00;0.34;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;i;NA;19.60;3.00;0.78;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;i;NA;32.93;5.00;0.87;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;f;NA;26.27;3.00;0.03;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;m;NA;35.25;4.00;;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES4;i;NA;37.82;4.00;0.61;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;i;NA;20.07;2.00;0.12;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;i;NA;27.18;2.00;0.92;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES2;i;NA;21.14;1.00;0.34;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES3;i;NA;1.82;4.00;0.1;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES4;i;NA;36.55;4.00;0.39;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES1;i;NA;20.39;3.00;0.28;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES2;i;NA;19.88;3.00;0.31;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES3;i;NA;18.16;1.00;0.34;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;i;NA;10.22;2.00;0.31;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;f;NA;33.03;5.00;0.26;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES1;i;NA;1.00;4.00;0.81;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES2;i;NA;27.61;3.00;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES3;i;NA;20.44;3.00;0.43;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES4;i;NA;6.86;1.00;0.23;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES1;i;NA;15.04;4.00;0.95;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES2;i;NA;35.03;1.00;0.26;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES3;i;NA;19.41;1.00;0.51;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES4;i;NA;24.58;2.00;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES1;i;NA;2.46;3.00;0.32;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES2;i;NA;18.93;5.00;0.22;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES3;i;NA;23.77;5.00;0.12;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES4;i;NA;0.94;3.00;0.77;NA Added: trunk/coser-business/src/test/resources/projects/project2/original/teststrata.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/original/teststrata.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/original/teststrata.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +Survey;Stratum;Surface +COSER_TEST;STR1;15909.15 +COSER_TEST;STR2;11184.27 +COSER_TEST;STR3;5200.96 +COSER_TEST;STR4;15573.19 +COSER_TEST;STR5;8625.07 +COSER_TEST;STR6;10.20 +COSER_TEST;STR7;19683.28 +COSER_TEST;STR8;6053.53 +COSER_TEST;STR9;993.49 +COSER_TEST;STR10;5975.14 Added: trunk/coser-business/src/test/resources/projects/project2/project.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/project.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/project.properties 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,5 @@ +#Fri Nov 26 11:37:55 CET 2010 +project.catchFileName=testcatch.csv +project.strataFileName=teststrata.csv +project.haulFileName=testhaul.csv +project.lengthFileName=testlength.csv Added: trunk/coser-business/src/test/resources/projects/project2/reftaxSpecies.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/reftaxSpecies.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/reftaxSpecies.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,6 @@ +"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" +"1";"000001";"1";"COSER_SPECIES1";"L'espece de test coser 1";"";"";""; +"2";"000002";"2";"COSER_SPECIES2";"L'espece de test coser 2";"";"";""; +"3";"000003";"3";"COSER_SPECIES3";"L'espece de test coser 3";"";"";""; +"4";"000004";"4";"COSER_SPECIES4";"L'espece de test coser 4";"";"";""; +"5";"000005";"5";"COSER_SPECIES_MERGE";"L'espece de test coser pour fusion";"";"";""; Added: trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testcatch_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testcatch_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testcatch_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Number";"Weight" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"234.33";"4.55" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"4.33";"1.12" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"859.04";"22.16" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"251.86";"59.34" +"5";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"407.54";"81.37" +"6";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"472.91";"59.38" +"7";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"38.36";"41.60" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"146.76";"76.15" +"9";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"737.53";"32.27" +"10";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"715.54";"91.42" +"11";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"256.31";"55.32" +"12";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"308.81";"85.96" +"13";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES1";"326.53";"0.55" +"14";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES2";"965.46";"75.30" +"15";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES3";"187.44";"45.04" +"16";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES4";"714.22";"25.60" +"17";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES1";"475.71";"51.42" +"18";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES2";"661.88";"82.41" +"19";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES3";"378.28";"27.32" +"20";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES4";"139.31";"11.74" +"21";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES1";"810.68";"67.38" +"22";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES2";"783.03";"40.36" +"23";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES3";"244.24";"87.85" +"24";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES4";"52.71";"22.93" Added: trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testhaul_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testhaul_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testhaul_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +"coser.business.line";"Survey";"Year";"Haul";"Month";"Stratum";"SweptSurface";"Lat";"Long";"Depth" +"1";"COSER_TEST";"2010";"TRAIT1";"10";"STR1";"0.06";"43.75";"-1.50";"45.50" +"2";"COSER_TEST";"2010";"TRAIT2";"10";"STR2";"0.06";"43.81";"-1.45";"31.00" +"3";"COSER_TEST";"2010";"TRAIT3";"10";"STR3";"0.06";"43.89";"-1.73";"115.00" +"4";"COSER_TEST";"2011";"TRAIT10";"10";"STR4";"0.06";"43.96";"-2.03";"143.00" +"5";"COSER_TEST";"2011";"TRAIT20";"10";"STR5";"0.06";"43.91";"-2.09";"185.00" +"6";"COSER_TEST";"2011";"TRAIT30";"10";"STR6";"0.06";"43.88";"-2.12";"295.00" Added: trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testlength_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testlength_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testlength_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,30 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Sex";"Maturity";"Length";"Number";"Weight";"Age" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"i";"NA";"29.19";"1.00";"0.45";"NA" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"2.00";"0.34";"NA" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"3.00";"0.78";"NA" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"i";"NA";"32.93";"5.00";"0.87";"NA" +"5";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"f";"NA";"26.27";"3.00";"0.03";"NA" +"6";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"m";"NA";"35.25";"4.00";"";"NA" +"7";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"i";"NA";"37.82";"4.00";"0.61";"NA" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"20.07";"2.00";"0.12";"NA" +"9";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"27.18";"2.00";"0.92";"NA" +"10";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"i";"NA";"21.14";"1.00";"0.34";"NA" +"11";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"i";"NA";"1.82";"4.00";"0.1";"NA" +"12";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"i";"NA";"36.55";"4.00";"0.39";"NA" +"13";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"i";"NA";"20.39";"3.00";"0.28";"NA" +"14";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"i";"NA";"19.88";"3.00";"0.31";"NA" +"15";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"i";"NA";"18.16";"1.00";"0.34";"NA" +"16";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"i";"NA";"10.22";"2.00";"0.31";"NA" +"17";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"f";"NA";"33.03";"5.00";"0.26";"NA" +"18";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES1";"i";"NA";"1.00";"4.00";"0.81";"NA" +"19";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES2";"i";"NA";"27.61";"3.00";"NA" +"20";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES3";"i";"NA";"20.44";"3.00";"0.43";"NA" +"21";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES4";"i";"NA";"6.86";"1.00";"0.23";"NA" +"22";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES1";"i";"NA";"15.04";"4.00";"0.95";"NA" +"23";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES2";"i";"NA";"35.03";"1.00";"0.26";"NA" +"24";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES3";"i";"NA";"19.41";"1.00";"0.51";"NA" +"25";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES4";"i";"NA";"24.58";"2.00";"NA" +"26";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES1";"i";"NA";"2.46";"3.00";"0.32";"NA" +"27";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES2";"i";"NA";"18.93";"5.00";"0.22";"NA" +"28";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES3";"i";"NA";"23.77";"5.00";"0.12";"NA" +"29";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES4";"i";"NA";"0.94";"3.00";"0.77";"NA" Added: trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testselection2.selection =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testselection2.selection (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/testselection2.selection 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,4 @@ +#Fri Nov 26 11:37:55 CET 2010 +selection.validated=false +selection.densityFilter=5.0 +selection.occurrenceFilter=5.0 Added: trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/teststrata_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/teststrata_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/project2/selections/testselection2/teststrata_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +"coser.business.line";"Survey";"Stratum";"Surface" +"1";"COSER_TEST";"STR1";"15909.15" +"2";"COSER_TEST";"STR2";"11184.27" +"3";"COSER_TEST";"STR3";"5200.96" +"4";"COSER_TEST";"STR4";"15573.19" +"5";"COSER_TEST";"STR5";"8625.07" +"6";"COSER_TEST";"STR6";"10.20" +"7";"COSER_TEST";"STR7";"19683.28" +"8";"COSER_TEST";"STR8";"6053.53" +"9";"COSER_TEST";"STR9";"993.49" +"10";"COSER_TEST";"STR10";"5975.14" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,4 @@ +"Types";"Commentaire";"NumSys min";"NumSys max" +"Type1";;"00001";"00002" +"Type2";;"00003";"00005" +"Type3";;"00006";"00010" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/control.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/control.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/control.properties 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,2 @@ +#Fri Nov 26 11:37:55 CET 2010 +control.validated=true Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testcatch_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testcatch_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testcatch_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Number";"Weight" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"234.33";"4.55" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"4.33";"1.12" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"859.04";"22.16" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"251.86";"59.34" +"5";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"407.54";"81.37" +"6";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"472.91";"59.38" +"7";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"38.36";"41.60" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"146.76";"76.15" +"9";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"737.53";"32.27" +"10";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"715.54";"91.42" +"11";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"256.31";"55.32" +"12";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"308.81";"85.96" +"13";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES1";"326.53";"0.55" +"14";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES2";"965.46";"75.30" +"15";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES3";"187.44";"45.04" +"16";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES4";"714.22";"25.60" +"17";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES1";"475.71";"51.42" +"18";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES2";"661.88";"82.41" +"19";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES3";"378.28";"27.32" +"20";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES4";"139.31";"11.74" +"21";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES1";"810.68";"67.38" +"22";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES2";"783.03";"40.36" +"23";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES3";"244.24";"87.85" +"24";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES4";"52.71";"22.93" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testhaul_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testhaul_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testhaul_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +"coser.business.line";"Survey";"Year";"Haul";"Month";"Stratum";"SweptSurface";"Lat";"Long";"Depth" +"1";"COSER_TEST";"2010";"TRAIT1";"10";"STR1";"0.06";"43.75";"-1.50";"45.50" +"2";"COSER_TEST";"2010";"TRAIT2";"10";"STR2";"0.06";"43.81";"-1.45";"31.00" +"3";"COSER_TEST";"2010";"TRAIT3";"10";"STR3";"0.06";"43.89";"-1.73";"115.00" +"4";"COSER_TEST";"2011";"TRAIT10";"10";"STR4";"0.06";"43.96";"-2.03";"143.00" +"5";"COSER_TEST";"2011";"TRAIT20";"10";"STR5";"0.06";"43.91";"-2.09";"185.00" +"6";"COSER_TEST";"2011";"TRAIT30";"10";"STR6";"0.06";"43.88";"-2.12";"295.00" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testlength_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testlength_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/testlength_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,30 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Sex";"Maturity";"Length";"Number";"Weight";"Age" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"i";"NA";"29.19";"1.00";"0.45";"NA" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"2.00";"0.34";"NA" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"3.00";"0.78";"NA" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"i";"NA";"32.93";"5.00";"0.87";"NA" +"5";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"f";"NA";"26.27";"3.00";"0.03";"NA" +"6";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"m";"NA";"35.25";"4.00";"";"NA" +"7";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"i";"NA";"37.82";"4.00";"0.61";"NA" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"20.07";"2.00";"0.12";"NA" +"9";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"27.18";"2.00";"0.92";"NA" +"10";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"i";"NA";"21.14";"1.00";"0.34";"NA" +"11";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"i";"NA";"1.82";"4.00";"0.1";"NA" +"12";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"i";"NA";"36.55";"4.00";"0.39";"NA" +"13";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"i";"NA";"20.39";"3.00";"0.28";"NA" +"14";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"i";"NA";"19.88";"3.00";"0.31";"NA" +"15";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"i";"NA";"18.16";"1.00";"0.34";"NA" +"16";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"i";"NA";"10.22";"2.00";"0.31";"NA" +"17";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"f";"NA";"33.03";"5.00";"0.26";"NA" +"18";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES1";"i";"NA";"1.00";"4.00";"0.81";"NA" +"19";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES2";"i";"NA";"27.61";"3.00";"NA" +"20";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES3";"i";"NA";"20.44";"3.00";"0.43";"NA" +"21";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES4";"i";"NA";"6.86";"1.00";"0.23";"NA" +"22";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES1";"i";"NA";"15.04";"4.00";"0.95";"NA" +"23";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES2";"i";"NA";"35.03";"1.00";"0.26";"NA" +"24";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES3";"i";"NA";"19.41";"1.00";"0.51";"NA" +"25";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES4";"i";"NA";"24.58";"2.00";"NA" +"26";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES1";"i";"NA";"2.46";"3.00";"0.32";"NA" +"27";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES2";"i";"NA";"18.93";"5.00";"0.22";"NA" +"28";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES3";"i";"NA";"23.77";"5.00";"0.12";"NA" +"29";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES4";"i";"NA";"0.94";"3.00";"0.77";"NA" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/teststrata_co.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/teststrata_co.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/control/teststrata_co.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +"coser.business.line";"Survey";"Stratum";"Surface" +"1";"COSER_TEST";"STR1";"15909.15" +"2";"COSER_TEST";"STR2";"11184.27" +"3";"COSER_TEST";"STR3";"5200.96" +"4";"COSER_TEST";"STR4";"15573.19" +"5";"COSER_TEST";"STR5";"8625.07" +"6";"COSER_TEST";"STR6";"10.20" +"7";"COSER_TEST";"STR7";"19683.28" +"8";"COSER_TEST";"STR8";"6053.53" +"9";"COSER_TEST";"STR9";"993.49" +"10";"COSER_TEST";"STR10";"5975.14" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testcatch.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testcatch.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testcatch.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"Survey";"Year";"Haul";"Species";"Number";"Weight" +COSER_TEST;2010;TRAIT1;COSER_SPECIES1;234.33;4.55 +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;4.33;1.12 +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;859.04;22.16 +COSER_TEST;2010;TRAIT1;COSER_SPECIES4;251.86;59.34 +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;407.54;81.37 +COSER_TEST;2010;TRAIT2;COSER_SPECIES2;472.91;59.38 +COSER_TEST;2010;TRAIT2;COSER_SPECIES3;38.36;41.60 +COSER_TEST;2010;TRAIT2;COSER_SPECIES4;146.76;76.15 +COSER_TEST;2010;TRAIT3;COSER_SPECIES1;737.53;32.27 +COSER_TEST;2010;TRAIT3;COSER_SPECIES2;715.54;91.42 +COSER_TEST;2010;TRAIT3;COSER_SPECIES3;256.31;55.32 +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;308.81;85.96 +COSER_TEST;2011;TRAIT10;COSER_SPECIES1;326.53;0.55 +COSER_TEST;2011;TRAIT10;COSER_SPECIES2;965.46;75.30 +COSER_TEST;2011;TRAIT10;COSER_SPECIES3;187.44;45.04 +COSER_TEST;2011;TRAIT10;COSER_SPECIES4;714.22;25.60 +COSER_TEST;2011;TRAIT20;COSER_SPECIES1;475.71;51.42 +COSER_TEST;2011;TRAIT20;COSER_SPECIES2;661.88;82.41 +COSER_TEST;2011;TRAIT20;COSER_SPECIES3;378.28;27.32 +COSER_TEST;2011;TRAIT20;COSER_SPECIES4;139.31;11.74 +COSER_TEST;2011;TRAIT30;COSER_SPECIES1;810.68;67.38 +COSER_TEST;2011;TRAIT30;COSER_SPECIES2;783.03;40.36 +COSER_TEST;2011;TRAIT30;COSER_SPECIES3;244.24;87.85 +COSER_TEST;2011;TRAIT30;COSER_SPECIES4;52.71;22.93 Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testhaul.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testhaul.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testhaul.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +Survey;Year;Haul;Month;Stratum;SweptSurface;Lat;Long;Depth +COSER_TEST;2010;TRAIT1;10;STR1;0.06;43.75;-1.50;45.50 +COSER_TEST;2010;TRAIT2;10;STR2;0.06;43.81;-1.45;31.00 +COSER_TEST;2010;TRAIT3;10;STR3;0.06;43.89;-1.73;115.00 +COSER_TEST;2011;TRAIT10;10;STR4;0.06;43.96;-2.03;143.00 +COSER_TEST;2011;TRAIT20;10;STR5;0.06;43.91;-2.09;185.00 +COSER_TEST;2011;TRAIT30;10;STR6;0.06;43.88;-2.12;295.00 Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testlength.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testlength.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/testlength.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,30 @@ +Survey;Year;Haul;Species;Sex;Maturity;Length;Number;Weight;Age +COSER_TEST;2010;TRAIT1;COSER_SPECIES1;i;NA;29.19;1.00;0.45;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;i;NA;19.60;2.00;0.34;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES2;i;NA;19.60;3.00;0.78;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;i;NA;32.93;5.00;0.87;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;f;NA;26.27;3.00;0.03;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES3;m;NA;35.25;4.00;;NA +COSER_TEST;2010;TRAIT1;COSER_SPECIES4;i;NA;37.82;4.00;0.61;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;i;NA;20.07;2.00;0.12;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES1;i;NA;27.18;2.00;0.92;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES2;i;NA;21.14;1.00;0.34;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES3;i;NA;1.82;4.00;0.1;NA +COSER_TEST;2010;TRAIT2;COSER_SPECIES4;i;NA;36.55;4.00;0.39;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES1;i;NA;20.39;3.00;0.28;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES2;i;NA;19.88;3.00;0.31;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES3;i;NA;18.16;1.00;0.34;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;i;NA;10.22;2.00;0.31;NA +COSER_TEST;2010;TRAIT3;COSER_SPECIES4;f;NA;33.03;5.00;0.26;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES1;i;NA;1.00;4.00;0.81;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES2;i;NA;27.61;3.00;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES3;i;NA;20.44;3.00;0.43;NA +COSER_TEST;2011;TRAIT1;COSER_SPECIES4;i;NA;6.86;1.00;0.23;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES1;i;NA;15.04;4.00;0.95;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES2;i;NA;35.03;1.00;0.26;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES3;i;NA;19.41;1.00;0.51;NA +COSER_TEST;2011;TRAIT2;COSER_SPECIES4;i;NA;24.58;2.00;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES1;i;NA;2.46;3.00;0.32;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES2;i;NA;18.93;5.00;0.22;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES3;i;NA;23.77;5.00;0.12;NA +COSER_TEST;2011;TRAIT3;COSER_SPECIES4;i;NA;0.94;3.00;0.77;NA Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/teststrata.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/teststrata.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/original/teststrata.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +Survey;Stratum;Surface +COSER_TEST;STR1;15909.15 +COSER_TEST;STR2;11184.27 +COSER_TEST;STR3;5200.96 +COSER_TEST;STR4;15573.19 +COSER_TEST;STR5;8625.07 +COSER_TEST;STR6;10.20 +COSER_TEST;STR7;19683.28 +COSER_TEST;STR8;6053.53 +COSER_TEST;STR9;993.49 +COSER_TEST;STR10;5975.14 Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/project.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/project.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/project.properties 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,5 @@ +#Fri Nov 26 11:37:55 CET 2010 +project.catchFileName=testcatch.csv +project.strataFileName=teststrata.csv +project.haulFileName=testhaul.csv +project.lengthFileName=testlength.csv Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/reftaxSpecies.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/reftaxSpecies.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/reftaxSpecies.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,6 @@ +"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" +"1";"000001";"1";"COSER_SPECIES1";"L'espece de test coser 1";"";"";""; +"2";"000002";"2";"COSER_SPECIES2";"L'espece de test coser 2";"";"";""; +"3";"000003";"3";"COSER_SPECIES3";"L'espece de test coser 3";"";"";""; +"4";"000004";"4";"COSER_SPECIES4";"L'espece de test coser 4";"";"";""; +"5";"000005";"5";"COSER_SPECIES_MERGE";"L'espece de test coser pour fusion";"";"";""; Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testcatch_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testcatch_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testcatch_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,25 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Number";"Weight" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"234.33";"4.55" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"4.33";"1.12" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"859.04";"22.16" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"251.86";"59.34" +"5";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"407.54";"81.37" +"6";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"472.91";"59.38" +"7";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"38.36";"41.60" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"146.76";"76.15" +"9";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"737.53";"32.27" +"10";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"715.54";"91.42" +"11";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"256.31";"55.32" +"12";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"308.81";"85.96" +"13";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES1";"326.53";"0.55" +"14";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES2";"965.46";"75.30" +"15";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES3";"187.44";"45.04" +"16";"COSER_TEST";"2011";"TRAIT10";"COSER_SPECIES4";"714.22";"25.60" +"17";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES1";"475.71";"51.42" +"18";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES2";"661.88";"82.41" +"19";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES3";"378.28";"27.32" +"20";"COSER_TEST";"2011";"TRAIT20";"COSER_SPECIES4";"139.31";"11.74" +"21";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES1";"810.68";"67.38" +"22";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES2";"783.03";"40.36" +"23";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES3";"244.24";"87.85" +"24";"COSER_TEST";"2011";"TRAIT30";"COSER_SPECIES4";"52.71";"22.93" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testhaul_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testhaul_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testhaul_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +"coser.business.line";"Survey";"Year";"Haul";"Month";"Stratum";"SweptSurface";"Lat";"Long";"Depth" +"1";"COSER_TEST";"2010";"TRAIT1";"10";"STR1";"0.06";"43.75";"-1.50";"45.50" +"2";"COSER_TEST";"2010";"TRAIT2";"10";"STR2";"0.06";"43.81";"-1.45";"31.00" +"3";"COSER_TEST";"2010";"TRAIT3";"10";"STR3";"0.06";"43.89";"-1.73";"115.00" +"4";"COSER_TEST";"2011";"TRAIT10";"10";"STR4";"0.06";"43.96";"-2.03";"143.00" +"5";"COSER_TEST";"2011";"TRAIT20";"10";"STR5";"0.06";"43.91";"-2.09";"185.00" +"6";"COSER_TEST";"2011";"TRAIT30";"10";"STR6";"0.06";"43.88";"-2.12";"295.00" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testlength_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testlength_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testlength_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,30 @@ +"coser.business.line";"Survey";"Year";"Haul";"Species";"Sex";"Maturity";"Length";"Number";"Weight";"Age" +"1";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES1";"i";"NA";"29.19";"1.00";"0.45";"NA" +"2";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"2.00";"0.34";"NA" +"3";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES2";"i";"NA";"19.60";"3.00";"0.78";"NA" +"4";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"i";"NA";"32.93";"5.00";"0.87";"NA" +"5";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"f";"NA";"26.27";"3.00";"0.03";"NA" +"6";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES3";"m";"NA";"35.25";"4.00";"";"NA" +"7";"COSER_TEST";"2010";"TRAIT1";"COSER_SPECIES4";"i";"NA";"37.82";"4.00";"0.61";"NA" +"8";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"20.07";"2.00";"0.12";"NA" +"9";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES1";"i";"NA";"27.18";"2.00";"0.92";"NA" +"10";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES2";"i";"NA";"21.14";"1.00";"0.34";"NA" +"11";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES3";"i";"NA";"1.82";"4.00";"0.1";"NA" +"12";"COSER_TEST";"2010";"TRAIT2";"COSER_SPECIES4";"i";"NA";"36.55";"4.00";"0.39";"NA" +"13";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES1";"i";"NA";"20.39";"3.00";"0.28";"NA" +"14";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES2";"i";"NA";"19.88";"3.00";"0.31";"NA" +"15";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES3";"i";"NA";"18.16";"1.00";"0.34";"NA" +"16";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"i";"NA";"10.22";"2.00";"0.31";"NA" +"17";"COSER_TEST";"2010";"TRAIT3";"COSER_SPECIES4";"f";"NA";"33.03";"5.00";"0.26";"NA" +"18";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES1";"i";"NA";"1.00";"4.00";"0.81";"NA" +"19";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES2";"i";"NA";"27.61";"3.00";"NA" +"20";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES3";"i";"NA";"20.44";"3.00";"0.43";"NA" +"21";"COSER_TEST";"2011";"TRAIT1";"COSER_SPECIES4";"i";"NA";"6.86";"1.00";"0.23";"NA" +"22";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES1";"i";"NA";"15.04";"4.00";"0.95";"NA" +"23";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES2";"i";"NA";"35.03";"1.00";"0.26";"NA" +"24";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES3";"i";"NA";"19.41";"1.00";"0.51";"NA" +"25";"COSER_TEST";"2011";"TRAIT2";"COSER_SPECIES4";"i";"NA";"24.58";"2.00";"NA" +"26";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES1";"i";"NA";"2.46";"3.00";"0.32";"NA" +"27";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES2";"i";"NA";"18.93";"5.00";"0.22";"NA" +"28";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES3";"i";"NA";"23.77";"5.00";"0.12";"NA" +"29";"COSER_TEST";"2011";"TRAIT3";"COSER_SPECIES4";"i";"NA";"0.94";"3.00";"0.77";"NA" Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testselection1.selection =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testselection1.selection (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/testselection1.selection 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,7 @@ +#Fri Nov 26 11:37:55 CET 2010 +selection.validated=false +selection.densityFilter=3.5 +selection.occurrenceFilter=3.75 +selection.commands.0=(57dc29ae-9991-4f0c-9233-9ab0a5a4ccf4);(MergeSpeciesCommand);();((newSpecyName\=COSER_SPECIES_MERGE);(speciesNames\=(COSER_SPECIES1);(COSER_SPECIES2))) +selection.selectedSpeciesOccDensComment=Test selectedSpeciesOccDensComment +selection.comment=Selection test Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/teststrata_se.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/teststrata_se.csv (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/teststrata_se.csv 2010-11-26 10:57:07 UTC (rev 287) @@ -0,0 +1,11 @@ +"coser.business.line";"Survey";"Stratum";"Surface" +"1";"COSER_TEST";"STR1";"15909.15" +"2";"COSER_TEST";"STR2";"11184.27" +"3";"COSER_TEST";"STR3";"5200.96" +"4";"COSER_TEST";"STR4";"15573.19" +"5";"COSER_TEST";"STR5";"8625.07" +"6";"COSER_TEST";"STR6";"10.20" +"7";"COSER_TEST";"STR7";"19683.28" +"8";"COSER_TEST";"STR8";"6053.53" +"9";"COSER_TEST";"STR9";"993.49" +"10";"COSER_TEST";"STR10";"5975.14"