SONAR-8674 add organization to response of api/ce/task

SonarSource · Jan 17, 2017 · 0af4eff · 0af4eff
1 parent c7c37a4
commit 0af4eff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ce/ws/task-example.json
@@ -1,5 +1,6 @@
 {
   "task": {
+    "organization": "my-org-1",
     "id": "AVAn5RKqYwETbXvgas-I",
     "type": "REPORT",
     "componentId": "AVAn5RJmYwETbXvgas-H",

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java
@@ -31,6 +31,7 @@
 import org.sonar.db.ce.CeQueueDto;
 import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.organization.OrganizationDto;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.tester.UserSessionRule;
@@ -59,14 +60,16 @@ public class TaskActionTest {
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
 
+  private OrganizationDto organizationDto;
   private ComponentDto project;
   private TaskFormatter formatter = new TaskFormatter(dbTester.getDbClient(), System2.INSTANCE);
   private TaskAction underTest = new TaskAction(dbTester.getDbClient(), formatter, userSession);
   private WsActionTester ws = new WsActionTester(underTest);
 
   @Before
   public void setUp() {
-    project = dbTester.components().insertProject(dbTester.organizations().insert());
+    organizationDto = dbTester.organizations().insert();
+    project = dbTester.components().insertProject(organizationDto);
   }
 
   @Test
@@ -87,6 +90,7 @@ public void task_is_in_queue() throws Exception {
       .execute();
 
     WsCe.TaskResponse taskResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.TaskResponse.PARSER);
+    assertThat(taskResponse.getTask().getOrganization()).isEqualTo(organizationDto.getKey());
     assertThat(taskResponse.getTask().getId()).isEqualTo(SOME_TASK_UUID);
     assertThat(taskResponse.getTask().getStatus()).isEqualTo(WsCe.TaskStatus.PENDING);
     assertThat(taskResponse.getTask().getSubmitterLogin()).isEqualTo("john");
@@ -111,6 +115,7 @@ public void task_is_archived() throws Exception {
 
     WsCe.TaskResponse taskResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.TaskResponse.PARSER);
     WsCe.Task task = taskResponse.getTask();
+    assertThat(task.getOrganization()).isEqualTo(organizationDto.getKey());
     assertThat(task.getId()).isEqualTo(SOME_TASK_UUID);
     assertThat(task.getStatus()).isEqualTo(WsCe.TaskStatus.FAILED);
     assertThat(task.getComponentId()).isEqualTo(project.uuid());
@@ -174,10 +179,10 @@ public void return_scannerContext_of_activity_with_scannerContext_when_additiona
     persistScannerContext(SOME_TASK_UUID, scannerContext);
 
     TestResponse wsResponse = ws.newRequest()
-        .setMediaType(PROTOBUF)
-        .setParam("id", SOME_TASK_UUID)
-        .setParam("additionalFields", "scannerContext")
-        .execute();
+      .setMediaType(PROTOBUF)
+      .setParam("id", SOME_TASK_UUID)
+      .setParam("additionalFields", "scannerContext")
+      .execute();
 
     WsCe.TaskResponse taskResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.TaskResponse.PARSER);
     WsCe.Task task = taskResponse.getTask();
@@ -194,10 +199,10 @@ public void do_not_return_scannerContext_of_activity_with_scannerContext_when_ad
     persistScannerContext(SOME_TASK_UUID, scannerContext);
 
     TestResponse wsResponse = ws.newRequest()
-        .setMediaType(PROTOBUF)
-        .setParam("id", SOME_TASK_UUID)
-        .setParam("additionalFields", "stacktrace")
-        .execute();
+      .setMediaType(PROTOBUF)
+      .setParam("id", SOME_TASK_UUID)
+      .setParam("additionalFields", "stacktrace")
+      .execute();
 
     WsCe.TaskResponse taskResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.TaskResponse.PARSER);
     WsCe.Task task = taskResponse.getTask();