Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 9d608f1e by Tony CHEMIT at 2018-02-20T19:29:19+01:00 let's use a password, otherwise can't open test db in IDEA, what a shame... - - - - - 92556d11 by Tony CHEMIT at 2018-02-20T20:40:10+01:00 Improve persistences tests - - - - - 9c95acac by Tony CHEMIT at 2018-02-20T20:40:17+01:00 [N0] Calcul des temps de pêche (Closes #240) - - - - - 22 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractCountryTopiaDao.java - + t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java - + t3-domain/src/main/resources/db/migration/V2_2_07_add-Route-table.sql - t3-domain/src/main/xmi/t3-persistence.properties - t3-domain/src/main/xmi/t3-persistence.zargo - + t3-domain/src/test/java/fr/ird/t3/entities/T3PersistenceFixtures.java - t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/CountryTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/HarbourTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/OceanTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/SpecieDAOImplTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselTopiaDaoTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java - t3-input-avdthv35/src/test/resources/t3-TopiaContextImpl.properties - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java Changes: ===================================== 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 @@ -36,6 +36,7 @@ import fr.ird.t3.entities.T3Functions; import fr.ird.t3.entities.T3Predicates; import fr.ird.t3.entities.reference.Harbour; import fr.ird.t3.entities.reference.Ocean; +import fr.ird.t3.entities.reference.OceanImpl; import fr.ird.t3.entities.reference.OceanTopiaDao; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.type.T3Date; @@ -127,19 +128,21 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< // query = createQuery("t") // .setSelect("t.id") // .addWhere("size(t." + Trip.PROPERTY_ACTIVITY + ") = 0"); - hql = "SELECT t.id FROM TripImpl t WHERE size(t.activity) = 0"; + hql = "SELECT t.id FROM TripImpl as t WHERE size(t.route) = 0"; // params = Collections.emptyList(); } else { // query = new TopiaQuery(Activity.class, "a") // .setSelect("distinct(a.trip.id)") // .addWhere("a.ocean", TopiaQuery.Op.EQ, ocean); - hql = "SELECT DISTINCT(a.trip.id) FROM ActivityImpl a WHERE a.ocean = :ocean"; + hql = "SELECT DISTINCT(a.route.trip.id) FROM ActivityImpl a WHERE a.ocean = :ocean"; paramsBuilder.put("ocean", ocean); // params = Lists.<Object>newArrayList("ocean", ocean); } return findAll(hql, paramsBuilder.build()); } + public static final Ocean EMPTY_OCEAN = new OceanImpl(); + public Multimap<Ocean, String> findAllIdsByOcean() throws TopiaException { Set<Ocean> oceans = topiaDaoSupplier.getDao(Ocean.class, OceanTopiaDao.class).findAllUsedInActivity(); @@ -154,7 +157,7 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< // add trips with no ocean (http://forge.codelutin.com/issues/1134) List<String> tripsWithNoOcean = findAllIdsByOcean(null); if (CollectionUtils.isNotEmpty(tripsWithNoOcean)) { - result.putAll(null, tripsWithNoOcean); + result.putAll(EMPTY_OCEAN, tripsWithNoOcean); } return result; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java @@ -26,12 +26,13 @@ import fr.ird.t3.entities.reference.VesselActivity; import fr.ird.t3.entities.type.T3Point; import fr.ird.t3.entities.type.T3PointImpl; import fr.ird.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Implementation of {@link Activity} with manual quadrant @@ -60,6 +61,11 @@ public class ActivityImpl extends ActivityAbstract { protected Integer quadrant; @Override + public Trip getTrip() { + return getRoute().getTrip(); + } + + @Override public Integer getQuadrant() { if (quadrant == null) { ===================================== 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 @@ -30,9 +30,17 @@ import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.reference.VesselImpl; +import org.nuiton.util.DateUtil; import java.util.Collection; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.nuiton.i18n.I18n.n; @@ -480,4 +488,73 @@ public class TripImpl extends TripAbstract { ComputedDataHelper.deleteComputedDataLevel3(getWell()); } + @Override + public int sizeActivity() { + return (int) activityStream().count(); + } + + @Override + public boolean isActivityEmpty() { + return isRouteEmpty() || activityStream().count() == 0; + } + + @Override + public boolean isActivityNotEmpty() { + return isRouteNotEmpty() && activityStream().count() > 0; + } + + @Override + public List<Activity> getActivity() { + return activityStream().collect(Collectors.toList()); + } + + @Override + public void setActivity(List<Activity> activities) { + clearRoute(); + for (Activity activity : activities) { + addActivity(activity); + } + } + + @Override + public Activity getActivityByTopiaId(String topiaId) { + return activityStream().filter(a -> topiaId.equals(a.getTopiaId())).findFirst().orElse(null); + } + + @Override + public Collection<String> getActivityTopiaIds() { + return activityStream().map(Activity::getTopiaId).collect(Collectors.toList()); + } + + @Override + public void addActivity(Activity activity) { + Date date = DateUtil.getDay(activity.getDate()); + Optional<Route> optionalRoute = routeStream().filter(r -> Objects.equals(r.getDate(), date)).findFirst(); + Route route; + if (optionalRoute.isPresent()) { + route = optionalRoute.get(); + } else { + route = new RouteImpl(); + route.setDate(date); + addRoute(route); + } + route.addActivity(activity); + } + + @Override + public List<Route> getRoute() { + List<Route> route = super.getRoute(); + if (route == null) { + setRoute(route = new LinkedList<>()); + } + return route; + } + + private Stream<Route> routeStream() { + return getRoute().stream(); + } + + private Stream<Activity> activityStream() { + return routeStream().flatMap(r -> r.getActivity().stream()); + } } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractCountryTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractCountryTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractCountryTopiaDao.java @@ -126,7 +126,7 @@ public class AbstractCountryTopiaDao<E extends Country> extends GeneratedCountry // .addParam("oceanId", oceanId); String hql = "SELECT DISTINCT(c) " + - "FROM CountryImpl c, TripImpl t LEFT JOIN t.activity as a " + + "FROM CountryImpl c, TripImpl t LEFT JOIN t.route as r LEFT JOIN r.activity as a " + "WHERE t.vessel.fleetCountry = c.id AND a.ocean.id = :oceanId"; // FIXME : trouvé pk cela est aussi long... // .addWhere("(SELECT count(*) FROM " + SetSpeciesFrequencyImpl.class.getSimpleName() + " s WHERE s." + SetSpeciesFrequency.PROPERTY_ACTIVITY + " = a.id) > 0") @@ -155,7 +155,7 @@ public class AbstractCountryTopiaDao<E extends Country> extends GeneratedCountry // .addParam("oceanId", oceanId); String hql = "SELECT DISTINCT(c) " + - "FROM CountryImpl c, TripImpl t LEFT JOIN t.activity as a " + + "FROM CountryImpl c, TripImpl t LEFT JOIN t.route as r LEFT JOIN r.activity as a " + "WHERE t.vessel.flagCountry = c.id AND a.ocean.id = :oceanId"; // FIXME : trouvé pk cela est aussi long... // .addWhere("(SELECT count(*) FROM " + SetSpeciesFrequencyImpl.class.getSimpleName() + " s WHERE s." + SetSpeciesFrequency.PROPERTY_ACTIVITY + " = a.id) >0") ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java ===================================== --- /dev/null +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java @@ -0,0 +1,133 @@ +package fr.ird.t3.services.migration; + +/* + * #%L + * T3 :: Domain + * %% + * Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.DateUtil; +import org.nuiton.version.Versions; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +/** + * Created by tchemit on 18/02/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +@AutoService(TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion.class) +public class T3MigrationCallbackV2_2 extends T3MigrationCallbackSupport { + + private static final Log log = LogFactory.getLog(T3MigrationCallbackV2_2.class); + + public T3MigrationCallbackV2_2() { + super(Versions.valueOf("2.2")); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + addScript("07", "add-Route-table", queries); + + + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + + List<String> tripList = sqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT DISTINCT(a.trip) FROM activity a"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + + for (String tripId : tripList) { + + int i = tripId.indexOf('#'); + String routeIdPrefix = "fr.ird.t3.entities.data.Route#" + tripId.substring(i + 1, tripId.lastIndexOf('#') + 1); + + log.info("Route prefix: " + routeIdPrefix); + List<TripActivity> activityList = sqlSupport.findMultipleResult(new TopiaSqlQuery<TripActivity>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement preparedStatement = connection.prepareStatement("SELECT a.topiaId, a.date FROM activity a WHERE a.trip = ?"); + preparedStatement.setString(1, tripId); + return preparedStatement; + } + + @Override + public TripActivity prepareResult(ResultSet set) throws SQLException { + return new TripActivity(set.getString(1), set.getDate(2)); + } + }); + + + Set<Date> days = new LinkedHashSet<>(); + for (TripActivity activity : activityList) { + + String dayDateStr = df.format(activity.date); + String routeId = routeIdPrefix + dayDateStr.replaceAll("-", ""); + + if (days.add(activity.date)) { + + log.info(String.format("[%s] new Route: %s", tripId, routeId)); + // create new route + queries.add(String.format("INSERT INTO Route(topiaId, topiaVersion, topiaCreateDate, trip, date) VALUES('%s', 0, CURRENT_TIMESTAMP, '%s', to_date('%s', 'YYY-MM-DD'));", routeId, tripId, dayDateStr)); + } + queries.add(String.format("UPDATE Activity SET route = '%s', topiaVersion = topiaVersion + 1 WHERE topiaId = '%s';", routeId, activity.activity)); + } + + if (!activityList.isEmpty()) { + queries.add(String.format("UPDATE Trip SET effortComputed = false, topiaVersion = topiaVersion + 1 WHERE topiaId = '%s';", tripId)); + } + } + + queries.add("ALTER TABLE Activity DROP COLUMN trip;"); + queries.add("ALTER TABLE Activity DROP COLUMN date;"); + } + + private static class TripActivity { + + private final String activity; + private final Date date; + + private TripActivity(String activity, Date date) { + this.activity = activity; + this.date = DateUtil.getDay(date); + } + } + +} ===================================== t3-domain/src/main/resources/db/migration/V2_2_07_add-Route-table.sql ===================================== --- /dev/null +++ b/t3-domain/src/main/resources/db/migration/V2_2_07_add-Route-table.sql @@ -0,0 +1,28 @@ +--- +-- #%L +-- T3 :: Domain +-- %% +-- Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- +CREATE TABLE Route( topiaid VARCHAR(255) PRIMARY KEY NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP NOT NULL, trip VARCHAR(255) NOT NULL, date DATE NOT NULL, computedFishingTimeN0 REAL, computedSearchTimeN0 REAL, computedTimeAtSeaN0 REAL); +CREATE UNIQUE INDEX uk_route ON Route(trip, date); +ALTER TABLE Route ADD CONSTRAINT fk_route_trip FOREIGN KEY (trip) REFERENCES Trip(topiaid); +CREATE INDEX idx_route_trip ON Route(trip); + +ALTER TABLE Activity ADD COLUMN route VARCHAR(255); +ALTER TABLE Activity ADD CONSTRAINT fk_activity_route FOREIGN KEY (route) REFERENCES Route(topiaid); +CREATE INDEX idx_activity_route ON Activity(route); ===================================== t3-domain/src/main/xmi/t3-persistence.properties ===================================== --- a/t3-domain/src/main/xmi/t3-persistence.properties +++ b/t3-domain/src/main/xmi/t3-persistence.properties @@ -22,11 +22,17 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=2.1 +model.tagValue.version=2.2 model.tagValue.indexForeignKeys=true -fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered -fr.ird.t3.entities.data.Trip.attribute.activity.tagvalue.orderBy=date +fr.ird.t3.entities.data.Trip.attribute.route.stereotype=ordered +fr.ird.t3.entities.data.Route.attribute.activity.stereotype=ordered + +fr.ird.t3.entities.data.Trip.attribute.route.tagvalue.orderBy=date +fr.ird.t3.entities.data.Route.attribute.activity.tagvalue.orderBy=date + +fr.ird.t3.entities.data.Route.attribute.date.tagvalue.hibernateAttributeType.java.util.Date=date +fr.ird.t3.entities.data.Activity.attribute.time.tagvalue.hibernateAttributeType.java.util.Date=time fr.ird.t3.entities.data.Activity.attribute.comment.tagvalue.sqlType=text fr.ird.t3.entities.data.LocalMarketBatch.attribute.origin.tagvalue.sqlType=text ===================================== t3-domain/src/main/xmi/t3-persistence.zargo ===================================== Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ ===================================== t3-domain/src/test/java/fr/ird/t3/entities/T3PersistenceFixtures.java ===================================== --- /dev/null +++ b/t3-domain/src/test/java/fr/ird/t3/entities/T3PersistenceFixtures.java @@ -0,0 +1,90 @@ +package fr.ird.t3.entities; + +import fr.ird.t3.entities.data.Activity; +import fr.ird.t3.entities.data.Trip; +import fr.ird.t3.entities.reference.Country; +import fr.ird.t3.entities.reference.Harbour; +import fr.ird.t3.entities.reference.Ocean; +import fr.ird.t3.entities.reference.Species; +import fr.ird.t3.entities.reference.Vessel; +import fr.ird.t3.entities.reference.VesselSimpleType; +import fr.ird.t3.entities.reference.VesselType; + +import java.util.Date; +import java.util.Objects; + +/** + * Created by tchemit on 20/02/2018. + * + * @author Tony Chemit - dev@tchemit.fr + */ +public class T3PersistenceFixtures { + + public static Activity newActivity(T3TopiaPersistenceContext tx, Ocean ocean) { + return newActivity(tx, ocean, new Date()); + } + + public static Ocean newOcean(T3TopiaPersistenceContext tx) { + return newOcean(tx, 0); + } + + public static Ocean newOcean(T3TopiaPersistenceContext tx, int code) { + return tx.getOceanDao().create(Ocean.PROPERTY_CODE, code); + } + + public static Country newCountry(T3TopiaPersistenceContext tx, int code) { + return tx.getCountryDao().create(Country.PROPERTY_CODE, code); + } + + public static Activity newActivity(T3TopiaPersistenceContext tx, Ocean ocean, Date date) { + return Objects.requireNonNull(tx.getActivityDao()).create(Activity.PROPERTY_OCEAN, Objects.requireNonNull(ocean), Activity.PROPERTY_DATE, Objects.requireNonNull(date)); + } + + public static Trip newTrip(T3TopiaPersistenceContext tx) { + return tx.getTripDao().create(); + } + + public static Trip newTrip(T3TopiaPersistenceContext tx, Vessel vessel) { + return tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel); + } + + public static Trip newTrip(T3TopiaPersistenceContext tx, Harbour harbour) { + return tx.getTripDao().create(Trip.PROPERTY_LANDING_HARBOUR, harbour); + } + + public static Trip newTrip(T3TopiaPersistenceContext tx, int code, Date date) { + return tx.getTripDao().create(Trip.PROPERTY_CODE, code, Trip.PROPERTY_LANDING_DATE, date); + } + + public static Trip newTrip(T3TopiaPersistenceContext tx, int code, Date date, boolean sampleOnly) { + return tx.getTripDao().create(Trip.PROPERTY_CODE, code, Trip.PROPERTY_LANDING_DATE, date, Trip.PROPERTY_SAMPLES_ONLY, sampleOnly); + } + + public static Harbour newHarbour(T3TopiaPersistenceContext tx, int code) { + return tx.getHarbourDao().create(Harbour.PROPERTY_CODE, code); + } + + public static Species newSpecies(T3TopiaPersistenceContext tx, int code) { + return tx.getSpeciesDao().create(Species.PROPERTY_CODE, code); + } + + public static Vessel newVessel(T3TopiaPersistenceContext tx, int code) { + return tx.getVesselDao().create(Vessel.PROPERTY_CODE, code); + } + + public static VesselType newVesselType(T3TopiaPersistenceContext tx, int code, VesselSimpleType vesselSimpleType) { + return tx.getVesselTypeDao().create(VesselType.PROPERTY_CODE, code, VesselType.PROPERTY_VESSEL_SIMPLE_TYPE, vesselSimpleType); + } + + public static VesselSimpleType newVesselSimpleType(T3TopiaPersistenceContext tx, int code) { + return tx.getVesselSimpleTypeDao().create(VesselSimpleType.PROPERTY_CODE, code); + } + + public static Vessel newVessel(T3TopiaPersistenceContext tx, Country country, int code) { + return tx.getVesselDao().create(Vessel.PROPERTY_FLAG_COUNTRY, country, Vessel.PROPERTY_FLEET_COUNTRY, country, Vessel.PROPERTY_CODE, code); + } + + public static Vessel newVessel(T3TopiaPersistenceContext tx, VesselType vesselType, int code) { + return tx.getVesselDao().create(Vessel.PROPERTY_VESSEL_TYPE, vesselType, Vessel.PROPERTY_CODE, code); + } +} ===================================== 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 @@ -22,17 +22,19 @@ package fr.ird.t3.entities.data; import com.google.common.collect.Multimap; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.reference.Ocean; -import fr.ird.t3.entities.reference.OceanTopiaDao; import fr.ird.t3.entities.type.T3Date; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; /** * Tests the trip dao {@link TripTopiaDao}. @@ -42,36 +44,23 @@ import org.junit.Test; */ public class TripTopiaDaoTest extends AbstractDatabaseTest { - T3TopiaPersistenceContext tx; - - TripTopiaDao dao; - - OceanTopiaDao oceanDAO; - - ActivityTopiaDao activitDAO; + private T3TopiaPersistenceContext tx; + private TripTopiaDao dao; @Before - public void setUp() throws Exception { - + public void setUp() { tx = beginTransaction(); dao = tx.getTripDao(); - oceanDAO = tx.getOceanDao(); - activitDAO = tx.getActivityDao(); } @Test - public void findAllBetweenLandingDate() throws Exception { + public void findAllBetweenLandingDate() { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); - Trip trip = dao.create(Trip.PROPERTY_CODE, 0, - Trip.PROPERTY_LANDING_DATE, startDate.toBeginDate(), - Trip.PROPERTY_SAMPLES_ONLY, false - ); - Trip trip1 = dao.create(Trip.PROPERTY_CODE, 1, - Trip.PROPERTY_LANDING_DATE, endDate.toBeginDate(), - Trip.PROPERTY_SAMPLES_ONLY, true); + Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), false); + Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), true); List<Trip> result; @@ -103,20 +92,20 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void getFirstLandingDate() throws Exception { + public void getFirstLandingDate() { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); T3Date result; - dao.create(Trip.PROPERTY_CODE, 1, Trip.PROPERTY_LANDING_DATE, endDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate()); result = dao.getFirstLandingDate(); Assert.assertNotNull(result); Assert.assertEquals(endDate, result); - dao.create(Trip.PROPERTY_CODE, 0, Trip.PROPERTY_LANDING_DATE, startDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate()); result = dao.getFirstLandingDate(); Assert.assertNotNull(result); @@ -124,20 +113,20 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void getLastLandingDate() throws Exception { + public void getLastLandingDate() { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); T3Date result; - dao.create(Trip.PROPERTY_CODE, 0, Trip.PROPERTY_LANDING_DATE, startDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate()); result = dao.getLastLandingDate(); Assert.assertNotNull(result); Assert.assertEquals(startDate, result); - dao.create(Trip.PROPERTY_CODE, 1, Trip.PROPERTY_LANDING_DATE, endDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate()); result = dao.getLastLandingDate(); Assert.assertNotNull(result); @@ -145,20 +134,20 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void findAllYearsUsedInTrip() throws Exception { + public void findAllYearsUsedInTrip() { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); List<Integer> result; - dao.create(Trip.PROPERTY_CODE, 1, Trip.PROPERTY_LANDING_DATE, endDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate()); result = dao.findAllYearsUsedInTrip(); Assert.assertNotNull(result); - Assert.assertEquals(Arrays.asList(2011), result); + Assert.assertEquals(Collections.singletonList(2011), result); - dao.create(Trip.PROPERTY_CODE, 0, Trip.PROPERTY_LANDING_DATE, startDate.toBeginDate()); + T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate()); result = dao.findAllYearsUsedInTrip(); Assert.assertNotNull(result); @@ -230,22 +219,22 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { // } @Test - public void findAllIdsByOcean() throws Exception { + public void findAllIdsByOcean() { - Ocean ocean1 = oceanDAO.create(Ocean.PROPERTY_CODE, 1); - Ocean ocean2 = oceanDAO.create(Ocean.PROPERTY_CODE, 2); + Ocean ocean1 = T3PersistenceFixtures.newOcean(tx, 1); + Ocean ocean2 = T3PersistenceFixtures.newOcean(tx, 2); - Trip trip1 = dao.create(Trip.PROPERTY_CODE, 1, Trip.PROPERTY_LANDING_DATE, new Date()); - Activity activity1 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean1); + Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, new Date()); + Activity activity1 = T3PersistenceFixtures.newActivity(tx, ocean1); trip1.addActivity(activity1); - Activity activity11 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean2); + Activity activity11 = T3PersistenceFixtures.newActivity(tx, ocean2); trip1.addActivity(activity11); - Trip trip2 = dao.create(Trip.PROPERTY_CODE, 2, Trip.PROPERTY_LANDING_DATE, new Date()); - Activity activity2 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean2); + Trip trip2 = T3PersistenceFixtures.newTrip(tx, 2, new Date()); + Activity activity2 = T3PersistenceFixtures.newActivity(tx, ocean2); trip2.addActivity(activity2); - Trip trip3 = dao.create(Trip.PROPERTY_CODE, 3, Trip.PROPERTY_LANDING_DATE, new Date()); + Trip trip3 = T3PersistenceFixtures.newTrip(tx, 3, new Date()); Multimap<Ocean, String> result = dao.findAllIdsByOcean(); @@ -263,7 +252,7 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { Assert.assertTrue(trips.contains(trip1.getTopiaId())); Assert.assertTrue(trips.contains(trip2.getTopiaId())); - trips = result.get(null); + trips = result.get(TripTopiaDao.EMPTY_OCEAN); Assert.assertNotNull(trips); Assert.assertEquals(1, trips.size()); Assert.assertTrue(trips.contains(trip3.getTopiaId())); @@ -283,25 +272,24 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void findAllByIds() throws Exception { - - Ocean ocean1 = oceanDAO.create(Ocean.PROPERTY_CODE, 1); - Ocean ocean2 = oceanDAO.create(Ocean.PROPERTY_CODE, 2); + public void findAllByIds() { + Ocean ocean1 = T3PersistenceFixtures.newOcean(tx, 1); + Ocean ocean2 = T3PersistenceFixtures.newOcean(tx, 2); - Trip trip1 = dao.create(Trip.PROPERTY_CODE, 1, Trip.PROPERTY_LANDING_DATE, new Date()); - Activity activity1 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean1); + Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, new Date()); + Activity activity1 = T3PersistenceFixtures.newActivity(tx, ocean1); trip1.addActivity(activity1); - Activity activity11 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean2); + Activity activity11 = T3PersistenceFixtures.newActivity(tx, ocean2); trip1.addActivity(activity11); - Trip trip2 = dao.create(Trip.PROPERTY_CODE, 2, Trip.PROPERTY_LANDING_DATE, new Date()); - Activity activity2 = activitDAO.create(Activity.PROPERTY_OCEAN, ocean2); + Trip trip2 = T3PersistenceFixtures.newTrip(tx, 2, new Date()); + Activity activity2 = T3PersistenceFixtures.newActivity(tx, ocean2); trip2.addActivity(activity2); List<Trip> result; - result = dao.findAllByIds(Arrays.asList(trip1.getTopiaId())); + result = dao.findAllByIds(Collections.singletonList(trip1.getTopiaId())); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/CountryTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/CountryTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/CountryTopiaDaoTest.java @@ -21,14 +21,17 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.CorrectedElementaryCatch; import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractCountryTopiaDao}. * @@ -37,44 +40,44 @@ import org.junit.Test; */ public class CountryTopiaDaoTest extends AbstractDatabaseTest { - @Test - public void findAllFleetUsedInTrip() throws Exception { - - T3TopiaPersistenceContext tx = beginTransaction(); + private Country country; + private Vessel vessel; + private Vessel vessel2; + private Ocean ocean; + private T3TopiaPersistenceContext tx; + private CountryTopiaDao dao; + + @Before + public void setUp() { + tx = beginTransaction(); + dao = tx.getCountryDao(); + country = T3PersistenceFixtures.newCountry(tx, 0); + Country country2 = T3PersistenceFixtures.newCountry(tx, 1); + vessel = T3PersistenceFixtures.newVessel(tx, country, 0); + vessel2 = T3PersistenceFixtures.newVessel(tx, country2, 1); + ocean = T3PersistenceFixtures.newOcean(tx, 0); + } - CountryTopiaDao dao = tx.getCountryDao(); + @Test + public void findAllFleetUsedInTrip() { - Country country = dao.create(Country.PROPERTY_CODE, 0); - Country country2 = dao.create(Country.PROPERTY_CODE, 1); - Vessel vessel = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country, Vessel.PROPERTY_CODE, 0); - Vessel vessel2 = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country2, Vessel.PROPERTY_CODE, 1); - Trip trip = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel); + T3PersistenceFixtures.newTrip(tx, vessel); - Set<Country> result = dao.findAllFleetUsedInTrip(); + Set<Country> result = tx.getCountryDao().findAllFleetUsedInTrip(); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(country, result.iterator().next()); } @Test - public void findAllFleetUsedInCatch() throws Exception { - - T3TopiaPersistenceContext tx = beginTransaction(); - - CountryTopiaDao dao = tx.getCountryDao(); + public void findAllFleetUsedInCatch() { - Country country = dao.create(Country.PROPERTY_CODE, 0); - Country country2 = dao.create(Country.PROPERTY_CODE, 1); - Vessel vessel = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country, Vessel.PROPERTY_CODE, 0); - Vessel vessel2 = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country2, Vessel.PROPERTY_CODE, 1); - Trip trip = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel); + Trip trip = T3PersistenceFixtures.newTrip(tx, vessel); - // create another trip without any activity (so withou also any corrected catches) - Trip trip2 = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel2); + // create another trip without any activity (so without also any corrected catches) + T3PersistenceFixtures.newTrip(tx, vessel2); - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_TRIP, trip - ); + Activity activity = T3PersistenceFixtures.newActivity(tx, ocean); trip.addActivity(activity); CorrectedElementaryCatch catche = tx.getCorrectedElementaryCatchDao().create(); @@ -89,27 +92,15 @@ public class CountryTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void findAllFleetUsedInSample() throws Exception { - - T3TopiaPersistenceContext tx = beginTransaction(); + public void findAllFleetUsedInSample() { - Ocean ocean = tx.getOceanDao().create(); + Trip trip = T3PersistenceFixtures.newTrip(tx, vessel); - CountryTopiaDao dao = tx.getCountryDao(); - Country country = dao.create(Country.PROPERTY_CODE, 0); - Country country2 = dao.create(Country.PROPERTY_CODE, 1); - Vessel vessel = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country, Vessel.PROPERTY_CODE, 0); - Vessel vessel2 = tx.getVesselDao().create(Vessel.PROPERTY_FLEET_COUNTRY, country2, Vessel.PROPERTY_CODE, 1); - Trip trip = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel); + // create another trip without any activity (so without also any corrected catches) + T3PersistenceFixtures.newTrip(tx, vessel2); - // create another trip without any activity (so withou also any corrected catches) - Trip trip2 = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel2); - - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_TRIP, trip, - Activity.PROPERTY_OCEAN, ocean - ); + Activity activity = T3PersistenceFixtures.newActivity(tx, ocean); trip.addActivity(activity); Set<Country> result; @@ -132,32 +123,17 @@ public class CountryTopiaDaoTest extends AbstractDatabaseTest { } @Test - public void findAllFlagUsedInSample() throws Exception { - - T3TopiaPersistenceContext tx = beginTransaction(); - - Ocean ocean = tx.getOceanDao().create(); + public void findAllFlagUsedInSample() { - CountryTopiaDao dao = tx.getCountryDao(); - - Country country = dao.create(Country.PROPERTY_CODE, 0); - Country country2 = dao.create(Country.PROPERTY_CODE, 1); - Vessel vessel = tx.getVesselDao().create(Vessel.PROPERTY_FLAG_COUNTRY, country, Vessel.PROPERTY_CODE, 0); - Vessel vessel2 = tx.getVesselDao().create(Vessel.PROPERTY_FLAG_COUNTRY, country2, Vessel.PROPERTY_CODE, 1); - Trip trip = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel); + Trip trip = T3PersistenceFixtures.newTrip(tx, vessel); // create another trip without any activity (so withou also any corrected catches) - Trip trip2 = tx.getTripDao().create(Trip.PROPERTY_VESSEL, vessel2); + T3PersistenceFixtures.newTrip(tx, vessel2); - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_TRIP, trip, - Activity.PROPERTY_OCEAN, ocean - ); + Activity activity = T3PersistenceFixtures.newActivity(tx, ocean); trip.addActivity(activity); - Set<Country> result; - - result = dao.findAllFlagUsedInSample(ocean.getTopiaId()); + Set<Country> result = dao.findAllFlagUsedInSample(ocean.getTopiaId()); Assert.assertNotNull(result); //FIXME Should be zero when we will fix the request... // Assert.assertEquals(0, result.size()); @@ -166,10 +142,10 @@ public class CountryTopiaDaoTest extends AbstractDatabaseTest { // SetSpeciesFrequency f = // tx.getSetSpeciesFrequencyDAO(tx).create(SetSpeciesFrequency.PROPERTY_ACTIVITY, activity); - result = dao.findAllFlagUsedInSample(ocean.getTopiaId()); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - Assert.assertEquals(country, result.iterator().next()); +// result = dao.findAllFlagUsedInSample(ocean.getTopiaId()); +// Assert.assertNotNull(result); +// Assert.assertEquals(1, result.size()); +// Assert.assertEquals(country, result.iterator().next()); } } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/HarbourTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/HarbourTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/HarbourTopiaDaoTest.java @@ -21,12 +21,13 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; -import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractHarbourTopiaDao}. * @@ -36,20 +37,14 @@ import org.junit.Test; public class HarbourTopiaDaoTest extends AbstractDatabaseTest { @Test - public void findAllUsedInLandingTrip() throws Exception { - + public void findAllUsedInLandingTrip() { T3TopiaPersistenceContext tx = beginTransaction(); - HarbourTopiaDao dao = tx.getHarbourDao(); - - Harbour harbour = dao.create(Harbour.PROPERTY_CODE, 1); - Harbour harbour2 = dao.create(Harbour.PROPERTY_CODE, 2); - - Trip trip = tx.getTripDao().create( - Trip.PROPERTY_LANDING_HARBOUR, harbour - ); + Harbour harbour = T3PersistenceFixtures.newHarbour(tx, 1); + T3PersistenceFixtures.newHarbour(tx, 2); + T3PersistenceFixtures.newTrip(tx, harbour); - Set<Harbour> result = dao.findAllUsedInLandingTrip(); + Set<Harbour> result = tx.getHarbourDao().findAllUsedInLandingTrip(); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(harbour, result.iterator().next()); ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java @@ -28,15 +28,16 @@ import com.google.common.collect.Sets; import fr.ird.t3.entities.AbstractDatabaseTest; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.type.T3Date; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.TopiaException; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * tests the {@link LengthWeightConversionHelper}. * @@ -46,13 +47,13 @@ import org.nuiton.topia.persistence.TopiaException; public class LengthWeightConversionHelperTest extends AbstractDatabaseTest { @Before - public void setUp() throws Exception { + public void setUp() { db.loadClassPathScript("/db/LengthWeightConversionHelperTest.sql"); } @Test - public void testGetConversionsAtlantique() throws Exception { + public void testGetConversionsAtlantique() { T3TopiaPersistenceContext tx = beginTransaction(); @@ -63,7 +64,7 @@ public class LengthWeightConversionHelperTest extends AbstractDatabaseTest { } @Test - public void testGetConversionsIndian() throws Exception { + public void testGetConversionsIndian() { T3TopiaPersistenceContext tx = beginTransaction(); @@ -73,8 +74,7 @@ public class LengthWeightConversionHelperTest extends AbstractDatabaseTest { } - protected void testConversionForOcean(T3TopiaPersistenceContext tx, - Ocean ocean) throws TopiaException { + private void testConversionForOcean(T3TopiaPersistenceContext tx, Ocean ocean) throws TopiaException { Date date = T3Date.newDate(1, 2010).toBeginDate(); LengthWeightConversionHelper conversionHelper = @@ -130,10 +130,10 @@ public class LengthWeightConversionHelperTest extends AbstractDatabaseTest { } Range<Integer> open = Range.open(0, 1000); - List<Integer> lenghtClasses = Lists.newArrayList(ContiguousSet.create(open,DiscreteDomain.integers())); + List<Integer> lengthClasses = Lists.newArrayList(ContiguousSet.create(open,DiscreteDomain.integers())); Map<Integer, WeightCategoryTreatment> distribution = - conversionHelper.getWeightCategoriesDistribution(conversion, allCategories, lenghtClasses); + conversionHelper.getWeightCategoriesDistribution(conversion, allCategories, lengthClasses); Assert.assertNotNull(distribution); Set<WeightCategoryTreatment> usedweithCategories = Sets.newHashSet(distribution.values()); // all categories must be used (except the undefined one ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/OceanTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/OceanTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/OceanTopiaDaoTest.java @@ -21,13 +21,15 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractOceanTopiaDao}. * @@ -37,21 +39,18 @@ import org.junit.Test; public class OceanTopiaDaoTest extends AbstractDatabaseTest { @Test - public void findAllUsedInActivity() throws Exception { + public void findAllUsedInActivity() { T3TopiaPersistenceContext tx = beginTransaction(); - OceanTopiaDao dao = tx.getOceanDao(); - Ocean ocean = dao.create(Ocean.PROPERTY_CODE, 0); - Trip trip = tx.getTripDao().create(); - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_OCEAN, ocean, - Activity.PROPERTY_TRIP, trip - ); + Ocean ocean = T3PersistenceFixtures.newOcean(tx); + Trip trip = T3PersistenceFixtures.newTrip(tx); + Activity activity = T3PersistenceFixtures.newActivity(tx, ocean); trip.addActivity(activity); - Set<Ocean> result = dao.findAllUsedInActivity(); + Set<Ocean> result = tx.getOceanDao().findAllUsedInActivity(); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(ocean, result.iterator().next()); } + } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/SpecieDAOImplTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/SpecieDAOImplTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/SpecieDAOImplTest.java @@ -21,14 +21,16 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.CorrectedElementaryCatch; import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractSpeciesTopiaDao}. * @@ -38,28 +40,23 @@ import org.junit.Test; public class SpecieDAOImplTest extends AbstractDatabaseTest { @Test - public void findAllSpecieUsedInCatch() throws Exception { + public void findAllSpecieUsedInCatch() { T3TopiaPersistenceContext tx = beginTransaction(); SpeciesTopiaDao dao = tx.getSpeciesDao(); - Species species = dao.create(Species.PROPERTY_CODE, 0); - Species species2 = dao.create(Species.PROPERTY_CODE, 1); + Species species = T3PersistenceFixtures.newSpecies(tx, 0); + T3PersistenceFixtures.newSpecies(tx, 1); - Trip trip = tx.getTripDao().create(); + Trip trip = T3PersistenceFixtures.newTrip(tx); - // create another trip without any activity (so withou also any corrected catches) - Trip trip2 = tx.getTripDao().create(); + // create another trip without any activity (so without also any corrected catches) + T3PersistenceFixtures.newTrip(tx, T3PersistenceFixtures.newVessel(tx, 0)); - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_TRIP, trip - ); + Activity activity = T3PersistenceFixtures.newActivity(tx, T3PersistenceFixtures.newOcean(tx)); trip.addActivity(activity); - - CorrectedElementaryCatch catche = - tx.getCorrectedElementaryCatchDao().create(CorrectedElementaryCatch.PROPERTY_SPECIES, species); - activity.addCorrectedElementaryCatch(catche); + activity.addCorrectedElementaryCatch(tx.getCorrectedElementaryCatchDao().create(CorrectedElementaryCatch.PROPERTY_SPECIES, species)); Set<Species> result = dao.findAllSpeciesUsedInCatch(); Assert.assertNotNull(result); ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java @@ -21,12 +21,13 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; -import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractVesselSimpleTypeTopiaDao}. * @@ -36,26 +37,21 @@ import org.junit.Test; public class VesselSimpleTypeTopiaDaoTest extends AbstractDatabaseTest { @Test - public void findAllUsedInTrip() throws Exception { + public void findAllUsedInTrip() { T3TopiaPersistenceContext tx = beginTransaction(); - VesselSimpleTypeTopiaDao dao = tx.getVesselSimpleTypeDao(); - VesselSimpleType vesselSimpleType = dao.create(VesselSimpleType.PROPERTY_CODE, 1); - VesselSimpleType vesselSimpleType2 = dao.create(VesselSimpleType.PROPERTY_CODE, 2); + VesselSimpleType vesselSimpleType = T3PersistenceFixtures.newVesselSimpleType(tx, 1); + VesselSimpleType vesselSimpleType2 = T3PersistenceFixtures.newVesselSimpleType(tx, 2); - VesselTypeTopiaDao vesselTypeDAO = tx.getVesselTypeDao(); - VesselType vesselType = vesselTypeDAO.create(VesselType.PROPERTY_CODE, 1, VesselType.PROPERTY_VESSEL_SIMPLE_TYPE, vesselSimpleType); - VesselType vesselType2 = vesselTypeDAO.create(VesselType.PROPERTY_CODE, 2, VesselType.PROPERTY_VESSEL_SIMPLE_TYPE, vesselSimpleType2); + VesselType vesselType = T3PersistenceFixtures.newVesselType(tx, 1, vesselSimpleType); + VesselType vesselType2 = T3PersistenceFixtures.newVesselType(tx, 2, vesselSimpleType2); - VesselTopiaDao vesselDAO = tx.getVesselDao(); - Vessel vessel = vesselDAO.create(Vessel.PROPERTY_CODE, 1, Vessel.PROPERTY_VESSEL_TYPE, vesselType); - Vessel vessel2 = vesselDAO.create(Vessel.PROPERTY_CODE, 2, Vessel.PROPERTY_VESSEL_TYPE, vesselType2); + Vessel vessel = T3PersistenceFixtures.newVessel(tx, vesselType, 1); + T3PersistenceFixtures.newVessel(tx, vesselType2, 2); - Trip trip = tx.getTripDao().create( - Trip.PROPERTY_VESSEL, vessel - ); - Set<VesselSimpleType> result = dao.findAllUsedInTrip(null); + T3PersistenceFixtures.newTrip(tx, vessel); + Set<VesselSimpleType> result = tx.getVesselSimpleTypeDao().findAllUsedInTrip(null); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(vesselSimpleType, result.iterator().next()); ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselTopiaDaoTest.java @@ -21,13 +21,15 @@ package fr.ird.t3.entities.reference; import fr.ird.t3.entities.AbstractDatabaseTest; +import fr.ird.t3.entities.T3PersistenceFixtures; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.Trip; -import java.util.Set; import org.junit.Assert; import org.junit.Test; +import java.util.Set; + /** * Test the user dao {@link AbstractVesselTopiaDao}. * @@ -37,22 +39,17 @@ import org.junit.Test; public class VesselTopiaDaoTest extends AbstractDatabaseTest { @Test - public void findAllUsedInTrip() throws Exception { + public void findAllUsedInTrip() { T3TopiaPersistenceContext tx = beginTransaction(); - VesselTopiaDao dao = tx.getVesselDao(); - Vessel vessel = dao.create(Vessel.PROPERTY_CODE, 1); - Vessel vessel2 = dao.create(Vessel.PROPERTY_CODE, 2); + Vessel vessel = T3PersistenceFixtures.newVessel(tx, 1); + T3PersistenceFixtures.newVessel(tx, 2); - Trip trip = tx.getTripDao().create( - Trip.PROPERTY_VESSEL, vessel - ); - Activity activity = tx.getActivityDao().create( - Activity.PROPERTY_TRIP, trip - ); + Trip trip = T3PersistenceFixtures.newTrip(tx, vessel); + Activity activity = T3PersistenceFixtures.newActivity(tx, T3PersistenceFixtures.newOcean(tx)); trip.addActivity(activity); - Set<Vessel> result = dao.findAllUsedInTrip(); + Set<Vessel> result = tx.getVesselDao().findAllUsedInTrip(); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(vessel, result.iterator().next()); ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java @@ -39,7 +39,7 @@ import org.junit.Test; public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { @Test - public void testGetOldCategoryCode() throws Exception { + public void testGetOldCategoryCode() { db.loadClassPathScript("/db/WeightCategoryTreatmentImplTest.sql"); try (T3TopiaPersistenceContext tx = beginTransaction()) { @@ -52,7 +52,7 @@ public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { } @Test - public void testWeightCategoryTreatmentComparator() throws Exception { + public void testWeightCategoryTreatmentComparator() { WeightCategoryTreatment catInconnu = new WeightCategoryTreatmentImpl(); @@ -83,7 +83,7 @@ public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { } @Test - public void testWeightCategoryTreatmentComparator2() throws Exception { + public void testWeightCategoryTreatmentComparator2() { WeightCategoryTreatment catInconnu = new WeightCategoryTreatmentImpl(); @@ -135,7 +135,7 @@ public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { } @Test - public void getWeightCategoryTreatment() throws Exception { + public void getWeightCategoryTreatment() { WeightCategoryTreatment catInconnu = new WeightCategoryTreatmentImpl(); @@ -184,7 +184,7 @@ public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { } @Test - public void getWeightCategoryTreatment2() throws Exception { + public void getWeightCategoryTreatment2() { WeightCategoryTreatment catInconnu = new WeightCategoryTreatmentImpl(); ===================================== t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java ===================================== --- a/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java +++ b/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java @@ -55,11 +55,12 @@ import fr.ird.t3.io.input.access.T3AccessEntityMeta; import fr.ird.t3.io.input.access.T3AccessEntityMetaProvider; import fr.ird.t3.io.input.access.T3AccessReferentielEntityMeta; import fr.ird.t3.io.input.access.type.IntToBoolean; -import java.util.Date; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Date; +import java.util.Set; + /** * Provider of {@link T3AccessEntityMeta}. * @@ -86,9 +87,7 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv Activity.PROPERTY_ACTIVITY_FISHING_CONTEXT, ActivityFishingContext.class, Activity.PROPERTY_ELEMENTARY_CATCH, ElementaryCatch.class }, - new Object[]{ - Activity.PROPERTY_TRIP, Trip.class - }, + new Object[]{ /* Nothing to do any longer */}, Activity.PROPERTY_DATE, Date.class, "D_ACT", Activity.PROPERTY_NUMBER, Integer.class, "N_ACT", Activity.PROPERTY_OCEAN, Ocean.class, "C_OCEA", ===================================== t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java ===================================== --- a/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java +++ b/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java @@ -34,9 +34,9 @@ import fr.ird.t3.entities.data.LocalMarketSampleSpeciesFrequency; import fr.ird.t3.entities.data.LocalMarketSampleWell; import fr.ird.t3.entities.data.LocalMarketSurvey; import fr.ird.t3.entities.data.Sample; +import fr.ird.t3.entities.data.SampleSet; import fr.ird.t3.entities.data.SampleSpecies; import fr.ird.t3.entities.data.SampleSpeciesFrequency; -import fr.ird.t3.entities.data.SampleSet; import fr.ird.t3.entities.data.Trip; import fr.ird.t3.entities.data.Well; import fr.ird.t3.entities.data.WellPlan; @@ -98,9 +98,7 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv Activity.PROPERTY_ACTIVITY_FISHING_CONTEXT, ActivityFishingContext.class, Activity.PROPERTY_ELEMENTARY_CATCH, ElementaryCatch.class }, - new Object[]{ - Activity.PROPERTY_TRIP, Trip.class - }, + new Object[]{/* Nothing to do any longer */}, Activity.PROPERTY_DATE, Date.class, "D_ACT", Activity.PROPERTY_NUMBER, Integer.class, "N_ACT", Activity.PROPERTY_OCEAN, Ocean.class, "C_OCEA", ===================================== t3-input-avdthv35/src/test/resources/t3-TopiaContextImpl.properties ===================================== --- a/t3-input-avdthv35/src/test/resources/t3-TopiaContextImpl.properties +++ b/t3-input-avdthv35/src/test/resources/t3-TopiaContextImpl.properties @@ -24,7 +24,7 @@ hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa -hibernate.connection.password= +hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver # tchemit 2010-11-28 : comment this line, each test must define his own db path #hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data ===================================== t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java ===================================== --- a/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java +++ b/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java @@ -34,9 +34,9 @@ import fr.ird.t3.entities.data.LocalMarketSampleSpeciesFrequency; import fr.ird.t3.entities.data.LocalMarketSampleWell; import fr.ird.t3.entities.data.LocalMarketSurvey; import fr.ird.t3.entities.data.Sample; +import fr.ird.t3.entities.data.SampleSet; import fr.ird.t3.entities.data.SampleSpecies; import fr.ird.t3.entities.data.SampleSpeciesFrequency; -import fr.ird.t3.entities.data.SampleSet; import fr.ird.t3.entities.data.Trip; import fr.ird.t3.entities.data.Well; import fr.ird.t3.entities.data.WellPlan; @@ -100,9 +100,7 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv Activity.PROPERTY_ACTIVITY_FISHING_CONTEXT, ActivityFishingContext.class, Activity.PROPERTY_ELEMENTARY_CATCH, ElementaryCatch.class }, - new Object[]{ - Activity.PROPERTY_TRIP, Trip.class - }, + new Object[]{ /* Nothing to do any longer */}, Activity.PROPERTY_DATE, Date.class, "D_ACT", Activity.PROPERTY_NUMBER, Integer.class, "N_ACT", Activity.PROPERTY_OCEAN, Ocean.class, "C_OCEA", View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/896731cf2ee1936293340e4c2e25c732... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/896731cf2ee1936293340e4c2e25c732... You're receiving this email because of your account on gitlab.com.