SONAR-3755 refactor comments

5 files changed, 19 insertions, 105 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java
index 316c041879a..363445e918f 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java
@@ -43,7 +43,7 @@ public class IssueChangeMapperTest extends AbstractDaoTestCase {
     dto.setKey(null /* no key on field changes */);
     dto.setUserLogin("emmerik");
     dto.setIssueKey("ABCDE");
-    dto.setChangeType(ChangeDtoConverter.TYPE_FIELD_CHANGE);
+    dto.setChangeType(IssueChangeDto.TYPE_FIELD_CHANGE);
     dto.setChangeData("severity=INFO|BLOCKER");
     Date d = DateUtils.parseDate("2013-05-18");
     dto.setCreatedAt(d);
@@ -60,7 +60,7 @@ public class IssueChangeMapperTest extends AbstractDaoTestCase {
     dto.setKey("COMMENT-1234");
     dto.setUserLogin("emmerik");
     dto.setIssueKey("ABCDE");
-    dto.setChangeType(ChangeDtoConverter.TYPE_COMMENT);
+    dto.setChangeType(IssueChangeDto.TYPE_COMMENT);
     dto.setChangeData("the comment");
     Date d = DateUtils.parseDate("2013-05-18");
     dto.setCreatedAt(d);
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index 4238afe1fc9..5c75cbdf706 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -240,15 +240,4 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     Collection<IssueDto> results = dao.selectByIds(newArrayList(100l, 101l, 102l));
     assertThat(results).hasSize(3);
   }
-
-  @Test
-  public void selectByChangeKey() throws Exception {
-    setupData("shared", "selectByChangeKey");
-    IssueDto issue = dao.selectByChangeKey("COMMENT-20");
-    assertThat(issue.getKee()).isEqualTo("ISSUE-2");
-
-    issue = dao.selectByChangeKey("COMMENT-UNKNOWN");
-    assertThat(issue).isNull();
-  }
-
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
index 72f5c9c7879..b7e1513678c 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java
@@ -64,7 +64,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     mapper.insert(dto);
     session.commit();
 
-    checkTables("testInsert", new String[]{"id", "effort_to_fix"}, "issues");
+    checkTables("testInsert", new String[]{"id"}, "issues");
   }
 
   @Test
@@ -97,6 +97,6 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     mapper.update(dto);
     session.commit();
 
-    checkTables("testUpdate", new String[]{"id", "effort_to_fix"}, "issues");
+    checkTables("testUpdate", new String[]{"id"}, "issues");
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java b/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java
index 88abcf3d2d3..2205ac573f5 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java
@@ -22,20 +22,17 @@ package org.sonar.core.persistence;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang.StringUtils;
+import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
 import org.dbunit.dataset.datatype.IDataTypeFactory;
+import org.dbunit.dataset.datatype.ToleratedDeltaMap;
 import org.dbunit.ext.h2.H2DataTypeFactory;
 import org.dbunit.ext.mssql.MsSqlDataTypeFactory;
 import org.dbunit.ext.mysql.MySqlDataTypeFactory;
 import org.dbunit.ext.oracle.Oracle10DataTypeFactory;
 import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
