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

Commits:

11 changed files:

Changes:

  • services-local/pom.xml
    ... ... @@ -236,15 +236,6 @@
    236 236 
                   <test>fr.ird.observe.services.local.ServiceLocalTestSuite</test>
    237 237 
                 </configuration>
    238 238 
               </execution>
    239 
    -          <execution>
    240 
    -            <id>default-test</id>
    241 
    -            <goals>
    242 
    -              <goal>test</goal>
    243 
    -            </goals>
    244 
    -            <configuration>
    245 
    -              <skip>true</skip>
    246 
    -            </configuration>
    247 
    -          </execution>
    248 239 
             </executions>
    249 240 
           </plugin>
    250 241
    ... ... @@ -254,7 +245,7 @@
    254 245
    255 246 
       <profiles>
    256 247 
         <profile>
    257 
    -      <id>migrate-test-dbs</id>
    248 
    +      <id>generate-test-dbs</id>
    258 249 
           <build>
    259 250 
             <defaultGoal>test</defaultGoal>
    260 251 
             <plugins>
    ... ... @@ -267,7 +258,7 @@
    267 258 
                       <goal>test</goal>
    268 259 
                     </goals>
    269 260 
                     <configuration>
    270 
    -                  <test>fr.ird.observe.services.test.MigrateTestsDatabases</test>
    261 
    +                  <test>fr.ird.observe.services.fixtures.GenerateTestsDatabases</test>
    271 262 
                     </configuration>
    272 263 
                   </execution>
    273 264 
                   <execution>
    ... ... @@ -285,7 +276,7 @@
    285 276 
           </build>
    286 277 
         </profile>
    287 278 
         <profile>
    288 
    -      <id>update-test-fixtures</id>
    279 
    +      <id>generate-test-fixtures</id>
    289 280 
           <build>
    290 281 
             <defaultGoal>test</defaultGoal>
    291 282 
             <plugins>
    ... ... @@ -298,7 +289,7 @@
    298 289 
                       <goal>test</goal>
    299 290 
                     </goals>
    300 291 
                     <configuration>
    301 
    -                  <test>fr.ird.observe.services.test.GenerateDatabaseFixtures</test>
    292 
    +                  <test>fr.ird.observe.services.fixtures.GenerateDatabaseFixtures</test>
    302 293 
                     </configuration>
    303 294 
                   </execution>
    304 295 
                   <execution>

  • services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
    ... ... @@ -40,15 +40,17 @@ import fr.ird.observe.entities.ObserveDataEntity;
    40 40 
     import fr.ird.observe.entities.ObserveEntity;
    41 41 
     import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
    42 42 
     import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    43 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    44 43 
     import fr.ird.observe.services.test.DatabaseName;
    45 
    -import fr.ird.observe.test.ObserveFixtures;
    44 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    45 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    46 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    46 47 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    47 48 
     import fr.ird.observe.spi.DtoModelClasses;
    48 49 
     import fr.ird.observe.spi.DtoModelHelper;
    49 50 
     import fr.ird.observe.spi.PersistenceModelHelper;
    50 51 
     import fr.ird.observe.spi.context.DataDtoEntityContext;
    51 52 
     import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
    53 
    +import fr.ird.observe.test.ObserveFixtures;
    52 54 
     import java.util.Collection;
    53 55 
     import java.util.List;
    54 56 
     import org.apache.commons.logging.Log;
    ... ... @@ -64,7 +66,7 @@ import org.nuiton.topia.persistence.TopiaDao;
    64 66 
      *
    65 67 
      * @author Tony Chemit - dev@tchemit.fr
    66 68 
      */
    67 
    -public class DecoratorServiceTest extends ServiceLocalTestSupport {
    69 
    +public class DecoratorServiceTest extends ServiceTestSupport {
    68 70
    69 71 
         /** Logger. */
    70 72 
         private static final Log log = LogFactory.getLog(DecoratorServiceTest.class);
    ... ... @@ -72,6 +74,17 @@ public class DecoratorServiceTest extends ServiceLocalTestSupport {
    72 74 
         private DecoratorService decoratorService;
    73 75 
         private Collection<Class<? extends IdDto>> dtoTypes;
    74 76
    77 
    +
    78 
    +    @Override
    79 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    80 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    81 
    +    }
    82 
    +
    83 
    +    @Override
    84 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    85 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    86 
    +    }
    87 
    +
    75 88 
         @Before
    76 89 
         public void setUp() {
    77 90

  • services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
    ... ... @@ -34,7 +34,9 @@ import fr.ird.observe.entities.referentiel.Species;
    34 34 
     import fr.ird.observe.entities.referentiel.SpeciesTopiaDao;
    35 35 
     import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
    36 36 
     import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    37 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    37 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    38 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    39 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    38 40 
     import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    39 41 
     import java.util.Date;
    40 42 
     import java.util.Optional;
    ... ... @@ -51,13 +53,24 @@ import org.nuiton.util.DateUtil;
    51 53 
      * @author Tony Chemit - dev@tchemit.fr
    52 54 
      * @since 1.8
    53 55 
      */
    54 
    -public class LengthWeightParemetersTest extends ServiceLocalTestSupport {
    56 
    +public class LengthWeightParemetersTest extends ServiceTestSupport {
    55 57
    56 58 
         /** Logger */
    57 59 
         private static final Log log = LogFactory.getLog(LengthWeightParemetersTest.class);
    58 60
    59 61 
         private ObserveTopiaPersistenceContext persistenceContext;
    60 62
    63 
    +
    64 
    +    @Override
    65 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    66 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    67 
    +    }
    68 
    +
    69 
    +    @Override
    70 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    71 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    72 
    +    }
    73 
    +
    61 74 
         @Before
    62 75 
         public void setUp() {
    63 76

  • services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
    ... ... @@ -30,11 +30,13 @@ import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialIm
    30 30 
     import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
    31 31 
     import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
    32 32 
     import fr.ird.observe.services.local.ObserveTopiaApplicationContextFactory;
    33 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    34 33 
     import fr.ird.observe.services.service.BabModelVersionException;
    35 34 
     import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    36 35 
     import fr.ird.observe.services.service.DatabaseNotFoundException;
    37 36 
     import fr.ird.observe.services.test.DatabaseName;
    37 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    38 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    39 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    38 40 
     import java.io.File;
    39 41 
     import java.io.IOException;
    40 42 
     import java.io.Writer;
    ... ... @@ -53,7 +55,7 @@ import org.nuiton.util.StringUtil;
    53 55 
      *
    54 56 
      * @author Tony Chemit - dev@tchemit.fr
    55 57 
      */
    56 
    -class ReplicateTestSupport extends ServiceLocalTestSupport {
    58 
    +class ReplicateTestSupport extends ServiceTestSupport {
    57 59
    58 60 
         /**
    59 61 
          * Logger.
    ... ... @@ -62,6 +64,17 @@ class ReplicateTestSupport extends ServiceLocalTestSupport {
    62 64
    63 65 
         private File scriptFile;
    64 66
    67 
    +
    68 
    +    @Override
    69 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    70 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    71 
    +    }
    72 
    +
    73 
    +    @Override
    74 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    75 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    76 
    +    }
    77 
    +
    65 78 
         ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException {
    66 79
    67 80 
             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
    1 
    -package fr.ird.observe.services.test;
    1 
    +package fr.ird.observe.services.fixtures;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -26,7 +26,11 @@ import com.google.common.collect.ImmutableSet;
    26 26 
     import fr.ird.observe.dto.data.DataDto;
    27 27 
     import fr.ird.observe.dto.referential.ReferentialDto;
    28 28 
     import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    29 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    29 
    +import fr.ird.observe.services.test.DatabaseFixtures;
    30 
    +import fr.ird.observe.services.test.DatabaseName;
    31 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    32 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    33 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    30 34 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    31 35 
     import fr.ird.observe.spi.DtoModelClasses;
    32 36 
     import fr.ird.observe.spi.PersistenceModelHelper;
    ... ... @@ -46,7 +50,18 @@ import org.junit.Test;
    46 50 
      *
    47 51 
      * @author Tony Chemit - dev@tchemit.fr
    48 52 
      */
    49 
    -public class GenerateDatabaseFixtures extends ServiceLocalTestSupport {
    53 
    +public class GenerateDatabaseFixtures extends ServiceTestSupport {
    54 
    +
    55 
    +
    56 
    +    @Override
    57 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    58 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    59 
    +    }
    60 
    +
    61 
    +    @Override
    62 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    63 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    64 
    +    }
    50 65
    51 66 
         @DatabaseNameConfiguration(DatabaseName.referentiel)
    52 67 
         @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
    1 
    -package fr.ird.observe.services.test;
    1 
    +package fr.ird.observe.services.fixtures;
    2 2
    3 3 
     /*-
    4 4 
      * #%L
    ... ... @@ -24,7 +24,6 @@ package fr.ird.observe.services.test;
    24 24
    25 25 
     import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
    26 26 
     import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
    27 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    28 27 
     import fr.ird.observe.services.service.BabModelVersionException;
    29 28 
     import fr.ird.observe.services.service.DataSourceService;
    30 29 
     import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    ... ... @@ -32,6 +31,11 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
    32 31 
     import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
    33 32 
     import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult;
    34 33 
     import fr.ird.observe.services.service.sql.SqlScriptProducerService;
    34 
    +import fr.ird.observe.services.test.DatabaseName;
    35 
    +import fr.ird.observe.services.test.ObserveTestConfiguration;
    36 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    37 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    38 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    35 39 
     import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    36 40 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    37 41 
     import fr.ird.observe.services.test.spi.DatabaseVersionConfiguration;
    ... ... @@ -54,16 +58,27 @@ import org.nuiton.version.Version;
    54 58 
      * @author Tony Chemit - dev@tchemit.fr
    55 59 
      */
    56 60 
     @DatabaseVersionConfiguration(ObserveTestConfiguration.PREVIOUS_VERSION)
    57 
    -public class MigrateTestsDatabases extends ServiceLocalTestSupport {
    61 
    +public class GenerateTestsDatabases extends ServiceTestSupport {
    58 62
    59 63 
         /**
    60 64 
          * Logger.
    61 65 
          */
    62 
    -    private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class);
    66 
    +    private static final Log log = LogFactory.getLog(GenerateTestsDatabases.class);
    63 67
    64 68 
         protected SqlScriptProducerService service;
    65 69 
         private DataSourceService dataSourceService;
    66 70
    71 
    +
    72 
    +    @Override
    73 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    74 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    75 
    +    }
    76 
    +
    77 
    +    @Override
    78 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    79 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    80 
    +    }
    81 
    +
    67 82 
         @BeforeClass
    68 83 
         public static void setUpClass() throws Exception {
    69 84 
             ((ServiceLocalTestClassResource) TOPIA_TEST_CLASS_RESOURCE).getDataSourcesForTestManager().clear();

  • services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java
    ... ... @@ -37,11 +37,14 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    37 37 
     import fr.ird.observe.services.service.DatabaseNotFoundException;
    38 38 
     import fr.ird.observe.services.service.referential.ReferentialService;
    39 39 
     import fr.ird.observe.services.test.DatabaseName;
    40 
    -import fr.ird.observe.test.ObserveFixtures;
    41 40 
     import fr.ird.observe.services.test.ObserveTestConfiguration;
    42 41 
     import fr.ird.observe.services.test.ObserveTestResources;
    42 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    43 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    44 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    43 45 
     import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    44 46 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    47 
    +import fr.ird.observe.test.ObserveFixtures;
    45 48 
     import java.io.File;
    46 49 
     import java.io.IOException;
    47 50 
     import java.lang.reflect.Modifier;
    ... ... @@ -66,13 +69,23 @@ import org.nuiton.topia.persistence.TopiaPersistenceContext;
    66 69 
      */
    67 70 
     @Ignore
    68 71 
     @DatabaseNameConfiguration(DatabaseName.dataSourceTest)
    69 
    -public class DataSourceServiceLocalTest extends ServiceLocalTestSupport {
    72 
    +public class DataSourceServiceLocalTest extends ServiceTestSupport {
    70 73
    71 74 
         /** Logger. */
    72 75 
         private static final Log log = LogFactory.getLog(DataSourceServiceLocalTest.class);
    73 76
    74 77 
         protected DataSourceService service;
    75 78
    79 
    +    @Override
    80 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    81 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    82 
    +    }
    83 
    +
    84 
    +    @Override
    85 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    86 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    87 
    +    }
    88 
    +
    76 89 
         @Before
    77 90 
         public void setUp() {
    78 91

  • 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;
    38 38 
     import fr.ird.observe.services.service.referential.ReferentialService;
    39 39 
     import fr.ird.observe.services.test.DatabaseName;
    40 40 
     import fr.ird.observe.services.test.ObserveTestConfiguration;
    41 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    42 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    43 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    41 44 
     import fr.ird.observe.services.test.spi.DatabaseLoginConfiguration;
    42 45 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    43 46 
     import fr.ird.observe.services.test.spi.DatabasePasswordConfiguration;
    ... ... @@ -54,13 +57,23 @@ import org.junit.Test;
    54 57 
     @Ignore
    55 58 
     @DatabaseNameConfiguration(DatabaseName.dataSourceTest)
    56 59 
     @DatabasePasswordConfiguration(ObserveTestConfiguration.OBSTUNA_PASSWORD)
    57 
    -public class RigthTest extends ServiceLocalTestSupport {
    60 
    +public class RigthTest extends ServiceTestSupport {
    58 61
    59 62 
         public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843";
    60 63
    61 64 
         public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234";
    62 65
    63 66
    67 
    +    @Override
    68 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    69 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    70 
    +    }
    71 
    +
    72 
    +    @Override
    73 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    74 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    75 
    +    }
    76 
    +
    64 77 
         @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_ADMIN_LOGIN)
    65 78 
         @Test
    66 79 
         public void testAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException {

  • services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java deleted
    1 
    -package fr.ird.observe.services.local.service;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe :: Services local implementation
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import fr.ird.observe.dto.reference.ReferentialDtoReference;
    26 
    -import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    27 
    -import fr.ird.observe.dto.referential.ReferentialDto;
    28 
    -import fr.ird.observe.entities.ObserveEntity;
    29 
    -import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    30 
    -import fr.ird.observe.services.service.BabModelVersionException;
    31 
    -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    32 
    -import fr.ird.observe.services.service.DatabaseNotFoundException;
    33 
    -import fr.ird.observe.services.service.referential.ReferentialService;
    34 
    -import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    35 
    -import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    36 
    -import fr.ird.observe.services.test.ServiceTestSupport;
    37 
    -import fr.ird.observe.spi.PersistenceModelHelper;
    38 
    -import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
    39 
    -import java.util.Date;
    40 
    -import org.junit.Assert;
    41 
    -
    42 
    -/**
    43 
    - * Created on 26/12/15.
    44 
    - *
    45 
    - * @author Tony Chemit - dev@tchemit.fr
    46 
    - */
    47 
    -public class ServiceLocalTestSupport extends ServiceTestSupport {
    48 
    -
    49 
    -    @Override
    50 
    -    public ServiceLocalTestClassResource getTestClassResource() {
    51 
    -        return (ServiceLocalTestClassResource) super.getTestClassResource();
    52 
    -    }
    53 
    -
    54 
    -    @Override
    55 
    -    public ServiceLocalTestMethodResource getTestMethodResource() {
    56 
    -        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    57 
    -    }
    58 
    -
    59 
    -    public <E extends ObserveEntity> Date getLastUpdateDate(Class<E> entityType) {
    60 
    -        try (ObserveTopiaPersistenceContext persistenceContext = getTestMethodResource().newPersistenceContext()) {
    61 
    -            return persistenceContext.getLastUpdateDate(entityType);
    62 
    -        }
    63 
    -    }
    64 
    -
    65 
    -    public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R getReference(Class<D> type, int index) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
    66 
    -
    67 
    -        ReferentialDtoEntityContext<D, R, ?, ?> entityContext = PersistenceModelHelper.fromReferentialDto(type);
    68 
    -        Class<R> referenceType = entityContext.toReferenceType();
    69 
    -
    70 
    -        ReferentialService referentialService = getTestMethodResource().newService(ReferentialService.class);
    71 
    -        ReferentialDtoReferenceSet<R> referentialReferenceSet = getTestMethodResource().getReferentialCache().getReferentialReferenceSet(referentialService, referenceType);
    72 
    -        return referentialReferenceSet.getReferenceByPosition(index);
    73 
    -
    74 
    -    }
    75 
    -
    76 
    -    protected void assertEntityEqualsReferenceDto(ObserveEntity entity, ReferentialDtoReference referenceDto) {
    77 
    -        if (entity == null) {
    78 
    -            Assert.assertNull(referenceDto);
    79 
    -        } else {
    80 
    -            Assert.assertEquals(entity.getTopiaId(), referenceDto.getId());
    81 
    -        }
    82 
    -    }
    83 
    -
    84 
    -    protected void assertReferenceDtoEqualsEntity(ReferentialDtoReference referenceDto, ObserveEntity entity) {
    85 
    -        if (referenceDto == null) {
    86 
    -            Assert.assertNull(entity);
    87 
    -        } else {
    88 
    -            Assert.assertEquals(referenceDto.getId(), entity.getTopiaId());
    89 
    -        }
    90 
    -    }
    91 
    -
    92 
    -}

  • 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;
    29 29 
     import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto;
    30 30 
     import fr.ird.observe.persistence.Entities;
    31 31 
     import fr.ird.observe.persistence.ObserveEntityEnum;
    32 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    33 32 
     import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
    34 33 
     import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine;
    35 34 
     import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults;
    ... ... @@ -41,6 +40,7 @@ import fr.ird.observe.services.test.DatabaseName;
    41 40 
     import fr.ird.observe.services.test.ObserveTestConfiguration;
    42 41 
     import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    43 42 
     import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    43 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    44 44 
     import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
    45 45 
     import fr.ird.observe.services.test.spi.DatabaseClassifier;
    46 46 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    ... ... @@ -61,7 +61,7 @@ import org.junit.Test;
    61 61 
      *
    62 62 
      * @author Tony Chemit - dev@tchemit.fr
    63 63 
      */
    64 
    -public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSupport {
    64 
    +public class UnidirectionalSynchronizeReferentialTest extends ServiceTestSupport {
    65 65
    66 66 
         @ClassRule
    67 67 
         public static final ServiceLocalTestClassResource TOPIA_TEST_CLASS_RESOURCE_CENTRAL = new ServiceLocalTestClassResource(DatabaseClassifier.CENTRAL);
    ... ... @@ -72,6 +72,17 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu
    72 72 
         private UnidirectionalReferentialSynchronizeLocalService localService;
    73 73 
         private ReferentialSynchronizeDiffsEngine diffsEngine;
    74 74
    75 
    +
    76 
    +    @Override
    77 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    78 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    79 
    +    }
    80 
    +
    81 
    +    @Override
    82 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    83 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    84 
    +    }
    85 
    +
    75 86 
         @Before
    76 87 
         public void setUp() throws Exception {
    77 88 
             localService = getTestMethodResource().newService(UnidirectionalReferentialSynchronizeLocalService.class);

  • services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
    ... ... @@ -30,8 +30,10 @@ import fr.ird.observe.dto.referential.ReferentialLocale;
    30 30 
     import fr.ird.observe.entities.ObserveDataEntity;
    31 31 
     import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
    32 32 
     import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    33 
    -import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    34 33 
     import fr.ird.observe.services.test.DatabaseName;
    34 
    +import fr.ird.observe.services.test.ServiceLocalTestClassResource;
    35 
    +import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
    36 
    +import fr.ird.observe.services.test.ServiceTestSupport;
    35 37 
     import fr.ird.observe.test.ObserveFixtures;
    36 38 
     import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
    37 39 
     import fr.ird.observe.spi.context.DataDtoEntityContext;
    ... ... @@ -49,11 +51,22 @@ import org.nuiton.topia.persistence.TopiaDao;
    49 51 
      * @author Tony Chemit - dev@tchemit.fr
    50 52 
      */
    51 53 
     @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
    52 
    -public class PersistenceModelHelperTest extends ServiceLocalTestSupport {
    54 
    +public class PersistenceModelHelperTest extends ServiceTestSupport {
    53 55
    54 56 
         /** Logger. */
    55 57 
         private static final Log log = LogFactory.getLog(PersistenceModelHelperTest.class);
    56 58
    59 
    +
    60 
    +    @Override
    61 
    +    public ServiceLocalTestClassResource getTestClassResource() {
    62 
    +        return (ServiceLocalTestClassResource) super.getTestClassResource();
    63 
    +    }
    64 
    +
    65 
    +    @Override
    66 
    +    public ServiceLocalTestMethodResource getTestMethodResource() {
    67 
    +        return (ServiceLocalTestMethodResource) super.getTestMethodResource();
    68 
    +    }
    69 
    +
    57 70 
         @Test
    58 71 
         public void testTransformEntityToReferentialDto() throws Exception {
    59 72

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