SONAR-3755 rename Issue#message() to description()

5 files changed, 26 insertions, 17 deletions

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 2e9b7a50880..6ba6e1f87ee 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 {
   public void should_create_issue() throws Exception {
     String componentKey = "org.apache.struts:struts-core:Action.java";
     DefaultIssue issue = (DefaultIssue) new DefaultIssueBuilder(callback, componentKey)
-      .message("msg")
+      .description("the desc")
       .line(123)
       .cost(10000.0)
       .ruleKey(RuleKey.of("squid", "NullDereference"))
@@ -46,14 +46,14 @@ public class DefaultIssueBuilderTest {
     assertThat(issue.key()).isNull();
     assertThat(issue.cost()).isEqualTo(10000.0);
     assertThat(issue.componentKey()).isEqualTo(componentKey);
-    assertThat(issue.message()).isEqualTo("msg");
+    assertThat(issue.description()).isEqualTo("the desc");
     assertThat(issue.line()).isEqualTo(123);
     assertThat(issue.ruleKey().repository()).isEqualTo("squid");
     assertThat(issue.ruleKey().rule()).isEqualTo("NullDereference");
     assertThat(issue.severity()).isEqualTo(Severity.CRITICAL);
     assertThat(issue.updatedAt()).isNull();
     assertThat(issue.closedAt()).isNull();
-    assertThat(issue.assigneeLogin()).isNull();
+    assertThat(issue.assignee()).isNull();
     assertThat(issue.isNew()).isTrue();
     verify(callback).onIssueCreation(issue);
   }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueFinderTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueFinderTest.java
index 54b52850807..73bc35ad508 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueFinderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueFinderTest.java
@@ -27,6 +27,7 @@ import org.mockito.stubbing.Answer;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.IssueFinder;
 import org.sonar.api.issue.IssueQuery;
+import org.sonar.api.web.UserRole;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.user.AuthorizationDao;
 
@@ -60,16 +61,14 @@ public class DefaultIssueFinderTest {
 
     IssueDto issue1 = new IssueDto().setId(1L).setRuleId(50).setResourceId(123)
       .setComponentKey_unit_test_only("Action.java")
-      .setRuleRepo_unit_test_only("squid")
-      .setRule_unit_test_only("AvoidCycle");
+      .setRuleKey_unit_test_only("squid", "AvoidCycle");
     IssueDto issue2 = new IssueDto().setId(2L).setRuleId(50).setResourceId(123)
       .setComponentKey_unit_test_only("Action.java")
-      .setRuleRepo_unit_test_only("squid")
-      .setRule_unit_test_only("AvoidCycle");
+      .setRuleKey_unit_test_only("squid", "AvoidCycle");
     List<IssueDto> dtoList = newArrayList(issue1, issue2);
     when(issueDao.select(eq(issueQuery), any(SqlSession.class))).thenReturn(dtoList);
 
-    IssueFinder.Results results = finder.find(issueQuery, null);
+    IssueFinder.Results results = finder.find(issueQuery, null, UserRole.USER);
     assertThat(results.issues()).hasSize(2);
     Issue issue = results.issues().iterator().next();
     assertThat(issue.componentKey()).isEqualTo("Action.java");
@@ -80,8 +79,7 @@ public class DefaultIssueFinderTest {
   public void should_find_by_key() {
     IssueDto issueDto = new IssueDto().setId(1L).setRuleId(1).setResourceId(1)
       .setComponentKey_unit_test_only("Action.java")
-      .setRuleRepo_unit_test_only("squid")
-      .setRule_unit_test_only("AvoidCycle");
+      .setRuleKey_unit_test_only("squid", "AvoidCycle");
     when(issueDao.selectByKey("ABCDE")).thenReturn(issueDto);
 
     Issue issue = finder.findByKey("ABCDE");
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
index 20c1011f85f..b070d4d82d8 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.core.issue;
 
+import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 
 import static org.fest.assertions.Assertions.assertThat;
@@ -68,4 +69,14 @@ public class DefaultIssueTest {
       assertThat(e).hasMessage("Not a valid severity: FOO");
     }
   }
+
+  @Test
+  public void size_of_description_should_be_limited() {
+    try {
+      issue.setDescription(StringUtils.repeat("a", 5000));
+      fail();
+    } catch (IllegalArgumentException e) {
+      assertThat(e).hasMessage("Description must not be longer than 4000 characters (got 5000)");
+    }
+  }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
index 59f909a68d9..9f45587d8ba 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
@@ -55,8 +55,8 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     issueDto.setSeverity("BLOCKER");
     issueDto.setLine(200);
     issueDto.setStatus("OPEN");
-    issueDto.setAssigneeLogin("user");
-    issueDto.setMessage("message");
+    issueDto.setAssignee("user");
+    issueDto.setDescription("the description");
     issueDto.setCost(10.0);
     issueDto.setChecksum("checksum");
     issueDto.setPersonId(100L);
@@ -80,7 +80,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     issue.setResolution("NEW_RESOLUTION");
     issue.setStatus("NEW_STATUS");
     issue.setSeverity("NEW_SEV");
-    issue.setAssigneeLogin("new_user");
+    issue.setAssignee("new_user");
     issue.setManualSeverity(true);
     issue.setManualIssue(false);
     issue.setTitle("NEW_TITLE");
@@ -105,7 +105,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.isManualSeverity()).isFalse();
     assertThat(issue.isManualIssue()).isFalse();
     assertThat(issue.getTitle()).isNull();
-    assertThat(issue.getMessage()).isNull();
+    assertThat(issue.getDescription()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
     assertThat(issue.getCost()).isEqualTo(4.2);
     assertThat(issue.getStatus()).isEqualTo("OPEN");
@@ -113,7 +113,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getChecksum()).isEqualTo("XXX");
     assertThat(issue.getPersonId()).isNull();
     assertThat(issue.getUserLogin()).isEqualTo("arthur");
-    assertThat(issue.getAssigneeLogin()).isEqualTo("perceval");
+    assertThat(issue.getAssignee()).isEqualTo("perceval");
     assertThat(issue.getData()).isEqualTo("JIRA=FOO-1234");
     assertThat(issue.getCreatedAt()).isNotNull();
     assertThat(issue.getUpdatedAt()).isNotNull();
@@ -136,7 +136,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     IssueQuery query = IssueQuery.builder()
       .keys(newArrayList("ABCDE"))
       .userLogins(newArrayList("arthur", "otherguy"))
-      .assigneeLogins(newArrayList("perceval", "otherguy"))
+      .assignees(newArrayList("perceval", "otherguy"))
       .components(newArrayList("Action.java"))
       .resolutions(newArrayList("FIXED"))
       .severities(newArrayList("BLOCKER"))
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/IssueDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/IssueDaoTest/insert-result.xml
index 0fcbb2a2639..461bc8c3530 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/IssueDaoTest/insert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/IssueDaoTest/insert-result.xml
@@ -8,7 +8,7 @@
       manual_severity="[false]"
       manual_issue="[false]"
       title="[null]"
-      message="message"
+      message="the description"
       line="200"
       cost="10.0"
       status="OPEN"