SONAR-3321 add file move IT

SonarSource · Jun 2, 2016 · 4d60012 · 4d60012
1 parent 275ea95
commit 4d60012
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 10 deletions.
diff --git a/it/it-projects/issue/xoo-tracking-v3/sonar-project.properties b/it/it-projects/issue/xoo-tracking-v3/sonar-project.properties
@@ -0,0 +1,5 @@
+sonar.projectKey=sample
+sonar.projectName=Sample
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.sources=src/main/xoo
+sonar.language=xoo
diff --git a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo b/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo
@@ -0,0 +1,12 @@
+package sample;
+
+public class Sample {
+
+  public Sample(int i) {
+    int j = i++; // foobar
+  }
+
+  private String myMethod() {
+    return "hello";
+  }
+}
diff --git a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures b/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures
@@ -0,0 +1 @@
+ncloc:13
diff --git a/it/it-tests/src/test/java/it/issue/IssueTrackingTest.java b/it/it-tests/src/test/java/it/issue/IssueTrackingTest.java
@@ -19,7 +19,6 @@
  */
 package it.issue;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.sonar.orchestrator.locator.FileLocation;
 import java.text.SimpleDateFormat;
@@ -39,7 +38,8 @@ public class IssueTrackingTest extends AbstractIssueTest {
   private static final String SAMPLE_PROJECT_KEY = "sample";
 
   private static final String OLD_DATE = "2014-03-01";
-  private static final String NEW_DATE = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+  private static final Date NEW_DATE = new Date();
+  private static final String NEW_DATE_STR = new SimpleDateFormat("yyyy-MM-dd").format(NEW_DATE);
 
   @Before
   public void prepareData() {
@@ -62,7 +62,7 @@ public void close_issues_on_removed_components() throws Exception {
 
     // version 2
     runProjectAnalysis(ORCHESTRATOR, "issue/xoo-tracking-v1",
-      "sonar.projectDate", NEW_DATE,
+      "sonar.projectDate", NEW_DATE_STR,
       "sonar.exclusions", "**/*.xoo");
 
     issues = searchIssuesByProject("sample");
@@ -89,7 +89,7 @@ public void track_issues_based_on_blocks_recognition() throws Exception {
 
     // version 2
     runProjectAnalysis(ORCHESTRATOR, "issue/xoo-tracking-v2",
-      "sonar.projectDate", NEW_DATE);
+      "sonar.projectDate", NEW_DATE_STR);
 
     issues = searchUnresolvedIssuesByComponent("sample:src/main/xoo/sample/Sample.xoo");
     assertThat(issues).hasSize(3);
@@ -159,13 +159,37 @@ public void track_existing_unchanged_issues_on_multi_modules() throws Exception
     }
   }
 
+  @Test
+  public void track_file_moves_based_on_identical_content() {
+    ORCHESTRATOR.getServer().associateProjectToQualityProfile(SAMPLE_PROJECT_KEY, "xoo", "issue-on-tag-foobar");
+
+    // version 1
+    runProjectAnalysis(ORCHESTRATOR, "issue/xoo-tracking-v1",
+      "sonar.projectDate", OLD_DATE);
+
+    List<Issue> issues = searchUnresolvedIssuesByComponent("sample:src/main/xoo/sample/Sample.xoo");
+    assertThat(issues).hasSize(1);
+    Issue issueOnSample = issues.iterator().next();
+
+    // version 2
+    runProjectAnalysis(ORCHESTRATOR, "issue/xoo-tracking-v3",
+      "sonar.projectDate", NEW_DATE_STR);
+
+    assertThat(searchUnresolvedIssuesByComponent("sample:src/main/xoo/sample/Sample.xoo")).isEmpty();
+
+    issues = searchUnresolvedIssuesByComponent("sample:src/main/xoo/sample/Sample2.xoo");
+    assertThat(issues).hasSize(1);
+    Issue issueOnSample2 = issues.get(0);
+    assertThat(issueOnSample2.key()).isEqualTo(issueOnSample.key());
+    assertThat(issueOnSample2.creationDate()).isEqualTo(issueOnSample.creationDate());
+    assertThat(issueOnSample2.updateDate()).isNotEqualTo(issueOnSample.updateDate());
+    assertThat(issueOnSample2.status()).isEqualTo("OPEN");
+  }
+
   private Issue getIssueOnLine(final Integer line, final String repoKey, final String ruleKey, List<Issue> issues) {
-    return Iterables.find(issues, new Predicate<Issue>() {
-      public boolean apply(Issue issue) {
-        return Objects.equals(issue.line(), line) &&
-          Objects.equals(issue.ruleKey(), repoKey + ":" + ruleKey);
-      }
-    });
+    return Iterables.find(
+      issues,
+      issue -> Objects.equals(issue.line(), line) && Objects.equals(issue.ruleKey(), repoKey + ":" + ruleKey));
   }
 
   private List<Issue> searchUnresolvedIssuesByComponent(String componentKey) {