- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 3 commits: use new i18n mojo and configuration
by Tony CHEMIT 03 Nov '17

03 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ecd72f5 by Tony CHEMIT at 2017-11-03T10:46:20+01:00 use new i18n mojo and configuration - - - - - a56301c1 by Tony CHEMIT at 2017-11-03T10:46:30+01:00 use last jaxx + optimize dependencies - - - - - 1251fc61 by Tony CHEMIT at 2017-11-03T10:46:30+01:00 clean ui code - - - - - 30 changed files: - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/i18n.xml - client/src/main/i18n/client_en_GB.properties - client/src/main/i18n/client_es_ES.properties - client/src/main/i18n/client_fr_FR.properties - client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java - client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx - dto/pom.xml - pom.xml - services-client/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -130,9 +130,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -163,15 +164,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -718,9 +718,9 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> + <id>default-parse-java-enumerations</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> </goals> <configuration> <enumerationSets> @@ -748,7 +748,7 @@ </configuration> </execution> <execution> - <id>check-convergence</id> + <id>default-check-i18n-artifacts</id> <goals> <goal>check-i18n-artifacts</goal> </goals> @@ -760,16 +760,16 @@ <goal>generate</goal> </goals> <configuration> - <entries> + <copyToClasses>false</copyToClasses> +  </configuration> </execution> <execution> - <id>make-bundle</id> + <id>default-bundle</id> <goals> <goal>bundle</goal> </goals> ===================================== client/src/main/assembly/i18n.xml ===================================== --- a/client/src/main/assembly/i18n.xml +++ b/client/src/main/assembly/i18n.xml @@ -37,7 +37,7 @@ </fileSet> <fileSet> - <directory>target/generated-sources/resources/META-INF</directory> + <directory>target/classes/META-INF</directory> <outputDirectory/> <includes> <include>observe-i18n*</include> ===================================== client/src/main/i18n/client_en_GB.properties ===================================== --- a/client/src/main/i18n/client_en_GB.properties +++ b/client/src/main/i18n/client_en_GB.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< No activity for curre observe.common.ActivityLonglineObsDto.message.not.open=Activity is not opened, no edit possible. observe.common.ActivityLonglineObsDto.message.updating=Updating an activity observe.common.ActivityLonglineObsDto.timeStamp=timestamp -observe.common.ActivityLonglineObsDto.titles=Activities observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity observe.common.ActivitySeineDto.action.addSet=Add a Set @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=Activity is not opened, no edit observe.common.ActivitySeineDto.message.updating=Updating an activity observe.common.ActivitySeineDto.observedSystemTab=Observed systems observe.common.ActivitySeineDto.selectedObservedSystem=Selected observed systems -observe.common.ActivitySeineDto.titles=Activities observe.common.ActivitySeineDto.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set. observe.common.BaitsCompositionObsDto.action.create=Insert this bait observe.common.BaitsCompositionObsDto.action.create.tip=Insert this bait @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancel modifications observe.common.DataDto.action.reset.well.tip=Reset observe.common.DataDto.action.resetTagNumber=Reset tag number observe.common.DataDto.message.historical.data=Historical data (can be closed, even if not valid) -observe.common.Dto.label.usage.data.title=Data '%1$s' (%2$d occurrences) observe.common.Dto.label.usage.referential.title=Referentiel '%1$s' (%2$d occurrences) observe.common.Dto.lastUpdateDate=Last update date observe.common.Dto.technicalInformations=Technical information of %1$s @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=Current route is not open, no modificat observe.common.RouteDto.message.updating=Route is in editing mode. observe.common.RouteDto.noneForTrip=< No route fo current trip > observe.common.RouteDto.title=Route -observe.common.RouteDto.titles=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type observe.common.Sample.length.computed.tip=Length was computed observe.common.Sample.length.observed.tip=Length was observed @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Data location observe.common.TdrDto.delete.data.message=Confirm to delete saved data observe.common.TdrDto.deleteData=Delete observe.common.TdrDto.deleteData.tip=Delete data -observe.common.TdrDto.deployementStart=Deployement start observe.common.TdrDto.enableTimestamp=Use timestamp observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder observe.common.TdrDto.exportData=Export @@ -1111,7 +1106,6 @@ observe.common.directory=Directory observe.common.exist.on.remote=%1$s (already exist) observe.common.file=File observe.common.global.progression.description=Global progression -observe.common.label=Label observe.common.ocean=Ocean observe.common.operation.resume=Summary of operations observe.common.resume=Summary @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=New activity observe.type.activitySeine.unsaved=New activity observe.type.floatingObject.unsaved=New DCP -observe.type.management=Management of %s observe.type.reference.common=Common Referential observe.type.reference.longline=Longline Referential observe.type.reference.seine=Seine Referential @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Founded references observe.validator.field.tip=Property '%1$s' observe.validator.message.tip=Message\: %1$s observe.validator.scope.tip=Message type\: '%1$s' -observe.view.message=Messages observe.view.navigation=Navigation observe.view.server=Local database in server mode observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. ===================================== client/src/main/i18n/client_es_ES.properties ===================================== --- a/client/src/main/i18n/client_es_ES.properties +++ b/client/src/main/i18n/client_es_ES.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Ninguna actividad por observe.common.ActivityLonglineObsDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivityLonglineObsDto.message.updating=Se está modificando la actividad actual. observe.common.ActivityLonglineObsDto.timeStamp=Timestamp -observe.common.ActivityLonglineObsDto.titles=Actividades observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un DCP observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad observe.common.ActivitySeineDto.action.addSet=Añadir un lance @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=La actividad no está abierta, observe.common.ActivitySeineDto.message.updating=Se está modificando la actividad actual. observe.common.ActivitySeineDto.observedSystemTab=Sistema observado observe.common.ActivitySeineDto.selectedObservedSystem=Sistemas observados seleccionados -observe.common.ActivitySeineDto.titles=Actividades observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance observe.common.BaitsCompositionObsDto.action.create=Insertar este cebo observe.common.BaitsCompositionObsDto.action.create.tip=Insertar este cebo @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancelar las modificaciones observe.common.DataDto.action.reset.well.tip=Reiniciar observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon \#TODO observe.common.DataDto.message.historical.data=Datos históricos (puede cerrarse incluso sin validar) -observe.common.Dto.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias) observe.common.Dto.label.usage.referential.title=Referencial '%1$s' (%2$d ocurrencias) observe.common.Dto.lastUpdateDate=Last update date observe.common.Dto.technicalInformations=Informaciones técnicas del referencial %1$s @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=la ruta actual no está abierta, no se observe.common.RouteDto.message.updating=Se está modificando la ruta actual. observe.common.RouteDto.noneForTrip=Ninguna ruta en la marea actual observe.common.RouteDto.title=Ruta -observe.common.RouteDto.titles=Rutas observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut \#TODO observe.common.Sample.length.computed.tip=Longitud calculada observe.common.Sample.length.observed.tip=Longitud observada @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=ubicación del archivo de datos observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos observe.common.TdrDto.deleteData=Eliminar observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos -observe.common.TdrDto.deployementStart=Inicio de despliegue observe.common.TdrDto.enableTimestamp=Activar el timestamp observe.common.TdrDto.enableTimestamp.tip=Activar el timestamp para este registrador observe.common.TdrDto.exportData=Exportar @@ -1111,7 +1106,6 @@ observe.common.directory=Carpeta observe.common.exist.on.remote=%1$s (ya existe) observe.common.file=Archivo observe.common.global.progression.description=Progresión global -observe.common.label=Texto observe.common.ocean=Océano observe.common.operation.resume=Resumen de operaciones observe.common.resume=Resumen de la configuración @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=Nueva actividad observe.type.activitySeine.unsaved=Nueva actividad observe.type.floatingObject.unsaved=Nuevo DCP -observe.type.management=Gestión de %s observe.type.reference.common=Referencial commun observe.type.reference.longline=Referencial Palangre observe.type.reference.seine=Referencial Senne @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Referencias encontradas observe.validator.field.tip=Propriedad '%1$s' observe.validator.message.tip=Mensaje \: %1$s observe.validator.scope.tip=Tipo de mensaje \: '%1$s' -observe.view.message=Mensajes observe.view.navigation=Navegación observe.view.server=Base locale en modo servidor observe.warning.nimbus.landf=El look and Feel Nimbus no fue encontrado, se necesita a minimo la versión 1.6u10 de java. ===================================== client/src/main/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/i18n/client_fr_FR.properties +++ b/client/src/main/i18n/client_fr_FR.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Aucune activité pour observe.common.ActivityLonglineObsDto.message.not.open=L'opération de pêche n'est pas ouverte, aucune modification possible. observe.common.ActivityLonglineObsDto.message.updating=L'activité est en cours de modification. observe.common.ActivityLonglineObsDto.timeStamp=Horodatage -observe.common.ActivityLonglineObsDto.titles=Activités observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité observe.common.ActivitySeineDto.action.addSet=Ajouter la calée @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=L'activité n'est pas ouverte, observe.common.ActivitySeineDto.message.updating=L'activité est en cours de modification. observe.common.ActivitySeineDto.observedSystemTab=Systèmes observés observe.common.ActivitySeineDto.selectedObservedSystem=Systèmes observés sélectionnés -observe.common.ActivitySeineDto.titles=Activités observe.common.ActivitySeineDto.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée. observe.common.BaitsCompositionObsDto.action.create=Insérer cet appât observe.common.BaitsCompositionObsDto.action.create.tip=Insérer cet appât @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Annuler les modifications observe.common.DataDto.action.reset.well.tip=Réinitialiser observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon observe.common.DataDto.message.historical.data=Donnée historique (peut-être clôturé même si non valide) -observe.common.Dto.label.usage.data.title=Donnée '%1$s' (%2$d occurrences) observe.common.Dto.label.usage.referential.title=Référentiel '%1$s' (%2$d occurrences) observe.common.Dto.lastUpdateDate=Date de dernière mise à jour observe.common.Dto.technicalInformations=Informations techniques de l'objet de type '%1$s' @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=La route courante n'est pas ouverte, au observe.common.RouteDto.message.updating=La route est en cours de modification. observe.common.RouteDto.noneForTrip=< Aucune route pour la marée courante > observe.common.RouteDto.title=Route -observe.common.RouteDto.titles=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut observe.common.Sample.length.computed.tip=La longueur a été calculée observe.common.Sample.length.observed.tip=La longueur a été observée @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données observe.common.TdrDto.deleteData=Supprimer observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données -observe.common.TdrDto.deployementStart=Début déploiement observe.common.TdrDto.enableTimestamp=Activer l'horodatage observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur observe.common.TdrDto.exportData=Exporter @@ -1111,7 +1106,6 @@ observe.common.directory=Répertoire observe.common.exist.on.remote=%1$s (déjà existante) observe.common.file=Fichier observe.common.global.progression.description=Progression globale -observe.common.label=Libellé observe.common.ocean=Océan observe.common.operation.resume=Résumé des opérations observe.common.resume=Résumé de la configuration @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=Nouvelle activité observe.type.activitySeine.unsaved=Nouvelle activité observe.type.floatingObject.unsaved=Nouveau DCP -observe.type.management=Gestion des %s observe.type.reference.common=Référentiel commun observe.type.reference.longline=Référentiel Palangre observe.type.reference.seine=Référentiel Senne @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Références trouvées observe.validator.field.tip=Propriété '%1$s' observe.validator.message.tip=Message \: %1$s observe.validator.scope.tip=Type de message \: '%1$s' -observe.view.message=Messages observe.view.navigation=Navigation observe.view.server=Base locale en mode serveur observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. ===================================== client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java +++ b/client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java @@ -67,7 +67,7 @@ public class FormUIApplicationContext { return decoratorService.get(); } - public NavigationTree getNavigation() { + public final NavigationTree getNavigation() { return navigation.get(); } } ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java @@ -115,7 +115,6 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R @Override protected void initialize(FormUIInitializerContext<U> initializerContext) { - validationManager = new FormUIValidationMessageManager(model.getBeanType(), ui); super.initialize(initializerContext); OpenableDataDtoListCellRenderer<D, R> cellRenderer = new OpenableDataDtoListCellRenderer<>(ui.getList().getCellRenderer(), navigation); @@ -166,7 +165,7 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R @Override public void onDataSelected(MouseEvent event) { if (event.getClickCount() > 1) { - if (getModel().isOneSelectedData()) { + if (model.isOneSelectedData()) { gotoChild(ui.getSelectedData()); } } ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx @@ -48,7 +48,7 @@ <ObserveMainUI id="mainUI"/> - <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.titles' + <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.types' listText='{n("observe.common.ActivityDto.list")}' emptyListMessage='{n("observe.common.ActivityLonglineObsDto.message.nonForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx @@ -46,7 +46,7 @@ <ObserveMainUI id="mainUI"/> <TripLonglineListUIModel id='model' - title='observe.common.TripLonglineDto.titles' + title='observe.common.TripLonglineDto.types' listText='{n("observe.common.TripDto.list")}' emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx @@ -50,7 +50,7 @@ <ObserveMainUI id="mainUI"/> <ActivitySeineListUIModel id='model' - title='observe.common.ActivitySeineDto.titles' + title='observe.common.ActivitySeineDto.types' listText='{n("observe.common.ActivityDto.list")}' emptyListMessage='{n("observe.common.ActivitySeineDto.message.noneForRoute")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx @@ -46,7 +46,7 @@ <ObserveMainUI id="mainUI"/> - <RouteListUIModel id='model' title='observe.common.RouteDto.titles' + <RouteListUIModel id='model' title='observe.common.RouteDto.types' listText='{n("observe.common.RouteDto.list")}' emptyListMessage='{n("observe.common.RouteDto.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx @@ -47,7 +47,7 @@ <ObserveMainUI id="mainUI"/> <TripSeineListUIModel id='model' - title='observe.common.TripSeineDto.titles' + title='observe.common.TripSeineDto.types' listText='{n("observe.common.TripDto.list")}' emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java @@ -35,6 +35,8 @@ import fr.ird.observe.client.form.spi.ReferentialReferencesFilter; import fr.ird.observe.client.form.spi.init.CoordinatesEditorInitializer; import fr.ird.observe.client.form.spi.init.TabInfoInitializer; import fr.ird.observe.client.form.table.longline.set.WeightMeasuresTableModel; +import fr.ird.observe.client.spi.ClientDataContext; +import fr.ird.observe.client.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableTableModelSupport; import fr.ird.observe.client.util.table.InlineTableAutotSelectRowAndShowPopupAction; @@ -42,6 +44,7 @@ import fr.ird.observe.client.validation.ClientValidationContext; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.DataListDto; import fr.ird.observe.dto.data.seine.TargetCatchDto; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; import java.awt.BorderLayout; @@ -73,6 +76,7 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.select.BeanListHeader; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -135,14 +139,15 @@ public abstract class ObserveDataTableFormUIHandler<D extends DataDto, C extends // // } // + // @Override -// public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) { -// String message = n("observe.entity.message.updating"); -// NavigationTreeNodeSupport node = navigation.getSelectedNode(); -// String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getBeanType()); -// message = t(message, t(entityLabel)); -// validationManager.addInfoMessage(node.getParent().getBeanType(), message); -// } + public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) { + String message = n("observe.entity.message.updating"); + NavigationTreeNodeSupport node = navigation.getSelectedNode(); + String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getDataType()); + message = t(message, t(entityLabel)); + validationManager.addInfoMessage(node.getParent().getDataType(), message); + } // // @Override // public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java @@ -58,6 +58,7 @@ import org.nuiton.jaxx.runtime.swing.JTables; import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -157,8 +158,8 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle } // FIXME!!! -// @Override -// protected void loadEditBean(String beanId) { + @Override + protected void loadEditBean(String beanId) { // loadForm(beanId); // // boolean showData = !model.getFormUIContext().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty(); @@ -171,11 +172,11 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle // // validationManager.removeAllMessages(); // -// validationManager.addInfoMessage( -// SetSeineDto.class, -// t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); + validationManager.addInfoMessage( + SetSeineDto.class, + t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); // } -// } + } @Override public void onSelectedRowChanged(int editingRow, NonTargetCatchReleaseDto bean, boolean create) { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss @@ -99,7 +99,7 @@ JToolBar { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; enabled: {tableEditBean.isIsLengthComputed()}; - toolTipText:{getLengthDataTip(tableEditBean.isIsLengthComputed())}; + toolTipText:{TargetSampleUIHandler.getLengthDataTip(tableEditBean.isIsLengthComputed())}; } #weightLabel { @@ -115,7 +115,7 @@ JToolBar { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; enabled: {tableEditBean.isIsWeightComputed()}; - toolTipText:{getWeightDataTip(tableEditBean.isIsWeightComputed())}; + toolTipText:{TargetSampleUIHandler.getWeightDataTip(tableEditBean.isIsWeightComputed())}; } #comment { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx @@ -68,27 +68,6 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='getHandler().updateAcquisitionMode((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> - <script><![CDATA[ - -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - -public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); -} - -public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); -} - -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} -]]> - </script> - <JLabel id='hideFormInformation' styleClass="skipI18n"/> <Table id='editorPanel' fill='both' insets='1'> ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss @@ -47,7 +47,7 @@ #speciesTypeTaille { font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; + text:{TargetSampleUIHandler.getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; } #hideFormInformation { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java @@ -24,12 +24,16 @@ package fr.ird.observe.client.form.table.seine.samples; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import fr.ird.observe.client.constants.AcquisitionMode; +import fr.ird.observe.client.form.FormUIMode; import fr.ird.observe.client.form.spi.ReferentialReferencesFilter; import fr.ird.observe.client.form.table.ContentTableModel; import fr.ird.observe.client.form.table.ObserveDataTableFormUIHandler; +import fr.ird.observe.client.spi.ClientDataContext; +import fr.ird.observe.client.spi.OpenDtoManager; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.seine.NonTargetLengthDto; import fr.ird.observe.dto.data.seine.NonTargetSampleDto; +import fr.ird.observe.dto.data.seine.SetSeineDto; import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SexReference; @@ -48,6 +52,7 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -148,9 +153,9 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT UIHelper.setTableColumnRenderer(table, 7, renderer); } -// FIXME!!! + // FIXME!!! // @Override -// public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { + public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { // FormUIMode mode = super.computeContentMode(dataContext, openDataManager); // // String setId = dataContext.getSelectedSetId(); @@ -164,10 +169,11 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT // // on repasse en mode resteint car on ne peut pas éditer l'écran // mode = FormUIMode.READ; // -// validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded")); + validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded")); // } // return mode; -// } + return null; + } @SuppressWarnings("unchecked") @Override ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx @@ -64,22 +64,6 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='TargetSampleUIHandler.updateAcquisitionMode(this, (AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> - <script><![CDATA[ - -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - -public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); -} - -public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); -} -]]> - </script> <Table id='editorPanel' fill='both' insets='1'>  ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java @@ -50,6 +50,7 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -60,6 +61,11 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode /** Logger */ private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class); + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à @@ -332,4 +338,16 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode return result; } + public static String getWeightDataTip(boolean computed) { + return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + } + + public static String getLengthDataTip(boolean computed) { + return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + } + + public static String getSpeciesFauneTypeTaille(SpeciesReference species) { + return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); + } + } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -39,6 +39,7 @@ javax.swing.JComboBox static fr.ird.observe.client.util.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t </import> <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -48,21 +48,6 @@ <CardLayout2Ext id='creationModeLayout' constructorParams='this, "creationModeContent"'/> - <script><![CDATA[ -protected String updateMigrationPolicy(boolean canMigrate) { - if (canMigrate) { - return t("observe.storage.report.can.migrate", config.getModelVersion()); - } else { - return t("observe.storage.report.can.not.migrate"); - } -} - -protected String updateCreationModeContent(DbMode mode) { - return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode"; -} -]]> - </script> - <JPanel id='content'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss @@ -69,7 +69,7 @@ } #creationModeLayout { - selected:{updateCreationModeContent(model.getDbMode())}; + selected:{handler.updateCreationModeContent(model.getDbMode())}; } #creationModeContent { @@ -130,7 +130,7 @@ } #migrationPolicy { - text:{updateMigrationPolicy(model.isCanMigrate())}; + text:{handler.updateMigrationPolicy(model.isCanMigrate())}; } #showMigrationSql { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.I18nEnumHelper; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.constants.CreationMode; +import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.tools.ObserveTextGenerator; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; @@ -97,4 +98,16 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i } return visible; } + + String updateMigrationPolicy(boolean canMigrate) { + if (canMigrate) { + return t("observe.storage.report.can.migrate", ui.getConfig().getModelVersion()); + } else { + return t("observe.storage.report.can.not.migrate"); + } + } + + String updateCreationModeContent(DbMode mode) { + return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode"; + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.client.ui.storage.tabs.SecurityModel fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel + + static org.nuiton.i18n.I18n.t </import> <StorageStep id='step' initializer='StorageStep.ROLES'/> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -249,9 +249,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -278,16 +279,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.34</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> @@ -132,7 +132,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:http://git@gitlab.com/${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> @@ -156,7 +156,8 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> + <jaxx.version>3.0-alpha-17</jaxx.version> + <i18n.version>4.0-alpha-6</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -423,7 +424,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-api</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -435,7 +436,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> </dependency> @@ -835,7 +836,7 @@ <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> </plugin> <plugin> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -50,12 +50,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>validation</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -43,11 +43,6 @@ <artifactId>dto</artifactId> <version>${project.version}</version> </dependency> -  <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> @@ -156,6 +151,7 @@ <plugins> + <plugin> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>toolbox-maven-plugin</artifactId> @@ -165,27 +161,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <className>ClientI18nValidatorHelper</className> - <prefix>observe.common.</prefix> - <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> - <sourceRoot>../validation/src/main/resources</sourceRoot> - <inheritanceMapping> - <fr.ird.observe.dto.referential.I18nReferentialDto> - label1,label2,label3,label4,label5,label6,label7,label8 - </fr.ird.observe.dto.referential.I18nReferentialDto> - <fr.ird.observe.dto.referential.ReferentialDto> - code,status,uri,needComment - </fr.ird.observe.dto.referential.ReferentialDto> - </inheritanceMapping> - </configuration> - </execution> - <execution> - <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -215,17 +190,32 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> <goals> <goal>parse-java</goal> - <goal>parse-validation</goal> + <goal>parse-validation-fields</goal> + <goal>parse-validation-messages</goal> <goal>generate</goal> </goals> <configuration> - <force>true</force> + <validationFieldPrefix>observe.common.</validationFieldPrefix> + <inheritanceMapping> + <fr.ird.observe.dto.referential.I18nReferentialDto> + label1,label2,label3,label4,label5,label6,label7,label8 + </fr.ird.observe.dto.referential.I18nReferentialDto> + <fr.ird.observe.dto.referential.ReferentialDto> + code,status,uri,needComment + </fr.ird.observe.dto.referential.ReferentialDto> + </inheritanceMapping> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dto</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/200e6bfc25867f0d28e5e5580e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/200e6bfc25867f0d28e5e5580e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: use new i18n mojos
by Tony CHEMIT 01 Nov '17

