- Echobase-commits - mailman.cloud.codelutin.com

r388 - in trunk/echobase-services: . src/test/resources src/test/resources/import-data
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 17:46:26 +0100 (Thu, 22 Mar 2012) New Revision: 388 Url: http://forge.codelutin.com/repositories/revision/echobase/388 Log: updates tests db Modified: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz trunk/echobase-services/update-import-data-db.sh Modified: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-03-22 16:31:31 UTC (rev 387) +++ trunk/echobase-services/update-import-data-db.sh 2012-03-22 16:46:26 UTC (rev 388) @@ -27,8 +27,9 @@ dst="$dbnameprefix-$dbdst.h2.db" rm -f $dbDir/$dst.gz - - (cp -v $dbname "$dbDir/$dst" & cd $dbDir & gzip $dst) + echo "dbdir = $dbDir" + echo "dst = $dst" + (cp -v $dbname "$dbDir/$dst" ; cd "$dbDir" ; gzip "$dst") } rm -rf target

1 0

r387 - in trunk/echobase-tools/src/test: java/fr/ifremer/echobase/tools/loaders resources/csv/new
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 17:31:31 +0100 (Thu, 22 Mar 2012) New Revision: 387 Url: http://forge.codelutin.com/repositories/revision/echobase/387 Log: add new metas Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-20 18:32:08 UTC (rev 386) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-22 16:31:31 UTC (rev 387) @@ -35,7 +35,7 @@ public class DataMetadataLoaderIT extends AbstractLoaderIT<DataMetadata, DataMetadataLoader> { public DataMetadataLoaderIT() { - super(DataMetadataLoader.class, 37, 28); + super(DataMetadataLoader.class, 38, 28); } @Test Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-20 18:32:08 UTC (rev 386) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-22 16:31:31 UTC (rev 387) @@ -36,3 +36,4 @@ "EsduFlag";"EsduFlag";"ESDU Flag: 0 discard, : keep";;"boolean";;;;;0;1;0;;999;"Mean"; "NumberOfSamplesRecorded";"NumberOfSamples";"Number of acoustic samples recorded in a cell";;;;;;;0;999999999;1;0;0;; "NumberOfSamplesEchoIntegrated";"NumberOfSamples";"Number of acoustic samples echo-integrated in a cell";;;;;;;0;999999999;1;0;0;; +"En";;"Electrical energy received by the acoustic transceiver";"sound_intensity_level_in_water";"m²/mV²";;;;;0;999999999;0.02327;0;;;

1 0

