SONAR-3755 rename COST to EFFORT_TO_FIX

24 files changed, 65 insertions, 61 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
index 86eefaed14a..2e25531216e 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -51,7 +51,7 @@ public class DefaultIssue implements Issue {
   private boolean manualSeverity = false;
   private String description;
   private Integer line;
-  private Double cost;
+  private Double effortToFix;
   private String status;
   private String resolution;
   private String userLogin;
@@ -140,13 +140,13 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
-  public Double cost() {
-    return cost;
+  public Double effortToFix() {
+    return effortToFix;
   }
 
-  public DefaultIssue setCost(@Nullable Double c) {
-    Preconditions.checkArgument(c == null || c >= 0, "Cost must be positive (got " + c + ")");
-    this.cost = c;
+  public DefaultIssue setEffortToFix(@Nullable Double d) {
+    Preconditions.checkArgument(d == null || d >= 0, "Effort to fix must be greater than or equal 0 (got " + d + ")");
+    this.effortToFix = d;
     return this;
   }
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
index 19da2da56e2..497e1f860af 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
@@ -40,7 +40,7 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   private Integer line;
   private String description;
   private String severity;
-  private Double cost;
+  private Double effortToFix;
   private boolean manual = false;
   private Date createdDate;
   private Map<String, String> attributes;
@@ -84,8 +84,8 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   }
 
   @Override
-  public Issuable.IssueBuilder cost(@Nullable Double cost) {
-    this.cost = cost;
+  public Issuable.IssueBuilder effortToFix(@Nullable Double d) {
+    this.effortToFix = d;
     return this;
   }
 
@@ -124,7 +124,7 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     issue.setRuleKey(ruleKey);
     issue.setDescription(description);
     issue.setSeverity(Objects.firstNonNull(severity, Severity.MAJOR));
-    issue.setCost(cost);
+    issue.setEffortToFix(effortToFix);
     issue.setLine(line);
     issue.setManual(manual);
     issue.setManualSeverity(manual);
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
index 60c31e673b0..4f325a5cfa2 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
@@ -106,6 +106,10 @@ public class IssueUpdater implements BatchComponent, ServerComponent {
     issue.setCloseDate(d);
   }
 
+  public void setEffortToFix(DefaultIssue issue, @Nullable Double d) {
+    issue.setEffortToFix(d);
+  }
+
   public boolean setAttribute(DefaultIssue issue, String key, @Nullable String value, IssueChangeContext context) {
     String oldValue = issue.attribute(key);
     if (!Objects.equal(oldValue, value)) {
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
index 46128519883..6625f8e821b 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
@@ -44,7 +44,7 @@ public final class IssueDto {
   private boolean manualIssue;
   private String description;
   private Integer line;
-  private Double cost;
+  private Double effortToFix;
   private String status;
   private String resolution;
   private String checksum;
@@ -148,12 +148,12 @@ public final class IssueDto {
     return this;
   }
 
-  public Double getCost() {
-    return cost;
+  public Double getEffortToFix() {
+    return effortToFix;
   }
 
-  public IssueDto setCost(@Nullable Double cost) {
-    this.cost = cost;
+  public IssueDto setEffortToFix(@Nullable Double d) {
+    this.effortToFix = d;
     return this;
   }
 
@@ -306,7 +306,7 @@ public final class IssueDto {
       .setKey(issue.key())
       .setLine(issue.line())
       .setDescription(issue.description())
-      .setCost(issue.cost())
+      .setEffortToFix(issue.effortToFix())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
       .setSeverity(issue.severity())
@@ -332,7 +332,7 @@ public final class IssueDto {
     issue.setStatus(status);
     issue.setResolution(resolution);
     issue.setDescription(description);
-    issue.setCost(cost);
+    issue.setEffortToFix(effortToFix);
     issue.setLine(line);
     issue.setSeverity(severity);
     issue.setUserLogin(userLogin);
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index d96764e5c4c..4f0c14f67d2 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -14,7 +14,7 @@
     i.manual_issue as manualIssue,
     i.description as description,
     i.line as line,
-    i.cost as cost,
+    i.effort_to_fix as effortToFix,
     i.status as status,
     i.resolution as resolution,
     i.checksum as checksum,
@@ -33,10 +33,10 @@
   </sql>
 
   <insert id="insert" parameterType="Issue" useGeneratedKeys="true" keyProperty="id">
-    INSERT INTO issues (kee, resource_id, rule_id, severity, manual_severity, manual_issue, description, line, cost, status,
+    INSERT INTO issues (kee, resource_id, rule_id, severity, manual_severity, manual_issue, description, line, effort_to_fix, status,
     resolution, checksum, user_login, assignee_login, author_login, attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at)
-    VALUES (#{kee}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{description}, #{line}, #{cost}, #{status},
+    VALUES (#{kee}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{description}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{userLogin}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
   </insert>
@@ -46,10 +46,10 @@
     <selectKey order="BEFORE" resultType="Long" keyProperty="id">
       select issues_seq.NEXTVAL from DUAL
     </selectKey>
-    INSERT INTO issues (id, kee, resource_id, rule_id, severity, manual_severity, manual_issue, description, line, cost, status,
+    INSERT INTO issues (id, kee, resource_id, rule_id, severity, manual_severity, manual_issue, description, line, effort_to_fix, status,
     resolution, checksum, user_login, assignee_login, author_login, attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at)
-    VALUES (#{id}, #{kee}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{description}, #{line}, #{cost}, #{status},
+    VALUES (#{id}, #{kee}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{description}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{userLogin}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
   </insert>
@@ -63,7 +63,7 @@
       manual_issue=#{manualIssue},
       description=#{description},
       line=#{line},
-      cost=#{cost},
+      effort_to_fix=#{effortToFix},
       status=#{status},
       resolution=#{resolution},
       checksum=#{checksum},
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index a57ece8a982..05ca08707b3 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -527,7 +527,7 @@ CREATE TABLE "ISSUES" (
   "MANUAL_ISSUE" BOOLEAN NOT NULL,
   "DESCRIPTION" VARCHAR(4000),
   "LINE" INTEGER,
-  "COST" DOUBLE,
+  "EFFORT_TO_FIX" DOUBLE,
   "STATUS" VARCHAR(20),
   "RESOLUTION" VARCHAR(20),
   "CHECKSUM" VARCHAR(1000),
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
index fe536ac5d9a..6ce91863110 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
@@ -35,7 +35,7 @@ public class DefaultIssueBuilderTest {
       .componentKey(componentKey)
       .description("the desc")
       .line(123)
-      .cost(10000.0)
+      .effortToFix(10000.0)
       .ruleKey(RuleKey.of("squid", "NullDereference"))
       .severity(Severity.CRITICAL)
       .attribute("JIRA", "FOO-123")
@@ -44,7 +44,7 @@ public class DefaultIssueBuilderTest {
 
     assertThat(issue).isNotNull();
     assertThat(issue.key()).isNotNull();
-    assertThat(issue.cost()).isEqualTo(10000.0);
+    assertThat(issue.effortToFix()).isEqualTo(10000.0);
     assertThat(issue.componentKey()).isEqualTo(componentKey);
     assertThat(issue.description()).isEqualTo("the desc");
     assertThat(issue.line()).isEqualTo(123);
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 83b9a362a6a..7592dae2f08 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
@@ -58,7 +58,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.isManualIssue()).isFalse();
     assertThat(issue.getDescription()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
-    assertThat(issue.getCost()).isEqualTo(4.2);
+    assertThat(issue.getEffortToFix()).isEqualTo(4.2);
     assertThat(issue.getStatus()).isEqualTo("OPEN");
     assertThat(issue.getResolution()).isEqualTo("FIXED");
     assertThat(issue.getChecksum()).isEqualTo("XXX");
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
index 2a585569584..539229136ab 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java
@@ -61,7 +61,7 @@ public class IssueDtoTest {
         .setResourceId(1)
         .setStatus(Issue.STATUS_CLOSED)
         .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
-        .setCost(15.0)
+        .setEffortToFix(15.0)
         .setLine(6)
         .setSeverity("BLOCKER")
         .setDescription("message")
@@ -81,7 +81,7 @@ public class IssueDtoTest {
     assertThat(issue.componentKey()).isEqualTo("component-key");
     assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED);
     assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FALSE_POSITIVE);
-    assertThat(issue.cost()).isEqualTo(15.0);
+    assertThat(issue.effortToFix()).isEqualTo(15.0);
     assertThat(issue.line()).isEqualTo(6);
     assertThat(issue.severity()).isEqualTo("BLOCKER");
     assertThat(issue.description()).isEqualTo("message");
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
index 17e12b371a5..285456d07fe 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
index 300f7a99aad..e09cf89e7a8 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
index 5867469c575..a55ab8c6142 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
@@ -10,7 +10,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="OPEN"
       resolution="[null]"
       checksum="[null]"
@@ -35,7 +35,7 @@
       manual_issue="[false]"
       description="[null]"
       line="120"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="CLOSED"
       resolution="FIXED"
       checksum="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
index 40417c1bcff..dc3dce23a04 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
@@ -10,7 +10,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -35,7 +35,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
index 17e12b371a5..285456d07fe 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
index 8c79cc3237f..8b3367cd6f0 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
@@ -10,7 +10,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
index 64ea7b18d54..29750932d6e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
@@ -10,7 +10,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
index 5cb5360442f..9fbab6fea10 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_ids_and_components_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_ids_and_components_ids.xml
index 17e12b371a5..285456d07fe 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_ids_and_components_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_ids_and_components_ids.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
index f05c5895f2f..59b4add50ba 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
@@ -10,7 +10,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="OPEN"
       resolution="[null]"
       checksum="[null]"
@@ -35,7 +35,7 @@
       manual_issue="[false]"
       description="[null]"
       line="120"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="OPEN"
       resolution="FIXED"
       checksum="[null]"
@@ -60,7 +60,7 @@
       manual_issue="[false]"
       description="[null]"
       line="120"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="CLOSED"
       resolution="FIXED"
       checksum="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
index 92821838fe5..f6d9e75ea16 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
@@ -11,7 +11,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -36,7 +36,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
@@ -63,7 +63,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="4.2"
+      effort_to_fix="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
index 3a0362262cc..b1e88540c59 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml
@@ -3,7 +3,7 @@
       assignee_login="[null]"
       author_login="[null]"
       checksum="[null]"
-      cost="[null]"
+      effort_to_fix="[null]"
       description="[null]"
       line="5000"
       manual_issue="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index a82e547ed23..57e99d174a1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -8,7 +8,7 @@
           assignee_login="loic"
           author_login="simon"
           checksum="FFFFF"
-          cost="[null]"
+          effort_to_fix="[null]"
           description="[null]"
           line="5000"
           manual_issue="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 7a34c953c4b..56998d9b2a1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -8,7 +8,7 @@
           assignee_login="loic"
           author_login="simon"
           checksum="FFFFF"
-          cost="[null]"
+          effort_to_fix="[null]"
           description="[null]"
           line="3000"
           manual_issue="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index a2e0f6fced4..1a8e204b301 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -28,7 +28,7 @@
       manual_issue="[false]"
       description="[null]"
       line="200"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="OPEN"
       resolution="[null]"
       checksum="[null]"
@@ -53,7 +53,7 @@
       manual_issue="[false]"
       description="[null]"
       line="120"
-      cost="[null]"
+      effort_to_fix="[null]"
       status="OPEN"
       resolution="FIXED"
       checksum="[null]"