Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • 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;
    28 28 
     import fr.ird.observe.services.service.DatabaseNotFoundException;
    29 29 
     import fr.ird.observe.services.test.DatabaseName;
    30 30 
     import fr.ird.observe.services.test.ServiceTestSupport;
    31 
    +import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    31 32 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    32 33 
     import java.util.Set;
    33 34 
     import org.junit.Assert;
    ... ... @@ -49,6 +50,7 @@ public class ConsolidateDataServiceTest extends ServiceTestSupport {
    49 50 
         }
    50 51
    51 52 
         @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    53 
    +    @CopyDatabaseConfiguration
    52 54 
         @Test
    53 55 
         public void testConsolidateTripSeine() {
    54 56

  • services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java
    ... ... @@ -42,7 +42,6 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    42 42
    43 43 
             int row = 0;
    44 44
    45 
    -//        FIXME!!! Certaines valeurs ont changé comprendre pk ?
    46 45 
             assertResultRow(result, row++, "[FAO]LUK [sc]Selene dorsalis [fr]Selene dorsalis", "-", "-");
    47 46 
             assertResultRow(result, row++, "[FAO]ETA [sc]Etelis carbunculus [fr]Vivaneau rubis", "-", "-");
    48 47 
             assertResultRow(result, row++, "[FAO]BAB [sc]Sphyraena qenie [fr]Barracuda à queue noire", "-", "-");
    ... ... @@ -58,8 +57,8 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    58 57 
             assertResultRow(result, row++, "[FAO]BVP [sc]Balistes punctatus [fr]Baliste à taches bleues", "-", "-");
    59 58 
             assertResultRow(result, row++, "[FAO]BAR [sc]Sphyraena spp [fr]Barracudas nca", "-", "-");
    60 59 
             assertResultRow(result, row++, "[FAO]ALN [sc]Aluterus scriptus [fr]Bourse écriture", "+ Effectif : 1 Poids total (t) : 0.00050", "-");
    61 
    -        assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01120");
    62 
    -        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");
    60 
    +        assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01060");
    61 
    +        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");
    63 62 
             assertResultRow(result, row++, "[FAO]BAF [sc]Ablennes hians [fr]Orphie plate ", "-", "-");
    64 63 
             assertResultRow(result, row++, "[FAO]BIS [sc]Selar crumenophthalmus [fr]Sélar coulisou (Pêche-cavale)", "-", "-");
    65 64 
             assertResultRow(result, row++, "[FAO]BON [sc]Sarda sarda [fr]Bonite à dos rayé", "-", "+ Effectif : 11");
    ... ... @@ -69,11 +68,11 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    69 68 
             assertResultRow(result, row++, "[FAO]CAQ [sc]Catharacta lonnbergi [fr]Labbe brun", "-", "-");
    70 69 
             assertResultRow(result, row++, "[FAO]CBG [sc]Cubiceps gracilis [fr]Libine", "-", "-");
    71 70 
             assertResultRow(result, row++, "[FAO]DVH [sc]Cyclichthys orbicularis [fr]Cyclichthys orbicularis", "-", "-");
    72 
    -        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");
    71 
    +        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");
    73 72 
             assertResultRow(result, row++, "[FAO]CLP [sc]Clupeidae  [fr]Famille Clupeidae", "-", "-");
    74 73 
             assertResultRow(result, row++, "[FAO]NXU [sc]Caranx lugubris [fr]Carangue noire", "-", "-");
    75 74 
             assertResultRow(result, row++, "[FAO]CFW [sc]Coryphaena equiselis [fr]Coryphène dauphin", "+ Effectif : 2 Poids total (t) : 0.008", "-");
    76 
    -        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");
    75 
    +        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");
    77 76 
             assertResultRow(result, row++, "[FAO]NGT [sc]Carangoides orthogrammus [fr]Carangue des îles ", "-", "-");
    78 77 
             assertResultRow(result, row++, "[FAO]CXS [sc]Caranx sexfasciatus [fr]Carangue vorace ", "-", "+ Effectif : 22 Poids total (t) : 0.01100");
    79 78 
             assertResultRow(result, row++, "[FAO]RUB [sc]Caranx crysos [fr]Carangue coubali", "-", "-");
    ... ... @@ -85,7 +84,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    85 84 
             assertResultRow(result, row++, "[FAO]DIO [sc]Diodontidae [fr]Famille Diodontidae", "+ Effectif : 1 Poids total (t) : 0.00050", "-");
    86 85 
             assertResultRow(result, row++, "[FAO]3DEY [sc]Diodon eydouxii [fr]Porc-épic", "-", "-");
    87 86 
             assertResultRow(result, row++, "[FAO]EHN [sc]Echeneis naucrates [fr]Rémora commun ", "+ Effectif : 7 Poids total (t) : 0.00350", "-");
    88 
    -        assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45101");
    87 
    +        assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45108");
    89 88 
             assertResultRow(result, row++, "[FAO]HTL [sc]Phtheirichthys lineatus  [fr]Rémora ", "-", "-");
    90 89 
             assertResultRow(result, row++, "[FAO]TRI [sc]Balistidae [fr]Famille Balistidae", "-", "-");
    91 90 
             assertResultRow(result, row++, "[FAO]BEN [sc]Belonidae [fr]Famille Belonidae", "-", "-");
    ... ... @@ -117,7 +116,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    117 116 
             assertResultRow(result, row++, "[FAO]LEC [sc]Lepidocybium flavobrunneum [fr]Escolier noir", "-", "-");
    118 117 
             assertResultRow(result, row++, "[FAO]LFX [sc]Lagocephalus spp [fr]Lagocephalus spp", "-", "-");
    119 118 
             assertResultRow(result, row++, "[FAO]LGH [sc]Lagocephalus lagocephalus [fr]Compère océanique ", "-", "-");
    120 
    -        assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.0676");
    119 
    +        assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.06754");
    121 120 
             assertResultRow(result, row++, "[FAO]LOP [sc]Lophotus capellei [fr]Roi des harengs", "-", "-");
    122 121 
             assertResultRow(result, row++, "[FAO]LVM [sc]Luvarus imperialis [fr]Luvar ", "-", "-");
    123 122 
             assertResultRow(result, row++, "[FAO]MRW [sc]Masturus lanceolatus [fr]Poisson-lune à queue pointue", "-", "-");
    ... ... @@ -151,7 +150,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    151 150 
             assertResultRow(result, row++, "[FAO]MAS [sc]Scomber japonicus [fr]Maquereau espagnol", "-", "-");
    152 151 
             assertResultRow(result, row++, "[FAO]SLP [sc]Hydrurga leptonyx [fr]Léopard de mer", "-", "-");
    153 152 
             assertResultRow(result, row++, "[FAO]SNK [sc]Thyrsites atun [fr]Escolier", "-", "-");
    154 
    -        assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.1124");
    153 
    +        assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.11222");
    155 154 
             assertResultRow(result, row++, "[FAO]BAZ [sc]Sphyraenidae [fr]Famille Sphyraenidae", "-", "-");
    156 155 
             assertResultRow(result, row++, "[FAO]SQC [sc]Loligo spp [fr]Calmars Loligo nca", "-", "-");
    157 156 
             assertResultRow(result, row++, "[FAO]MAC [sc]Scomber scombrus [fr]Maquereau commun", "-", "-");
    ... ... @@ -169,7 +168,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
    169 168 
             assertResultRow(result, row++, "[FAO]URU [sc]Uraspis uraspis [fr]Carangue paia ", "-", "-");
    170 169 
             assertResultRow(result, row++, "[FAO]VLF* [sc]Very long fish nei [fr]Très longs poissons nca", "-", "-");
    171 170 
             assertResultRow(result, row++, "[FAO]VVL* [sc]Very very long fish nei [fr]Très très longs poissons nca", "-", "-");
    172 
    -        assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6783");
    171 
    +        assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6800");
    173 172 
             assertResultRow(result, row++, "[FAO]9XXX [sc]Indéterminé [fr]Indéterminé", "-", "-");
    174 173 
             assertResultRow(result, row++, "[FAO]XXX* [sc] [fr]", "-", "-");
    175 174 
             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
    ... ... @@ -103,10 +103,8 @@ public class ReportAccessoryCatchTest extends AbstractReportServiceTest {
    103 103 
             assertResultRow(result, row++, "[FAO]CCE [sc]Carcharhinus leucas [fr]Requin-bouledogue", "-", "-");
    104 104 
             assertResultRow(result, row++, "[FAO]CCL [sc]Carcharhinus limbatus [fr]Requin bordé", "-", "-");
    105 105 
             assertResultRow(result, row++, "[FAO]CCP [sc]Carcharhinus plumbeus [fr]Requin gris", "-", "-");
    106 
    -//        FIXME!!! Ca change ???
    107 
    -        assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1751");
    108 
    -//        FIXME!!! Ca change ???
    109 
    -        assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0446", "-");
    106 
    +        assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1753");
    107 
    +        assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0447", "-");
    110 108 
             assertResultRow(result, row++, "[FAO]CWZ [sc]Carcharhinus spp [fr]Requins Carcharhinus nca", "-", "-");
    111 109 
             assertResultRow(result, row++, "[FAO]DUS [sc]Carcharhinus obscurus [fr]Requin sombre", "-", "-");
    112 110 
             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
    ... ... @@ -295,9 +295,7 @@ public class ValidateServiceTest extends ServiceTestSupport {
    295 295 
             assertValidateResult(result, TransmittingBuoyDto.class, 1);
    296 296 
             assertValidateResult(result, SetSeineDto.class, 3);
    297 297 
             assertValidateResult(result, NonTargetCatchDto.class, 2);
    298 
    -//         FIXME!!! fr.ird.observe.entities.seine.NonTargetLength#1361823413607#0.2806937404765002 On a une erreur non connue avant
    299 
    -//        FIXME!!! Le poids pour cette espèce doit être compris entre 8.0 et 600.0.
    300 
    -        assertValidateResult(result, NonTargetLengthDto.class, 7); // 1009 !!!
    298 
    +        assertValidateResult(result, NonTargetLengthDto.class, 6); // 1009 !!!
    301 299 
             assertValidateResult(result, TargetLengthDto.class, 1); // 85 !!!
    302 300 
             assertValidateResult(result, FloatingObjectDto.class, 1);
    303 301

  • services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
    ... ... @@ -37,13 +37,12 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
    37 37 
     import fr.ird.observe.services.service.data.longline.TripLonglineService;
    38 38 
     import fr.ird.observe.services.service.data.seine.TripSeineService;
    39 39 
     import fr.ird.observe.services.test.DatabaseName;
    40 
    -import fr.ird.observe.test.ObserveFixtures;
    41 40 
     import fr.ird.observe.services.test.ServiceTestSupport;
    42 41 
     import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    43 42 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    43 
    +import fr.ird.observe.test.ObserveFixtures;
    44 44 
     import org.junit.Assert;
    45 45 
     import org.junit.Before;
    46 
    -import org.junit.Ignore;
    47 46 
     import org.junit.Test;
    48 47
    49 48 
     /**
    ... ... @@ -51,7 +50,6 @@ import org.junit.Test;
    51 50 
      *
    52 51 
      * @author Tony Chemit - dev@tchemit.fr
    53 52 
      */
    54 
    -@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    55 53 
     public class TripManagementServiceTest extends ServiceTestSupport {
    56 54
    57 55 
         private TripManagementService tripManagementService;
    ... ... @@ -63,16 +61,18 @@ public class TripManagementServiceTest extends ServiceTestSupport {
    63 61 
             tripSeineService = getTestMethodResource().newService(TripSeineService.class);
    64 62 
         }
    65 63
    64 
    +    @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    66 65 
         @Test
    67 
    -    public void exportTrip() {
    66 
    +    public void exportTripSeine() {
    68 67 
             ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1);
    69 68 
             ExportTripResult result = tripManagementService.exportTrip(request);
    70 69 
             Assert.assertNotNull(result);
    71 70 
         }
    72 71
    72 
    +    @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    73 73 
         @CopyDatabaseConfiguration
    74 74 
         @Test
    75 
    -    public void deleteTrip() {
    75 
    +    public void deleteTripSeine() {
    76 76
    77 77 
             DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine();
    78 78
    ... ... @@ -84,6 +84,8 @@ public class TripManagementServiceTest extends ServiceTestSupport {
    84 84 
             Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1);
    85 85 
         }
    86 86
    87 
    +    @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    88 
    +    @CopyDatabaseConfiguration
    87 89 
         @Test
    88 90 
         public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
    89 91
    ... ... @@ -93,8 +95,9 @@ public class TripManagementServiceTest extends ServiceTestSupport {
    93 95 
         }
    94 96
    95 97 
         // FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines)
    96 
    -    @Ignore
    98 
    +//    @Ignore
    97 99 
         @DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
    100 
    +    @CopyDatabaseConfiguration
    98 101 
         @Test
    99 102 
         public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
    100 103

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.