r385 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/csv echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/test/java/fr/ifremer/echobase/services echobase-services/src/test/resources
by tchemit＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 11:45:03 +0100 (Tue, 20 Mar 2012) New Revision: 385 Url: http://forge.codelutin.com/repositories/revision/echobase/385 Log: fix db export Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AssociationExportContext.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityExportContext.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/AssociationMeta.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/MetaFilenameAware.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AssociationExportContext.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AssociationExportContext.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AssociationExportContext.java 2012-03-20 10:45:03 UTC (rev 385) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.csv; -import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.entities.meta.AssociationMeta; import org.apache.commons.io.FileUtils; @@ -35,10 +34,7 @@ import java.io.Closeable; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.Writer; import java.util.List; @@ -68,7 +64,7 @@ public AssociationExportContext(ExportModel<TopiaEntity> model, AssociationMeta meta, File container, - List<TopiaEntity> data) throws FileNotFoundException { + List<TopiaEntity> data) { Preconditions.checkNotNull(model); Preconditions.checkNotNull(meta); Preconditions.checkNotNull(container); @@ -77,12 +73,12 @@ export = EchoBaseExport.newExport(model, data, true); - entryFile = new File(container, meta.getFilename()); + entryFile = meta.newFile(container); if (log.isDebugEnabled()) { - log.debug("Creates AssociationExportContext::" + meta + " - " + entryFile.getName()); + log.debug("Creates AssociationExportContext::" + meta + + " - " + entryFile.getName()); } - writer = new OutputStreamWriter(new FileOutputStream(entryFile), - Charsets.UTF_8); + writer = meta.newWriter(container); } @Override Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityExportContext.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityExportContext.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityExportContext.java 2012-03-20 10:45:03 UTC (rev 385) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.csv; -import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.meta.AssociationMeta; @@ -37,10 +36,7 @@ import java.io.Closeable; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Collection; import java.util.List; @@ -67,9 +63,9 @@ /** * Unique list to store data to export. (will be shared with - * association export context.) + * association export contexts.) */ - protected final List<TopiaEntity> data; + private final List<TopiaEntity> data; /** Association export context for this type of entity. */ protected final Collection<AssociationExportContext> associationExportContexts; @@ -78,24 +74,26 @@ public EntityExportContext(ExportModel<TopiaEntity> model, TableMeta meta, - File container) throws FileNotFoundException { + File container) { Preconditions.checkNotNull(model); Preconditions.checkNotNull(meta); Preconditions.checkNotNull(container); this.meta = meta; - export = EchoBaseExport.newExport(model, data = Lists.newArrayList(), true); - entryFile = new File(container, meta.getFilename()); + data = Lists.newArrayList(); + export = EchoBaseExport.newExport(model, data, true); + entryFile = meta.newFile(container); if (log.isDebugEnabled()) { - log.debug("Creates EntityExportContext::" + meta + " - " + entryFile.getName()); + log.debug("Creates EntityExportContext::" + meta + " - " + + entryFile.getName()); } - writer = new OutputStreamWriter(new FileOutputStream(entryFile), Charsets.UTF_8); + writer = meta.newWriter(container); associationExportContexts = Lists.newArrayList(); } public void addAssociationExportContext(AssociationMeta meta, ExportModel<TopiaEntity> model, - File container) throws FileNotFoundException { + File container) { associationExportContexts.add( new AssociationExportContext(model, meta, @@ -104,11 +102,6 @@ ); } - public void setData(TopiaEntity entity) { - data.clear(); - data.add(entity); - } - @Override public void close() throws IOException { @@ -131,13 +124,27 @@ } } - public void write() throws Exception { - export.write(writer); + public void write(TopiaEntity data) throws Exception { + this.data.add(data); + try { + export.write(writer); + } finally { + this.data.clear(); + } } - public void writeAssociations() throws Exception { - for (AssociationExportContext c : associationExportContexts) { - c.write(); + public void writeAssociations(TopiaEntity data) throws Exception { + this.data.add(data); + try { + for (AssociationExportContext c : associationExportContexts) { + AssociationMeta cMeta = c.meta; + boolean emptyChild = cMeta.isChildEmpty(data); + if (!emptyChild) { + c.write(); + } + } + } finally { + this.data.clear(); } } } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/AssociationMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/AssociationMeta.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/AssociationMeta.java 2012-03-20 10:45:03 UTC (rev 385) @@ -23,13 +23,20 @@ */ package fr.ifremer.echobase.entities.meta; +import com.google.common.base.Charsets; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.util.ObjectUtil; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; import java.io.Serializable; +import java.io.Writer; import java.util.Collection; /** @@ -84,6 +91,22 @@ return source.name() + "_" + name + CSV_EXTENSION; } + @Override + public File newFile(File container) { + return new File(container, getFilename()); + } + + @Override + public Writer newWriter(File container) { + File file = newFile(container); + try { + return new OutputStreamWriter(new FileOutputStream(file), + Charsets.UTF_8); + } catch (FileNotFoundException e) { + throw new EchoBaseTechnicalException("Could not find file "+file); + } + } + public EchoBaseEntityEnum getTarget() { return target; } @@ -104,6 +127,11 @@ public void setChilds(TopiaEntity entity, Collection<TopiaEntity> childs) { getOperator().addAllChild(name, entity, childs); } + + public boolean isChildEmpty(TopiaEntity entity) { + boolean result = getOperator().isChildEmpty(name, entity); + return result; + } public EntityOperator<TopiaEntity> getOperator() { if (operator == null) { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/MetaFilenameAware.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/MetaFilenameAware.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/MetaFilenameAware.java 2012-03-20 10:45:03 UTC (rev 385) @@ -25,6 +25,9 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import java.io.File; +import java.io.Writer; + /** * Contract for exportable some Meta. * @@ -40,4 +43,9 @@ String getName(); String getFilename(); + + File newFile(File container); + + Writer newWriter(File container); + } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2012-03-20 10:45:03 UTC (rev 385) @@ -23,9 +23,11 @@ */ package fr.ifremer.echobase.entities.meta; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; @@ -34,7 +36,12 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; import java.io.Serializable; +import java.io.Writer; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -84,6 +91,22 @@ } @Override + public File newFile(File container) { + return new File(container, getFilename()); + } + + @Override + public Writer newWriter(File container) { + File file = newFile(container); + try { + return new OutputStreamWriter(new FileOutputStream(file), + Charsets.UTF_8); + } catch (FileNotFoundException e) { + throw new EchoBaseTechnicalException("Could not find file "+file); + } + } + + @Override public String toString() { return "<" + source + ">"; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-03-20 10:45:03 UTC (rev 385) @@ -43,7 +43,6 @@ import org.nuiton.util.csv.ExportModel; import java.io.File; -import java.io.FileNotFoundException; import java.util.Collection; import java.util.Map; @@ -65,7 +64,7 @@ public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, - File container) throws FileNotFoundException { + File container) { Preconditions.checkNotNull(service); Preconditions.checkNotNull(entityMetas); @@ -134,8 +133,7 @@ } EntityExportContext entityExporter = entityExporters.get(entity.getClass()); - entityExporter.setData(entity); - entityExporter.write(); + entityExporter.write(entity); } catch (Exception e) { throw new EchoBaseTechnicalException( "Could not export entity " + entity, e); @@ -155,7 +153,7 @@ } EntityExportContext entityExporter = entityExporters.get(entity.getClass()); - entityExporter.writeAssociations(); + entityExporter.writeAssociations(entity); } catch (Exception e) { throw new EchoBaseTechnicalException( "Could not export associations of entity " + entity, e); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-03-20 08:14:10 UTC (rev 384) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-03-20 10:45:03 UTC (rev 385) @@ -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; import fr.ifremer.echobase.entities.EchoBaseUser; Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r384 - in trunk/echobase-services: . src/main/java/fr/ifremer/echobase/services src/test/java/fr/ifremer/echobase/services src/test/resources
by tchemit＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-20 09:14:10 +0100 (Tue, 20 Mar 2012) New Revision: 384 Url: http://forge.codelutin.com/repositories/revision/echobase/384 Log: add import db service test + improve update test dbs by script Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/update-import-data-db.sh Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-19 19:03:59 UTC (rev 383) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-20 08:14:10 UTC (rev 384) @@ -78,7 +78,8 @@ * @throws TopiaException if any pb while topia treatment */ public void importDb(ImportDbConfiguration model, - EchoBaseUser user, boolean computeSteps) throws IOException, TopiaException { + EchoBaseUser user, + boolean computeSteps) throws IOException, TopiaException { File file = model.getInput().getFile(); @@ -92,7 +93,7 @@ if (computeSteps) { int size = entriestoConsume.size(); - model.setNbSteps(size + missingEntries.size() + 1); + model.setNbSteps(size + missingEntries.size()); } for (String missingEntry : missingEntries) { @@ -142,6 +143,7 @@ EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() ); commitTransaction("Could not commit db import from file " + file); + } finally { zipFile.close(); } Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-03-20 08:14:10 UTC (rev 384) @@ -0,0 +1,48 @@ +package fr.ifremer.echobase.services; + +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EchoBaseUserImpl; +import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; + +/** + * Tests the {@link ImportDbService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ImportDbServiceTest extends EchoBaseTestServiceSupport { + + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(null); + } + + @Test + public void importDb() throws IOException, TopiaException { + + ImportDbService service = getService(ImportDbService.class); + + ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + + prepareInputFile(conf.getInput(), "/echobase-0.3-importDb-referentiel.zip"); + + EchoBaseUser user = new EchoBaseUserImpl(); + user.setEmail("testUser(a)fake.fr"); + + service.importDb(conf, user, true); + + Assert.assertEquals(100f, conf.getProgression(), 1); + } + +} Added: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-03-19 19:03:59 UTC (rev 383) +++ trunk/echobase-services/update-import-data-db.sh 2012-03-20 08:14:10 UTC (rev 384) @@ -4,24 +4,14 @@ # le référentiel if [ ! $# -eq 1 ]; then - echo "usage: $0 pathToNoData.db" + echo "usage: $0 importdb.zip" exit fi - -no_data_db=$1 + dbnameprefix="echobase-0.3" dbDir=src/test/resources/import-data -function copyFile() { - incomingFile=$1 - filePrefix="$dbnameprefix-$2.h2.db" - echo "copy file from $incomingFile to $filePrefix" - rm -f $dbDir/$filePrefix.gz - cp $incomingFile "$dbDir/$filePrefix" - (cd $dbDir ; gzip $filePrefix) -} - function executeMaven() { testId=$1 dbdst=$2 @@ -33,13 +23,20 @@ fi testTimestamp=`ls target/surefire-workdir/$testId` dbname=target/surefire-workdir/$testId/$testTimestamp/db/echobase.h2.db - copyFile "$dbname" "$dbdst" + + dst="$dbnameprefix-$dbdst.h2.db" + + rm -f $dbDir/$dst.gz + + (cp -v $dbname "$dbDir/$dst" & cd $dbDir & gzip $dst) } rm -rf target -copyFile "$no_data_db" "nodata" +cp -v "$1" "src/test/resources/$dbnameprefix-importDb-referentiel.zip" +executeMaven fr.ifremer.echobase.services.ImportDbServiceTest nodata + executeMaven fr.ifremer.echobase.services.importdata.CommonDataImportServiceIT commonData executeMaven fr.ifremer.echobase.services.importdata.OperationImportServiceIT operation

