Rewrite dbunit test using dbtester

9 files changed, 250 insertions, 368 deletions

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
index 07d488e07af..083689ee498 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
@@ -21,6 +21,8 @@ package org.sonar.server.issue;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.Rule;
@@ -39,6 +41,11 @@ import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.issue.IssueMapper;
+import org.sonar.db.rule.RuleDefinitionDto;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.db.component.ComponentTesting.newFileDto;
+import static org.sonar.db.component.ComponentTesting.newModuleDto;
 
 public class IssueStorageTest {
 
@@ -47,8 +54,6 @@ public class IssueStorageTest {
   @org.junit.Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
 
-  private IssueChangeContext context = IssueChangeContext.createUser(new Date(system2.now()), "user_uuid");
-
   private DbClient dbClient = db.getDbClient();
 
   @Test
@@ -81,10 +86,13 @@ public class IssueStorageTest {
       .setProjectUuid("uuid-10")
       .setComponentKey("struts:Action");
 
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(0);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(0);
+
     saver.save(issue);
 
-    db.assertDbUnit(getClass(), "should_insert_new_issues-result.xml",
-      new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(1);
   }
 
   @Test
@@ -117,11 +125,14 @@ public class IssueStorageTest {
       .setProjectUuid("uuid-10")
       .setComponentKey("struts:Action");
 
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(0);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(0);
+
     saver.save(db.getSession(), issue);
     db.getSession().commit();
 
-    db.assertDbUnit(getClass(), "should_insert_new_issues-result.xml",
-      new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(1);
   }
 
   @Test
@@ -156,100 +167,197 @@ public class IssueStorageTest {
       .setComponentUuid("component-uuid")
       .setProjectUuid("project-uuid");
 
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(0);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(0);
+
     saver.save(db.getSession(), issue);
     db.getSession().commit();
 
-    db.assertDbUnit(getClass(), "should_insert_new_issues-result.xml", new String[] {"id", "created_at", "updated_at",
-      "issue_change_creation_date"}, "issues", "issue_changes");
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(1);
   }
 
   @Test
   public void batch_update_issues() {
-    db.prepareDbUnit(getClass(), "should_update_issues.xml");
-
     FakeBatchSaver saver = new FakeBatchSaver(dbClient, new FakeRuleFinder());
 
-    DefaultIssueComment comment = DefaultIssueComment.create("ABCDE", "user_uuid", "the comment");
-    // override generated key
-    comment.setKey("FGHIJ");
+    RuleDefinitionDto rule = db.rules().insert();
+    ComponentDto project = db.components().insertMainBranch();
+    ComponentDto module = db.components().insertComponent(newModuleDto(project));
+    ComponentDto file = db.components().insertComponent(newFileDto(module));
 
     Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000");
     DefaultIssue issue = new DefaultIssue()
       .setKey("ABCDE")
       .setType(RuleType.BUG)
+      .setNew(true)
+      .setRuleKey(rule.getKey())
+      .setProjectUuid(project.uuid())
+      .setComponentUuid(file.uuid())
+      .setLine(5000)
+      .setEffort(Duration.create(10L))
+      .addComment(DefaultIssueComment.create("ABCDE", "user_uuid", "first comment"))
+      .setResolution("OPEN")
+      .setStatus("OPEN")
+      .setSeverity("BLOCKER")
+      .setAttribute("foo", "bar")
+      .setCreationDate(date)
+      .setUpdateDate(date)
+      .setCloseDate(date);
+
+    saver.save(issue);
+
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(1);
+
+    DefaultIssue updated = new DefaultIssue()
+      .setKey(issue.key())
+      .setType(RuleType.VULNERABILITY)
       .setNew(false)
       .setChanged(true)
 
       // updated fields
-      .setLine(5000)
-      .setEffort(Duration.create(10L))
+      .setLine(issue.getLine() + 10)
+      .setProjectUuid("foo")
+      .setEffort(Duration.create(issue.effortInMinutes() + 10L))
       .setChecksum("FFFFF")
       .setAuthorLogin("simon")
       .setAssigneeUuid("loic")
-      .setFieldChange(context, "severity", "INFO", "BLOCKER")
+      .setFieldChange(IssueChangeContext.createUser(new Date(), "user_uuid"), "severity", "INFO", "BLOCKER")
+      .addComment(DefaultIssueComment.create("ABCDE", "user_uuid", "the comment"))
       .setResolution("FIXED")
       .setStatus("RESOLVED")
-      .setSeverity("BLOCKER")
-      .setAttribute("foo", "bar")
-      .addComment(comment)
-      .setCreationDate(date)
-      .setUpdateDate(date)
-      .setCloseDate(date)
-      .setComponentUuid("uuid-100")
-      .setProjectUuid("uuid-10")
+      .setSeverity("MAJOR")
+      .setAttribute("fox", "bax")
+      .setCreationDate(DateUtils.addDays(date, 1))
+      .setUpdateDate(DateUtils.addDays(date, 1))
+      .setCloseDate(DateUtils.addDays(date, 1))
 
       // unmodifiable fields
       .setRuleKey(RuleKey.of("xxx", "unknown"))
-      .setComponentKey("not:a:component");
-
-    saver.save(issue);
-
-    db.assertDbUnit(getClass(), "should_update_issues-result.xml", new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+      .setComponentKey("struts:Action")
+      .setProjectKey("struts");
+
+    saver.save(updated);
+
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.selectFirst("select * from issues"))
+      .containsEntry("ASSIGNEE", updated.assignee())
+      .containsEntry("AUTHOR_LOGIN", updated.authorLogin())
+      .containsEntry("CHECKSUM", updated.checksum())
+      .containsEntry("COMPONENT_UUID", issue.componentUuid())
+      .containsEntry("EFFORT", updated.effortInMinutes())
+      .containsEntry("ISSUE_ATTRIBUTES", "fox=bax")
+      .containsEntry("ISSUE_TYPE", (byte) 3)
+      .containsEntry("KEE", issue.key())
+      .containsEntry("LINE", (long) updated.line())
+      .containsEntry("PROJECT_UUID", updated.projectUuid())
+      .containsEntry("RESOLUTION", updated.resolution())
+      .containsEntry("STATUS", updated.status())
+      .containsEntry("SEVERITY", updated.severity());
+
+    List<Map<String, Object>> rows = db.select("select * from issue_changes order by id");
+    assertThat(rows).hasSize(3);
+    assertThat(rows.get(0))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("first comment", "comment", "user_uuid");
+    assertThat(rows.get(1))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("the comment", "comment", "user_uuid");
+    assertThat(rows.get(2))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("severity=INFO|BLOCKER", "diff", "user_uuid");
   }
 
   @Test
   public void server_update_issues() {
-    db.prepareDbUnit(getClass(), "should_update_issues.xml");
-
     ComponentDto project = new ComponentDto().setId(10L).setUuid("whatever-uuid");
     ComponentDto component = new ComponentDto().setId(100L).setUuid("whatever-uuid-2");
     FakeServerSaver saver = new FakeServerSaver(dbClient, new FakeRuleFinder(), component, project);
 
-    DefaultIssueComment comment = DefaultIssueComment.create("ABCDE", "user_uuid", "the comment");
-    // override generated key
-    comment.setKey("FGHIJ");
+    RuleDefinitionDto rule = db.rules().insert();
 
     Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000");
     DefaultIssue issue = new DefaultIssue()
       .setKey("ABCDE")
       .setType(RuleType.BUG)
+      .setNew(true)
+      .setRuleKey(rule.getKey())
+      .setProjectUuid(project.uuid())
+      .setComponentUuid(component.uuid())
+      .setLine(5000)
+      .setEffort(Duration.create(10L))
+      .addComment(DefaultIssueComment.create("ABCDE", "user_uuid", "first comment"))
+      .setResolution("OPEN")
+      .setStatus("OPEN")
+      .setSeverity("BLOCKER")
+      .setAttribute("foo", "bar")
+      .setCreationDate(date)
+      .setUpdateDate(date)
+      .setCloseDate(date);
+
+    saver.save(issue);
+
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(1);
+
+    DefaultIssue updated = new DefaultIssue()
+      .setKey(issue.key())
+      .setType(RuleType.VULNERABILITY)
       .setNew(false)
       .setChanged(true)
 
       // updated fields
-      .setLine(5000)
-      .setEffort(Duration.create(10L))
+      .setLine(issue.getLine() + 10)
+      .setProjectUuid("foo")
+      .setEffort(Duration.create(issue.effortInMinutes() + 10L))
       .setChecksum("FFFFF")
       .setAuthorLogin("simon")
       .setAssigneeUuid("loic")
-      .setFieldChange(context, "severity", "INFO", "BLOCKER")
+      .setFieldChange(IssueChangeContext.createUser(new Date(), "user_uuid"), "severity", "INFO", "BLOCKER")
+      .addComment(DefaultIssueComment.create("ABCDE", "user_uuid", "the comment"))
       .setResolution("FIXED")
       .setStatus("RESOLVED")
-      .setSeverity("BLOCKER")
-      .setAttribute("foo", "bar")
-      .addComment(comment)
-      .setCreationDate(date)
-      .setUpdateDate(date)
-      .setCloseDate(date)
-      .setProjectUuid("uuid-10")
+      .setSeverity("MAJOR")
+      .setAttribute("fox", "bax")
+      .setCreationDate(DateUtils.addDays(date, 1))
+      .setUpdateDate(DateUtils.addDays(date, 1))
+      .setCloseDate(DateUtils.addDays(date, 1))
 
       // unmodifiable fields
       .setRuleKey(RuleKey.of("xxx", "unknown"))
-      .setComponentKey("not:a:component");
-
-    saver.save(issue);
-
-    db.assertDbUnit(getClass(), "should_update_issues-result.xml", new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+      .setComponentKey("struts:Action")
+      .setProjectKey("struts");
+
+    saver.save(updated);
+
+    assertThat(db.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(db.selectFirst("select * from issues"))
+      .containsEntry("ASSIGNEE", updated.assignee())
+      .containsEntry("AUTHOR_LOGIN", updated.authorLogin())
+      .containsEntry("CHECKSUM", updated.checksum())
+      .containsEntry("COMPONENT_UUID", issue.componentUuid())
+      .containsEntry("EFFORT", updated.effortInMinutes())
+      .containsEntry("ISSUE_ATTRIBUTES", "fox=bax")
+      .containsEntry("ISSUE_TYPE", (byte) 3)
+      .containsEntry("KEE", issue.key())
+      .containsEntry("LINE", (long) updated.line())
+      .containsEntry("PROJECT_UUID", updated.projectUuid())
+      .containsEntry("RESOLUTION", updated.resolution())
+      .containsEntry("STATUS", updated.status())
+      .containsEntry("SEVERITY", updated.severity());
+
+    List<Map<String, Object>> rows = db.select("select * from issue_changes order by id");
+    assertThat(rows).hasSize(3);
+    assertThat(rows.get(0))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("first comment", "comment", "user_uuid");
+    assertThat(rows.get(1))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("the comment", "comment", "user_uuid");
+    assertThat(rows.get(2))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("severity=INFO|BLOCKER", "diff", "user_uuid");
   }
 
   static class FakeBatchSaver extends IssueStorage {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
index 023420d92ad..d03f432197e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
@@ -21,6 +21,8 @@ package org.sonar.server.issue;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
@@ -36,11 +38,15 @@ import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.server.issue.index.IssueIndexer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.sonar.db.component.ComponentTesting.newFileDto;
+import static org.sonar.db.component.ComponentTesting.newModuleDto;
 
 public class ServerIssueStorageTest {
 
@@ -78,21 +84,24 @@ public class ServerIssueStorageTest {
 
   @Test
   public void should_insert_new_issues() {
-    dbTester.prepareDbUnit(getClass(), "should_insert_new_issues.xml");
+    RuleDefinitionDto rule = dbTester.rules().insert();
+    ComponentDto project = dbTester.components().insertMainBranch();
+    ComponentDto module = dbTester.components().insertComponent(newModuleDto(project));
+    ComponentDto file = dbTester.components().insertComponent(newFileDto(module));
 
-    DefaultIssueComment comment = DefaultIssueComment.create("ABCDE", "user_uuid", "the comment");
+    String issueKey = "ABCDE";
+    DefaultIssueComment comment = DefaultIssueComment.create(issueKey, "user_uuid", "the comment");
     // override generated key
     comment.setKey("FGHIJ");
 
     Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000");
     DefaultIssue issue = new DefaultIssue()
-      .setKey("ABCDE")
+      .setKey(issueKey)
       .setType(RuleType.BUG)
       .setNew(true)
-
-      .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
-      .setProjectUuid("ABCD")
-      .setComponentUuid("BCDE")
+      .setRuleKey(rule.getKey())
+      .setProjectUuid(project.uuid())
+      .setComponentUuid(file.uuid())
       .setLine(5000)
       .setEffort(Duration.create(10L))
       .setResolution("OPEN")
@@ -106,53 +115,107 @@ public class ServerIssueStorageTest {
 
     underTest.save(issue);
 
-    dbTester.assertDbUnit(getClass(), "should_insert_new_issues-result.xml",
-      new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    assertThat(dbTester.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(dbTester.selectFirst("select * from issues"))
+      .containsEntry("PROJECT_UUID", project.uuid())
+      .containsEntry("COMPONENT_UUID", file.uuid())
+      .containsEntry("KEE", issue.key())
+      .containsEntry("RESOLUTION", issue.resolution())
+      .containsEntry("STATUS", issue.status())
+      .containsEntry("SEVERITY", issue.severity());
+
+    assertThat(dbTester.countRowsOfTable("issue_changes")).isEqualTo(1);
+    assertThat(dbTester.selectFirst("select * from issue_changes"))
+      .containsEntry("KEE", comment.key())
+      .containsEntry("ISSUE_KEY", issue.key())
+      .containsEntry("CHANGE_DATA", comment.markdownText())
+      .containsEntry("USER_LOGIN", comment.userUuid());
   }
 
   @Test
   public void should_update_issues() {
-    dbTester.prepareDbUnit(getClass(), "should_update_issues.xml");
-
-    IssueChangeContext context = IssueChangeContext.createUser(new Date(), "user_uuid");
-
-    DefaultIssueComment comment = DefaultIssueComment.create("ABCDE", "user_uuid", "the comment");
-    // override generated key
-    comment.setKey("FGHIJ");
+    RuleDefinitionDto rule = dbTester.rules().insert();
+    ComponentDto project = dbTester.components().insertMainBranch();
+    ComponentDto module = dbTester.components().insertComponent(newModuleDto(project));
+    ComponentDto file = dbTester.components().insertComponent(newFileDto(module));
 
     Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000");
     DefaultIssue issue = new DefaultIssue()
       .setKey("ABCDE")
       .setType(RuleType.BUG)
+      .setNew(true)
+      .setRuleKey(rule.getKey())
+      .setProjectUuid(project.uuid())
+      .setComponentUuid(file.uuid())
+      .setLine(5000)
+      .setEffort(Duration.create(10L))
+      .setResolution("OPEN")
+      .setStatus("OPEN")
+      .setSeverity("BLOCKER")
+      .setAttribute("foo", "bar")
+      .setCreationDate(date)
+      .setUpdateDate(date)
+      .setCloseDate(date);
+
+    underTest.save(issue);
+
+    assertThat(dbTester.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(dbTester.countRowsOfTable("issue_changes")).isEqualTo(0);
+
+    DefaultIssue updated = new DefaultIssue()
+      .setKey(issue.key())
+      .setType(RuleType.VULNERABILITY)
       .setNew(false)
       .setChanged(true)
 
       // updated fields
-      .setLine(5000)
-      .setProjectUuid("CDEF")
-      .setEffort(Duration.create(10L))
+      .setLine(issue.getLine() + 10)
+      .setProjectUuid("foo")
+      .setEffort(Duration.create(issue.effortInMinutes() + 10L))
       .setChecksum("FFFFF")
       .setAuthorLogin("simon")
       .setAssigneeUuid("loic")
-      .setFieldChange(context, "severity", "INFO", "BLOCKER")
+      .setFieldChange(IssueChangeContext.createUser(new Date(), "user_uuid"), "severity", "INFO", "BLOCKER")
+      .addComment(DefaultIssueComment.create("ABCDE", "user_uuid", "the comment"))
       .setResolution("FIXED")
       .setStatus("RESOLVED")
-      .setSeverity("BLOCKER")
-      .setAttribute("foo", "bar")
-      .addComment(comment)
-      .setCreationDate(date)
-      .setUpdateDate(date)
-      .setCloseDate(date)
+      .setSeverity("MAJOR")
+      .setAttribute("fox", "bax")
+      .setCreationDate(DateUtils.addDays(date, 1))
+      .setUpdateDate(DateUtils.addDays(date, 1))
+      .setCloseDate(DateUtils.addDays(date, 1))
 
       // unmodifiable fields
       .setRuleKey(RuleKey.of("xxx", "unknown"))
       .setComponentKey("struts:Action")
       .setProjectKey("struts");
 
-    underTest.save(issue);
-
-    dbTester.assertDbUnit(getClass(), "should_update_issues-result.xml",
-      new String[] {"id", "created_at", "updated_at", "issue_change_creation_date"}, "issues", "issue_changes");
+    underTest.save(updated);
+
+    assertThat(dbTester.countRowsOfTable("issues")).isEqualTo(1);
+    assertThat(dbTester.selectFirst("select * from issues"))
+      .containsEntry("ASSIGNEE", updated.assignee())
+      .containsEntry("AUTHOR_LOGIN", updated.authorLogin())
+      .containsEntry("CHECKSUM", updated.checksum())
+      .containsEntry("COMPONENT_UUID", issue.componentUuid())
+      .containsEntry("EFFORT", updated.effortInMinutes())
+      .containsEntry("ISSUE_ATTRIBUTES", "fox=bax")
+      .containsEntry("ISSUE_TYPE", (byte) 3)
+      .containsEntry("KEE", issue.key())
+      .containsEntry("LINE", (long) updated.line())
+      .containsEntry("PROJECT_UUID", updated.projectUuid())
+      .containsEntry("RESOLUTION", updated.resolution())
+      .containsEntry("STATUS", updated.status())
+      .containsEntry("SEVERITY", updated.severity());
+
+    List<Map<String, Object>> rows = dbTester.select("select * from issue_changes order by id");
+    assertThat(rows).hasSize(2);
+    assertThat(rows.get(0))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("the comment", "comment", "user_uuid");
+    assertThat(rows.get(1))
+      .extracting("CHANGE_DATA", "CHANGE_TYPE", "USER_LOGIN")
+      .containsExactlyInAnyOrder("severity=INFO|BLOCKER", "diff", "user_uuid");
   }
 
   static class FakeRuleFinder implements RuleFinder {
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
deleted file mode 100644
index 5bf22423c31..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
-          assignee="[null]"
-          author_login="[null]"
-          checksum="[null]"
-          gap="[null]"
-          effort="10"
-          message="[null]"
-          line="5000"
-          component_uuid="uuid-100"
-          project_uuid="uuid-10"
-          rule_id="200"
-          created_at="[null]"
-          updated_at="[null]"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1368878400000"
-          issue_update_date="1368878400000"
-          issue_close_date="1368878400000"
-          locations="[null]"
-          issue_type="2"
-    />
-
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="user_uuid"
-                 change_data="the comment"
-                 created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
-
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
deleted file mode 100644
index 0a39d215e77..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<dataset>
-  <issues id="1"
-          kee="ABCDE"
-          resolution="FIXED"
-          status="RESOLVED"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          gap="[null]"
-          effort="10"
-          message="[null]"
-          line="5000"
-          component_uuid="uuid-100"
-          project_uuid="uuid-10"
-          rule_id="200"
-          created_at="2013-05-18"
-          updated_at="2013-05-18"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1368878400000"
-          issue_update_date="1368878400000"
-          issue_close_date="1368878400000"
-          locations="[null]"
-          issue_type="2"
-    />
-
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="user_uuid"
-                 change_data="the comment" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
-  <issue_changes id="2" kee="[null]" issue_key="ABCDE" change_type="diff" user_login="user_uuid"
-                 change_data="severity=INFO|BLOCKER" created_at="[null]" updated_at="[null]"
-                 issue_change_creation_date="[null]"/>
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
deleted file mode 100644
index 478c01ec27d..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <issues id="1"
-          kee="ABCDE"
-          resolution="OPEN"
-          status="OPEN"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          gap="[null]"
-          effort="[null]"
-          message="[null]"
-          line="3000"
-          component_uuid="uuid-100"
-          project_uuid="uuid-11"
-          rule_id="200"
-          created_at="1400000000000"
-          updated_at="1400000000000"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1262300400000"
-          issue_update_date="1265065200000"
-          issue_close_date="[null]"
-          locations="[null]"
-          issue_type="2"
-    />
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
deleted file mode 100644
index cb2f3324eed..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<dataset>
-  <issues id="1" kee="ABCDE" resolution="OPEN" status="OPEN" severity="BLOCKER" manual_severity="[false]"
-          assignee="[null]"
-          author_login="[null]"
-          checksum="[null]"
-          gap="[null]"
-          effort="10"
-          message="[null]"
-          line="5000"
-          component_uuid="BCDE"
-          project_uuid="ABCD"
-          rule_id="200"
-          created_at="1000000000"
-          updated_at="1000000000"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1368878400000"
-          issue_update_date="1368878400000"
-          issue_close_date="1368878400000"
-          locations="[null]"
-          issue_type="2"
-      />
-
-  <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="user_uuid"
-                 change_data="the comment"
-                 created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/>
-
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
deleted file mode 100644
index 222670b1485..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<dataset>
-
-  <organizations uuid="org1"
-                 kee="org1_key"
-                 name="org1_name"
-                 guarded="[false]"
-                 new_project_private="[false]"
-                 default_quality_gate_uuid="DEFAULT_QG"
-                 created_at="1000"
-                 updated_at="2000"/>
-
-  <projects organization_uuid="org1"
-            uuid="ABCD"
-            uuid_path="NOT_USED"
-            root_uuid="ABCD"
-            project_uuid="ABCD"
-            id="10"
-            scope="PRJ"
-            qualifier="TRK"
-            kee="struts"
-            name="Struts"
-            private="[false]"/>
-  <snapshots id="10"
-             uuid="u10"
-             component_uuid="ABCD"
-             islast="[true]"/>
-
-  <projects organization_uuid="org1"
-            uuid="BCDE"
-            uuid_path="NOT_USED"
-            root_uuid="ABCD"
-            project_uuid="ABCD"
-            id="100"
-            scope="FIL"
-            qualifier="CLA"
-            kee="struts:Action"
-            name="Action"
-            private="[false]"/>
-  <snapshots id="100"
-             uuid="u100"
-             component_uuid="BCDE"
-             islast="[true]"/>
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
deleted file mode 100644
index 3c0d6b1ed41..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<dataset>
-  <issues id="1"
-          kee="ABCDE"
-          resolution="FIXED"
-          status="RESOLVED"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          gap="[null]"
-          effort="10"
-          message="[null]"
-          line="5000"
-          component_uuid="BCDE"
-          project_uuid="CDEF"
-          rule_id="200"
-          created_at="1000000000"
-          updated_at="2000000000"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          tags="[null]"
-          action_plan_key="[null]"
-          issue_creation_date="1368878400000"
-          issue_update_date="1368878400000"
-          issue_close_date="1368878400000"
-          locations="[null]"
-          issue_type="2"
-  />
-
-  <issue_changes id="1"
-                 kee="FGHIJ"
-                 issue_key="ABCDE"
-                 change_type="comment"
-                 user_login="user_uuid"
-                 change_data="the comment"
-                 created_at="[null]"
-                 updated_at="[null]"
-                 issue_change_creation_date="[null]"/>
-  <issue_changes id="2"
-                 kee="[null]"
-                 issue_key="ABCDE"
-                 change_type="diff"
-                 user_login="user_uuid"
-                 change_data="severity=INFO|BLOCKER"
-                 created_at="[null]"
-                 updated_at="[null]"
-                 issue_change_creation_date="[null]"/>
-</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
deleted file mode 100644
index 879f7973eb9..00000000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<dataset>
-
-  <organizations uuid="org1"
-                 kee="org1_key"
-                 name="org1_name"
-                 guarded="[false]"
-                 new_project_private="[false]"
-                 default_quality_gate_uuid="DEFAULT_QG"
-                 created_at="1000"
-                 updated_at="2000"/>
-
-  <projects organization_uuid="org1"
-            uuid="ABCD"
-            uuid_path="NOT_USED"
-            root_uuid="ABCD"
-            project_uuid="ABCD"
-            id="10"
-            scope="PRJ"
-            qualifier="TRK"
-            kee="struts"
-            name="Struts"
-            private="[false]"/>
-  <snapshots id="10"
-             uuid="u10"
-             component_uuid="ABCD"
-             islast="[true]"/>
-
-  <projects organization_uuid="org1"
-            uuid="BCDE"
-            uuid_path="NOT_USED"
-            root_uuid="ABCD"
-            project_uuid="ABCD"
-            id="100"
-            scope="FIL"
-            qualifier="CLA"
-            kee="struts:Action"
-            name="Action"
-            private="[false]"/>
-  <snapshots id="100"
-             uuid="u100"
-             component_uuid="BCDE"
-             islast="[true]"/>
-
-  <issues id="1"
-          kee="ABCDE"
-          resolution="OPEN"
-          status="OPEN"
-          severity="BLOCKER"
-          manual_severity="[false]"
-          assignee="loic"
-          author_login="simon"
-          checksum="FFFFF"
-          gap="[null]"
-          effort="[null]"
-          message="[null]"
-          line="3000"
-          component_uuid="BCDE"
-          project_uuid="ABCD"
-          rule_id="200"
-          created_at="1000000000"
-          updated_at="1000000000"
-          reporter="[null]"
-          issue_attributes="foo=bar"
-          action_plan_key="[null]"
-          issue_creation_date="1262300400000"
-          issue_update_date="1265065200000"
-          issue_close_date="[null]"
-          locations="[null]"
-          issue_type="[null]"
-  />
-</dataset>