01 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3c2de76e by Tony CHEMIT at 2017-11-01T09:49:08+01:00 use new i18n mojos - - - - - 200e6bfc by Tony CHEMIT at 2017-11-01T17:39:01+01:00 use new i18n mojo - - - - - 8 changed files: - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/i18n.xml - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx - dto/pom.xml - pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -130,9 +130,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -163,15 +164,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -718,9 +718,9 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> + <id>default-parse-java-enumerations</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> </goals> <configuration> <enumerationSets> @@ -748,7 +748,7 @@ </configuration> </execution> <execution> - <id>check-convergence</id> + <id>default-check-i18n-artifacts</id> <goals> <goal>check-i18n-artifacts</goal> </goals> @@ -760,16 +760,16 @@ <goal>generate</goal> </goals> <configuration> + <copyToClasses>false</copyToClasses> <entries> <entry> - <specificGoal>parse-java</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> </execution> <execution> - <id>make-bundle</id> + <id>default-bundle</id> <goals> <goal>bundle</goal> </goals> ===================================== client/src/main/assembly/i18n.xml ===================================== --- a/client/src/main/assembly/i18n.xml +++ b/client/src/main/assembly/i18n.xml @@ -37,7 +37,7 @@ </fileSet> <fileSet> - <directory>target/generated-sources/resources/META-INF</directory> + <directory>target/classes/META-INF</directory> <outputDirectory/> <includes> <include>observe-i18n*</include> ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -39,6 +39,7 @@ javax.swing.JComboBox static fr.ird.observe.client.util.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t </import> <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.client.ui.storage.tabs.SecurityModel fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel + + static org.nuiton.i18n.I18n.t </import> <StorageStep id='step' initializer='StorageStep.ROLES'/> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -249,9 +249,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -278,16 +279,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.34</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> @@ -132,7 +132,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:http://git@gitlab.com/${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> @@ -156,7 +156,8 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> + <jaxx.version>3.0-alpha-17-SNAPSHOT</jaxx.version> + <i18n.version>4.0-alpha-6</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -423,7 +424,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-api</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -435,7 +436,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> </dependency> @@ -835,7 +836,7 @@ <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> </plugin> <plugin> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -43,11 +43,6 @@ <artifactId>dto</artifactId> <version>${project.version}</version> </dependency> -  <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> @@ -156,6 +151,7 @@ <plugins> + <plugin> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>toolbox-maven-plugin</artifactId> @@ -165,27 +161,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <className>ClientI18nValidatorHelper</className> - <prefix>observe.common.</prefix> - <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> - <sourceRoot>../validation/src/main/resources</sourceRoot> - <inheritanceMapping> - <fr.ird.observe.dto.referential.I18nReferentialDto> - label1,label2,label3,label4,label5,label6,label7,label8 - </fr.ird.observe.dto.referential.I18nReferentialDto> - <fr.ird.observe.dto.referential.ReferentialDto> - code,status,uri,needComment - </fr.ird.observe.dto.referential.ReferentialDto> - </inheritanceMapping> - </configuration> - </execution> - <execution> - <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -215,17 +190,32 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> <goals> <goal>parse-java</goal> - <goal>parse-validation</goal> + <goal>parse-validation-fields</goal> + <goal>parse-validation-messages</goal> <goal>generate</goal> </goals> <configuration> - <force>true</force> + <validationFieldPrefix>observe.common.</validationFieldPrefix> + <inheritanceMapping> + <fr.ird.observe.dto.referential.I18nReferentialDto> + label1,label2,label3,label4,label5,label6,label7,label8 + </fr.ird.observe.dto.referential.I18nReferentialDto> + <fr.ird.observe.dto.referential.ReferentialDto> + code,status,uri,needComment + </fr.ird.observe.dto.referential.ReferentialDto> + </inheritanceMapping> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dto</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] review validation i18n configuration and find out 6 missing keys...
by Tony CHEMIT 29 Oct '17

