Author: tchemit Date: 2013-05-13 14:46:36 +0200 (Mon, 13 May 2013) New Revision: 940 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/940 Log: fix tests Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.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-13 12:12:16 UTC (rev 939) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2013-05-13 12:46:36 UTC (rev 940) @@ -329,6 +329,8 @@ log.info("After test " + testClass); } + closeSpring(); + Set<Failure> failures = TuttiRunListener.getFailuresForClass( description.getClassName()); @@ -360,6 +362,11 @@ Thread.currentThread().setContextClassLoader(oldClassLoader); } + TuttiPersistenceConfig.setInstance(null); + } + + protected void closeSpring() { + TuttiPersistenceServiceLocator.close(); if (beanFactoryReferenceLocation != null) { @@ -367,8 +374,6 @@ // push back default tutti configuration TuttiPersistenceServiceLocator.initTuttiDefault(); } - - TuttiPersistenceConfig.setInstance(null); } public Connection createEmptyDb(String dbDirectory, 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-13 12:12:16 UTC (rev 939) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-13 12:46:36 UTC (rev 940) @@ -232,19 +232,6 @@ SURVEY_CONTENT); } - protected void assertFileContent(String message, - File actualFile, - String expectedContent) throws IOException { - Assert.assertTrue(actualFile.exists()); - String fileContent = Files.toString(actualFile, - Charsets.UTF_8).trim(); - Assert.assertEquals(expectedContent, fileContent); - - if (log.isInfoEnabled()) { - log.info(message + fileContent); - } - } - @Test public void exportOperations() throws Exception { @@ -340,4 +327,17 @@ exportContext.accidentalCatchFile, ACCIDENTAL_CATCH_CONTENT); } + + protected void assertFileContent(String message, + File actualFile, + String expectedContent) throws IOException { + Assert.assertTrue(actualFile.exists()); + String fileContent = Files.toString(actualFile, + Charsets.UTF_8).trim(); + Assert.assertEquals(expectedContent, fileContent); + + if (log.isInfoEnabled()) { + log.info(message + fileContent); + } + } }