Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3933f93e by Tony CHEMIT at 2017-10-25T18:28:23+02:00 fix isolation on services tests, happy to get back it works as it was before refactor \o/ - - - - - 5 changed files: - services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java - services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java Changes: ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java @@ -28,6 +28,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ServiceTestSupport; +import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import java.util.Set; import org.junit.Assert; @@ -49,6 +50,7 @@ public class ConsolidateDataServiceTest extends ServiceTestSupport { } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) + @CopyDatabaseConfiguration @Test public void testConsolidateTripSeine() { ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java @@ -42,7 +42,6 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { int row = 0; -// FIXME!!! Certaines valeurs ont changé comprendre pk ? assertResultRow(result, row++, "[FAO]LUK [sc]Selene dorsalis [fr]Selene dorsalis", "-", "-"); assertResultRow(result, row++, "[FAO]ETA [sc]Etelis carbunculus [fr]Vivaneau rubis", "-", "-"); assertResultRow(result, row++, "[FAO]BAB [sc]Sphyraena qenie [fr]Barracuda à queue noire", "-", "-"); @@ -58,8 +57,8 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]BVP [sc]Balistes punctatus [fr]Baliste à taches bleues", "-", "-"); assertResultRow(result, row++, "[FAO]BAR [sc]Sphyraena spp [fr]Barracudas nca", "-", "-"); assertResultRow(result, row++, "[FAO]ALN [sc]Aluterus scriptus [fr]Bourse écriture", "+ Effectif : 1 Poids total (t) : 0.00050", "-"); - assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01120"); - assertResultRow(result, row++, "[FAO]CNT [sc]Canthidermis maculata [fr]Baliste rude", "+ Effectif : 2 Poids total (t) : 0.00140", "+ Effectif : 2230 Poids total (t) : 1.5610"); + assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01060"); + assertResultRow(result, row++, "[FAO]CNT [sc]Canthidermis maculata [fr]Baliste rude", "+ Effectif : 2 Poids total (t) : 0.00134", "+ Effectif : 2230 Poids total (t) : 1.49359"); assertResultRow(result, row++, "[FAO]BAF [sc]Ablennes hians [fr]Orphie plate ", "-", "-"); assertResultRow(result, row++, "[FAO]BIS [sc]Selar crumenophthalmus [fr]Sélar coulisou (Pêche-cavale)", "-", "-"); assertResultRow(result, row++, "[FAO]BON [sc]Sarda sarda [fr]Bonite à dos rayé", "-", "+ Effectif : 11"); @@ -69,11 +68,11 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]CAQ [sc]Catharacta lonnbergi [fr]Labbe brun", "-", "-"); assertResultRow(result, row++, "[FAO]CBG [sc]Cubiceps gracilis [fr]Libine", "-", "-"); assertResultRow(result, row++, "[FAO]DVH [sc]Cyclichthys orbicularis [fr]Cyclichthys orbicularis", "-", "-"); - assertResultRow(result, row++, "[FAO]MSD [sc]Decapterus macarellus [fr]Comète maquereau ", "+ Effectif : 47 Poids total (t) : 0.00235", "+ Effectif : 6 Poids total (t) : 0.0024"); + assertResultRow(result, row++, "[FAO]MSD [sc]Decapterus macarellus [fr]Comète maquereau ", "+ Effectif : 47 Poids total (t) : 0.0024", "+ Effectif : 6 Poids total (t) : 0.0027"); assertResultRow(result, row++, "[FAO]CLP [sc]Clupeidae [fr]Famille Clupeidae", "-", "-"); assertResultRow(result, row++, "[FAO]NXU [sc]Caranx lugubris [fr]Carangue noire", "-", "-"); assertResultRow(result, row++, "[FAO]CFW [sc]Coryphaena equiselis [fr]Coryphène dauphin", "+ Effectif : 2 Poids total (t) : 0.008", "-"); - assertResultRow(result, row++, "[FAO]DOL [sc]Coryphaena hippurus [fr]Coryphène commun", "+ Effectif : 5 Poids total (t) : 0.03824", "+ Effectif : 107 Poids total (t) : 0.5774"); + assertResultRow(result, row++, "[FAO]DOL [sc]Coryphaena hippurus [fr]Coryphène commun", "+ Effectif : 5 Poids total (t) : 0.03824", "+ Effectif : 107 Poids total (t) : 0.57632"); assertResultRow(result, row++, "[FAO]NGT [sc]Carangoides orthogrammus [fr]Carangue des îles ", "-", "-"); assertResultRow(result, row++, "[FAO]CXS [sc]Caranx sexfasciatus [fr]Carangue vorace ", "-", "+ Effectif : 22 Poids total (t) : 0.01100"); assertResultRow(result, row++, "[FAO]RUB [sc]Caranx crysos [fr]Carangue coubali", "-", "-"); @@ -85,7 +84,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]DIO [sc]Diodontidae [fr]Famille Diodontidae", "+ Effectif : 1 Poids total (t) : 0.00050", "-"); assertResultRow(result, row++, "[FAO]3DEY [sc]Diodon eydouxii [fr]Porc-épic", "-", "-"); assertResultRow(result, row++, "[FAO]EHN [sc]Echeneis naucrates [fr]Rémora commun ", "+ Effectif : 7 Poids total (t) : 0.00350", "-"); - assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45101"); + assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45108"); assertResultRow(result, row++, "[FAO]HTL [sc]Phtheirichthys lineatus [fr]Rémora ", "-", "-"); assertResultRow(result, row++, "[FAO]TRI [sc]Balistidae [fr]Famille Balistidae", "-", "-"); assertResultRow(result, row++, "[FAO]BEN [sc]Belonidae [fr]Famille Belonidae", "-", "-"); @@ -117,7 +116,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]LEC [sc]Lepidocybium flavobrunneum [fr]Escolier noir", "-", "-"); assertResultRow(result, row++, "[FAO]LFX [sc]Lagocephalus spp [fr]Lagocephalus spp", "-", "-"); assertResultRow(result, row++, "[FAO]LGH [sc]Lagocephalus lagocephalus [fr]Compère océanique ", "-", "-"); - assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.0676"); + assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.06754"); assertResultRow(result, row++, "[FAO]LOP [sc]Lophotus capellei [fr]Roi des harengs", "-", "-"); assertResultRow(result, row++, "[FAO]LVM [sc]Luvarus imperialis [fr]Luvar ", "-", "-"); assertResultRow(result, row++, "[FAO]MRW [sc]Masturus lanceolatus [fr]Poisson-lune à queue pointue", "-", "-"); @@ -151,7 +150,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]MAS [sc]Scomber japonicus [fr]Maquereau espagnol", "-", "-"); assertResultRow(result, row++, "[FAO]SLP [sc]Hydrurga leptonyx [fr]Léopard de mer", "-", "-"); assertResultRow(result, row++, "[FAO]SNK [sc]Thyrsites atun [fr]Escolier", "-", "-"); - assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.1124"); + assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.11222"); assertResultRow(result, row++, "[FAO]BAZ [sc]Sphyraenidae [fr]Famille Sphyraenidae", "-", "-"); assertResultRow(result, row++, "[FAO]SQC [sc]Loligo spp [fr]Calmars Loligo nca", "-", "-"); assertResultRow(result, row++, "[FAO]MAC [sc]Scomber scombrus [fr]Maquereau commun", "-", "-"); @@ -169,7 +168,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest { assertResultRow(result, row++, "[FAO]URU [sc]Uraspis uraspis [fr]Carangue paia ", "-", "-"); assertResultRow(result, row++, "[FAO]VLF* [sc]Very long fish nei [fr]Très longs poissons nca", "-", "-"); assertResultRow(result, row++, "[FAO]VVL* [sc]Very very long fish nei [fr]Très très longs poissons nca", "-", "-"); - assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6783"); + assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6800"); assertResultRow(result, row++, "[FAO]9XXX [sc]Indéterminé [fr]Indéterminé", "-", "-"); assertResultRow(result, row++, "[FAO]XXX* [sc] [fr]", "-", "-"); assertResultRow(result, row++, "[FAO]YMO [sc]Sthenoteuthis oualaniensis [fr]Encornet bande violette", "-", "-"); ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java @@ -103,10 +103,8 @@ public class ReportAccessoryCatchTest extends AbstractReportServiceTest { assertResultRow(result, row++, "[FAO]CCE [sc]Carcharhinus leucas [fr]Requin-bouledogue", "-", "-"); assertResultRow(result, row++, "[FAO]CCL [sc]Carcharhinus limbatus [fr]Requin bordé", "-", "-"); assertResultRow(result, row++, "[FAO]CCP [sc]Carcharhinus plumbeus [fr]Requin gris", "-", "-"); -// FIXME!!! Ca change ??? - assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1751"); -// FIXME!!! Ca change ??? - assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0446", "-"); + assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1753"); + assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0447", "-"); assertResultRow(result, row++, "[FAO]CWZ [sc]Carcharhinus spp [fr]Requins Carcharhinus nca", "-", "-"); assertResultRow(result, row++, "[FAO]DUS [sc]Carcharhinus obscurus [fr]Requin sombre", "-", "-"); assertResultRow(result, row++, "[FAO]SHL [sc]Etmopterus spp [fr]Genre Etmopterus", "-", "-"); ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java @@ -295,9 +295,7 @@ public class ValidateServiceTest extends ServiceTestSupport { assertValidateResult(result, TransmittingBuoyDto.class, 1); assertValidateResult(result, SetSeineDto.class, 3); assertValidateResult(result, NonTargetCatchDto.class, 2); -// FIXME!!! fr.ird.observe.entities.seine.NonTargetLength#1361823413607#0.2806937404765002 On a une erreur non connue avant -// FIXME!!! Le poids pour cette espèce doit être compris entre 8.0 et 600.0. - assertValidateResult(result, NonTargetLengthDto.class, 7); // 1009 !!! + assertValidateResult(result, NonTargetLengthDto.class, 6); // 1009 !!! assertValidateResult(result, TargetLengthDto.class, 1); // 85 !!! assertValidateResult(result, FloatingObjectDto.class, 1); ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java @@ -37,13 +37,12 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; /** @@ -51,7 +50,6 @@ import org.junit.Test; * * @author Tony Chemit - dev@tchemit.fr */ -@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class TripManagementServiceTest extends ServiceTestSupport { private TripManagementService tripManagementService; @@ -63,16 +61,18 @@ public class TripManagementServiceTest extends ServiceTestSupport { tripSeineService = getTestMethodResource().newService(TripSeineService.class); } + @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test - public void exportTrip() { + public void exportTripSeine() { ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); ExportTripResult result = tripManagementService.exportTrip(request); Assert.assertNotNull(result); } + @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @Test - public void deleteTrip() { + public void deleteTripSeine() { DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine(); @@ -84,6 +84,8 @@ public class TripManagementServiceTest extends ServiceTestSupport { Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1); } + @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) + @CopyDatabaseConfiguration @Test public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { @@ -93,8 +95,9 @@ public class TripManagementServiceTest extends ServiceTestSupport { } // FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines) - @Ignore +// @Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) + @CopyDatabaseConfiguration @Test public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3933f93eddbe67a47b8287cbbac6... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3933f93eddbe67a47b8287cbbac6... You're receiving this email because of your account on gitlab.com.