1 0

r383 - in trunk/echobase-services: . src/main/java/fr/ifremer/echobase/services/configurations src/test/java/fr/ifremer/echobase/services/importdata src/test/resources/import-data
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 20:03:59 +0100 (Mon, 19 Mar 2012) New Revision: 383 Url: http://forge.codelutin.com/repositories/revision/echobase/383 Log: add script to updates test dbs + update them :) Added: trunk/echobase-services/update-import-data-db.sh Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java 2012-03-19 18:38:36 UTC (rev 382) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java 2012-03-19 19:03:59 UTC (rev 383) @@ -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.configurations; import org.nuiton.util.StringUtil; Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.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/AcousticDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-19 18:38:36 UTC (rev 382) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-19 19:03:59 UTC (rev 383) @@ -93,8 +93,8 @@ getService(AcousticDataImportService.class); // //FIXME : remove this when db will have such data - service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "NumberOfSamplesRecorded"); - service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "NumberOfSamplesEchoIntegrated"); +// service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "NumberOfSamplesRecorded"); +// service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "NumberOfSamplesEchoIntegrated"); // service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "minEIthr"); // service.create(getDAO(DataMetadata.class), DataMetadata.PROPERTY_NAME, "maxEIthr"); // service.create(getDAO(AcousticInstrument.class), AcousticInstrument.PROPERTY_ID, "ES38B"); Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz =================================================================== (Binary files differ) Added: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh (rev 0) +++ trunk/echobase-services/update-import-data-db.sh 2012-03-19 19:03:59 UTC (rev 383) @@ -0,0 +1,53 @@ +#! /bin/bash + +# Script pour mettre à jour les bases de tests à partir d'une base avec juste +# le référentiel + +if [ ! $# -eq 1 ]; then + echo "usage: $0 pathToNoData.db" + exit +fi + +no_data_db=$1 +dbnameprefix="echobase-0.3" + +dbDir=src/test/resources/import-data + +function copyFile() { + incomingFile=$1 + filePrefix="$dbnameprefix-$2.h2.db" + echo "copy file from $incomingFile to $filePrefix" + rm -f $dbDir/$filePrefix.gz + cp $incomingFile "$dbDir/$filePrefix" + (cd $dbDir ; gzip $filePrefix) +} + +function executeMaven() { + testId=$1 + dbdst=$2 + echo "execute mvn test -Dtest=$testId ..." + mvn test -Dtest=$testId &>/tmp/maven-$testId.log + if [ $? -eq 1 ]; then + echo "Error with test $testId, see /tmp/maven-$testId.log" + exit 1 + fi + testTimestamp=`ls target/surefire-workdir/$testId` + dbname=target/surefire-workdir/$testId/$testTimestamp/db/echobase.h2.db + copyFile "$dbname" "$dbdst" +} + +rm -rf target + +copyFile "$no_data_db" "nodata" + +executeMaven fr.ifremer.echobase.services.importdata.CommonDataImportServiceIT commonData + +executeMaven fr.ifremer.echobase.services.importdata.OperationImportServiceIT operation + +executeMaven fr.ifremer.echobase.services.importdata.CatchesDataImportServiceIT catches + +executeMaven fr.ifremer.echobase.services.importdata.AcousticDataImportServiceIT catches-and-acoustic + +executeMaven fr.ifremer.echobase.services.importdata.ResultsImportServiceIT catches-and-acoustic-and-voyage-result + +executeMaven fr.ifremer.echobase.services.importdata.ResultsEsduImportServiceIT Property changes on: trunk/echobase-services/update-import-data-db.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r382 - in trunk/echobase-services/src/test: java/fr/ifremer/echobase/services/importdata resources/import-data
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 19:38:36 +0100 (Mon, 19 Mar 2012) New Revision: 382 Url: http://forge.codelutin.com/repositories/revision/echobase/382 Log: simplify db names Added: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz Removed: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation-result.h2.db.gz 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/CatchesDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 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-19 17:56:38 UTC (rev 381) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-19 18:38:36 UTC (rev 382) @@ -51,9 +51,9 @@ public static final String IMPORT_DATA_ECHOBASE_NO_DATA = "/import-data/echobase-0.3-nodata.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_COMMON_DATA_RESULT = "/import-data/echobase-0.3-commonData-result.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_COMMON_DATA = "/import-data/echobase-0.3-commonData.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_OPERATION_RESULT = "/import-data/echobase-0.3-operation-result.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_OPERATION = "/import-data/echobase-0.3-operation.h2.db.gz"; public static final String IMPORT_DATA_ECHOBASE_CATCHES = "/import-data/echobase-0.3-catches.h2.db.gz"; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-19 17:56:38 UTC (rev 381) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-19 18:38:36 UTC (rev 382) @@ -44,8 +44,7 @@ public class CatchesDataImportServiceIT extends AbstractImportDataServiceIT { protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_OPERATION_RESULT); + return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_OPERATION); } protected String[] getImportPath(String filename) { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-19 17:56:38 UTC (rev 381) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-19 18:38:36 UTC (rev 382) @@ -44,8 +44,7 @@ public class CommonData2ImportServiceIT extends AbstractImportDataServiceIT { protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_COMMON_DATA_RESULT); + return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_COMMON_DATA); } @Test Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-19 17:56:38 UTC (rev 381) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-19 18:38:36 UTC (rev 382) @@ -44,8 +44,7 @@ public class OperationImportServiceIT extends AbstractImportDataServiceIT { protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_COMMON_DATA_RESULT); + return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_COMMON_DATA); } protected String[] getImportPath(String filename) { Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData-result.h2.db.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz (from rev 369, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData-result.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation-result.h2.db.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz (from rev 369, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation-result.h2.db.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r380 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 18:54:32 +0100 (Mon, 19 Mar 2012) New Revision: 380 Url: http://forge.codelutin.com/repositories/revision/echobase/380 Log: redo something I have done at least 100 times, :( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-19 17:48:45 UTC (rev 379) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-19 17:54:32 UTC (rev 380) @@ -476,7 +476,6 @@ CsvFileImportResult importResult) { /* - Latitude OK Longitude OK depthStart (surface ou bottom) OK @@ -488,8 +487,6 @@ Surface OK NumberOfSamplesRecorded OK NumberOfSamplesEchoIntegrated OK -minEIthr OK -maxEIthr OK */ String dataValue; String startMeta; @@ -543,14 +540,6 @@ dataValue = String.valueOf(row.getCellNasc()); createCellData(dao, cell, dataMetadatas, "NASC", dataValue, importResult); - // create minEIthr data - dataValue = String.valueOf(row.getCellMinEIthr()); - createCellData(dao, cell, dataMetadatas, "minEIthr", dataValue, importResult); - - // create maxEIthr data - dataValue = String.valueOf(row.getCellMaxEIthr()); - createCellData(dao, cell, dataMetadatas, "maxEIthr", dataValue, importResult); - // create Volume data dataValue = String.valueOf(row.getCellVolume()); createCellData(dao, cell, dataMetadatas, "Volume ",

