aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-plugin-api/src/test/java/org/sonar/api
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2018-11-14 22:47:35 +0100
committersonartech <sonartech@sonarsource.com>2019-01-16 09:43:01 +0100
commitf594bf7568192dbfc9b9a8cf4f7c243ea4ad046b (patch)
treeb4d6818199beebf97e5d4d6a10dfcebde10e7ba8 /sonar-plugin-api/src/test/java/org/sonar/api
parenta0acec09a79485117ab9c8e3c67a8446224d5de9 (diff)
downloadsonarqube-f594bf7568192dbfc9b9a8cf4f7c243ea4ad046b.tar.gz
sonarqube-f594bf7568192dbfc9b9a8cf4f7c243ea4ad046b.zip
SONAR-11465 Deprecate InputModule and introduce InputProject
Diffstat (limited to 'sonar-plugin-api/src/test/java/org/sonar/api')
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputProjectTest.java (renamed from sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputModuleTest.java)4
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/TestInputFileBuilderTest.java2
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssueTest.java16
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java23
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java7
5 files changed, 27 insertions, 25 deletions
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputModuleTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputProjectTest.java
index 46065a5c3e2..e9e54e5a77a 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputModuleTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputProjectTest.java
@@ -28,7 +28,7 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
import static org.assertj.core.api.Assertions.assertThat;
-public class DefaultInputModuleTest {
+public class DefaultInputProjectTest {
@Rule
public TemporaryFolder temp = new TemporaryFolder();
@@ -46,7 +46,7 @@ public class DefaultInputModuleTest {
def.setWorkDir(workDir);
def.setSources("file1");
def.setTests("test1");
- DefaultInputModule module = new DefaultInputModule(def);
+ AbstractProjectOrModule module = new DefaultInputProject(def);
assertThat(module.key()).isEqualTo("projectKey");
assertThat(module.getName()).isEqualTo("projectName");
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/TestInputFileBuilderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/TestInputFileBuilderTest.java
index 702a76984f8..376536e6b7b 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/TestInputFileBuilderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/TestInputFileBuilderTest.java
@@ -65,7 +65,7 @@ public class TestInputFileBuilderTest {
@Test
public void testCreateInputModule() throws IOException {
File baseDir = temp.newFolder();
- DefaultInputModule module = TestInputFileBuilder.newDefaultInputModule("key", baseDir);
+ AbstractProjectOrModule module = TestInputFileBuilder.newDefaultInputModule("key", baseDir);
assertThat(module.key()).isEqualTo("key");
assertThat(module.getBaseDir()).isEqualTo(baseDir.toPath());
}
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssueTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssueTest.java
index 6ef27d97f3c..a2d07c75b20 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssueTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssueTest.java
@@ -28,7 +28,7 @@ import org.junit.rules.TemporaryFolder;
import org.sonar.api.batch.bootstrap.ProjectDefinition;
import org.sonar.api.batch.fs.InputComponent;
import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputModule;
+import org.sonar.api.batch.fs.internal.DefaultInputProject;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.rule.Severity;
import org.sonar.api.batch.sensor.internal.SensorStorage;
@@ -44,11 +44,11 @@ public class DefaultExternalIssueTest {
@Rule
public TemporaryFolder temp = new TemporaryFolder();
- private DefaultInputModule projectRoot;
+ private DefaultInputProject project;
@Before
public void setup() throws IOException {
- projectRoot = new DefaultInputModule(ProjectDefinition.create()
+ project = new DefaultInputProject(ProjectDefinition.create()
.setKey("foo")
.setBaseDir(temp.newFolder())
.setWorkDir(temp.newFolder()));
@@ -64,7 +64,7 @@ public class DefaultExternalIssueTest {
@Test
public void build_file_issue() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultExternalIssue issue = new DefaultExternalIssue(projectRoot, storage)
+ DefaultExternalIssue issue = new DefaultExternalIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputFile)
.at(inputFile.selectLine(1))
@@ -92,7 +92,7 @@ public class DefaultExternalIssueTest {
@Test
public void fail_to_store_if_no_type() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultExternalIssue issue = new DefaultExternalIssue(projectRoot, storage)
+ DefaultExternalIssue issue = new DefaultExternalIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputFile)
.at(inputFile.selectLine(1))
@@ -109,7 +109,7 @@ public class DefaultExternalIssueTest {
@Test
public void fail_to_store_if_primary_location_is_not_a_file() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultExternalIssue issue = new DefaultExternalIssue(projectRoot, storage)
+ DefaultExternalIssue issue = new DefaultExternalIssue(project, storage)
.at(new DefaultIssueLocation()
.on(mock(InputComponent.class))
.message("Wrong way!"))
@@ -125,7 +125,7 @@ public class DefaultExternalIssueTest {
@Test
public void fail_to_store_if_primary_location_has_no_message() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultExternalIssue issue = new DefaultExternalIssue(projectRoot, storage)
+ DefaultExternalIssue issue = new DefaultExternalIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputFile)
.at(inputFile.selectLine(1)))
@@ -142,7 +142,7 @@ public class DefaultExternalIssueTest {
@Test
public void fail_to_store_if_no_severity() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultExternalIssue issue = new DefaultExternalIssue(projectRoot, storage)
+ DefaultExternalIssue issue = new DefaultExternalIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputFile)
.at(inputFile.selectLine(1))
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java
index 5d36dcd2a9c..9fc65984432 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java
@@ -29,6 +29,7 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
import org.sonar.api.batch.fs.internal.DefaultInputDir;
import org.sonar.api.batch.fs.internal.DefaultInputFile;
import org.sonar.api.batch.fs.internal.DefaultInputModule;
+import org.sonar.api.batch.fs.internal.DefaultInputProject;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.rule.Severity;
import org.sonar.api.batch.sensor.internal.SensorStorage;
@@ -43,7 +44,7 @@ public class DefaultIssueTest {
@Rule
public TemporaryFolder temp = new TemporaryFolder();
- private DefaultInputModule projectRoot;
+ private DefaultInputProject project;
private DefaultInputFile inputFile = new TestInputFileBuilder("foo", "src/Foo.php")
.initMetadata("Foo\nBar\n")
@@ -51,7 +52,7 @@ public class DefaultIssueTest {
@Before
public void prepare() throws IOException {
- projectRoot = new DefaultInputModule(ProjectDefinition.create()
+ project = new DefaultInputProject(ProjectDefinition.create()
.setKey("foo")
.setBaseDir(temp.newFolder())
.setWorkDir(temp.newFolder()));
@@ -60,7 +61,7 @@ public class DefaultIssueTest {
@Test
public void build_file_issue() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultIssue issue = new DefaultIssue(projectRoot, storage)
+ DefaultIssue issue = new DefaultIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputFile)
.at(inputFile.selectLine(1))
@@ -82,14 +83,14 @@ public class DefaultIssueTest {
@Test
public void move_directory_issue_to_project_root() {
SensorStorage storage = mock(SensorStorage.class);
- DefaultIssue issue = new DefaultIssue(projectRoot, storage)
+ DefaultIssue issue = new DefaultIssue(project, storage)
.at(new DefaultIssueLocation()
- .on(new DefaultInputDir("foo", "src/main").setModuleBaseDir(projectRoot.getBaseDir()))
+ .on(new DefaultInputDir("foo", "src/main").setModuleBaseDir(project.getBaseDir()))
.message("Wrong way!"))
.forRule(RuleKey.of("repo", "rule"))
.overrideSeverity(Severity.BLOCKER);
- assertThat(issue.primaryLocation().inputComponent()).isEqualTo(projectRoot);
+ assertThat(issue.primaryLocation().inputComponent()).isEqualTo(project);
assertThat(issue.ruleKey()).isEqualTo(RuleKey.of("repo", "rule"));
assertThat(issue.primaryLocation().textRange()).isNull();
assertThat(issue.primaryLocation().message()).isEqualTo("[src/main] Wrong way!");
@@ -102,25 +103,25 @@ public class DefaultIssueTest {
@Test
public void move_submodule_issue_to_project_root() {
- File subModuleDirectory = new File(projectRoot.getBaseDir().toString(), "bar");
+ File subModuleDirectory = new File(project.getBaseDir().toString(), "bar");
subModuleDirectory.mkdir();
ProjectDefinition subModuleDefinition = ProjectDefinition.create()
.setKey("foo/bar")
.setBaseDir(subModuleDirectory)
.setWorkDir(subModuleDirectory);
- projectRoot.definition().addSubProject(subModuleDefinition);
+ project.definition().addSubProject(subModuleDefinition);
DefaultInputModule subModule = new DefaultInputModule(subModuleDefinition);
SensorStorage storage = mock(SensorStorage.class);
- DefaultIssue issue = new DefaultIssue(projectRoot, storage)
+ DefaultIssue issue = new DefaultIssue(project, storage)
.at(new DefaultIssueLocation()
.on(subModule)
.message("Wrong way!"))
.forRule(RuleKey.of("repo", "rule"))
.overrideSeverity(Severity.BLOCKER);
- assertThat(issue.primaryLocation().inputComponent()).isEqualTo(projectRoot);
+ assertThat(issue.primaryLocation().inputComponent()).isEqualTo(project);
assertThat(issue.ruleKey()).isEqualTo(RuleKey.of("repo", "rule"));
assertThat(issue.primaryLocation().textRange()).isNull();
assertThat(issue.primaryLocation().message()).isEqualTo("[bar] Wrong way!");
@@ -135,7 +136,7 @@ public class DefaultIssueTest {
public void build_project_issue() throws IOException {
SensorStorage storage = mock(SensorStorage.class);
DefaultInputModule inputModule = new DefaultInputModule(ProjectDefinition.create().setKey("foo").setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder()));
- DefaultIssue issue = new DefaultIssue(projectRoot, storage)
+ DefaultIssue issue = new DefaultIssue(project, storage)
.at(new DefaultIssueLocation()
.on(inputModule)
.message("Wrong way!"))
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java
index 88de1ff2d51..f6133e9fd6d 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java
@@ -25,7 +25,8 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.sonar.api.batch.bootstrap.ProjectDefinition;
-import org.sonar.api.batch.fs.internal.DefaultInputModule;
+import org.sonar.api.batch.fs.internal.AbstractProjectOrModule;
+import org.sonar.api.batch.fs.internal.DefaultInputProject;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.sensor.internal.SensorStorage;
import org.sonar.api.measures.CoreMetrics;
@@ -62,7 +63,7 @@ public class DefaultMeasureTest {
@Test
public void build_project_measure() throws IOException {
SensorStorage storage = mock(SensorStorage.class);
- DefaultInputModule module = new DefaultInputModule(ProjectDefinition.create().setKey("foo").setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder()));
+ AbstractProjectOrModule module = new DefaultInputProject(ProjectDefinition.create().setKey("foo").setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder()));
DefaultMeasure<Integer> newMeasure = new DefaultMeasure<Integer>(storage)
.forMetric(CoreMetrics.LINES)
.on(module)
@@ -82,7 +83,7 @@ public class DefaultMeasureTest {
thrown.expect(IllegalStateException.class);
thrown.expectMessage("on() already called");
new DefaultMeasure<Integer>()
- .on(new DefaultInputModule(ProjectDefinition.create().setKey("foo").setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder())))
+ .on(new DefaultInputProject(ProjectDefinition.create().setKey("foo").setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder())))
.on(new TestInputFileBuilder("foo", "src/Foo.php").build())
.withValue(3)
.save();
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 20:05:44 +0000