29 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f63e34a6 by Tony CHEMIT at 2017-10-29T16:22:57+01:00 review validation i18n configuration and find out 6 missing keys... - - - - - 4 changed files: - validation/pom.xml - validation/src/main/i18n/validation_en_GB.properties - validation/src/main/i18n/validation_es_ES.properties - validation/src/main/i18n/validation_fr_FR.properties Changes: ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -215,74 +215,19 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>parse-java-default</id> <phase>process-classes</phase> <goals> <goal>parse-java</goal> - </goals> - <configuration> - <treatDefaultEntry>false</treatDefaultEntry> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> - </entries> - </configuration> - </execution> - <execution> - <id>parse-validation-default</id> - <phase>process-classes</phase> - <goals> <goal>parse-validation</goal> + <goal>generate</goal> </goals> <configuration> - <treatDefaultEntry>false</treatDefaultEntry> - <entries> - <entry> - <basedir>${project.basedir}/src/main/resources/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> + <force>true</force> </configuration> </execution> - <execution> - <id>generate-default</id> - <phase>process-classes</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> </plugin> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </plugins> </build> </project> ===================================== validation/src/main/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/i18n/validation_en_GB.properties +++ b/validation/src/main/i18n/validation_en_GB.properties @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=A comment is observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode. observe.validation.catchLongline.required.position=Position must be filled. observe.validation.catchLongline.required.speciesCatch=Species catch must be filled. +observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound. +observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound. +observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound. +observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound. +observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound. +observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound. observe.validation.country.invalid.iso2Code.uniqueKey=Iso 2 code is not unique. observe.validation.country.invalid.iso3Code.uniqueKey=Iso 3 code is not unique. observe.validation.country.required.iso2Code=Iso 2 code must be filled. ===================================== validation/src/main/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/i18n/validation_es_ES.properties +++ b/validation/src/main/i18n/validation_es_ES.properties @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Se necesita u observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado. observe.validation.catchLongline.required.position=Se necesita la posición sobre el palangre. observe.validation.catchLongline.required.speciesCatch=Se necesita la especie. +observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound. \#TODO +observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound. \#TODO +observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound. \#TODO +observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound. \#TODO +observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound. \#TODO +observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound. \#TODO observe.validation.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. observe.validation.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. observe.validation.country.required.iso2Code=Código ISO2 no especificado ===================================== validation/src/main/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/i18n/validation_fr_FR.properties +++ b/validation/src/main/i18n/validation_fr_FR.properties @@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Un commentair observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. observe.validation.catchLongline.required.position=Pas de position renseignée sur la palangre. observe.validation.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée. +observe.validation.coordinate.degree.latitude.outOfBound=Les degrés de la latitude sont hors borne. +observe.validation.coordinate.degree.longitude.outOfBound=Les degrés de la longitude sont hors borne. +observe.validation.coordinate.minute.latitude.outOfBound=Les minutes de la latitude sont hors borne. +observe.validation.coordinate.minute.longitude.outOfBound=Les minutes de la longitude sont hors borne. +observe.validation.coordinate.second.latitude.outOfBound=Les secondes de la latitude sont hors borne. +observe.validation.coordinate.second.longitude.outOfBound=Les secondes de la longitude sont hors borne. observe.validation.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique observe.validation.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique observe.validation.country.required.iso2Code=Code ISO2 non renseigné. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f63e34a61a1d87299b4bfeefe5d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f63e34a61a1d87299b4bfeefe5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use next i18n plugin mojos
by Tony CHEMIT 29 Oct '17

