Author: tchemit Date: 2012-09-07 18:34:49 +0200 (Fri, 07 Sep 2012) New Revision: 635 Url: http://forge.codelutin.com/repositories/revision/echobase/635 Log: remove migraiont 0.9 (was only ther for test purpose) make import test works again (migrate them to version 1.2) make test use the working db as in real life refs #1437: Suppression des imports (test ImportResult ids and it works!) Added: trunk/echobase-services/src/test/resources/echobase-1.2-importDb-referentiel.zip trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-1.2-operation.h2.db.gz Removed: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV0_9.java 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-voyage-result.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 Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.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/AcousticImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.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/common/transect.csv.gz trunk/echobase-services/src/test/resources/import-data/common/transit.csv.gz trunk/echobase-services/src/test/resources/import-data/common/voyage.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthWeightKey.csv.gz trunk/echobase-services/update-import-data-db.sh Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2012-09-07 16:34:49 UTC (rev 635) @@ -187,7 +187,7 @@ * @param configuration topia configuration * @return the new fresh root context */ - public static TopiaContext newDb(Properties configuration) { + private static TopiaContext newDb(Properties configuration) { try { if (log.isInfoEnabled()) { log.info("Starts a db at : " + Deleted: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV0_9.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV0_9.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV0_9.java 2012-09-07 16:34:49 UTC (rev 635) @@ -1,113 +0,0 @@ -package fr.ifremer.echobase.persistence.migration.workingDb; - -/* - * #%L - * EchoBase :: Domain - * $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% - */ - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; - -import java.util.List; - -/** - * Migration for version {@code 0.9}. - * - * @author tchemit <chemit@codelutin.com> - * @since 1.2 - */ -public class MigrationCallbackV0_9 extends MigrationCallBackForVersion { - - @Override - public Version getVersion() { - return VersionUtil.valueOf("0.9"); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - - - // add strata column on lengthweightkey table - addStrataToLengthWeightKeyTable(tx, queries); - -// createSexCategoryTable(tx,queries); - } - - protected void addStrataToLengthWeightKeyTable(TopiaContextImplementor tx, - List<String> queries) throws TopiaNotFoundException { - Dialect dialect = - Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); - - if (dialect instanceof PostgreSQLDialect) { - - queries.add("ALTER TABLE lengthweightkey ADD COLUMN strata character varying(255);"); - - queries.add("ALTER TABLE lengthweightkey ADD CONSTRAINT FK1687F88192874545_INDEX_E FOREIGN KEY(strata) REFERENCES strata(topiaid);"); - - } else if (dialect instanceof H2Dialect) { - - queries.add("ALTER TABLE lengthweightkey ADD COLUMN strata VARCHAR(255);"); - - queries.add("ALTER TABLE lengthweightkey ADD CONSTRAINT FK1687F88192874545_INDEX_E FOREIGN KEY(strata) REFERENCES strata(topiaid);"); - } - } - -// -// protected void createSexCategoryTable(TopiaContextImplementor tx, -// List<String> queries) throws TopiaNotFoundException { -// Dialect dialect = -// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); -// -// if (dialect instanceof PostgreSQLDialect) { -// queries.add("CREATE TABLE sexcategory (\n" + -// "topiaid character varying(255) NOT NULL,\n" + -// "topiaversion bigint NOT NULL,\n" + -// "topiacreatedate date,\n" + -// "name character varying(1024),\n" + -// "meaning character varying(255)\n" + -// ");"); -// queries.add("ALTER TABLE sexcategory ADD CONSTRAINT PRIMARY_KEY_472 PRIMARY KEY(topiaid);"); -// queries.add("ALTER TABLE sexcategory ADD CONSTRAINT CONSTRAINT_INDEX_472 UNIQUE KEY(name);"); -// -// } else if (dialect instanceof H2Dialect) { -// -// queries.add("CREATE TABLE sexcategory (\n" + -// "topiaid VARCHAR(255) NOT NULL,\n" + -// "topiaversion BIGINT NOT NULL,\n" + -// "topiacreatedate DATE,\n" + -// "name VARCHAR(1024),\n" + -// "meaning VARCHAR(255)\n" + -// ");"); -// -// queries.add("ALTER TABLE sexcategory ADD CONSTRAINT PRIMARY_KEY_472 PRIMARY KEY(topiaid);"); -// queries.add("ALTER TABLE sexcategory ADD CONSTRAINT CONSTRAINT_INDEX_472 UNIQUE KEY(topiaid);"); -// } -// } -} Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2012-09-07 16:34:49 UTC (rev 635) @@ -1,3 +1,2 @@ -fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV0_9 fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV1_1 fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV1_2 \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-09-07 16:34:49 UTC (rev 635) @@ -199,7 +199,9 @@ // attach it to voyage voyage.addLengthWeightKey(lengthWeightKey); - importResult.incrementsNumberCreated(EchoBaseEntityEnum.LengthWeightKey); + // collect ids + importResult.addId(EchoBaseEntityEnum.LengthWeightKey, + lengthWeightKey); } return importResult; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-09-07 16:34:49 UTC (rev 635) @@ -138,29 +138,25 @@ protected <E extends TopiaEntity> void assertCsvImportResult(EchoBaseCsvFileImportResult actual, Class<E> entityType, - int numberCreated, - int nbIds) throws TopiaException { + int numberCreated) throws TopiaException { assertCsvImportResult(actual, entityType, numberCreated, 0, - numberCreated, - nbIds); + numberCreated); } protected <E extends TopiaEntity> void assertCsvImportResult(List<EchoBaseCsvFileImportResult> actual, int pos, Class<E> entityType, - int numberCreated, - int nbIds) throws TopiaException { + int numberCreated) throws TopiaException { Assert.assertTrue(actual.size() >= pos); assertCsvImportResult(actual.get(pos), entityType, numberCreated, 0, - numberCreated, - nbIds); + numberCreated); } @@ -168,8 +164,7 @@ Class<E> entityType, int numberCreated, int numberUpdated, - int nbCount, - int nbIds) throws TopiaException { + int nbCount) throws TopiaException { Assert.assertNotNull(actual); Set<EchoBaseEntityEnum> entityTypes = actual.getEntityTypes(); EchoBaseEntityEnum expectedEntityType = EchoBaseEntityEnum.valueOf(entityType); @@ -177,7 +172,6 @@ Assert.assertEquals(numberCreated, actual.getNumberCreated(expectedEntityType)); Assert.assertEquals(numberUpdated, actual.getNumberUpdated(expectedEntityType)); assertNbEntities(entityType, nbCount); - Assert.assertEquals(nbIds, actual.getIds().size()); } protected <E extends TopiaEntity> void assertCsvImportResult(List<EchoBaseCsvFileImportResult> results, @@ -185,8 +179,7 @@ Class<E> entityType, int numberCreated, int numberUpdated, - int nbCount, - int nbIds) throws TopiaException { + int nbCount) throws TopiaException { Assert.assertTrue(results.size() >= pos); EchoBaseCsvFileImportResult actual = results.get(pos); Assert.assertNotNull(actual); @@ -196,6 +189,14 @@ Assert.assertEquals(numberCreated, actual.getNumberCreated(expectedEntityType)); Assert.assertEquals(numberUpdated, actual.getNumberUpdated(expectedEntityType)); assertNbEntities(entityType, nbCount); + } + + protected <E extends TopiaEntity> void assertNbIDs(List<EchoBaseCsvFileImportResult> results, + int pos, + int nbIds) throws TopiaException { + Assert.assertTrue(results.size() >= pos); + EchoBaseCsvFileImportResult actual = results.get(pos); + Assert.assertNotNull(actual); Assert.assertEquals(nbIds, actual.getIds().size()); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2012-09-07 16:34:49 UTC (rev 635) @@ -149,11 +149,7 @@ configuration = new EchoBaseConfiguration(defaultProps); JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(testDir); - Properties properties = EchobaseTopiaContexts.loadWorkingDbConfiguration(dbConf); - - //FIXME should never try to update db, tests db should always be uptodate... - //properties.put("hibernate.hbm2ddl.auto", "update"); - rootContext = EchobaseTopiaContexts.newDb(properties); + rootContext = EchobaseTopiaContexts.newWorkingDb(dbConf); } @Override 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-09-07 16:34:49 UTC (rev 635) @@ -43,6 +43,8 @@ */ public class ImportDbServiceTest extends EchoBaseTestServiceSupport { + public static final String DB_VERSION = "1.2"; + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(null); @@ -51,8 +53,6 @@ @Test public void importDb() throws IOException, TopiaException { - serviceContext.getTransaction().updateSchema(); - ImportDbService service = getService(ImportDbService.class); ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); @@ -61,7 +61,7 @@ FileUtil.createDirectoryIfNecessary(workingDirectory); conf.setWorkingDirectory(workingDirectory); - prepareInputFile(conf.getInput(), "/echobase-0.3-importDb-referentiel.zip"); + prepareInputFile(conf.getInput(), "/echobase-" + DB_VERSION + "-importDb-referentiel.zip"); EchoBaseUser user = new EchoBaseUserImpl(); user.setEmail("testUser@fake.fr"); 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -50,6 +50,7 @@ import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.ImportDbServiceTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -81,19 +82,19 @@ public static final TimeLog TIME_LOG = new TimeLog(AbstractImportDataServiceIT.class); - 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_NO_DATA = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-nodata.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_COMMON_DATA = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-commonData.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_OPERATION = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-operation.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES = "/import-data/echobase-0.3-catches.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-catches.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-catches-and-voyage-result.h2.db.gz"; -// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz"; +// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-catches-and-acoustic.h2.db.gz"; -// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz"; +// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-" + ImportDbServiceTest.DB_VERSION + "-catches-and-acoustic-and-voyage-result.h2.db.gz"; public static final String VESSEL_ID = "fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855"; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticImportServiceIT.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -85,11 +85,13 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, AcousticImportService.class, 1); - assertCsvImportResult(result, 0, DataAcquisition.class, NB_DATA_ACQUISITION,NB_DATA_ACQUISITION); - assertCsvImportResult(result, 0, DataProcessing.class, NB_DATA_PROCESSING,0); - assertCsvImportResult(result, 0, Cell.class, NB_CELL,0); - assertCsvImportResult(result, 0, Data.class, NB_DATA,0); + assertNbIDs(result, 0, NB_CELL); + assertCsvImportResult(result, 0, DataAcquisition.class, NB_DATA_ACQUISITION); + assertCsvImportResult(result, 0, DataProcessing.class, NB_DATA_PROCESSING); + assertCsvImportResult(result, 0, Cell.class, NB_CELL); + assertCsvImportResult(result, 0, Data.class, NB_DATA); + assertImportAcousticDatas(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -70,17 +70,21 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CatchesImportService.class, 3); - assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE, NB_SAMPLE_TOTAL); - assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA, 0); - assertCsvImportResult(result, 0, SpeciesCategory.class, 4, 0, 456, 0); + assertNbIDs(result, 0, NB_SAMPLE_TOTAL); - assertCsvImportResult(result, 1, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE, NB_SAMPLE_UNSORTED); - assertCsvImportResult(result, 1, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA, 0); - assertCsvImportResult(result, 1, SpeciesCategory.class, 9, 0, 456, 0); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 0, SpeciesCategory.class, 4, 0, 456); - assertCsvImportResult(result, 2, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE, NB_SAMPLE_BIOMETRY); - assertCsvImportResult(result, 2, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA, 0); + assertNbIDs(result, 1, NB_SAMPLE_UNSORTED); + assertCsvImportResult(result, 1, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); + assertCsvImportResult(result, 1, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 1, SpeciesCategory.class, 9, 0, 456); + assertNbIDs(result, 2, NB_SAMPLE_BIOMETRY); + assertCsvImportResult(result, 2, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); + assertCsvImportResult(result, 2, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); + assertImportSampleDatas(); } @@ -103,8 +107,9 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CatchesImportService.class, 1); - assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, NB_SAMPLE_TOTAL); - assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0); + assertNbIDs(result, 0, NB_SAMPLE_TOTAL); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL); } @Ignore @@ -126,8 +131,9 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CatchesImportService.class, 1); - assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_UNSORTED, NB_SAMPLE_UNSORTED); - assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0); + assertNbIDs(result, 0, NB_SAMPLE_UNSORTED); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_UNSORTED); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_UNSORTED); } @Ignore @@ -148,8 +154,10 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CatchesImportService.class, 1); - assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_BIOMETRY, NB_SAMPLE_BIOMETRY); - assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0); + + assertNbIDs(result, 0, NB_SAMPLE_BIOMETRY); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_BIOMETRY); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_BIOMETRY); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -80,10 +80,15 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CommonAllImportService.class, 3); - assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE,NB_VOYAGE); - assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT,0); - assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT,0); + assertNbIDs(result, 0, NB_VOYAGE); + assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE); + assertNbIDs(result, 1, 0); + assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT); + + assertNbIDs(result, 2, 0); + assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT); + assertImportCommonData(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -76,7 +76,8 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, CommonTransectImportService.class, 1); - assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT,NB_TRANSECT); + assertNbIDs(result, 0, NB_TRANSECT); + assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT); assertImportCommonData(); } 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -71,10 +71,15 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, OperationImportService.class, 3); - assertCsvImportResult(result, 0, Operation.class, NB_OPERATION,NB_OPERATION); - assertCsvImportResult(result, 1, OperationMetadataValue.class, NB_OPERATION_METADATAVALUE,0); - assertCsvImportResult(result, 2, GearMetadataValue.class, NB_GEAR_METADATAVALUE,0); + assertNbIDs(result, 0, NB_OPERATION); + assertCsvImportResult(result, 0, Operation.class, NB_OPERATION); + assertNbIDs(result, 1, 0); + assertCsvImportResult(result, 1, OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); + + assertNbIDs(result, 2, 0); + assertCsvImportResult(result, 2, GearMetadataValue.class, NB_GEAR_METADATAVALUE); + assertImportOperations(); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -80,8 +80,10 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result, 0, Result.class, 43533,43533); - assertCsvImportResult(result, 0, Category.class, 7,0); + assertNbIDs(result, 0, 43533); + + assertCsvImportResult(result, 0, Result.class, 43533); + assertCsvImportResult(result, 0, Category.class, 7); } @Test @@ -112,9 +114,11 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result, 0, Result.class, 357291,357291); - assertCsvImportResult(result, 0, Category.class, 27,0); - assertCsvImportResult(result, 0, SpeciesCategory.class, 1, 0, 457,0); + assertNbIDs(result, 0, 357291); + + assertCsvImportResult(result, 0, Result.class, 357291); + assertCsvImportResult(result, 0, Category.class, 27); + assertCsvImportResult(result, 0, SpeciesCategory.class, 1, 0, 457); } @Test @@ -145,10 +149,11 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result, 0, Result.class, 68108,68108); - assertCsvImportResult(result, 0, Category.class, 129,0); - assertCsvImportResult(result, 0, SpeciesCategory.class, 129, 0, 585,0); - assertCsvImportResult(result, 0, SizeCategory.class, 62, 0, 69,0); + assertNbIDs(result, 0, 68108); + assertCsvImportResult(result, 0, Result.class, 68108); + assertCsvImportResult(result, 0, Category.class, 129); + assertCsvImportResult(result, 0, SpeciesCategory.class, 129, 0, 585); + assertCsvImportResult(result, 0, SizeCategory.class, 62, 0, 69); } @Test @@ -179,10 +184,11 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result, 0, Category.class, 14,0); - assertCsvImportResult(result, 0, Result.class, 10021,10021); - assertCsvImportResult(result, 0, AgeCategory.class, 6, 0, 10,0); - assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 470,0); + assertNbIDs(result, 0, 10021); + assertCsvImportResult(result, 0, Category.class, 14); + assertCsvImportResult(result, 0, Result.class, 10021); + assertCsvImportResult(result, 0, AgeCategory.class, 6, 0, 10); + assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 470); } } \ No newline at end of file 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -72,10 +72,12 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsMapCellImportService.class, 1); - assertCsvImportResult(result, 0, Cell.class, 380, 380); - assertCsvImportResult(result, 0, Data.class, 2280, 0); - assertCsvImportResult(result, 0, Result.class, 380, 0); - assertCsvImportResult(result, 0, Category.class, 1, 0); + assertNbIDs(result,0,380); + + assertCsvImportResult(result, 0, Cell.class, 380); + assertCsvImportResult(result, 0, Data.class, 2280); + assertCsvImportResult(result, 0, Result.class, 380); + assertCsvImportResult(result, 0, Category.class, 1); } } \ No newline at end of file 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -82,12 +82,14 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsRegionCellImportService.class, 3); - assertCsvImportResult(result, 0, Cell.class, 10, 0, 2083,10); - assertCsvImportResult(result, 0, Data.class, 238,0); - assertCsvImportResult(result, 1, Cell.class, 0, 4146, 2083,0); - assertCsvImportResult(result, 2, Result.class, 2128,0); - assertCsvImportResult(result, 2, Category.class, 27,0); - assertCsvImportResult(result, 2, SpeciesCategory.class, 1, 0, 457,0); + assertNbIDs(result, 0, 10); + + assertCsvImportResult(result, 0, Cell.class, 10, 0, 2083); + assertCsvImportResult(result, 0, Data.class, 238); + assertCsvImportResult(result, 1, Cell.class, 0, 4146, 2083); + assertCsvImportResult(result, 2, Result.class, 2128); + assertCsvImportResult(result, 2, Category.class, 27); + assertCsvImportResult(result, 2, SpeciesCategory.class, 1, 0, 457); } } \ No newline at end of file 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-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-09-07 16:34:49 UTC (rev 635) @@ -75,9 +75,14 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsVoyageImportService.class, 3); - assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY, NB_LENGTH_AGE_KEY); - assertCsvImportResult(result, 1, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY, NB_LENGTH_WEIGHT_KEY); - assertCsvImportResult(result, 2, Echotype.class, NB_ECHOTYPE, NB_ECHOTYPE); + assertNbIDs(result, 0, NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); + + assertNbIDs(result, 1, NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 1, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); + + assertNbIDs(result, 2, NB_ECHOTYPE); + assertCsvImportResult(result, 2, Echotype.class, NB_ECHOTYPE); } @Ignore @@ -102,7 +107,8 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsVoyageImportService.class, 1); - assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY, NB_LENGTH_AGE_KEY); + assertNbIDs(result, 0, NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); } @Ignore @@ -127,7 +133,8 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsVoyageImportService.class, 1); - assertCsvImportResult(result, 0, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY, NB_LENGTH_WEIGHT_KEY); + assertNbIDs(result, 0, NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 0, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); } @Ignore @@ -151,7 +158,8 @@ List<EchoBaseCsvFileImportResult> result; result = doImport(conf, ResultsVoyageImportService.class, 1); - assertCsvImportResult(result, 0, Echotype.class, NB_ECHOTYPE, NB_ECHOTYPE); + assertNbIDs(result, 0, NB_ECHOTYPE); + assertCsvImportResult(result, 0, Echotype.class, NB_ECHOTYPE); } } \ No newline at end of file Deleted: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/echobase-1.2-importDb-referentiel.zip (from rev 622, 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-1.2-importDb-referentiel.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-services/src/test/resources/import-data/common/transect.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/common/transit.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/common/voyage.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches-and-voyage-result.h2.db.gz (from rev 622, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz) =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-catches.h2.db.gz (from rev 622, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz) =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-commonData.h2.db.gz (from rev 622, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz) =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-nodata.h2.db.gz (from rev 622, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz) =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/echobase-1.2-operation.h2.db.gz (from rev 622, trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz) =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthWeightKey.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-09-07 14:02:07 UTC (rev 634) +++ trunk/echobase-services/update-import-data-db.sh 2012-09-07 16:34:49 UTC (rev 635) @@ -8,7 +8,7 @@ exit fi -dbnameprefix="echobase-0.3" +dbnameprefix="echobase-1.2" dbDir=src/test/resources/import-data @@ -16,7 +16,7 @@ testId=$1 dbdst=$2 echo "execute mvn test -Dtest=$testId ..." - mvn test -Dtest=$testId &>/tmp/maven-$testId.log + mvn test -Dtest=$testId -Dmaven.surefire.debug &>/tmp/maven-$testId.log if [ $? -eq 1 ]; then echo "Error with test $testId, see /tmp/maven-$testId.log" exit 1