Fix IssueResultSetIteratorTest on non-H2 dbs (new try)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IssueResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IssueResultSetIteratorTest.java
index 6c0eb46e6a6487e52fbd35b8762cf8346fe1a5f4..5a1364931d1beb6a6611871df3f69d6b74529ef5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/IssueResultSetIteratorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/IssueResultSetIteratorTest.java
@@ -62,14 +62,17 @@ public class IssueResultSetIteratorTest {
     IssueDoc issue = it.next();
     assertThat(issue.key()).isNotEmpty();
     assertThat(issue.assignee()).isNotEmpty();
-    assertThat(issue.actionPlanKey()).isNotEmpty();
-    assertThat(issue.authorLogin()).isNotEmpty();
     assertThat(issue.componentUuid()).isNotEmpty();
     assertThat(issue.projectUuid()).isNotEmpty();
     assertThat(issue.debt().toMinutes()).isGreaterThan(0L);
 
     assertThat(it.hasNext()).isTrue();
-    assertThat(it.next()).isNotNull();
+    issue = it.next();
+    assertThat(issue.key()).isNotEmpty();
+    assertThat(issue.assignee()).isNotEmpty();
+    assertThat(issue.componentUuid()).isNotEmpty();
+    assertThat(issue.projectUuid()).isNotEmpty();
+    assertThat(issue.debt().toMinutes()).isGreaterThan(0L);
 
     assertThat(it.hasNext()).isFalse();
   }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueResultSetIteratorTest/shared.xml
index bca53282c70b12c2faec10c30253908fadbe21f7..8bf47afac4f94c9e17494280e5312f68fff3eed8 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/es/IssueResultSetIteratorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/es/IssueResultSetIteratorTest/shared.xml
@@ -38,7 +38,7 @@
     status="OPEN"
     severity="MAJOR"
     manual_severity="[false]"
-    assignee="[null]"
+    assignee="guy2"
     author_login="[null]"
     checksum="FFFFF"
     effort_to_fix="[null]"
@@ -50,7 +50,7 @@
     rule_id="200"
     reporter="[null]"
     issue_attributes="JIRA=http://jira.com"
-    action_plan_key="[null]"
+    action_plan_key="PLAN2"
     created_at="2005-05-12"
     updated_at="2014-05-18"
     issue_creation_date="2005-05-12 00:00:00.0"