1 0

r379 - trunk/echobase-tools/src/test/resources/csv/new
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 18:48:45 +0100 (Mon, 19 Mar 2012) New Revision: 379 Url: http://forge.codelutin.com/repositories/revision/echobase/379 Log: fix references Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-19 17:19:05 UTC (rev 378) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-19 17:48:45 UTC (rev 379) @@ -34,5 +34,5 @@ "Formula";"Formula";"How was computed the sA value allocated to the cell/echotype combination?";;;;;;;;;;;;; "MeanXe";"MeanXe";"Mean acoustic scaling factor in (region) cells";;;;;;;0;10;;;999;"Mean"; "EsduFlag";"EsduFlag";"ESDU Flag: 0 discard, : keep";;"boolean";;;;;0;1;0;;999;"Mean"; -"minEIthr";;"minimum echo-integration threshold";;"dB ref. 1m-1";;;;;0;-120;0;;999999;; -"maxEIthr";;"maximum echo-integration threshold";;"dB ref. 1m-1";;;;;0;-120;0;;999999;; +"NumberOfSamplesRecorded";"NumberOfSamples";"Number of acoustic samples recorded in a cell";;;;;;;0;999999999;1;0;0;; +"NumberOfSamplesEchoIntegrated";"NumberOfSamples";"Number of acoustic samples echo-integrated in a cell";;;;;;;0;999999999;1;0;0;;

