[Echobase-commits] r417 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services/csv main/java/fr/ifremer/echobase/services/importdata test/java/fr/ifremer/echobase/services/importdata test/resources/import-data test/resources/import-data/acousticData test/resources/import-data/catchesData test/resources/import-data/commonData test/resources/import-data/operation test/resources/import-data/result

Author: tchemit Date: 2012-03-27 22:08:13 +0200 (Tue, 27 Mar 2012) New Revision: 417 Url: http://forge.codelutin.com/repositories/revision/echobase/417 Log: svn properties import of region cells Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/acousticData/movies.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 20:08:13 UTC (rev 417) @@ -24,23 +24,44 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DepthStratum; +import java.util.Map; + /** * Model to import cells (with type "region"). * * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -public class RegionCellImportModel extends AbstractImportModel<Cell> { +public class RegionCellImportModel extends AbstractImportModel<RegionCellImportModelRow> { - public RegionCellImportModel(char separator) { + protected final CellType cellType; + + public RegionCellImportModel(char separator, + CellType cellType, + Map<String, Voyage> voyageMap, + Map<String, DepthStratum> depthStramMap) { super(separator); + this.cellType = cellType; + + newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); + + newMandatoryColumn(RegionCellImportModelRow.PROPERTY_NAME); + newMandatoryColumn("x", RegionCellImportModelRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("y", RegionCellImportModelRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("z", RegionCellImportModelRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("surface", RegionCellImportModelRow.PROPERTY_DATA_SURFACE, EchobaseCsvUtil.PRIMITIVE_FLOAT); } @Override - public Cell newEmptyInstance() { - return new CellImpl(); + public RegionCellImportModelRow newEmptyInstance() { + RegionCellImportModelRow row = new RegionCellImportModelRow(); + row.getCell().setCellType(cellType); + return row; } } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java 2012-03-27 20:08:13 UTC (rev 417) @@ -0,0 +1,126 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; + +/** + * A row when import region cells using model {@link RegionCellImportModel}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class RegionCellImportModelRow { + + public static final String PROPERTY_NAME = "name"; + + public static final String PROPERTY_VOYAGE = "voyage"; + + public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; + + public static final String PROPERTY_DATA_X = "dataX"; + + public static final String PROPERTY_DATA_Y = "dataY"; + + public static final String PROPERTY_DATA_Z = "dataZ"; + + public static final String PROPERTY_DATA_SURFACE = "dataSurface"; + + protected Voyage voyage; + + protected DepthStratum depthStratum; + + protected final Cell cell; + + protected float dataX; + + protected float dataY; + + protected float dataZ; + + protected float dataSurface; + + public RegionCellImportModelRow() { + this.cell = new CellImpl(); + } + + public Cell getCell() { + return cell; + } + + public Voyage getVoyage() { + return voyage; + } + + public DepthStratum getDepthStratum() { + return depthStratum; + } + + public float getDataX() { + return dataX; + } + + public float getDataY() { + return dataY; + } + + public float getDataZ() { + return dataZ; + } + + public float getDataSurface() { + return dataSurface; + } + + public void setName(String name) { + getCell().setName(name); + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setDepthStratum(DepthStratum depthStratum) { + this.depthStratum = depthStratum; + } + + public void setDataX(float dataX) { + this.dataX = dataX; + } + + public void setDataY(float dataY) { + this.dataY = dataY; + } + + public void setDataZ(float dataZ) { + this.dataZ = dataZ; + } + + public void setDataSurface(float dataSurface) { + this.dataSurface = dataSurface; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 20:08:13 UTC (rev 417) @@ -79,7 +79,8 @@ } catch (ImportException e) { throw e; } catch (Exception e) { - throw new ImportException("Could not do import " + e.getMessage(), e); + throw new ImportException( + "Could not do import " + e.getMessage(), e); } } @@ -109,10 +110,14 @@ int numberCreated = importResult.getNumberCreated(entityType); int numberUpdated = importResult.getNumberUpdated(entityType); if (numberCreated > 0) { - description.append(" [ nombre de création : ").append(numberCreated).append("]"); + description.append(" [ nombre de création : "); + description.append(numberCreated); + description.append("]"); } if (numberUpdated > 0) { - description.append(" [ nombre de mises à jour : ").append(numberUpdated).append("]"); + description.append(" [ nombre de mises à jour : "); + description.append(numberUpdated); + description.append("]"); } create(dao, @@ -162,7 +167,8 @@ E result = dao.newInstance(); return result; } catch (TopiaException e) { - throw new EchoBaseTechnicalException("Could not create new instance of entity", e); + throw new EchoBaseTechnicalException( + "Could not create new instance of entity", e); } } Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 20:08:13 UTC (rev 417) @@ -23,7 +23,10 @@ */ package fr.ifremer.echobase.services.importdata; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.csv.EchoBaseImport; @@ -31,19 +34,28 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataDAO; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.services.ImportException; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.csv.MapImportModel; import fr.ifremer.echobase.services.csv.MapImportModelRow; import fr.ifremer.echobase.services.csv.MapResultImportModel; import fr.ifremer.echobase.services.csv.MapResultImportModelRow; +import fr.ifremer.echobase.services.csv.RegionCellImportModel; +import fr.ifremer.echobase.services.csv.RegionCellImportModelRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ImportRuntimeException; import java.io.Reader; +import java.util.Arrays; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -73,18 +85,26 @@ // get selected voyage Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); - InputFile inputFile = configuration.getMapsFile(); + InputFile inputFile = configuration.getRegionsFile(); + CsvFileImportResult importResult = importRegionFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, + importResult, user); + + inputFile = configuration.getRegionAssociationFile(); if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapFile( + importResult = importRegionAssociationFile( configuration, - inputFile, voyage); + inputFile, + voyage); + addResultAndLog(result, inputFile, importResult, user); + } - addResultAndLog(result, inputFile, - importResult, user); - } - inputFile = configuration.getMapResultFile(); + inputFile = configuration.getRegionResultFile(); if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapResultFile( + importResult = importRegionResultFile( configuration, inputFile, voyage); @@ -94,9 +114,149 @@ return result; } - protected CsvFileImportResult importMapFile(ResultsImportConfiguration configuration, - InputFile inputFile, - Voyage voyage) throws ImportException { + protected CsvFileImportResult importRegionFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + + + CellType cellType = getEntityByProperty( + CellType.class, CellType.PROPERTY_ID, "Region"); + Preconditions.checkNotNull(cellType); + + DataMetadata dataXMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LongitudeEnd"); + Preconditions.checkNotNull(dataXMeta); + + DataMetadata dataYMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LatitudeEnd"); + Preconditions.checkNotNull(dataYMeta); + + DataMetadata dataDepthSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefSurfaceEnd"); + Preconditions.checkNotNull(dataDepthSurfaceMeta); + + DataMetadata dataDepthBottomMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefBottomEnd"); + Preconditions.checkNotNull(dataDepthBottomMeta); + + DataMetadata dataSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "Surface"); + Preconditions.checkNotNull(dataSurfaceMeta); + + // authorize only the selected voyage to be imported + Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( + voyage), EchoBaseFunctions.VOYAGE_NAME); + + Map<String, DepthStratum> depthStratumMap = getEntitiesMap( + DepthStratum.class, + EchoBaseFunctions.DEPTH_STRATUM_ID); + + RegionCellImportModel csvModel = new RegionCellImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + cellType, + voyageMap, + depthStratumMap + ); + + if (log.isInfoEnabled()) { + log.info("Starts import of Region cells from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + DataDAO dataDao = getDAO(Data.class, DataDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<RegionCellImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + int rowNumber = 0; + + configuration.incrementsProgression(); + for (RegionCellImportModelRow row : importer) { + + rowNumber++; + configuration.incrementsProgression(); + + Cell cell = create(dao, row.getCell()); + + voyage.addPostCell(cell); + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); + + createCellData(dataDao, + cell, + dataXMeta, + String.valueOf(row.getDataX()), + importResult + ); + + createCellData(dataDao, + cell, + dataYMeta, + String.valueOf(row.getDataY()), + importResult + ); + + String depthStratumId = row.getDepthStratum().getId(); + + DataMetadata depth = null; + + if ("SURF".equals(depthStratumId)) { + + depth = dataDepthSurfaceMeta; + } else if ("CLAS".equals(depthStratumId)) { + depth = dataDepthBottomMeta; + + } else { + throw new ImportException( + "[Line " + rowNumber + + "] Depth stratum should be 'SURF' or 'CLAS', " + + "but was " + depthStratumId); + } + + createCellData(dataDao, + cell, + depth, + String.valueOf(row.getDataZ()), + importResult + ); + + createCellData(dataDao, + cell, + dataSurfaceMeta, + String.valueOf(row.getDataSurface()), + importResult + ); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private void createCellData(DataDAO dao, + Cell cell, + DataMetadata dataMetaData, + String dataValue, + CsvFileImportResult importResult) { + + Data data = create(dao); + data.setDataMetadata(dataMetaData); + data.setDataValue(dataValue); + cell.addData(data); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); + } + + protected CsvFileImportResult importRegionAssociationFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { MapImportModel csvModel = new MapImportModel( serviceContext.getConfiguration().getCsvSeparator()); @@ -132,9 +292,9 @@ } } - protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, - InputFile inputFile, - Voyage voyage) throws ImportException { + protected CsvFileImportResult importRegionResultFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { MapResultImportModel csvModel = new MapResultImportModel( serviceContext.getConfiguration().getCsvSeparator()); Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -138,6 +138,10 @@ public static final int NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY = 10021; + public static final int NB_REGION_CELLS = 228; + + public static final int NB_REGION_DATAS = NB_REGION_CELLS * 4; + public void assertImportCommonData() throws TopiaException { assertNbEntities(Voyage.class, NB_VOYAGE); assertNbEntities(Transit.class, NB_TRANSIT); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,3 +1,26 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,11 +1,35 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -27,7 +51,6 @@ return new String[]{"/import-data", "result", filename}; } - @Ignore @Test public void doImportRegion() throws Exception { @@ -49,15 +72,17 @@ prepareInputFile(conf.getRegionsFile(), getImportPath("regions.csv.gz")); - prepareInputFile(conf.getRegionAssociationFile(), - getImportPath("regionAssociations.csv.gz")); - prepareInputFile(conf.getRegionsFile(), - getImportPath("regionResults.csv.gz")); + //TODO Use this +// prepareInputFile(conf.getRegionAssociationFile(), +// getImportPath("regionAssociations.csv.gz")); +// prepareInputFile(conf.getRegionsFile(), +// getImportPath("regionResults.csv.gz")); List<CsvFileImportResult> result = doImport( conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + assertCsvImportResult(result.get(0), Cell.class, NB_REGION_CELLS); + assertCsvImportResult(result.get(0), Data.class, NB_REGION_DATAS); } } \ No newline at end of file Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,3 +1,26 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/test/resources/import-data/acousticData/movies.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL