Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 459fa5bd by Tony CHEMIT at 2018-03-06T16:20:06Z Renommage des valeurs de TripType (See #116) - - - - - 22 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java - t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java - t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql - t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties - t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties - t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java - t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java @@ -160,7 +160,7 @@ public class AnalyzeInputSourceAction extends T3Action<AnalyzeInputSourceConfigu LoadingTripHitModel hitModel = new LoadingTripHitModel(); hitModel.addPropertyChangeListener(LoadingTripHitModel.NB_TRIP_LOADED, evt -> incrementsProgression()); TripType tripType = getConfiguration().getTripType(); - boolean samplesOnly = tripType == TripType.SAMPLES_ONLY; + boolean samplesOnly = tripType == TripType.SAMPLEONLY; tripsLoaded = inputPilot.loadTrips(hitModel); boolean createVessel = getConfiguration().isCanCreateVessel(); Map<Integer, Vessel> vessels = null; ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java @@ -120,7 +120,7 @@ public abstract class AnalyzeInputSourceActionITSupport { fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutwell(), - TripType.NORMAL, + TripType.STANDARD, false, false ); @@ -136,7 +136,7 @@ public abstract class AnalyzeInputSourceActionITSupport { nbUnsafe, nbSafeWithoutwell, nbUnsafeWithoutWell, - TripType.NORMAL, + TripType.STANDARD, false, false ); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java @@ -89,11 +89,11 @@ public abstract class ImportInputSourceActionITSupport { } public void testExecute(OceanFixtures fixtures) throws Exception { - testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.NORMAL, false, false); + testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe) throws Exception { - testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false); + testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe, ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java @@ -91,7 +91,7 @@ public abstract class AnalyzeInputSourceActionTestSupport { } protected void testExecute(OceanFixtures fixture) throws Exception { - testExecute(fixture, TripType.NORMAL); + testExecute(fixture, TripType.STANDARD); } protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception { ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java @@ -81,7 +81,7 @@ public abstract class ImportInputSourceActionTestSupport { } protected void testExecute(OceanFixtures fixture) throws Exception { - testExecute(fixture, TripType.NORMAL); + testExecute(fixture, TripType.STANDARD); } protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception { ===================================== t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java @@ -50,7 +50,7 @@ public class AnalyzeInputSourceActionResumeTest extends AbstractActionResumeTest protected void prepareConfiguration(AnalyzeInputSourceConfiguration conf) { configuration.setInputFile(new File("inputSource")); configuration.setUseWells(true); - configuration.setTripType(TripType.NORMAL); + configuration.setTripType(TripType.STANDARD); configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]); configuration.setCanCreateVessel(true); configuration.setCreateVirtualVessel(true); ===================================== t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java @@ -48,7 +48,7 @@ public class ImportInputSourceActionResumeTest extends AbstractActionResumeTest< protected void prepareConfiguration(ImportInputSourceConfiguration conf) { configuration.setInputFile(new File("inputSource")); configuration.setUseWells(true); - configuration.setTripType(TripType.NORMAL); + configuration.setTripType(TripType.STANDARD); configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]); configuration.setCanCreateVessel(true); configuration.setCreateVirtualVessel(true); ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java @@ -80,9 +80,9 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< return ""; } if (samplesOnly) { - return " " + prefix + " t.tripType = 'SAMPLES_ONLY'"; + return " " + prefix + " t.tripType = 'SAMPLEONLY'"; } - return " " + prefix + " t.tripType != 'SAMPLES_ONLY'"; + return " " + prefix + " t.tripType != 'SAMPLEONLY'"; } public static <E extends Trip> Collection<E> getAllTripsWithNoDataComputed(Collection<E> trips) { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java @@ -83,12 +83,12 @@ public class TripImpl extends TripAbstract { @Override public boolean isSamplesOnly() { - return TripType.SAMPLES_ONLY == getTripType(); + return TripType.SAMPLEONLY == getTripType(); } @Override public boolean isWithoutLogbook() { - return TripType.WITHOUT_LOGBOOK == getTripType(); + return TripType.LOGBOOKMISSING == getTripType(); } public boolean isLevel2Computed() { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java @@ -26,9 +26,9 @@ import fr.ird.t3.t3.domain.I18nEnumHelper; import static org.nuiton.i18n.I18n.t; public enum TripType { - NORMAL, - SAMPLES_ONLY, - WITHOUT_LOGBOOK; + STANDARD, + SAMPLEONLY, + LOGBOOKMISSING; public String getLabel() { return I18nEnumHelper.getLabel(this); ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java @@ -91,8 +91,8 @@ public abstract class AbstractT3InputMSAccess implements T3Input { T3AccessHitModel hitModel = new T3AccessHitModel(); hitModel.addPropertyChangeListener(new LoadDbPropertyChangeListener(t3DataTypes)); // analyse data source - if (configuration.getTripType() == TripType.WITHOUT_LOGBOOK) { - dataSource.analyzeDb(TripType.WITHOUT_LOGBOOK, hitModel); + if (configuration.getTripType() == TripType.LOGBOOKMISSING) { + dataSource.analyzeDb(TripType.LOGBOOKMISSING, hitModel); } else { dataSource.analyzeDb(hitModel); } ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java @@ -144,11 +144,11 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T // on ne veut charger que les données observateurs, pas le referentiel continue; } - if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.Activity) { + if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.Activity) { //FIXME-116 Just to test remove this ASAP cache.put(meta, new Map[]{}); } - if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.WellPlan) { + if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.WellPlan) { //FIXME-116 Just to test remove this ASAP cache.put(meta, new Map[]{}); } ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java @@ -63,7 +63,7 @@ public abstract class T3AvdthDataEntityVisitor extends T3DataEntityVisitor { super(dataSource, referentiel); wellPlanReverse = newReverseAssociationGetter(Trip.class, WellPlan.class, Activity.class, Trip.PROPERTY_ACTIVITY, WellPlan.PROPERTY_ACTIVITY); sampleReverse = newReverseAssociationGetter(Trip.class, Sample.class, Well.class, Trip.PROPERTY_WELL, Sample.PROPERTY_WELL); - if (TripType.WITHOUT_LOGBOOK == configuration.getTripType()) { + if (TripType.LOGBOOKMISSING == configuration.getTripType()) { sampleSetReverse = new ReverseAssociationGetter<Trip, SampleSet, Activity>(Trip.class, SampleSet.class, Activity.class, Trip.PROPERTY_ACTIVITY, SampleSet.PROPERTY_ACTIVITY) { @Override void onReverseNotFound(Trip parent, T3AccessEntity entity, Object[] pKey) { ===================================== t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql +++ b/t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql @@ -18,7 +18,7 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'NORMAL' NOT NULL; -UPDATE Trip set tripType = 'SAMPLES_ONLY' WHERE samplesonly = TRUE; +ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'STANDARD' NOT NULL; +UPDATE Trip set tripType = 'SAMPLEONLY' WHERE samplesonly = TRUE; CREATE INDEX idx_trip_tripType ON Trip(tripType); ALTER TABLE Trip DROP COLUMN samplesonly; \ No newline at end of file ===================================== t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Default maximum acceptable for rfTot t3.config.stratum.weightRatio.description=Default weight ratio to accept while building level 2 or 3 stratum t3.config.treatment.working.directory.description=Location of treatment directory t3.config.users.file.description=Application users file -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Samples only -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Without Logbook +t3.enum.STANDARD=Standard +t3.enum.SAMPLEONLY=Samples only +t3.enum.LOGBOOKMISSING=Without Logbook t3.output.operations=Operations t3.output.outputProvider=Output Pilot t3.user.log.directory.description=Location of directory where to store user logs ===================================== t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Seuil maximum acceptable pour le calcul du r t3.config.stratum.weightRatio.description=Ratio du poids capturé / celui échantillonné acceptable dans une strate échantillon t3.config.treatment.working.directory.description=Répertoire de travail t3.config.users.file.description=Fichier contenant les utilisateurs de l'application -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Echantillons uniquement -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Sans logbook +t3.enum.STANDARD=Standard +t3.enum.SAMPLEONLY=Echantillons uniquement +t3.enum.LOGBOOKMISSING=Sans logbook t3.output.operations=Opérations t3.output.outputProvider=Pilote de sortie t3.user.log.directory.description=Répertoire où sont conservés les logs des utilisateurs ===================================== t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java @@ -59,8 +59,8 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); - Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.NORMAL); - Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLES_ONLY); + Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.STANDARD); + Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLEONLY); List<Trip> result; ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java @@ -131,7 +131,7 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test { nbUnsafe, nbSafeWithoutWell, nbUnsafeWithoutWell, - TripType.NORMAL, + TripType.STANDARD, false, false ); @@ -355,30 +355,30 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test { @Test @Override public void testExecute_ESATL_2006() throws Exception { - testExecute(70, 27, 97, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(70, 27, 97, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2007() throws Exception { - testExecute(273, 27, 238, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(273, 27, 238, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2008() throws Exception { - testExecute(46, 14, 60, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(46, 14, 60, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2009() throws Exception { - testExecute(64, 21, 85, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(64, 21, 85, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2010() throws Exception { - testExecute(75, 13, 80, 8, TripType.SAMPLES_ONLY, true, true); + testExecute(75, 13, 80, 8, TripType.SAMPLEONLY, true, true); } } ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java @@ -104,7 +104,7 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test { } public void testExecute(int nbSafe, int nbUnsafe) throws Exception { - testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false); + testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe, @@ -314,30 +314,30 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test { @Test @Override public void testExecute_ESATL_2006() throws Exception { - testExecute(70, 27, TripType.SAMPLES_ONLY, true, true); + testExecute(70, 27, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2007() throws Exception { - testExecute(53, 27, TripType.SAMPLES_ONLY, true, true); + testExecute(53, 27, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2008() throws Exception { - testExecute(46, 14, TripType.SAMPLES_ONLY, true, true); + testExecute(46, 14, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2009() throws Exception { - testExecute(64, 21, TripType.SAMPLES_ONLY, true, true); + testExecute(64, 21, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2010() throws Exception { - testExecute(75, 13, TripType.SAMPLES_ONLY, true, true); + testExecute(75, 13, TripType.SAMPLEONLY, true, true); } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -54,13 +54,13 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu @Ignore @Test public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK); + testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); } @Ignore @Test public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002,TripType.WITHOUT_LOGBOOK); + testExecute(IndianOceanFixtures.OI_2002,TripType.LOGBOOKMISSING); } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java @@ -53,13 +53,13 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp @Ignore @Test public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK); + testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); } @Ignore @Test public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002, TripType.WITHOUT_LOGBOOK); + testExecute(IndianOceanFixtures.OI_2002, TripType.LOGBOOKMISSING); } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java @@ -70,7 +70,7 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn * * @since 2.3 */ - private TripType tripType = TripType.NORMAL; + private TripType tripType = TripType.STANDARD; /** * flag to authorize creation of missing vessels. * View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/459fa5bd063e6ad4630c7c3eef519fe64... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/459fa5bd063e6ad4630c7c3eef519fe64... You're receiving this email because of your account on gitlab.com.