1 0

r378 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 18:19:05 +0100 (Mon, 19 Mar 2012) New Revision: 378 Url: http://forge.codelutin.com/repositories/revision/echobase/378 Log: fix NPE Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-03-19 17:07:09 UTC (rev 377) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-03-19 17:19:05 UTC (rev 378) @@ -129,10 +129,12 @@ MetaFilenameAware[] refEntries = EntitiesUtil.getReferenceEntries(getDbMeta()); + boolean withVoyages = model.getVoyageIds() != null; + if (computeSteps) { int nbstesp = refEntries.length; - if (model.getVoyageIds() != null) { + if (withVoyages) { nbstesp += model.getVoyageIds().length; } @@ -152,29 +154,31 @@ } } - MetaFilenameAware[] dataEntries = - EntitiesUtil.getDataEntries(getDbMeta()); - Multimap<EchoBaseEntityEnum, MetaFilenameAware> dataAssociationEntries = - EntitiesUtil.getDataAssociationsEntries(getDbMeta()); + if (withVoyages) { + MetaFilenameAware[] dataEntries = + EntitiesUtil.getDataEntries(getDbMeta()); + Multimap<EchoBaseEntityEnum, MetaFilenameAware> dataAssociationEntries = + EntitiesUtil.getDataAssociationsEntries(getDbMeta()); - ReplicateEntityVisitor visitor = ReplicateEntityVisitor.createVisitor( - exportService, - dataEntries, - dataAssociationEntries, - dir - ); + ReplicateEntityVisitor visitor = ReplicateEntityVisitor.createVisitor( + exportService, + dataEntries, + dataAssociationEntries, + dir + ); - try { - for (String voyageId : model.getVoyageIds()) { + try { + for (String voyageId : model.getVoyageIds()) { - model.incrementsProgression(); + model.incrementsProgression(); - Voyage voyage = getEntityById(Voyage.class, voyageId); - visitor.export(voyage); + Voyage voyage = getEntityById(Voyage.class, voyageId); + visitor.export(voyage); + } + } finally { + // clear visitor will close export files + visitor.clear(); } - } finally { - // clear visitor will close export files - visitor.clear(); } EchoBaseIOUtil.compressZipFile(zipFile, dir);