-import org.sonar.core.persistence.dialect.Dialect;
-import org.sonar.core.persistence.dialect.MsSql;
-import org.sonar.core.persistence.dialect.MySql;
-import org.sonar.core.persistence.dialect.Oracle;
-import org.sonar.core.persistence.dialect.PostgreSql;
+import org.sonar.core.persistence.dialect.*;
 
 import javax.sql.DataSource;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -46,8 +43,12 @@ import java.util.List;
 public abstract class DatabaseCommands {
   private final IDataTypeFactory dbUnitFactory;
 
-  private DatabaseCommands(IDataTypeFactory dbUnitFactory) {
+  private DatabaseCommands(DefaultDataTypeFactory dbUnitFactory) {
     this.dbUnitFactory = dbUnitFactory;
+
+    // Hack for MsSQL failure in IssueMapperTest.
+    // All the Double fields should be listed here.
+    dbUnitFactory.addToleratedDelta(new ToleratedDeltaMap.ToleratedDelta("issues", "effort_to_fix", 0.0001));
   }
 
   public final IDataTypeFactory getDbUnitFactory() {
@@ -58,11 +59,11 @@ public abstract class DatabaseCommands {
 
   public static DatabaseCommands forDialect(Dialect dialect) {
     DatabaseCommands command = ImmutableMap.of(
-        org.sonar.core.persistence.dialect.H2.ID, H2,
-        MsSql.ID, MSSQL,
-        MySql.ID, MYSQL,
-        Oracle.ID, ORACLE,
-        PostgreSql.ID, POSTGRESQL).get(dialect.getId());
+      org.sonar.core.persistence.dialect.H2.ID, H2,
+      MsSql.ID, MSSQL,
+      MySql.ID, MYSQL,
+      Oracle.ID, ORACLE,
+      PostgreSql.ID, POSTGRESQL).get(dialect.getId());
 
     return Preconditions.checkNotNull(command, "Unknown database: " + dialect);
   }
@@ -86,8 +87,8 @@ public abstract class DatabaseCommands {
     List<String> resetPrimaryKey(String table, int minSequenceValue) {
       String sequence = StringUtils.upperCase(table) + "_SEQ";
       return Arrays.asList(
-          "DROP SEQUENCE " + sequence,
-          "CREATE SEQUENCE " + sequence + " INCREMENT BY 1 MINVALUE 1 START WITH " + minSequenceValue);
+        "DROP SEQUENCE " + sequence,
+        "CREATE SEQUENCE " + sequence + " INCREMENT BY 1 MINVALUE 1 START WITH " + minSequenceValue);
     }
   };
 
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/selectByChangeKey.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/selectByChangeKey.xml
deleted file mode 100644
index a8da7191bdf..00000000000
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/selectByChangeKey.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<dataset>
-
-  <issues
-    id="100"
-    kee="ISSUE-1"
-    resource_id="400"
-    rule_id="500"
-    severity="INFO"
-    manual_severity="[false]"
-    manual_issue="[false]"
-    description="[null]"
-    line="[null]"
-    effort_to_fix="4.2"
-    status="OPEN"
-    resolution="FIXED"
-    checksum="XXX"
-    user_login="arthur"
-    assignee_login="perceval"
-    author_login="[null]"
-    attributes="JIRA=FOO-1234"
-    issue_creation_date="2013-04-16"
-    issue_update_date="2013-04-16"
-    issue_close_date="2013-04-16"
-    created_at="2013-04-16"
-    updated_at="2013-04-16"
-    />
-
-
-  <!-- the issue to return -->
-  <issues
-    id="101"
-    kee="ISSUE-2"
-    resource_id="400"
-    rule_id="500"
-    severity="BLOCKER"
-    manual_severity="[false]"
-    manual_issue="[false]"
-    description="[null]"
-    line="200"
-    effort_to_fix="4.2"
-    status="OPEN"
-    resolution="FIXED"
-    checksum="XXX"
-    user_login="arthur"
-    assignee_login="perceval"
-    author_login="[null]"
-    attributes="JIRA=FOO-1234"
-    issue_creation_date="2013-04-16"
-    issue_update_date="2013-04-16"
-    issue_close_date="2013-04-16"
-    created_at="2013-04-16"
-    updated_at="2013-04-16"
-    />
-
-  <issue_changes
-    id="1"
-    kee="COMMENT-10"
-    issue_key="ISSUE-1"
-    user_login="emmerik"
-    change_type="comment"
-    change_data="the comment"
-    created_at="2013-05-18"
-    updated_at="2013-05-18"
-    />
-
-  <issue_changes
-    id="2"
-    kee="COMMENT-20"
-    issue_key="ISSUE-2"
-    user_login="emmerik"
-    change_type="comment"
-    change_data="the comment"
-    created_at="2013-05-18"
-    updated_at="2013-05-18"
-    />
-</dataset>
\ No newline at end of file