From e8886ef578f813bd720256ef04bd0086b51b508f Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Wed, 2 Nov 2011 00:54:55 +0400 Subject: [PATCH] Fix DuplicationDaoTest Other tests can stuck if connection not closed. --- .../persistence/dao/DuplicationDaoTest.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sonar-core/src/test/java/org/sonar/persistence/dao/DuplicationDaoTest.java b/sonar-core/src/test/java/org/sonar/persistence/dao/DuplicationDaoTest.java index 0c2126f72bb..1622570ad3f 100644 --- a/sonar-core/src/test/java/org/sonar/persistence/dao/DuplicationDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/persistence/dao/DuplicationDaoTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import java.io.InputStream; +import java.sql.SQLException; import java.util.Arrays; import java.util.List; @@ -166,9 +167,10 @@ public class DuplicationDaoTest { } private final void checkTables(String testName, String[] excludedColumnNames, String... tables) { - // getSession().commit(); + IDatabaseConnection connection = null; try { - IDataSet dataSet = getCurrentDataSet(); + connection = databaseTester.getConnection(); + IDataSet dataSet = connection.createDataSet(); IDataSet expectedDataSet = getExpectedData(testName); for (String table : tables) { ITable filteredTable = DefaultColumnFilter.excludedColumnsTable(dataSet.getTable(table), excludedColumnNames); @@ -178,6 +180,16 @@ public class DuplicationDaoTest { throw translateException("Error while checking results", e); } catch (DatabaseUnitException e) { fail(e.getMessage()); + } catch (Exception e) { + throw translateException("Error while checking results", e); + } finally { + if (connection != null) { + try { + connection.close(); + } catch (SQLException e) { + throw translateException("Error while checking results", e); + } + } } } -- 2.39.5