1 0

r377 - in trunk/echobase-services: . src/test/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: tchemit Date: 2012-03-19 18:07:09 +0100 (Mon, 19 Mar 2012) New Revision: 377 Url: http://forge.codelutin.com/repositories/revision/echobase/377 Log: pass a test in IT Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java Removed: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java Modified: trunk/echobase-services/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-19 16:46:45 UTC (rev 376) +++ trunk/echobase-services/pom.xml 2012-03-19 17:07:09 UTC (rev 377) @@ -226,7 +226,7 @@ </executions> <configuration> <includes> - <include>**/*ImportServiceIT.java</include> + <include>**/*IT.java</include> </includes> </configuration> Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java (from rev 376, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-19 17:07:09 UTC (rev 377) @@ -0,0 +1,69 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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; + +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.importdata.AbstractImportDataServiceIT; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.FileUtil; + +import java.io.File; + +/** + * Test {@link EmbeddedApplicationService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EmbeddedApplicationServiceIT extends EchoBaseTestServiceSupport { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT); + } + + @Test + public void testCreateEmbeddedApplication() throws Exception { + EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); + conf.setVoyageIds(getVoyageId()); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + File warLocation = new File(workingDirectory, "echobase.war"); + FileUtil.writeString(warLocation, "dummy!"); + conf.setWarLocation(warLocation); + conf.setFileName("echobase"); + EmbeddedApplicationService service = + getService(EmbeddedApplicationService.class); + + File zipFile = service.createEmbeddedApplication(conf); + + Assert.assertTrue(zipFile.exists()); + Assert.assertEquals(100f, conf.getProgression(), 1); + + // TODO Test that embedded db has exactly same number of data than in incoming db + } +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-03-19 16:46:45 UTC (rev 376) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-03-19 17:07:09 UTC (rev 377) @@ -1,69 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 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; - -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; -import fr.ifremer.echobase.services.importdata.AbstractImportDataServiceIT; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.util.FileUtil; - -import java.io.File; - -/** - * Test {@link EmbeddedApplicationService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EmbeddedApplicationServiceTest extends EchoBaseTestServiceSupport { - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT); - } - - @Test - public void testCreateEmbeddedApplication() throws Exception { - EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); - conf.setVoyageIds(getVoyageId()); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - File warLocation = new File(workingDirectory, "echobase.war"); - FileUtil.writeString(warLocation, "dummy!"); - conf.setWarLocation(warLocation); - conf.setFileName("echobase"); - EmbeddedApplicationService service = - getService(EmbeddedApplicationService.class); - - File zipFile = service.createEmbeddedApplication(conf); - - Assert.assertTrue(zipFile.exists()); - Assert.assertEquals(100f, conf.getProgression(), 1); - - // TODO Test that embedded db has exactly same number of data than in incoming db - } -}

1 0