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

Commits:

9 changed files:

Changes:

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java
    ... ... @@ -94,7 +94,7 @@ public abstract class AnalyzeInputSourceActionITSupport {
    94 94
             if (doIt) {
    
    95 95
                 String dbName = msConfig.dbName;
    
    96 96
                 log.debug("Do test for db " + dbName);
    
    97
    -            outputFile = new File(serviceContext.getTestDir(), "result.txt");
    
    97
    +            outputFile = new File(serviceContext.getTestDir().getParentFile().getParentFile(), dbName.replace(".mdb","-result.txt"));
    
    98 98
                 log.info("Will save result in file : " + outputFile);
    
    99 99
                 outputWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile)));
    
    100 100
                 File workingDirectory = serviceContext.getApplicationConfiguration().getTreatmentWorkingDirectory("yo", true);
    
    ... ... @@ -113,30 +113,28 @@ public abstract class AnalyzeInputSourceActionITSupport {
    113 113
             if (outputWriter != null) {
    
    114 114
                 outputWriter.flush();
    
    115 115
                 outputWriter.close();
    
    116
    +            log.info(new String(Files.readAllBytes(outputFile.toPath())));
    
    116 117
             }
    
    117 118
         }
    
    118
    -
    
    119 119
         void testExecute(OceanFixtures fixture) throws Exception {
    
    120
    -        testExecute(
    
    121
    -                fixture.nbSafe(),
    
    122
    -                fixture.nbUnsafe(),
    
    123
    -                fixture.nbSafeWithoutWell(),
    
    124
    -                fixture.nbUnsafeWithoutWell(),
    
    125
    -                TripType.STANDARD,
    
    126
    -                false,
    
    127
    -                false
    
    128
    -        );
    
    120
    +        testExecute(fixture, TripType.STANDARD);
    
    121
    +    }
    
    122
    +    void testExecute(OceanFixtures fixture, TripType tripType) throws Exception {
    
    123
    +        serviceContext.getMsConfig().setUseWells(false);
    
    124
    +        testExecute(fixture.nbSafe(), fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), tripType, false, false);
    
    125
    +//        serviceContext.getMsConfig().setUseWells(true);
    
    126
    +//        testExecute(fixture.nbSafe(), fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutWell(), TripType.STANDARD, false, false);
    
    129 127
         }
    
    130 128
     
    
    131 129
     
    
    132 130
         public void testExecute(int nbSafe,
    
    133 131
                                 int nbUnsafe,
    
    134
    -                            int nbSafeWithoutwell,
    
    132
    +                            int nbSafeWithoutWell,
    
    135 133
                                 int nbUnsafeWithoutWell) throws Exception {
    
    136 134
             testExecute(
    
    137 135
                     nbSafe,
    
    138 136
                     nbUnsafe,
    
    139
    -                nbSafeWithoutwell,
    
    137
    +                nbSafeWithoutWell,
    
    140 138
                     nbUnsafeWithoutWell,
    
    141 139
                     TripType.STANDARD,
    
    142 140
                     false,
    
    ... ... @@ -168,13 +166,16 @@ public abstract class AnalyzeInputSourceActionITSupport {
    168 166
                 Set<Trip> unsafeTrips = action.getResultAsSet(AnalyzeInputSourceAction.RESULT_UNSAFE_TRIPS, Trip.class);
    
    169 167
                 Assert.assertNotNull(unsafeTrips);
    
    170 168
                 outputWriter.write(String.format("found %d unsafe trip(s).\n", unsafeTrips.size()));
    
    169
    +
    
    170
    +            log.info(String.format("\n[%s](useWells?%b) safe : %d - unsafe : %d\n", msConfig.dbName, msConfig.isUseWells(), safeTrips.size(), unsafeTrips.size()));
    
    171
    +
    
    171 172
                 List<String> messages;
    
    172 173
                 if (log.isWarnEnabled()) {
    
    173 174
                     messages = action.getWarnMessages();
    
    174 175
                     if (CollectionUtils.isNotEmpty(messages)) {
    
    175 176
                         for (String message : messages) {
    
    176
    -                        log.warn(String.format("[WARNING] %s\n", message));
    
    177
    -//                        outputWriter.write(String.format("[WARNING] %s\n", message));
    
    177
    +//                        log.debug(String.format("[WARNING] %s", message));
    
    178
    +                        outputWriter.write(String.format("[WARNING] %s\n", message));
    
    178 179
                         }
    
    179 180
                     }
    
    180 181
                 }
    
    ... ... @@ -187,9 +188,6 @@ public abstract class AnalyzeInputSourceActionITSupport {
    187 188
                     }
    
    188 189
                 }
    
    189 190
     
    
    190
    -            outputWriter.flush();
    
    191
    -            log.info(String.format("\n[%s] safe : %d - unsafe : %d\n", msConfig.dbName, safeTrips.size(), unsafeTrips.size()));
    
    192
    -            log.info(new String(Files.readAllBytes(outputFile.toPath())));
    
    193 191
                 if (msConfig.isUseWells()) {
    
    194 192
                     Assert.assertEquals(nbSafe, safeTrips.size());
    
    195 193
                     Assert.assertEquals(nbUnsafe, unsafeTrips.size());
    

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/MSAccessTestConfiguration.java
    ... ... @@ -188,4 +188,8 @@ public class MSAccessTestConfiguration {
    188 188
         public String getProviderId() {
    
    189 189
             return providerId;
    
    190 190
         }
    
    191
    +
    
    192
    +    public void setUseWells(boolean useWells) {
    
    193
    +        this.useWells = useWells;
    
    194
    +    }
    
    191 195
     }

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java
    ... ... @@ -46,6 +46,11 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu
    46 46
         }
    
    47 47
     
    
    48 48
         @Test
    
    49
    +    public void testExecute_OA_1980() throws Exception {
    
    50
    +        testExecute(AtlanticOceanFixtures.OA_1980, TripType.LOGBOOKMISSING);
    
    51
    +    }
    
    52
    +
    
    53
    +    @Test
    
    49 54
         public void testExecute_OI_2000() throws Exception {
    
    50 55
             testExecute(IndianOceanFixtures.OI_2000);
    
    51 56
         }
    

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java
    ... ... @@ -30,73 +30,74 @@ import fr.ird.t3.actions.io.input.test.OceanFixtures;
    30 30
      */
    
    31 31
     public enum AtlanticOceanFixtures implements OceanFixtures {
    
    32 32
     
    
    33
    -    OA_1960(318, 36, 352, 2),
    
    34
    -    OA_1961(298, 63, 361, 0),
    
    35
    -    OA_1962(184, 133, 317, 0),
    
    36
    -    OA_1963(218, 157, 375, 0),
    
    37
    -    OA_1964(121, 61, 182, 0),
    
    38
    -    OA_1965(93, 31, 124, 0),
    
    39
    -    OA_1966(70, 27, 97, 0),
    
    40
    -    OA_1967(53, 27, 80, 0),
    
    41
    -    OA_1968(46, 14, 60, 0),
    
    42
    -    OA_1969(64, 21, 86, 0),
    
    43
    -
    
    44
    -    OA_1970(318, 36, 352, 2),
    
    45
    -    OA_1971(298, 63, 361, 0),
    
    46
    -    OA_1972(184, 133, 317, 0),
    
    47
    -    OA_1973(218, 157, 375, 0),
    
    48
    -    OA_1974(121, 61, 182, 0),
    
    49
    -    OA_1975(93, 31, 124, 0),
    
    50
    -    OA_1976(70, 27, 97, 0),
    
    51
    -    OA_1977(53, 27, 80, 0),
    
    52
    -    OA_1978(46, 14, 60, 0),
    
    53
    -    OA_1979(64, 21, 86, 0),
    
    54
    -
    
    55
    -    OA_1980(318, 36, 352, 2),
    
    56
    -    OA_1981(298, 63, 361, 0),
    
    57
    -    OA_1982(184, 133, 317, 0),
    
    58
    -    OA_1983(218, 157, 375, 0),
    
    59
    -    OA_1984(121, 61, 182, 0),
    
    60
    -    OA_1985(93, 31, 124, 0),
    
    61
    -    OA_1986(70, 27, 97, 0),
    
    62
    -    OA_1987(53, 27, 80, 0),
    
    63
    -    OA_1988(46, 14, 60, 0),
    
    64
    -    OA_1989(64, 21, 86, 0),
    
    65
    -
    
    66
    -    OA_1990(318, 36, 352, 2),
    
    67
    -    OA_1991(298, 63, 361, 0),
    
    68
    -    OA_1992(184, 133, 317, 0),
    
    69
    -    OA_1993(218, 157, 375, 0),
    
    70
    -    OA_1994(121, 61, 182, 0),
    
    71
    -    OA_1995(93, 31, 124, 0),
    
    72
    -    OA_1996(70, 27, 97, 0),
    
    73
    -    OA_1997(53, 27, 80, 0),
    
    74
    -    OA_1998(46, 14, 60, 0),
    
    75
    -    OA_1999(64, 21, 86, 0),
    
    76 33
     
    
    34
    +    OA_1960(151, 0),
    
    35
    +    OA_1961(159, 0),
    
    36
    +    OA_1962(203, 0),
    
    37
    +    OA_1963(807, 0),
    
    38
    +    OA_1964(709, 0),
    
    39
    +    OA_1965(911, 0),
    
    40
    +    OA_1966(942, 0),
    
    41
    +    OA_1967(993, 0),
    
    42
    +    OA_1968(1339, 0),
    
    43
    +    OA_1969(453, 1179),
    
    44
    +    OA_1970(289, 970),
    
    45
    +    OA_1971(146, 1047),
    
    46
    +    OA_1972(143, 1069),
    
    47
    +    OA_1973(235, 890),
    
    48
    +    OA_1974(254, 948),
    
    49
    +    OA_1975(248, 709),
    
    50
    +    OA_1976(149, 692),
    
    51
    +    OA_1977(40, 761),
    
    52
    +    OA_1978(56, 766),
    
    53
    +    OA_1979(76, 618),
    
    54
    +    OA_1980(324, 299),
    
    55
    +    OA_1981(365, 280),
    
    56
    +    OA_1982(416, 247),
    
    57
    +    OA_1983(343, 257),
    
    58
    +    OA_1984(297, 111),
    
    59
    +    OA_1985(325, 115),
    
    60
    +    OA_1986(214, 121),
    
    61
    +    OA_1987(186, 165),
    
    62
    +    OA_1988(212, 156),
    
    63
    +    OA_1989(192, 154),
    
    64
    +    OA_1990(141, 192),
    
    65
    +    OA_1991(268, 0),
    
    66
    +    OA_1992(250, 0),
    
    67
    +    OA_1993(281, 2),
    
    68
    +    OA_1994(278, 0),
    
    69
    +    OA_1995(243, 3),
    
    70
    +    OA_1996(90, 142),
    
    71
    +    OA_1997(36, 178),
    
    72
    +    OA_1998(205, 2),
    
    73
    +    OA_1999(323, 5),
    
    77 74
         OA_2000(318, 36, 352, 2),
    
    78
    -    OA_2001(298, 63, 361, 0),
    
    79
    -    OA_2002(184, 133, 317, 0),
    
    80
    -    OA_2003(218, 157, 375, 0),
    
    81
    -    OA_2004(121, 61, 182, 0),
    
    75
    +    OA_2001(298, 63, 358, 3),
    
    76
    +    OA_2002(184, 133, 316, 1),
    
    77
    +    OA_2003(218, 157, 369, 6),
    
    78
    +    OA_2004(121, 61, 181, 1),
    
    82 79
         OA_2005(93, 31, 124, 0),
    
    83 80
         OA_2006(70, 27, 97, 0),
    
    84
    -    OA_2007(53, 27, 80, 0),
    
    81
    +    OA_2007(53, 27, 77, 3),
    
    85 82
         OA_2008(46, 14, 60, 0),
    
    86 83
         OA_2009(64, 21, 86, 0),
    
    87
    -
    
    88 84
         OA_2010(75, 13, 87, 0),
    
    89 85
         OA_2011(75, 13, 91, 1),
    
    90 86
         OA_2012(75, 13, 97, 0),
    
    91 87
         OA_2013(75, 13, 103, 0),
    
    92
    -    OA_2014(75, 13, 91, 0),
    
    93
    -    OA_2015(75, 13, 80, 8);
    
    88
    +    OA_2014(75, 13, 90, 0),
    
    89
    +    OA_2015(75, 13, 103, 0),
    
    90
    +    OA_2016(75, 13, 52, 55);
    
    94 91
     
    
    95 92
         private final int nbSafe;
    
    96 93
         private final int nbUnsafe;
    
    97 94
         private final int nbSafeWithoutWell;
    
    98 95
         private final int nbUnsafeWithoutWell;
    
    99 96
     
    
    97
    +    AtlanticOceanFixtures(int nbSafeWithoutWell, int nbUnsafeWithoutWell) {
    
    98
    +        this(nbSafeWithoutWell, nbUnsafeWithoutWell, nbSafeWithoutWell, nbUnsafeWithoutWell);
    
    99
    +    }
    
    100
    +
    
    100 101
         AtlanticOceanFixtures(int nbSafe, int nbUnsafe, int nbSafeWithoutWell, int nbUnsafeWithoutWell) {
    
    101 102
             this.nbSafe = nbSafe;
    
    102 103
             this.nbUnsafe = nbUnsafe;
    

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionAtlanticOceanIT.java
    ... ... @@ -23,6 +23,8 @@ package fr.ird.t3.actions.io.input.it;
    23 23
     import fr.ird.t3.actions.io.input.AnalyzeInputSourceAction;
    
    24 24
     import fr.ird.t3.actions.io.input.AtlanticOceanFixtures;
    
    25 25
     import fr.ird.t3.actions.io.input.test.MSAccessTestConfiguration;
    
    26
    +import fr.ird.t3.actions.io.input.test.OceanFixtures;
    
    27
    +import fr.ird.t3.entities.data.TripType;
    
    26 28
     import fr.ird.t3.io.input.avdth.v35.T3InputProviderAvdth35;
    
    27 29
     import org.junit.Ignore;
    
    28 30
     import org.junit.Test;
    
    ... ... @@ -33,9 +35,13 @@ import org.junit.Test;
    33 35
      * @author Tony Chemit - dev@tchemit.fr
    
    34 36
      * @since 1.0
    
    35 37
      */
    
    36
    -@Ignore
    
    37 38
     public class AnalyzeInputSourceActionAtlanticOceanIT extends AnalyzeInputSourceActionITSupport implements T3AVDTHV35TestAtlanticOcean {
    
    38 39
     
    
    40
    +    @Override
    
    41
    +    void testExecute(OceanFixtures fixture) throws Exception {
    
    42
    +        super.testExecute(fixture, TripType.LOGBOOKMISSING);
    
    43
    +    }
    
    44
    +
    
    39 45
         @Test
    
    40 46
         @Override
    
    41 47
         public void testExecute_OA_1960() throws Exception {
    
    ... ... @@ -370,6 +376,11 @@ public class AnalyzeInputSourceActionAtlanticOceanIT extends AnalyzeInputSourceA
    370 376
         public void testExecute_OA_2015() throws Exception {
    
    371 377
             testExecute(AtlanticOceanFixtures.OA_2015);
    
    372 378
         }
    
    379
    +    @Test
    
    380
    +    @Override
    
    381
    +    public void testExecute_OA_2016() throws Exception {
    
    382
    +        testExecute(AtlanticOceanFixtures.OA_2016);
    
    383
    +    }
    
    373 384
     
    
    374 385
         @Override
    
    375 386
         protected MSAccessTestConfiguration createConfiguration() {
    

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionAtlanticOceanRecentIT.java
    1
    +/*
    
    2
    + * #%L
    
    3
    + * T3 :: Input AVDTH v 35
    
    4
    + * %%
    
    5
    + * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io
    
    6
    + * %%
    
    7
    + * This program is free software: you can redistribute it and/or modify
    
    8
    + * it under the terms of the GNU Affero General Public License as published by
    
    9
    + * the Free Software Foundation, either version 3 of the License, or
    
    10
    + * (at your option) any later version.
    
    11
    + *
    
    12
    + * This program is distributed in the hope that it will be useful,
    
    13
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    + * GNU General Public License for more details.
    
    16
    + *
    
    17
    + * You should have received a copy of the GNU Affero General Public License
    
    18
    + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
    19
    + * #L%
    
    20
    + */
    
    21
    +package fr.ird.t3.actions.io.input.it;
    
    22
    +
    
    23
    +import fr.ird.t3.actions.io.input.AnalyzeInputSourceAction;
    
    24
    +import fr.ird.t3.actions.io.input.AtlanticOceanFixtures;
    
    25
    +import fr.ird.t3.actions.io.input.test.MSAccessTestConfiguration;
    
    26
    +import fr.ird.t3.io.input.avdth.v35.T3InputProviderAvdth35;
    
    27
    +import org.junit.Test;
    
    28
    +
    
    29
    +/**
    
    30
    + * Tests the action {@link AnalyzeInputSourceAction}.
    
    31
    + *
    
    32
    + * @author Tony Chemit - dev@tchemit.fr
    
    33
    + * @since 1.0
    
    34
    + */
    
    35
    +public class AnalyzeInputSourceActionAtlanticOceanRecentIT extends AnalyzeInputSourceActionITSupport implements T3AVDTHV35TestAtlanticOceanRecent {
    
    36
    +
    
    37
    +//    @Override
    
    38
    +//    void testExecute(OceanFixtures fixture) throws Exception {
    
    39
    +//        super.testExecute(fixture, TripType.LOGBOOKMISSING);
    
    40
    +//    }
    
    41
    +
    
    42
    +    @Test
    
    43
    +    @Override
    
    44
    +    public void testExecute_OA_1998() throws Exception {
    
    45
    +        testExecute(AtlanticOceanFixtures.OA_1998);
    
    46
    +    }
    
    47
    +
    
    48
    +    @Test
    
    49
    +    @Override
    
    50
    +    public void testExecute_OA_1999() throws Exception {
    
    51
    +        testExecute(AtlanticOceanFixtures.OA_1999);
    
    52
    +    }
    
    53
    +
    
    54
    +    @Test
    
    55
    +    @Override
    
    56
    +    public void testExecute_OA_2000() throws Exception {
    
    57
    +        testExecute(AtlanticOceanFixtures.OA_2000);
    
    58
    +    }
    
    59
    +
    
    60
    +    @Test
    
    61
    +    @Override
    
    62
    +    public void testExecute_OA_2001() throws Exception {
    
    63
    +        testExecute(AtlanticOceanFixtures.OA_2001);
    
    64
    +    }
    
    65
    +
    
    66
    +    @Test
    
    67
    +    @Override
    
    68
    +    public void testExecute_OA_2002() throws Exception {
    
    69
    +        testExecute(AtlanticOceanFixtures.OA_2002);
    
    70
    +    }
    
    71
    +
    
    72
    +    @Test
    
    73
    +    @Override
    
    74
    +    public void testExecute_OA_2003() throws Exception {
    
    75
    +        testExecute(AtlanticOceanFixtures.OA_2003);
    
    76
    +    }
    
    77
    +
    
    78
    +    @Test
    
    79
    +    @Override
    
    80
    +    public void testExecute_OA_2004() throws Exception {
    
    81
    +        testExecute(AtlanticOceanFixtures.OA_2004);
    
    82
    +    }
    
    83
    +
    
    84
    +    @Test
    
    85
    +    @Override
    
    86
    +    public void testExecute_OA_2005() throws Exception {
    
    87
    +        testExecute(AtlanticOceanFixtures.OA_2005);
    
    88
    +    }
    
    89
    +
    
    90
    +    @Test
    
    91
    +    @Override
    
    92
    +    public void testExecute_OA_2006() throws Exception {
    
    93
    +        testExecute(AtlanticOceanFixtures.OA_2006);
    
    94
    +    }
    
    95
    +
    
    96
    +    @Test
    
    97
    +    @Override
    
    98
    +    public void testExecute_OA_2007() throws Exception {
    
    99
    +        testExecute(AtlanticOceanFixtures.OA_2007);
    
    100
    +    }
    
    101
    +
    
    102
    +    @Test
    
    103
    +    @Override
    
    104
    +    public void testExecute_OA_2008() throws Exception {
    
    105
    +        testExecute(AtlanticOceanFixtures.OA_2008);
    
    106
    +    }
    
    107
    +
    
    108
    +    @Test
    
    109
    +    @Override
    
    110
    +    public void testExecute_OA_2009() throws Exception {
    
    111
    +        testExecute(AtlanticOceanFixtures.OA_2009);
    
    112
    +    }
    
    113
    +
    
    114
    +    @Test
    
    115
    +    @Override
    
    116
    +    public void testExecute_OA_2010() throws Exception {
    
    117
    +        testExecute(AtlanticOceanFixtures.OA_2010);
    
    118
    +    }
    
    119
    +
    
    120
    +    @Test
    
    121
    +    @Override
    
    122
    +    public void testExecute_OA_2011() throws Exception {
    
    123
    +        testExecute(AtlanticOceanFixtures.OA_2011);
    
    124
    +    }
    
    125
    +
    
    126
    +    @Test
    
    127
    +    @Override
    
    128
    +    public void testExecute_OA_2012() throws Exception {
    
    129
    +        testExecute(AtlanticOceanFixtures.OA_2012);
    
    130
    +    }
    
    131
    +
    
    132
    +    @Test
    
    133
    +    @Override
    
    134
    +    public void testExecute_OA_2013() throws Exception {
    
    135
    +        testExecute(AtlanticOceanFixtures.OA_2013);
    
    136
    +    }
    
    137
    +
    
    138
    +    @Test
    
    139
    +    @Override
    
    140
    +    public void testExecute_OA_2014() throws Exception {
    
    141
    +        testExecute(AtlanticOceanFixtures.OA_2014);
    
    142
    +    }
    
    143
    +
    
    144
    +    @Test
    
    145
    +    @Override
    
    146
    +    public void testExecute_OA_2015() throws Exception {
    
    147
    +        testExecute(AtlanticOceanFixtures.OA_2015);
    
    148
    +    }
    
    149
    +
    
    150
    +    @Test
    
    151
    +    @Override
    
    152
    +    public void testExecute_OA_2016() throws Exception {
    
    153
    +        testExecute(AtlanticOceanFixtures.OA_2016);
    
    154
    +    }
    
    155
    +
    
    156
    +    @Override
    
    157
    +    protected MSAccessTestConfiguration createConfiguration() {
    
    158
    +        return new MSAccessTestConfiguration("testExecute_([^_]*)_(.*)", "%s_%s_V35.mdb", T3InputProviderAvdth35.ID);
    
    159
    +    }
    
    160
    +}

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionAtlanticOceanIT.java
    ... ... @@ -379,5 +379,11 @@ public class ImportInputSourceActionAtlanticOceanIT extends ImportInputSourceAct
    379 379
             testExecute(AtlanticOceanFixtures.OA_2015);
    
    380 380
         }
    
    381 381
     
    
    382
    +    @Override
    
    383
    +    @Test
    
    384
    +    public void testExecute_OA_2016() throws Exception {
    
    385
    +        testExecute(AtlanticOceanFixtures.OA_2016);
    
    386
    +    }
    
    387
    +
    
    382 388
     
    
    383 389
     }

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/it/T3AVDTHV35TestAtlanticOcean.java
    ... ... @@ -26,7 +26,7 @@ package fr.ird.t3.actions.io.input.it;
    26 26
      * @author Tony Chemit - dev@tchemit.fr
    
    27 27
      * @since 1.0
    
    28 28
      */
    
    29
    -public interface T3AVDTHV35TestAtlanticOcean {
    
    29
    +public interface T3AVDTHV35TestAtlanticOcean extends T3AVDTHV35TestAtlanticOceanRecent {
    
    30 30
     
    
    31 31
         void testExecute_OA_1960() throws Exception;
    
    32 32
     
    
    ... ... @@ -104,40 +104,4 @@ public interface T3AVDTHV35TestAtlanticOcean {
    104 104
     
    
    105 105
         void testExecute_OA_1997() throws Exception;
    
    106 106
     
    
    107
    -    void testExecute_OA_1998() throws Exception;
    
    108
    -
    
    109
    -    void testExecute_OA_1999() throws Exception;
    
    110
    -
    
    111
    -    void testExecute_OA_2000() throws Exception;
    
    112
    -
    
    113
    -    void testExecute_OA_2001() throws Exception;
    
    114
    -
    
    115
    -    void testExecute_OA_2002() throws Exception;
    
    116
    -
    
    117
    -    void testExecute_OA_2003() throws Exception;
    
    118
    -
    
    119
    -    void testExecute_OA_2004() throws Exception;
    
    120
    -
    
    121
    -    void testExecute_OA_2005() throws Exception;
    
    122
    -
    
    123
    -    void testExecute_OA_2006() throws Exception;
    
    124
    -
    
    125
    -    void testExecute_OA_2007() throws Exception;
    
    126
    -
    
    127
    -    void testExecute_OA_2008() throws Exception;
    
    128
    -
    
    129
    -    void testExecute_OA_2009() throws Exception;
    
    130
    -
    
    131
    -    void testExecute_OA_2010() throws Exception;
    
    132
    -
    
    133
    -    void testExecute_OA_2011() throws Exception;
    
    134
    -
    
    135
    -    void testExecute_OA_2012() throws Exception;
    
    136
    -
    
    137
    -    void testExecute_OA_2013() throws Exception;
    
    138
    -
    
    139
    -    void testExecute_OA_2014() throws Exception;
    
    140
    -
    
    141
    -    void testExecute_OA_2015() throws Exception;
    
    142
    -
    
    143 107
     }

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/it/T3AVDTHV35TestAtlanticOceanRecent.java
    1
    +/*
    
    2
    + * #%L
    
    3
    + * T3 :: Input AVDTH v 35
    
    4
    + * %%
    
    5
    + * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io
    
    6
    + * %%
    
    7
    + * This program is free software: you can redistribute it and/or modify
    
    8
    + * it under the terms of the GNU Affero General Public License as published by
    
    9
    + * the Free Software Foundation, either version 3 of the License, or
    
    10
    + * (at your option) any later version.
    
    11
    + *
    
    12
    + * This program is distributed in the hope that it will be useful,
    
    13
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    + * GNU General Public License for more details.
    
    16
    + *
    
    17
    + * You should have received a copy of the GNU Affero General Public License
    
    18
    + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
    19
    + * #L%
    
    20
    + */
    
    21
    +package fr.ird.t3.actions.io.input.it;
    
    22
    +
    
    23
    +/**
    
    24
    + * Contract to use for all tests on avdth database
    
    25
    + *
    
    26
    + * @author Tony Chemit - dev@tchemit.fr
    
    27
    + * @since 1.0
    
    28
    + */
    
    29
    +public interface T3AVDTHV35TestAtlanticOceanRecent {
    
    30
    +
    
    31
    +    void testExecute_OA_1998() throws Exception;
    
    32
    +
    
    33
    +    void testExecute_OA_1999() throws Exception;
    
    34
    +
    
    35
    +    void testExecute_OA_2000() throws Exception;
    
    36
    +
    
    37
    +    void testExecute_OA_2001() throws Exception;
    
    38
    +
    
    39
    +    void testExecute_OA_2002() throws Exception;
    
    40
    +
    
    41
    +    void testExecute_OA_2003() throws Exception;
    
    42
    +
    
    43
    +    void testExecute_OA_2004() throws Exception;
    
    44
    +
    
    45
    +    void testExecute_OA_2005() throws Exception;
    
    46
    +
    
    47
    +    void testExecute_OA_2006() throws Exception;
    
    48
    +
    
    49
    +    void testExecute_OA_2007() throws Exception;
    
    50
    +
    
    51
    +    void testExecute_OA_2008() throws Exception;
    
    52
    +
    
    53
    +    void testExecute_OA_2009() throws Exception;
    
    54
    +
    
    55
    +    void testExecute_OA_2010() throws Exception;
    
    56
    +
    
    57
    +    void testExecute_OA_2011() throws Exception;
    
    58
    +
    
    59
    +    void testExecute_OA_2012() throws Exception;
    
    60
    +
    
    61
    +    void testExecute_OA_2013() throws Exception;
    
    62
    +
    
    63
    +    void testExecute_OA_2014() throws Exception;
    
    64
    +
    
    65
    +    void testExecute_OA_2015() throws Exception;
    
    66
    +
    
    67
    +    void testExecute_OA_2016() throws Exception;
    
    68
    +
    
    69
    +}