Author: bleny Date: 2011-04-07 11:30:30 +0000 (Thu, 07 Apr 2011) New Revision: 1156 Log: fix build Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java 2011-04-07 09:49:29 UTC (rev 1155) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java 2011-04-07 11:30:30 UTC (rev 1156) @@ -25,6 +25,8 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; @@ -53,6 +55,9 @@ @Before public void fillSampleRows() { + Company company = new CompanyImpl(); + company.setName("machin"); + TerrestrialDivision observationUnit = new TerrestrialDivisionImpl(); observationUnit.setObservationUnitCode("UO10"); observationUnit.setRegionIfremerCode("MA"); @@ -61,6 +66,7 @@ SampleRow row1 = new SampleRowImpl(); row1.setObsProgram(ObsProgram.OBSDEB); row1.setCode("1"); + row1.setCompany(company); row1.setDay(DateUtil.createDate(11, 3, 2011)); row1.setGroupName("OBS1"); row1.setObservationUnit(observationUnit); @@ -68,6 +74,7 @@ SampleRow row2 = new SampleRowImpl(); row2.setObsProgram(ObsProgram.OBSDEB); row2.setCode("2"); + row2.setCompany(company); row2.setDay(DateUtil.createDate(12, 3, 2011)); row2.setGroupName("OBS2"); row2.setObservationUnit(observationUnit); @@ -100,10 +107,10 @@ int actualLineNumber = lines.length; Assert.assertEquals(expectedLineNumber, actualLineNumber); - // check that each lines has 5 columns + // check that each lines has 6 columns for (String line : lines) { String[] columns = StringUtil.split(line, ";"); - Assert.assertEquals(5, columns.length); + Assert.assertEquals(6, columns.length); } } finally { IOUtils.closeQuietly(input);