From 41b5bad5d03711faacb58e704f180f9dacf653d7 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 9 Feb 2015 18:23:17 +0100 Subject: SONAR-6162 Fix bad merge --- .../test/java/org/sonar/batch/issue/ModuleIssuesTest.java | 2 +- .../org/sonar/batch/mediumtest/issues/ChecksMediumTest.java | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'sonar-batch/src/test/java') diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java index a4cf6a1329b..0594cb16234 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java @@ -179,7 +179,7 @@ public class ModuleIssuesTest { @Test public void use_rule_name_if_no_message() throws Exception { ruleBuilder.add(SQUID_RULE_KEY).setName(SQUID_RULE_NAME); - activeRulesBuilder.create(SQUID_RULE_KEY).setSeverity(Severity.INFO).activate(); + activeRulesBuilder.create(SQUID_RULE_KEY).setSeverity(Severity.INFO).setName(SQUID_RULE_NAME).activate(); initModuleIssues(); Date analysisDate = new Date(); diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java index 54c2aab58b4..5d1a3838f36 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java @@ -25,17 +25,15 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.sonar.api.batch.fs.internal.DefaultInputFile; -import org.sonar.api.batch.sensor.issue.Issue; import org.sonar.batch.mediumtest.BatchMediumTester; -import org.sonar.batch.mediumtest.BatchMediumTester.TaskResult; +import org.sonar.batch.mediumtest.TaskResult; import org.sonar.batch.protocol.input.ActiveRule; import org.sonar.xoo.XooPlugin; import java.io.File; import java.io.IOException; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ChecksMediumTest { @@ -47,7 +45,6 @@ public class ChecksMediumTest { .addDefaultQProfile("xoo", "Sonar Way") .activateRule(new ActiveRule("xoo", "TemplateRule_1234", "TemplateRule", "A template rule", "MAJOR", null, "xoo").addParam("line", "1")) .activateRule(new ActiveRule("xoo", "TemplateRule_1235", "TemplateRule", "Another template rule", "MAJOR", null, "xoo").addParam("line", "2")) - .bootstrapProperties(ImmutableMap.of("sonar.analysis.mode", "sensor")) .build(); @Before @@ -86,15 +83,15 @@ public class ChecksMediumTest { boolean foundIssueAtLine1 = false; boolean foundIssueAtLine2 = false; - for (Issue issue : result.issues()) { + for (org.sonar.api.issue.Issue issue : result.issues()) { if (issue.line() == 1) { foundIssueAtLine1 = true; - assertThat(issue.inputPath()).isEqualTo(new DefaultInputFile("com.foo.project", "src/sample.xoo")); + assertThat(issue.componentKey()).isEqualTo("com.foo.project:src/sample.xoo"); assertThat(issue.message()).isEqualTo("A template rule"); } if (issue.line() == 2) { foundIssueAtLine2 = true; - assertThat(issue.inputPath()).isEqualTo(new DefaultInputFile("com.foo.project", "src/sample.xoo")); + assertThat(issue.componentKey()).isEqualTo("com.foo.project:src/sample.xoo"); assertThat(issue.message()).isEqualTo("Another template rule"); } } -- cgit v1.2.3