Author: tchemit Date: 2013-11-29 17:35:33 +0100 (Fri, 29 Nov 2013) New Revision: 1413 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1413 Log: fix some tests Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2013-11-29 09:19:25 UTC (rev 1412) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2013-11-29 16:35:33 UTC (rev 1413) @@ -73,7 +73,7 @@ public class DatabaseFixtures { public Version lastAdagioSchemaVersion() { - return VersionUtil.valueOf("3.2.3"); + return VersionUtil.valueOf("3.4.1"); } public Version currentAdagioSchemaVersion() { 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-11-29 09:19:25 UTC (rev 1412) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-11-29 16:35:33 UTC (rev 1413) @@ -259,7 +259,7 @@ applicationConfig.parse(); config = new TuttiConfiguration(applicationConfig); - + TuttiConfiguration.setInstance(config); File db; if (writeDb) { @@ -382,6 +382,7 @@ } closeSpring(); + TuttiConfiguration.setInstance(null); Set<Failure> failures = TuttiRunListener.getFailuresForClass( description.getClassName()); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java 2013-11-29 09:19:25 UTC (rev 1412) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java 2013-11-29 16:35:33 UTC (rev 1413) @@ -40,7 +40,6 @@ * @author tchemit <chemit@codelutin.com> * @since 2.4 */ -@Ignore public class UpdateSchemaTest { @ClassRule