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