From 085f48615e1424da08239bb76c331a0b7a0bf90f Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 3 Dec 2012 15:32:08 +0100 Subject: [PATCH] SONAR-3306 Improve unit test to fix issue on it-sonar-persistence tests --- .../core/persistence/SemaphoreDaoTest.java | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java index 30fd3363958..781d5c95997 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java @@ -27,9 +27,6 @@ import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.util.Date; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; @@ -237,34 +234,12 @@ public class SemaphoreDaoTest extends AbstractDaoTestCase { } private boolean isRecent(Date date) { - Date futur = DateUtils.addDays(now(), 1); - Date past = DateUtils.addDays(now(), -1); + Date now = new Date(); + Date futur = DateUtils.addDays(now, 1); + Date past = DateUtils.addDays(now, -1); return date.after(past) && date.before(futur); } - private Date now() { - Connection connection = null; - PreparedStatement statement = null; - ResultSet rs = null; - try { - connection = getConnection(); - rs = null; - statement = connection.prepareStatement("select current_timestamp"); - rs = statement.executeQuery(); - if (rs.next()) { - return new Date(); - } - return null; - - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - DatabaseUtils.closeQuietly(rs); - DatabaseUtils.closeQuietly(statement); - DatabaseUtils.closeQuietly(connection); - } - } - private static class Runner extends Thread { SemaphoreDao dao; AtomicInteger locks; -- 2.39.5