Author: tchemit Date: 2012-03-08 19:32:11 +0100 (Thu, 08 Mar 2012) New Revision: 338 Url: http://forge.codelutin.com/repositories/revision/echobase/338 Log: Mise a jour des bases de tests (avec le dernier referentiel) Mise a jour des imports Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/CatchesDataImportServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/OperationImportServiceTest.java 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-nodata.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/CatchesDataImportServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/CatchesDataImportServiceTest.java 2012-03-08 18:31:24 UTC (rev 337) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/CatchesDataImportServiceTest.java 2012-03-08 18:32:11 UTC (rev 338) @@ -74,10 +74,6 @@ CatchesDataImportService service = getService(CatchesDataImportService.class); - //FIXME : Il reste des NA - //FIXME : remove this when db will have such data - service.create(getDAO(Species.class), Species.PROPERTY_BARACOUDA_CODE, "CARI-DAC"); - List<CsvFileImportResult> result = service.doImport(conf, createFakeUser()); @@ -148,10 +144,6 @@ CatchesDataImportService service = getService(CatchesDataImportService.class); - //FIXME : Il reste des NA - //FIXME : remove this when db will have such data - service.create(getDAO(Species.class), Species.PROPERTY_BARACOUDA_CODE, "CARI-DAC"); - List<CsvFileImportResult> result = service.doImport(conf, createFakeUser()); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/OperationImportServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/OperationImportServiceTest.java 2012-03-08 18:31:24 UTC (rev 337) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/OperationImportServiceTest.java 2012-03-08 18:32:11 UTC (rev 338) @@ -77,14 +77,6 @@ OperationImportService service = getService(OperationImportService.class); - //FIXME : Encore des chalut mal nommé Chalut aa/bb au lieu de aaxbb - //FIXME : remove this when db will have such data - service.create(getDAO(Gear.class), Gear.PROPERTY_CASINO_GEAR_NAME, "PS"); - service.create(getDAO(GearMetadata.class), GearMetadata.PROPERTY_NAME, "AverageSpeed"); - service.create(getDAO(GearMetadata.class), GearMetadata.PROPERTY_NAME, "VesselHeading"); - service.create(getDAO(GearMetadata.class), GearMetadata.PROPERTY_NAME, "DriftHeading"); - service.create(getDAO(GearMetadata.class), GearMetadata.PROPERTY_NAME, "DriftSpeed"); - List<CsvFileImportResult> result = service.doImport(conf, createFakeUser()); Assert.assertNotNull(result); Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData-result.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-result.h2.db.gz =================================================================== (Binary files differ)