29 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 29835352 by Tony CHEMIT at 2017-10-29T15:55:46+01:00 use next i18n plugin mojos - - - - - 24 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties - dto/pom.xml - dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties - pom.xml - server-configuration/pom.xml - server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties - server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties - server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties - services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties - services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties - services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties - validation/pom.xml - validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -168,8 +168,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties ===================================== ===================================== client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties ===================================== ===================================== client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties ===================================== ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -756,13 +756,13 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> <entry> - <specificGoal>parserJava</specificGoal> + <specificGoal>parse-java</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> ===================================== client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties ===================================== ===================================== client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties ===================================== ===================================== client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties ===================================== ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -284,8 +284,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties ===================================== ===================================== dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties ===================================== ===================================== dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties ===================================== ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -160,8 +160,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties ===================================== ===================================== server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties ===================================== ===================================== server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties ===================================== ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -215,58 +215,74 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>parse</id> + <id>parse-java-default</id> <phase>process-classes</phase> <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> + <goal>parse-java</goal> </goals> <configuration> - <treateDefaultEntry>false</treateDefaultEntry> + <treatDefaultEntry>false</treatDefaultEntry> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + </execution> + <execution> + <id>parse-validation-default</id> + <phase>process-classes</phase> + <goals> + <goal>parse-validation</goal> + </goals> + <configuration> + <treatDefaultEntry>false</treatDefaultEntry> <entries> <entry> - <specificGoal>parserValidation</specificGoal> <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> </entries> </configuration> </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> <execution> - <id>copy i18n files</id> + <id>generate-default</id> <phase>process-classes</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n"> - <filterset> - <filter value="${observe.model.version}" token="observe.model.version" /> - </filterset> - <fileset dir="${project.build.directory}/generated-sources/i18n"> - <include name="*.properties" /> - </fileset> - </copy> - </target> - </configuration> <goals> - <goal>run</goal> + <goal>generate</goal> </goals> </execution> + </executions> </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </plugins> </build> </project> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties ===================================== ===================================== validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties ===================================== ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties ===================================== View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: clean some tests
by Tony CHEMIT 28 Oct '17

