SONAR-3755 Fixed IssueDao test due to some session issue

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueDao.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueDao.java
index 3f2add7205f602c1921dea6b6894247156473013..4a190ba34492ced335d9d76ec8725a0a3b0dac42 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/IssueDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueDao.java
@@ -20,6 +20,7 @@
 
 package org.sonar.core.issue;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
@@ -108,6 +109,16 @@ public class IssueDao implements BatchComponent, ServerComponent {
     }
   }
 
+  @VisibleForTesting
+  List<IssueDto> selectIssueIdsAndComponentsId(IssueQuery query) {
+    SqlSession session = mybatis.openSession();
+    try {
+      return selectIssueIdsAndComponentsId(query, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
   /**
    * The returned IssueDto list contains only the issue id and the resource id
    */
@@ -116,6 +127,15 @@ public class IssueDao implements BatchComponent, ServerComponent {
     return session.selectList("org.sonar.core.issue.IssueMapper.selectIssueIdsAndComponentsId", query);
   }
 
+  Collection<IssueDto> selectByIds(Collection<Long> ids) {
+    SqlSession session = mybatis.openSession();
+    try {
+      return selectByIds(ids, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
   public Collection<IssueDto> selectByIds(Collection<Long> ids, SqlSession session) {
     if (ids.isEmpty()) {
       return Collections.emptyList();

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
index ad7197b659a879225cc1b2b1586f3d05b84a2287..3880b69cf9e67b7c6ca6629447885bf7e433254b 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
@@ -205,7 +205,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     setupData("shared", "should_select_issue_ids_and_components_ids");
 
     IssueQuery query = IssueQuery.builder().build();
-    List<IssueDto> results = dao.selectIssueIdsAndComponentsId(query, getMyBatis().openSession());
+    List<IssueDto> results = dao.selectIssueIdsAndComponentsId(query);
     assertThat(results).hasSize(3);
   }
 
@@ -226,7 +226,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
   public void should_select_by_ids() {
     setupData("shared", "should_select_by_ids");
 
-    Collection<IssueDto> results = dao.selectByIds(newArrayList(100l, 101l, 102l), getMyBatis().openSession());
+    Collection<IssueDto> results = dao.selectByIds(newArrayList(100l, 101l, 102l));
     assertThat(results).hasSize(3);
   }