Fix conflicts

2 files changed, 4 insertions, 4 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueQueryResultTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueQueryResultTest.java
index c3241d569c6..b1018bd62a8 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueQueryResultTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueQueryResultTest.java
@@ -23,18 +23,19 @@ import org.junit.Test;
 import org.sonar.api.issue.Issue;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 public class DefaultIssueQueryResultTest {
   @Test
   public void test_first_issue() {
-    DefaultIssueQueryResult result = new DefaultIssueQueryResult();
+    DefaultIssueQueryResult result = new DefaultIssueQueryResult(Collections.<Issue>emptyList());
     assertThat(result.first()).isNull();
 
     Issue first = new DefaultIssue();
     Issue second = new DefaultIssue();
-    result.setIssues(Arrays.asList(first, second));
+    result = new DefaultIssueQueryResult(Arrays.asList(first, second));
     assertThat(result.first()).isSameAs(first);
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueNotificationsTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueNotificationsTest.java
index 42c404ada63..34789bb72ce 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/IssueNotificationsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueNotificationsTest.java
@@ -76,8 +76,7 @@ public class IssueNotificationsTest {
       .setFieldDiff(context, "status", "OPEN", "RESOLVED")
       .setComponentKey("struts:Action")
       .setProjectKey("struts");
-    DefaultIssueQueryResult queryResult = new DefaultIssueQueryResult();
-    queryResult.setIssues(Arrays.<Issue>asList(issue));
+    DefaultIssueQueryResult queryResult = new DefaultIssueQueryResult(Arrays.<Issue>asList(issue));
     queryResult.addProjects(Arrays.<Component>asList(new Project("struts")));
 
     Notification notification = issueNotifications.sendChanges(issue, context, queryResult);