28 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9f908c7b by Tony CHEMIT at 2017-10-28T22:44:04+02:00 clean some tests - - - - - 3313a4e7 by Tony CHEMIT at 2017-10-29T00:08:07+02:00 review validation (everything about validation in validation module (+ make this work with i18n plugin... with some tricks we are intend to fix in the plugin it-self) - - - - - ec662366 by Tony CHEMIT at 2017-10-29T00:18:11+02:00 use default phase for toolbox plugin - - - - - 30 changed files: - CONTRIBUTING.md - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - client/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - client/src/test/java/fr/ird/observe/client/ClientTestContext.java - client/src/test/java/fr/ird/observe/client/ClientTestMethodResource.java - client/src/test/java/fr/ird/observe/client/ClientTestSupport.java - client/src/test/java/fr/ird/observe/client/tools/ObserveTextGeneratorTest.java - persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java → persistence/src/test/java/fr/ird/observe/entities/seine/GenerateReferentialObjectMaterial.java - services-client/pom.xml - services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java - services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestContext.java - services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestMethodResource.java - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/EntityInterceptor.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java - services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java - services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java - services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/99b151d16bccca979fc97b3cf5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/99b151d16bccca979fc97b3cf5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve replicate tests
by Tony CHEMIT 28 Oct '17

28 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99b151d1 by Tony CHEMIT at 2017-10-28T22:22:53+02:00 improve replicate tests - - - - - 8 changed files: - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json - test/src/main/resources/db/6.904/empty_pg-fixtures.json - test/src/main/resources/db/6.904/referentiel-fixtures.json Changes: ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== --- a/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java +++ b/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java @@ -234,7 +234,7 @@ public class DtoModelClasses { .addAll(LONGLINE_REFERENTIAL_TYPES) .build(); - private static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of( + public static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of( ActivitySeineDto.class, FloatingObjectDto.class, FloatingObjectPartDto.class, @@ -265,7 +265,7 @@ public class DtoModelClasses { SetSeineTargetCatchDto.class, TripSeineGearUseDto.class); - private static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of( + public static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of( ActivityLonglineObsDto.class, BaitsCompositionObsDto.class, BasketDto.class, ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java @@ -22,10 +22,15 @@ package fr.ird.observe.entity; * #L% */ +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; -import org.junit.Test; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; @@ -35,20 +40,23 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; * @author Tony Chemit - dev(a)tchemit.fr */ @DatabaseNameConfiguration(DatabaseName.referentiel) -public class ReplicateReferentialsTest extends ReplicateTestSupport { +public class ReplicateReferentialTest extends ReplicateTestSupport { - @Test - public void testReplicate() throws Exception { + public ReplicateReferentialTest() { + super(DtoModelClasses.REFERENTIAL_TYPES, null); + } - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getReferentialTables(); + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getReferentialTables(); + } - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.empty_h2) + @Override + ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + return createReplicateTablesRequest(DatabaseName.empty_h2) .setTables(tables) .build(); - testReplicate0(request, ObserveFixtures.REFERENTIAL_TABLES_COUNT); - } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java @@ -22,8 +22,12 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; +import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.entities.ObserveDataEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveTopiaApplicationContext; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; @@ -37,17 +41,16 @@ import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ServiceLocalTestClassResource; import fr.ird.observe.services.test.ServiceLocalTestMethodResource; import fr.ird.observe.services.test.ServiceTestSupport; +import fr.ird.observe.spi.PersistenceModelHelper; import java.io.File; import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.junit.Test; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; -import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.util.StringUtil; @@ -56,7 +59,7 @@ import org.nuiton.util.StringUtil; * * @author Tony Chemit - dev(a)tchemit.fr */ -class ReplicateTestSupport extends ServiceTestSupport { +public abstract class ReplicateTestSupport extends ServiceTestSupport { /** * Logger. @@ -64,7 +67,17 @@ class ReplicateTestSupport extends ServiceTestSupport { private static final Log log = LogFactory.getLog(ReplicateTestSupport.class); private File scriptFile; + private final ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest; + private final ImmutableSet<Class<? extends DataDto>> dataTypesToTest; + abstract TopiaSqlTables createTables(); + + abstract ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException; + + ReplicateTestSupport(ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest, ImmutableSet<Class<? extends DataDto>> dataTypesToTest) { + this.referentialTypesToTest = referentialTypesToTest; + this.dataTypesToTest = dataTypesToTest; + } @Override public ServiceLocalTestClassResource getTestClassResource() { @@ -76,80 +89,60 @@ class ReplicateTestSupport extends ServiceTestSupport { return (ServiceLocalTestMethodResource) super.getTestMethodResource(); } - ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + @Test + public final void testReplicate() throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication"); - ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword()); - ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration); + TopiaSqlTables tables = createTables(); - scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql"); + ReplicateTablesRequest request = createRequest(tables); - Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8); + log.info(String.format("Will replicate using %d tables.", tables.size())); - return getTestMethodResource().getTopiaApplicationContext() + getTestMethodResource().getTopiaApplicationContext() .getSqlBatchService() - .replicateTablesRequestBuilder() - .to(targetTopiaApplicationContext) - .to(writer); - } - - private static void assertReplicateTripResults(ReplicateTablesRequest replicationRequest, ImmutableMap<String, Long> expectedResults) { - - TopiaSqlTables tables = replicationRequest.getTables(); - try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) replicationRequest.getTargetTopiaApplicationContext().newPersistenceContext()) { - - for (TopiaSqlTable table : tables) { - - String fullyTableName = table.getFullyTableName(); + .execute(request); - if (!expectedResults.containsKey(fullyTableName.toLowerCase())) { - Long count = persistenceContext.countTable(fullyTableName); - System.out.println(fullyTableName + " , " + count); + try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) request.getTargetTopiaApplicationContext().newPersistenceContext()) { + if (referentialTypesToTest != null) { + for (Class<? extends ReferentialDto> aClass : referentialTypesToTest) { + Class<ObserveReferentialEntity> entityType = PersistenceModelHelper.fromReferentialDto(aClass).toEntityType(); + int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass); + long actualCount = persistenceContext.getDao(entityType).count(); + Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount); } - } - - for (Map.Entry<String, Long> entry : expectedResults.entrySet()) { - String fullyTableName = entry.getKey(); - Long expectedCount = entry.getValue(); - Long count = persistenceContext.countTable(fullyTableName); - - log.debug("Found: " + fullyTableName + " , " + count); - Assert.assertEquals("Should have found " + expectedCount + " on " + fullyTableName + ", but was " + count, expectedCount, count); - + if (dataTypesToTest != null) { + for (Class<? extends DataDto> aClass : dataTypesToTest) { + Class<ObserveDataEntity> entityType = PersistenceModelHelper.fromDataDto(aClass).toEntityType(); + int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass); + long actualCount = persistenceContext.getDao(entityType).count(); + Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount); + } } } - } - - void testReplicate0(ReplicateTablesRequest request, ImmutableMap<String, Long> expectedTablesCount) { - - TopiaSqlTables tables = request.getTables(); - log.info(String.format("Will replicate using %d tables.", tables.size())); - - getTestMethodResource().getTopiaApplicationContext() - .getSqlBatchService() - .execute(request); - - - assertReplicateTripResults(request, expectedTablesCount); - log.debug(String.format("Replicate to script (length: %s) :\n%s", StringUtil.convertMemory(scriptFile.length()), scriptFile)); } - protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); + File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication"); + ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword()); + ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration); - testReplicate0(request, expectedTablesCount); + scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql"); + + Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8); + return getTestMethodResource().getTopiaApplicationContext() + .getSqlBatchService() + .replicateTablesRequestBuilder() + .to(targetTopiaApplicationContext) + .to(writer); } + } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java @@ -23,13 +23,21 @@ package fr.ird.observe.entity; */ import fr.ird.observe.dto.data.longline.TripLonglineDto; +import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -43,27 +51,25 @@ public class ReplicateTripLonglineTest extends ReplicateTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class); - @Test - public void testReplicate() throws Exception { + public ReplicateTripLonglineTest() { + super(null, DtoModelClasses.LONGLINE_ENTITY_DATA_TYPES); + } + + + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); + } + + @Override + protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); log.info(String.format("will replicate %d trip(s).", ids.size())); - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); - testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids); - } -// @Test -// public void testReplicateTripLonline1() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); -// } -// -// @Test -// public void testReplicateTripLonline2() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); -// } -// -// @Test -// public void testReplicateTripLonline3() throws Exception { -// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); -// } + return createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(ids)) + .setTables(tables) + .build(); + } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java @@ -22,14 +22,22 @@ package fr.ird.observe.entity; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.spi.DtoModelClasses; +import java.io.IOException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -39,30 +47,28 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; */ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReplicateTripSeineTest extends ReplicateTestSupport { + /** Logger. */ private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class); - @Test - public void testReplicate() throws Exception { + public ReplicateTripSeineTest() { + super(null, DtoModelClasses.SEINE_ENTITY_DATA_TYPES); + } + + @Override + TopiaSqlTables createTables() { + return getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); + } + + @Override + protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); log.info(String.format("will replicate %d trip(s).", ids.size())); - TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); - testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids); - } -// @Test -// public void testReplicateTripSeine1() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); -// } -// -// @Test -// public void testReplicateTripSeine2() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); -// } -// -// @Test -// public void testReplicateTripSeine3() throws Exception { -// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); -// } + return createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(ids)) + .setTables(tables) + .build(); + } } ===================================== test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json +++ b/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json @@ -10134,4 +10134,4 @@ }, "types": {} } -} +} \ No newline at end of file ===================================== test/src/main/resources/db/6.904/empty_pg-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/empty_pg-fixtures.json +++ b/test/src/main/resources/db/6.904/empty_pg-fixtures.json @@ -121,4 +121,4 @@ }, "types": {} } -} +} \ No newline at end of file ===================================== test/src/main/resources/db/6.904/referentiel-fixtures.json ===================================== --- a/test/src/main/resources/db/6.904/referentiel-fixtures.json +++ b/test/src/main/resources/db/6.904/referentiel-fixtures.json @@ -1080,6 +1080,8 @@ "fr.ird.observe.entities.referentiel.Person#1428578953995#0.8402597879270977", "fr.ird.observe.entities.referentiel.Person#1428578984404#0.1624818954985996", "fr.ird.observe.entities.referentiel.Person#1428579047136#0.28582733330602794", + "fr.ird.observe.entities.referentiel.Person#1429515754811#0.0860557500272989", + "fr.ird.observe.entities.referentiel.Person#1429515754847#0.704271007329226", "fr.ird.observe.entities.referentiel.Person#1432805038273#0.5664302448691187", "fr.ird.observe.entities.referentiel.Person#1433499200854#0.615648015402257", "fr.ird.observe.entities.referentiel.Person#1433499201263#0.745114278979599", @@ -1274,6 +1276,13 @@ "fr.ird.observe.entities.referentiel.ShipOwner#0#9" ], "referential.SizeMeasureType": [ + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949422#0.323839171556756", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949444#0.180838016327471", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949471#0.763535852311179", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949556#0.658470877679065", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949576#0.370653854450211", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949617#0.259305257815868", + "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949639#0.329839885467663", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359", @@ -1485,6 +1494,15 @@ "fr.ird.observe.entities.referentiel.Species#1365776436586#0.42584811850930293", "fr.ird.observe.entities.referentiel.Species#1383399210341#0.7324960169421437", "fr.ird.observe.entities.referentiel.Species#1383400882289#0.9275723384489454", + "fr.ird.observe.entities.referentiel.Species#1429515782578#0.57668571616523", + "fr.ird.observe.entities.referentiel.Species#1429515783191#0.301721239695325", + "fr.ird.observe.entities.referentiel.Species#1429515783493#0.271485573379323", + "fr.ird.observe.entities.referentiel.Species#1429515783680#0.0288836669642478", + "fr.ird.observe.entities.referentiel.Species#1429515783742#0.596136273350567", + "fr.ird.observe.entities.referentiel.Species#1429515783863#0.310130815720186", + "fr.ird.observe.entities.referentiel.Species#1429515784177#0.217057247878984", + "fr.ird.observe.entities.referentiel.Species#1429515784214#0.543130560778081", + "fr.ird.observe.entities.referentiel.Species#1429515784335#0.773490378633141", "fr.ird.observe.entities.referentiel.Species#1433499238727#0.452269877539948", "fr.ird.observe.entities.referentiel.Species#1433499239128#0.665396141353995", "fr.ird.observe.entities.referentiel.Species#1433499239536#0.330866874894127", @@ -2526,6 +2544,9 @@ "fr.ird.observe.entities.referentiel.Vessel#1418400134914#0.7508690402739512", "fr.ird.observe.entities.referentiel.Vessel#1418400258815#0.12569862197124138", "fr.ird.observe.entities.referentiel.Vessel#1418400345435#0.5664364147475593", + "fr.ird.observe.entities.referentiel.Vessel#1429515780666#0.496382233686745", + "fr.ird.observe.entities.referentiel.Vessel#1429515780701#0.825504872016609", + "fr.ird.observe.entities.referentiel.Vessel#1429515781376#0.949138431344181", "fr.ird.observe.entities.referentiel.Vessel#1433148953942#0.24272879354646504", "fr.ird.observe.entities.referentiel.Vessel#1433499209711#0.316791892750189", "fr.ird.observe.entities.referentiel.Vessel#1433499210648#0.808905522339046", @@ -2849,6 +2870,7 @@ "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.2", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.3", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.4", + "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1429515949203#0.00216103950515389", "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1433499460626#0.465611247578636" ], "referential.longline.BaitType": [ @@ -2862,6 +2884,7 @@ "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.8", "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.9", "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#1.0", + "fr.ird.observe.entities.referentiel.longline.BaitType#1429515949067#0.955311801983044", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499457783#0.290097113000229", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499458077#0.820353789720684", "fr.ird.observe.entities.referentiel.longline.BaitType#1433499458372#0.785577602451667", @@ -2874,6 +2897,7 @@ "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.2", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.4", + "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1429515949274#0.952565349172801", "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1433499462055#0.71151070506312" ], "referential.longline.EncounterType": [ @@ -2935,6 +2959,7 @@ "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.7", "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.8", "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.9", + "fr.ird.observe.entities.referentiel.longline.HookSize#1429515948468#0.511942049022764", "fr.ird.observe.entities.referentiel.longline.HookSize#1433499436918#0.552373287733644" ], "referential.longline.HookType": [ @@ -3038,6 +3063,7 @@ "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.3", "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.4", "fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.5", + "fr.ird.observe.entities.referentiel.longline.SettingShape#1429515949392#0.162451097276062", "fr.ird.observe.entities.referentiel.longline.SettingShape#1433499465088#0.892811479745433" ], "referential.longline.StomacFullness": [ @@ -3047,6 +3073,7 @@ "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.4", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.5", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.6", + "fr.ird.observe.entities.referentiel.longline.StomacFullness#1429515949368#0.204060212243348", "fr.ird.observe.entities.referentiel.longline.StomacFullness#1433499464733#0.548250555759296" ], "referential.longline.TripType": [ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix db name
by Tony CHEMIT 27 Oct '17

27 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5b394d8 by Tony CHEMIT at 2017-10-27T13:34:13+02:00 fix db name - - - - - 6a24f3b4 by Tony CHEMIT at 2017-10-27T13:34:40+02:00 fix some replication tests on longline model + improve some other trip management stuff - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java - persistence/src/main/models/Observe.model - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java - services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java - services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/6.0/referentiel.sql.gz - test/src/main/resources/db/6.904/referentiel.sql.gz Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java @@ -332,7 +332,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa for (TripEntry tripEntry : tripEntries) { progressModel.incrementsCurrentStep(); - ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); + ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.exportData.message.result.export.trip"), exportTripResult, ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -326,7 +326,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -355,7 +355,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java @@ -154,7 +154,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { for (DataDtoReference trip : entry.getValue()) { - ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId()); + ExportTripRequest exportRequest = new ExportTripRequest(false, trip.getId()); ExportTripResult exportTripResult = managementService.exportTrip(exportRequest); progressModel.incrementsCurrentStep(); ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -264,7 +264,7 @@ sensorType {*:1} referentiel.longline.SensorType sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat sensorBrand {*:1} referentiel.longline.SensorBrand -longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=SetObs +longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=setObs homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.local.service.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.db.ObserveBlobsContainer; +import fr.ird.observe.entities.Trip; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; @@ -87,7 +88,9 @@ public class TripManagementServiceLocal extends ObserveServiceLocal implements T long time = System.nanoTime() - t0; - return new ExportTripResult(exportRequest, tripContent, blobsContainers, time); + Trip trip = getTopiaPersistenceContext().findByTopiaId(tripId); + String programId = trip.getProgram().getTopiaId(); + return new ExportTripResult(exportRequest, programId,tripContent, blobsContainers, time); } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java @@ -46,6 +46,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.util.StringUtil; @@ -140,4 +141,15 @@ class ReplicateTestSupport extends ServiceTestSupport { } + protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + + ReplicateTablesRequest request + = createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) + .setTables(tables) + .build(); + + testReplicate0(request, expectedTablesCount); + + } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java @@ -22,71 +22,48 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; -import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; -import java.io.IOException; -import org.junit.Ignore; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** * Created on 29/12/15. * * @author Tony Chemit - dev(a)tchemit.fr - * FIXME Review database, there is some missing in new referential, so it does not work. */ -@Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) public class ReplicateTripLonglineTest extends ReplicateTestSupport { - @Test - public void testReplicateAllTripLongline() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT); - } - - @Test - public void testReplicateAllTripLongline2() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, - ObserveFixtures.TRIP_LONGLINE_ID_1, - ObserveFixtures.TRIP_LONGLINE_ID_2, - ObserveFixtures.TRIP_LONGLINE_ID_3); - } + /** Logger. */ + private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class); @Test - public void testReplicateTripLonline1() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); - } - - @Test - public void testReplicateTripLonline2() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); - } - - @Test - public void testReplicateTripLonline3() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); - } - - protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - + public void testReplicate() throws Exception { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + log.info(String.format("will replicate %d trip(s).", ids.size())); TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); - - testReplicate0(request, expectedTablesCount); - + testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids); } +// @Test +// public void testReplicateTripLonline1() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); +// } +// +// @Test +// public void testReplicateTripLonline2() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); +// } +// +// @Test +// public void testReplicateTripLonline3() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); +// } + } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java @@ -22,13 +22,14 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; +import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -38,47 +39,30 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; */ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReplicateTripSeineTest extends ReplicateTestSupport { + /** Logger. */ + private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class); @Test - public void testReplicateAllTripSeine() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT); - } - - @Test - public void testReplicateTripSeine1() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); - } - - @Test - public void testReplicateAllTripSeine2() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT, - ObserveFixtures.TRIP_SEINE_ID_1, - ObserveFixtures.TRIP_SEINE_ID_2, - ObserveFixtures.TRIP_SEINE_ID_3); - } - - @Test - public void testReplicateTripSeine2() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); - } - - @Test - public void testReplicateTripSeine3() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); - } - - protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws Exception { - + public void testReplicate() throws Exception { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + log.info(String.format("will replicate %d trip(s).", ids.size())); TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); - - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); - - testReplicate0(request, expectedTablesCount); - + testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids); } +// @Test +// public void testReplicateTripSeine1() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); +// } +// +// @Test +// public void testReplicateTripSeine2() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); +// } +// +// @Test +// public void testReplicateTripSeine3() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); +// } + } ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java @@ -22,6 +22,9 @@ package fr.ird.observe.services.service.data; * #L% */ +import fr.ird.observe.dto.data.longline.TripLonglineDto; +import fr.ird.observe.dto.data.longline.TripLonglineReference; +import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; @@ -41,6 +44,7 @@ import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; +import java.util.Set; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -54,19 +58,24 @@ public class TripManagementServiceTest extends ServiceTestSupport { private TripManagementService tripManagementService; private TripSeineService tripSeineService; + private TripLonglineService tripLonglineService; @Before public void setUp() throws Exception { tripManagementService = getTestMethodResource().newService(TripManagementService.class); tripSeineService = getTestMethodResource().newService(TripSeineService.class); + tripLonglineService = getTestMethodResource().newService(TripLonglineService.class); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void exportTripSeine() { - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - ExportTripResult result = tripManagementService.exportTrip(request); - Assert.assertNotNull(result); + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + for (String id : ids) { + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = tripManagementService.exportTrip(request); + Assert.assertNotNull(result); + } } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @@ -74,64 +83,93 @@ public class TripManagementServiceTest extends ServiceTestSupport { @Test public void deleteTripSeine() { - DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine(); + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + for (String id : ids) { - DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - DeleteTripResult result = tripManagementService.deleteTrip(request); - Assert.assertNotNull(result); + DataDtoReferenceSet<TripSeineReference> allTripBefore = tripSeineService.getAllTripSeine(); + DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id); + DeleteTripResult result = tripManagementService.deleteTrip(request); + Assert.assertNotNull(result); - DataDtoReferenceSet<TripSeineReference> allTripSeineAfter = tripSeineService.getAllTripSeine(); - Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1); + DataDtoReferenceSet<TripSeineReference> allTripAfter = tripSeineService.getAllTripSeine(); + Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1); + } } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @Test public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - importTrip(request, true); - + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + importTrip(true, ids); } - // FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines) -// @Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @CopyDatabaseConfiguration @Test public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + importTrip(false, ids); + } + + @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) + @CopyDatabaseConfiguration + @Test + public void deleteTripLongline() { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + for (String id : ids) { + DataDtoReferenceSet<TripLonglineReference> allTripBefore = tripLonglineService.getAllTripLongline(); + + DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id); + DeleteTripResult result = tripManagementService.deleteTrip(request); + Assert.assertNotNull(result); - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_LONGLINE_ID_1); - importTrip(request, false); + DataDtoReferenceSet<TripLonglineReference> allTripAfter = tripLonglineService.getAllTripLongline(); + Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1); + } + } + @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) + @Test + public void exportTripLongline() { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + for (String id : ids) { + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = tripManagementService.exportTrip(request); + Assert.assertNotNull(result); + } } - private void importTrip(ExportTripRequest request, boolean forSeine) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - ExportTripResult result = tripManagementService.exportTrip(request); + private void importTrip(boolean forSeine, Set<String> ids) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget"); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget" + forSeine); try (DataSourceService dataSourceService = getTestClassResource().newService(dataSourceConfiguration, DataSourceService.class)) { DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(getTestMethodResource().getDataSourceConfiguration()); - + dataSourceCreateConfiguration.setLeaveOpenSource(true); ObserveDataSourceConnection dataSourceConnection = dataSourceService.create(dataSourceConfiguration, dataSourceCreateConfiguration); dataSourceConnection = new ObserveDataSourceConnectionTopiaForTest(dataSourceConnection.getAuthenticationToken()); - TripManagementService tripManagementService = getTestClassResource().newService(dataSourceConnection, TripManagementService.class); TripSeineService tripSeineService = getTestClassResource().newService(dataSourceConnection, TripSeineService.class); TripLonglineService tripLonglineService = getTestClassResource().newService(dataSourceConnection, TripLonglineService.class); - int allTripSeineBefore = forSeine ? tripSeineService.getAllTripSeine().size() : + int allTripBefore = forSeine ? tripSeineService.getAllTripSeine().size() : tripLonglineService.getAllTripLongline().size(); - tripManagementService.importTrip(new ImportTripRequest(result)); + for (String id : ids) { - int allTripSeineAfter = forSeine ? tripSeineService.getAllTripSeine().size() : - tripLonglineService.getAllTripLongline().size(); - Assert.assertTrue(allTripSeineAfter == allTripSeineBefore + 1); + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = this.tripManagementService.exportTrip(request); + + tripManagementService.importTrip(new ImportTripRequest(result)); + + int allTripAfter = forSeine ? tripSeineService.getAllTripSeine().size() : + tripLonglineService.getAllTripLongline().size(); + Assert.assertEquals(allTripAfter, ++allTripBefore); + } } ===================================== services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java @@ -33,12 +33,10 @@ import fr.ird.observe.dto.ObserveDto; public class ExportTripRequest implements ObserveDto { private final boolean forPG; - private final String programId; private final String tripId; - public ExportTripRequest(boolean forPG, String programId, String tripId) { + public ExportTripRequest(boolean forPG, String tripId) { this.forPG = forPG; - this.programId = programId; this.tripId = tripId; } @@ -46,10 +44,6 @@ public class ExportTripRequest implements ObserveDto { return forPG; } - public String getProgramId() { - return programId; - } - public String getTripId() { return tripId; } ===================================== services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java @@ -41,10 +41,10 @@ public class ExportTripResult implements ObserveDto { private final long time; public ExportTripResult(ExportTripRequest request, - byte[] sqlContent, + String programId, byte[] sqlContent, ImmutableSet<ObserveBlobsContainer> blobsContainers, long time) { - this.programId = request.getProgramId(); + this.programId = programId; this.tripId = request.getTripId(); this.sqlContent = sqlContent; this.blobsContainers = blobsContainers; ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -94,19 +94,19 @@ public class ObserveFixtures { .put("observe_common.lengthlengthparameter", 0L) .put("observe_common.lengthweightparameter", 365L) .put("observe_common.ocean", 3L) - .put("observe_common.ocean_species", 500L) + .put("observe_common.ocean_species", 517L) .put("observe_common.organism", 9L) - .put("observe_common.person", 512L) + .put("observe_common.person", 514L) .put("observe_common.program", 27L) .put("observe_common.shipOwner", 27L) - .put("observe_common.sex", 5L) - .put("observe_common.sizemeasuretype", 17L) - .put("observe_common.species", 285L) - .put("observe_common.species_specieslist", 401L) + .put("observe_common.shipowner", 27L) + .put("observe_common.sizemeasuretype", 24L) + .put("observe_common.species", 294L) + .put("observe_common.species_specieslist", 410L) .put("observe_common.speciesgroup", 11L) - .put("observe_common.speciesgroupreleasemode", 10L) + .put("observe_common.speciesgroup_speciesgroupreleasemode", 20L) .put("observe_common.specieslist", 6L) - .put("observe_common.vessel", 1172L) + .put("observe_common.vessel", 1175L) .put("observe_common.vesselsizecategory", 13L) .put("observe_common.vesseltype", 14L) .put("observe_common.weightmeasuretype", 3L) @@ -135,13 +135,13 @@ public class ObserveFixtures { private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() .put("observe_longline.baithaulingstatus", 5L) - .put("observe_longline.baitsettingstatus", 5L) - .put("observe_longline.baittype", 16L) - .put("observe_longline.catchfate", 5L) + .put("observe_longline.baitsettingstatus", 6L) + .put("observe_longline.baittype", 17L) + .put("observe_longline.catchfate", 6L) .put("observe_longline.encountertype", 12L) .put("observe_longline.healthness", 6L) .put("observe_longline.hookposition", 13L) - .put("observe_longline.hooksize", 22L) + .put("observe_longline.hooksize", 23L) .put("observe_longline.hooktype", 13L) .put("observe_longline.itemverticalposition", 3L) .put("observe_longline.itemhorizontalposition", 3L) @@ -153,8 +153,8 @@ public class ObserveFixtures { .put("observe_longline.sensorbrand", 4L) .put("observe_longline.sensordataformat", 2L) .put("observe_longline.sensortype", 4L) - .put("observe_longline.settingshape", 6L) - .put("observe_longline.stomacfullness", 7L) + .put("observe_longline.settingshape", 7L) + .put("observe_longline.stomacfullness", 8L) .put("observe_longline.triptype", 3L) .put("observe_longline.vesselactivity", 5L) .build(); @@ -307,7 +307,7 @@ public class ObserveFixtures { .put("observe_longline.basket", 3229L) .put("observe_longline.branchline", 19374L) .put("observe_longline.catch", 677L) - .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.mitigationtype_setobs", 0L) .put("observe_longline.sizemeasure", 647L) .put("observe_longline.weightmeasure", 0L) .put("observe_longline.catch_predator", 25L) ===================================== test/src/main/resources/db/6.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.0/referentiel.sql.gz and b/test/src/main/resources/db/6.0/referentiel.sql.gz differ ===================================== test/src/main/resources/db/6.904/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.904/referentiel.sql.gz and b/test/src/main/resources/db/6.904/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d389157… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d389157… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] reformat test + improve code
by Tony CHEMIT 25 Oct '17

25 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bb2a1aac by Tony CHEMIT at 2017-10-25T18:59:03+02:00 reformat test + improve code - - - - - 17 changed files: - services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java - services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java - services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java - services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java - services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java Changes: ===================================== services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java ===================================== --- a/services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java +++ b/services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java @@ -30,7 +30,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.service.ObserveService; -import fr.ird.observe.services.test.TestClassResourceSupport; import fr.ird.observe.services.test.spi.DatabaseClassifier; import java.io.IOException; import java.net.URL; @@ -88,11 +87,11 @@ public class ServiceClientTestClassResource extends TestClassResourceSupport { } public ObserveDataSourceConfigurationRest createDataSourceConfigurationRest(Class<?> testClass, - String databaseName, - Version dbVersion, - URL serverUrl, - String login, - char... password) { + String databaseName, + Version dbVersion, + URL serverUrl, + String login, + char... password) { ObserveDataSourceConfigurationRest configurationRest = new ObserveDataSourceConfigurationRest(); configurationRest.setLabel(testClass.getSimpleName() + "#" + serverUrl); ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java @@ -23,8 +23,8 @@ package fr.ird.observe.entity; */ import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Test; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java @@ -29,8 +29,8 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import java.io.IOException; import org.junit.Ignore; import org.junit.Test; ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java @@ -24,8 +24,8 @@ package fr.ird.observe.entity; import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Test; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.local.service.actions.validate; */ import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.validation.ValidatorsMap; +import fr.ird.observe.test.ObserveFixtures; import java.util.Arrays; import java.util.List; import org.junit.Assert; ===================================== services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java +++ b/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java @@ -34,10 +34,10 @@ import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ServiceLocalTestClassResource; import fr.ird.observe.services.test.ServiceLocalTestMethodResource; import fr.ird.observe.services.test.ServiceTestSupport; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.context.DataDtoEntityContext; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import fr.ird.observe.test.ObserveFixtures; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java @@ -24,9 +24,9 @@ package fr.ird.observe.services.service.actions.report; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import java.io.IOException; import java.net.URL; import java.util.List; ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java @@ -95,10 +95,10 @@ import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; import org.junit.Test; ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java @@ -40,10 +40,10 @@ import fr.ird.observe.entities.longline.SetLonglineObs; import fr.ird.observe.services.action.LoadFormRequestDto; import fr.ird.observe.services.action.SaveRequestDto; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; import org.junit.Test; ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java @@ -26,9 +26,9 @@ import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.action.PreCreateFormRequestDto; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; import org.junit.Test; ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java @@ -28,9 +28,9 @@ import fr.ird.observe.dto.data.seine.TargetSampleDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.action.LoadFormRequestDto; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; import org.junit.Test; ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java @@ -34,10 +34,10 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.action.LoadFormRequestDto; import fr.ird.observe.services.action.SaveRequestDto; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Before; import org.junit.Test; ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java @@ -41,10 +41,10 @@ import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import java.util.Calendar; import java.util.Date; import org.junit.Assert; ===================================== services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.test.DatabaseFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.spi.DtoModelClasses; -import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; import java.io.IOException; import java.util.Date; @@ -90,7 +89,7 @@ public class ReferentialServiceTest extends ServiceTestSupport { @Test public void testGetTripSeineRequest() throws Exception { - FormDefinition<TripSeineDto> dataDefinition = DtoModelHelper.<TripSeineDto>getOptionalFormDefinition(TripSeineDto.class).orElseThrow(IllegalAccessException::new); + FormDefinition<TripSeineDto> dataDefinition = TripSeineDto.formDefinition(); Class<TripSeineDto> requestName = dataDefinition.getType(); //FIXME @@ -131,7 +130,7 @@ public class ReferentialServiceTest extends ServiceTestSupport { } -// FIXME!!! Coming from rest See what is going on ? + // FIXME!!! Coming from rest See what is going on ? @Ignore @Test public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException { ===================================== services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java @@ -25,9 +25,9 @@ package fr.ird.observe.services.service.sql; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; ===================================== services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java +++ b/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java @@ -86,6 +86,7 @@ public class ObserveTestResources { public static URL getResourceContentUrl(String scriptPath) throws IOException { return ObserveTestResources.class.getResource(scriptPath); } + public static byte[] getResourceContent(String scriptPath) throws IOException { URL url = getResourceContentUrl(scriptPath); ===================================== services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java +++ b/services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java @@ -242,7 +242,7 @@ public abstract class TestMethodResourceSupport implements TestRule { if (referentialCache != null) { referentialCache.close(); } - + getTestClassResource().setTemporaryDirectoryRoot(null); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb2a1aac2e3a2dade97d3891576… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb2a1aac2e3a2dade97d3891576… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix isolation on services tests, happy to get back it works as it was before refactor \o/
by Tony CHEMIT 25 Oct '17

25 Oct '17

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

1 0

[Git][ultreiaio/ird-observe][develop] clean service local tests
by Tony CHEMIT 25 Oct '17

25 Oct '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 480ee425 by Tony CHEMIT at 2017-10-25T15:26:25+02:00 clean service local tests - - - - - 11 changed files: - services-local/pom.xml - services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java - services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java - services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java - services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java - − services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java - services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java Changes: ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -236,15 +236,6 @@ <test>fr.ird.observe.services.local.ServiceLocalTestSuite</test> </configuration> </execution> - <execution> - <id>default-test</id> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> </executions> </plugin> @@ -254,7 +245,7 @@ <profiles> <profile> - <id>migrate-test-dbs</id> + <id>generate-test-dbs</id> <build> <defaultGoal>test</defaultGoal> <plugins> @@ -267,7 +258,7 @@ <goal>test</goal> </goals> <configuration> - <test>fr.ird.observe.services.test.MigrateTestsDatabases</test> + <test>fr.ird.observe.services.fixtures.GenerateTestsDatabases</test> </configuration> </execution> <execution> @@ -285,7 +276,7 @@ </build> </profile> <profile> - <id>update-test-fixtures</id> + <id>generate-test-fixtures</id> <build> <defaultGoal>test</defaultGoal> <plugins> @@ -298,7 +289,7 @@ <goal>test</goal> </goals> <configuration> - <test>fr.ird.observe.services.test.GenerateDatabaseFixtures</test> + <test>fr.ird.observe.services.fixtures.GenerateDatabaseFixtures</test> </configuration> </execution> <execution> ===================================== services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java +++ b/services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java @@ -40,15 +40,17 @@ import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.PersistenceModelHelper; import fr.ird.observe.spi.context.DataDtoEntityContext; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import fr.ird.observe.test.ObserveFixtures; import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; @@ -64,7 +66,7 @@ import org.nuiton.topia.persistence.TopiaDao; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class DecoratorServiceTest extends ServiceLocalTestSupport { +public class DecoratorServiceTest extends ServiceTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(DecoratorServiceTest.class); @@ -72,6 +74,17 @@ public class DecoratorServiceTest extends ServiceLocalTestSupport { private DecoratorService decoratorService; private Collection<Class<? extends IdDto>> dtoTypes; + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @Before public void setUp() { ===================================== services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java @@ -34,7 +34,9 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesTopiaDao; import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import java.util.Date; import java.util.Optional; @@ -51,13 +53,24 @@ import org.nuiton.util.DateUtil; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.8 */ -public class LengthWeightParemetersTest extends ServiceLocalTestSupport { +public class LengthWeightParemetersTest extends ServiceTestSupport { /** Logger */ private static final Log log = LogFactory.getLog(LengthWeightParemetersTest.class); private ObserveTopiaPersistenceContext persistenceContext; + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @Before public void setUp() { ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java @@ -30,11 +30,13 @@ import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialIm import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.local.ObserveTopiaApplicationContextFactory; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -53,7 +55,7 @@ import org.nuiton.util.StringUtil; * * @author Tony Chemit - dev(a)tchemit.fr */ -class ReplicateTestSupport extends ServiceLocalTestSupport { +class ReplicateTestSupport extends ServiceTestSupport { /** * Logger. @@ -62,6 +64,17 @@ class ReplicateTestSupport extends ServiceLocalTestSupport { private File scriptFile; + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication"); ===================================== services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java +++ b/services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.test; +package fr.ird.observe.services.fixtures; /*- * #%L @@ -26,7 +26,11 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; +import fr.ird.observe.services.test.DatabaseFixtures; +import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.spi.PersistenceModelHelper; @@ -46,7 +50,18 @@ import org.junit.Test; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class GenerateDatabaseFixtures extends ServiceLocalTestSupport { +public class GenerateDatabaseFixtures extends ServiceTestSupport { + + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } @DatabaseNameConfiguration(DatabaseName.referentiel) @Test ===================================== services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java +++ b/services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.test; +package fr.ird.observe.services.fixtures; /*- * #%L @@ -24,7 +24,6 @@ package fr.ird.observe.services.test; import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -32,6 +31,11 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.sql.SqlScriptProducerService; +import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.ObserveTestConfiguration; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.services.test.spi.DatabaseVersionConfiguration; @@ -54,16 +58,27 @@ import org.nuiton.version.Version; * @author Tony Chemit - dev(a)tchemit.fr */ @DatabaseVersionConfiguration(ObserveTestConfiguration.PREVIOUS_VERSION) -public class MigrateTestsDatabases extends ServiceLocalTestSupport { +public class GenerateTestsDatabases extends ServiceTestSupport { /** * Logger. */ - private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class); + private static final Log log = LogFactory.getLog(GenerateTestsDatabases.class); protected SqlScriptProducerService service; private DataSourceService dataSourceService; + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @BeforeClass public static void setUpClass() throws Exception { ((ServiceLocalTestClassResource) TOPIA_TEST_CLASS_RESOURCE).getDataSourcesForTestManager().clear(); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java @@ -37,11 +37,14 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.ObserveTestConfiguration; import fr.ird.observe.services.test.ObserveTestResources; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.ObserveFixtures; import java.io.File; import java.io.IOException; import java.lang.reflect.Modifier; @@ -66,13 +69,23 @@ import org.nuiton.topia.persistence.TopiaPersistenceContext; */ @Ignore @DatabaseNameConfiguration(DatabaseName.dataSourceTest) -public class DataSourceServiceLocalTest extends ServiceLocalTestSupport { +public class DataSourceServiceLocalTest extends ServiceTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceServiceLocalTest.class); protected DataSourceService service; + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @Before public void setUp() { ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java @@ -38,6 +38,9 @@ import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ObserveTestConfiguration; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseLoginConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.services.test.spi.DatabasePasswordConfiguration; @@ -54,13 +57,23 @@ import org.junit.Test; @Ignore @DatabaseNameConfiguration(DatabaseName.dataSourceTest) @DatabasePasswordConfiguration(ObserveTestConfiguration.OBSTUNA_PASSWORD) -public class RigthTest extends ServiceLocalTestSupport { +public class RigthTest extends ServiceTestSupport { public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_ADMIN_LOGIN) @Test public void testAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java deleted ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java +++ /dev/null @@ -1,92 +0,0 @@ -package fr.ird.observe.services.local.service; - -/*- - * #%L - * ObServe :: Services local implementation - * %% - * Copyright (C) 2008 - 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 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 General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; -import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.entities.ObserveEntity; -import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.referential.ReferentialService; -import fr.ird.observe.services.test.ServiceLocalTestClassResource; -import fr.ird.observe.services.test.ServiceLocalTestMethodResource; -import fr.ird.observe.services.test.ServiceTestSupport; -import fr.ird.observe.spi.PersistenceModelHelper; -import fr.ird.observe.spi.context.ReferentialDtoEntityContext; -import java.util.Date; -import org.junit.Assert; - -/** - * Created on 26/12/15. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public class ServiceLocalTestSupport extends ServiceTestSupport { - - @Override - public ServiceLocalTestClassResource getTestClassResource() { - return (ServiceLocalTestClassResource) super.getTestClassResource(); - } - - @Override - public ServiceLocalTestMethodResource getTestMethodResource() { - return (ServiceLocalTestMethodResource) super.getTestMethodResource(); - } - - public <E extends ObserveEntity> Date getLastUpdateDate(Class<E> entityType) { - try (ObserveTopiaPersistenceContext persistenceContext = getTestMethodResource().newPersistenceContext()) { - return persistenceContext.getLastUpdateDate(entityType); - } - } - - public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R getReference(Class<D> type, int index) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - - ReferentialDtoEntityContext<D, R, ?, ?> entityContext = PersistenceModelHelper.fromReferentialDto(type); - Class<R> referenceType = entityContext.toReferenceType(); - - ReferentialService referentialService = getTestMethodResource().newService(ReferentialService.class); - ReferentialDtoReferenceSet<R> referentialReferenceSet = getTestMethodResource().getReferentialCache().getReferentialReferenceSet(referentialService, referenceType); - return referentialReferenceSet.getReferenceByPosition(index); - - } - - protected void assertEntityEqualsReferenceDto(ObserveEntity entity, ReferentialDtoReference referenceDto) { - if (entity == null) { - Assert.assertNull(referenceDto); - } else { - Assert.assertEquals(entity.getTopiaId(), referenceDto.getId()); - } - } - - protected void assertReferenceDtoEqualsEntity(ReferentialDtoReference referenceDto, ObserveEntity entity) { - if (referenceDto == null) { - Assert.assertNull(entity); - } else { - Assert.assertEquals(referenceDto.getId(), entity.getTopiaId()); - } - } - -} ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java @@ -29,7 +29,6 @@ import fr.ird.observe.dto.referential.VesselDto; import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.persistence.Entities; import fr.ird.observe.persistence.ObserveEntityEnum; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults; @@ -41,6 +40,7 @@ import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.ObserveTestConfiguration; import fr.ird.observe.services.test.ServiceLocalTestClassResource; import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseClassifier; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; @@ -61,7 +61,7 @@ import org.junit.Test; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSupport { +public class UnidirectionalSynchronizeReferentialTest extends ServiceTestSupport { @ClassRule public static final ServiceLocalTestClassResource TOPIA_TEST_CLASS_RESOURCE_CENTRAL = new ServiceLocalTestClassResource(DatabaseClassifier.CENTRAL); @@ -72,6 +72,17 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu private UnidirectionalReferentialSynchronizeLocalService localService; private ReferentialSynchronizeDiffsEngine diffsEngine; + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @Before public void setUp() throws Exception { localService = getTestMethodResource().newService(UnidirectionalReferentialSynchronizeLocalService.class); ===================================== services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java +++ b/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java @@ -30,8 +30,10 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.test.DatabaseName; +import fr.ird.observe.services.test.ServiceLocalTestClassResource; +import fr.ird.observe.services.test.ServiceLocalTestMethodResource; +import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.context.DataDtoEntityContext; @@ -49,11 +51,22 @@ import org.nuiton.topia.persistence.TopiaDao; * @author Tony Chemit - dev(a)tchemit.fr */ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) -public class PersistenceModelHelperTest extends ServiceLocalTestSupport { +public class PersistenceModelHelperTest extends ServiceTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(PersistenceModelHelperTest.class); + + @Override + public ServiceLocalTestClassResource getTestClassResource() { + return (ServiceLocalTestClassResource) super.getTestClassResource(); + } + + @Override + public ServiceLocalTestMethodResource getTestMethodResource() { + return (ServiceLocalTestMethodResource) super.getTestMethodResource(); + } + @Test public void testTransformEntityToReferentialDto() throws Exception { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/480ee425551eaa048f35b2b9a4e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/480ee425551eaa048f35b2b9a4e… You're receiving this email because of your account on gitlab.com.

1 0