Fix JDBC connection leak when executing tests on non-H2

5 files changed, 4 insertions, 8 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
index 0bd07c3e198..5f578de9534 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
@@ -71,8 +71,8 @@ public class BackendCleanup implements ServerComponent {
       }
 
     } finally {
-      dbSession.close();
       DbUtils.closeQuietly(connection);
+      MyBatis.closeQuietly(dbSession);
     }
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
index a8c767a6868..802fba978d9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
@@ -40,16 +40,13 @@ import static org.mockito.Mockito.mock;
 
 public class ActivityDaoTest extends AbstractDaoTestCase {
 
-
   private ActivityDao dao;
   private DbSession session;
-  private System2 system2;
 
   @Before
   public void before() throws Exception {
     this.session = getMyBatis().openSession(false);
-    this.system2 = mock(System2.class);
-    this.dao = new ActivityDao(system2);
+    this.dao = new ActivityDao(mock(System2.class));
   }
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java
index d4cbf8ac4b6..e1f74f4cb19 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java
@@ -41,7 +41,6 @@ public class SwitchSnapshotStepTest {
 
   private DbSession session;
   private SwitchSnapshotStep sut;
-  private SnapshotDao dao;
 
   @Before
   public void before() {
@@ -50,7 +49,6 @@ public class SwitchSnapshotStepTest {
     System2 system2 = mock(System2.class);
     when(system2.now()).thenReturn(DateUtils.parseDate("2011-09-29").getTime());
     this.sut = new SwitchSnapshotStep(new SnapshotDao(system2));
-    this.dao = new SnapshotDao(system2);
   }
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/SearchHealthMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/SearchHealthMediumTest.java
index e1ed6d6be8b..2edefc9b664 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/SearchHealthMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/SearchHealthMediumTest.java
@@ -45,6 +45,7 @@ public class SearchHealthMediumTest {
     DbSession dbSession = tester.get(DbClient.class).openSession(false);
     tester.get(RuleDao.class).insert(dbSession, RuleTesting.newDto(RuleKey.of("javascript", "S001")));
     dbSession.commit();
+    dbSession.close();
 
     SearchHealth health = tester.get(SearchHealth.class);
     Date now = new Date();
@@ -55,7 +56,6 @@ public class SearchHealthMediumTest {
 
     NodeHealth nodeHealth = health.getNodesHealth().values().iterator().next();
     assertThat(nodeHealth.isMaster()).isTrue();
-    System.out.println(nodeHealth.getAddress());
     assertThat(nodeHealth.getAddress()).contains(":");
     assertThat(nodeHealth.getJvmHeapUsedPercent()).contains("%");
     assertThat(nodeHealth.getFsUsedPercent()).contains("%");
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java b/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java
index 49b341cc3a3..56eadb4aace 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java
@@ -115,6 +115,7 @@ public class TestDatabase extends ExternalResource {
       if (db.getDialect().getId().equals("h2")) {
         ((H2Database) db).executeScript(schemaPath);
       } else {
+        db.stop();
         throw new AssumptionViolatedException("Test disabled because it supports only H2");
       }
     }