[Observe-commits] [Git][ultreiaio/ird-observe][develop] clean service local tests

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@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@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@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@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@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@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@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@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/480ee425551eaa048f35b2b9a4e5... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/480ee425551eaa048f35b2b9a4e5... You're receiving this email because of your account on gitlab.com.