Author: tchemit Date: 2013-05-12 22:37:39 +0200 (Sun, 12 May 2013) New Revision: 937 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/937 Log: fix service tests using real db Added: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties Removed: trunk/tutti-service/src/test/resources/tutti-test-read-dbGenericExport.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java trunk/tutti-service/src/test/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-12 19:56:50 UTC (rev 936) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-12 20:37:39 UTC (rev 937) @@ -167,6 +167,16 @@ Class<?> testClass; + protected void prepareConfig(ApplicationConfig applicationConfig, + File resourceDirectory) { + + applicationConfig.loadDefaultOptions( + TuttiPersistenceConfigOption.values()); + applicationConfig.setDefaultOption( + "tutti.data.directory", + new File(resourceDirectory, "data").getAbsolutePath()); + } + protected void before(Description description) throws Throwable { TuttiRunListener.beforeClass(description); @@ -213,11 +223,8 @@ Preconditions.checkNotNull(resourceAsStream, "Could not find " + configFilename + " in test class-path"); ApplicationConfig applicationConfig = new ApplicationConfig(configFilename); - applicationConfig.loadDefaultOptions( - TuttiPersistenceConfigOption.values()); - applicationConfig.setDefaultOption( - "tutti.data.directory", - new File(resourceDirectory, "data").getAbsolutePath()); + prepareConfig(applicationConfig, resourceDirectory); + applicationConfig.parse(); config = new TuttiPersistenceConfig(applicationConfig); Property changes on: trunk/tutti-service/src/test ___________________________________________________________________ Added: svn:ignore + dbCGFS Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-05-12 19:56:50 UTC (rev 936) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-05-12 20:37:39 UTC (rev 937) @@ -25,12 +25,16 @@ */ import fr.ifremer.tutti.persistence.RessourceClassLoader; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption; import fr.ifremer.tutti.persistence.test.DatabaseResource; import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; import org.apache.commons.io.IOUtils; import org.junit.runner.Description; import org.nuiton.i18n.I18n; +import org.nuiton.util.config.ApplicationConfig; +import java.io.File; import java.io.IOException; import java.util.Locale; @@ -47,6 +51,19 @@ return new TuttiServiceContext(loader, config); } + @Override + protected void prepareConfig(ApplicationConfig applicationConfig, + File resourceDirectory) { + applicationConfig.loadDefaultOptions( + TuttiPersistenceConfigOption.values()); + applicationConfig.loadDefaultOptions( + TuttiServiceConfigOption.values()); + + applicationConfig.setDefaultOption( + "tutti.basedir", + resourceDirectory.getAbsolutePath()); + } + protected TuttiServiceContext serviceContext; protected TuttiServiceConfig serviceConfig; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-12 19:56:50 UTC (rev 936) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-12 20:37:39 UTC (rev 937) @@ -61,7 +61,7 @@ @ClassRule public static final ServiceDbResource dbResource = - ServiceDbResource.readDb("dbGenericExport"); + ServiceDbResource.readDb("dbCGFS"); public static final String PROGRAM_ID = "CAM-CGFS"; Copied: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties (from rev 935, trunk/tutti-service/src/test/resources/tutti-test-read-dbGenericExport.properties) =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties (rev 0) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-12 20:37:39 UTC (rev 937) @@ -0,0 +1,27 @@ +### +# #%L +# Tutti :: Service +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# 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% +### +tutti.persistence.db.directory=src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro +#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro +#tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Deleted: trunk/tutti-service/src/test/resources/tutti-test-read-dbGenericExport.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbGenericExport.properties 2013-05-12 19:56:50 UTC (rev 936) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbGenericExport.properties 2013-05-12 20:37:39 UTC (rev 937) @@ -1,27 +0,0 @@ -### -# #%L -# Tutti :: Service -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# 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% -### -tutti.persistence.db.directory=src/test/dbGenericExport -tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbGenericExport/allegro -#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro -#tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file