From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 6 Dec 2017 10:22:27 +0000 (+0100)
Subject: SONAR-10134 Sanitize DeselectActionTest by removing setup method
X-Git-Tag: 7.0-RC1~139
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5935b111974ea5b0a00748eae7b5940898a34b82;p=sonarqube.git

SONAR-10134 Sanitize DeselectActionTest by removing setup method
---

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
index 01a8d3b6017..e9e25f06bc6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java
@@ -19,15 +19,13 @@
  */
 package org.sonar.server.qualitygate.ws;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.server.ws.Change;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.api.utils.System2;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.util.Uuids;
+import org.sonar.core.util.UuidFactoryFast;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
@@ -35,7 +33,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.qualitygate.QualityGateDto;
-import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.component.TestComponentFinder;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
@@ -45,8 +42,10 @@ import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
 
 import static java.lang.String.format;
+import static java.lang.String.valueOf;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES;
 import static org.sonar.server.qualitygate.QualityGates.SONAR_QUALITYGATE_PROPERTY;
 
@@ -57,204 +56,194 @@ public class DeselectActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create();
 
   private DbClient dbClient = db.getDbClient();
   private DbSession dbSession = db.getSession();
   private TestDefaultOrganizationProvider organizationProvider = TestDefaultOrganizationProvider.from(db);
-  private QualityGates qualityGates = new QualityGates(dbClient, userSession, organizationProvider);
-  private WsActionTester ws;
-  private ComponentDto project;
-  private QualityGateDto gate;
-  private DeselectAction underTest;
-
-  @Before
-  public void setUp() {
-    ComponentFinder componentFinder = TestComponentFinder.from(db);
-    underTest = new DeselectAction(qualityGates, dbClient, componentFinder);
-    ws = new WsActionTester(underTest);
-
-    project = db.components().insertPrivateProject();
-    gate = insertQualityGate();
-  }
+  private QualityGates qualityGates = new QualityGates(dbClient, userSession, organizationProvider, UuidFactoryFast.getInstance());
 
-  @Test
-  public void definition() {
-    WebService.Action def = ws.getDef();
-
-    assertThat(def.description()).isNotEmpty();
-    assertThat(def.isPost()).isTrue();
-    assertThat(def.since()).isEqualTo("4.3");
-    assertThat(def.changelog()).extracting(Change::getVersion, Change::getDescription).containsExactly(
-      tuple("6.6", "The parameter 'gateId' was removed"));
-
-    assertThat(def.params()).extracting(WebService.Param::key)
-      .containsExactlyInAnyOrder("projectId", "projectKey");
-
-    WebService.Param projectId = def.param("projectId");
-    assertThat(projectId.isRequired()).isFalse();
-    assertThat(projectId.deprecatedSince()).isEqualTo("6.1");
-    assertThat(projectId.description()).isNotEmpty();
-    assertThat(projectId.exampleValue()).isNotEmpty();
-
-    WebService.Param projectKey = def.param("projectKey");
-    assertThat(projectKey.isRequired()).isFalse();
-    assertThat(projectKey.since()).isEqualTo("6.1");
-    assertThat(projectKey.description()).isNotEmpty();
-    assertThat(projectKey.exampleValue()).isNotEmpty();
-  }
+  private DeselectAction underTest = new DeselectAction(qualityGates, dbClient, TestComponentFinder.from(db));
+  private WsActionTester ws = new WsActionTester(underTest);
 
   @Test
-  public void deselect_by_id() throws Exception {
-    logInAsRoot();
+  public void deselect_by_id() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
+    QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
+    ComponentDto project = db.components().insertPrivateProject();
 
     ComponentDto anotherProject = db.components().insertPrivateProject();
-    String gateId = String.valueOf(gate.getId());
+    String gateId = valueOf(qualityGate.getId());
     associateProjectToQualityGate(project.getId(), gateId);
     associateProjectToQualityGate(anotherProject.getId(), gateId);
 
-    callById(project.getId());
+    ws.newRequest()
+      .setParam("projectId", valueOf(project.getId()))
+      .execute();
 
     assertDeselected(project.getId());
     assertSelected(gateId, anotherProject.getId());
   }
 
   @Test
-  public void deselect_by_uuid() throws Exception {
-    logInAsRoot();
+  public void deselect_by_uuid() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
+    QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
+    ComponentDto project = db.components().insertPrivateProject();
 
-    String gateId = String.valueOf(gate.getId());
+    String gateId = valueOf(qualityGate.getId());
     associateProjectToQualityGate(project.getId(), gateId);
 
-    callByUuid(project.uuid());
+    ws.newRequest()
+      .setParam("projectId", project.uuid())
+      .execute();
 
     assertDeselected(project.getId());
   }
 
   @Test
-  public void deselect_by_key() throws Exception {
-    logInAsRoot();
+  public void deselect_by_key() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
+    QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
+    ComponentDto project = db.components().insertPrivateProject();
 
-    String gateId = String.valueOf(gate.getId());
+    String gateId = valueOf(qualityGate.getId());
     associateProjectToQualityGate(project.getId(), gateId);
 
-    callByKey(project.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", project.getDbKey())
+      .execute();
 
     assertDeselected(project.getId());
   }
 
   @Test
-  public void project_admin() throws Exception {
-    String gateId = String.valueOf(gate.getId());
-    associateProjectToQualityGate(project.getId(), gateId);
-
+  public void project_admin() {
+    QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
+    ComponentDto project = db.components().insertPrivateProject();
+    associateProjectToQualityGate(project.getId(), valueOf(qualityGate.getId()));
     userSession.logIn().addProjectPermission(UserRole.ADMIN, project);
 
-    callByKey(project.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", project.getDbKey())
+      .execute();
 
     assertDeselected(project.getId());
   }
 
   @Test
-  public void fail_when_no_project_id() throws Exception {
-    String gateId = String.valueOf(gate.getId());
+  public void fail_when_no_project_id() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
 
     expectedException.expect(NotFoundException.class);
 
-    callById(1L);
+    ws.newRequest()
+      .setParam("projectId", valueOf((Long) 1L))
+      .execute();
   }
 
   @Test
-  public void fail_when_no_project_key() throws Exception {
-    String gateId = String.valueOf(gate.getId());
+  public void fail_when_no_project_key() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
 
     expectedException.expect(NotFoundException.class);
 
-    callByKey("unknown");
+    ws.newRequest()
+      .setParam("projectKey", "unknown")
+      .execute();
   }
 
   @Test
-  public void fail_when_anonymous() throws Exception {
-    String gateId = String.valueOf(gate.getId());
+  public void fail_when_anonymous() {
     userSession.anonymous();
+    ComponentDto project = db.components().insertPrivateProject();
 
     expectedException.expect(ForbiddenException.class);
-    callByKey(project.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", project.getDbKey())
+      .execute();
   }
 
   @Test
-  public void fail_when_not_project_admin() throws Exception {
-    String gateId = String.valueOf(gate.getId());
-
+  public void fail_when_not_project_admin() {
+    ComponentDto project = db.components().insertPrivateProject();
     userSession.logIn().addProjectPermission(UserRole.ISSUE_ADMIN, project);
 
     expectedException.expect(ForbiddenException.class);
 
-    callByKey(project.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", project.getDbKey())
+      .execute();
   }
 
   @Test
-  public void fail_when_not_quality_gates_admin() throws Exception {
-    String gateId = String.valueOf(gate.getId());
+  public void fail_when_not_quality_gates_admin() {
+    userSession.addPermission(ADMINISTER_QUALITY_GATES, db.getDefaultOrganization());
+    ComponentDto project = db.components().insertPrivateProject();
 
     userSession.logIn().addPermission(ADMINISTER_QUALITY_PROFILES, project.getOrganizationUuid());
 
     expectedException.expect(ForbiddenException.class);
 
-    callByKey(project.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", project.getDbKey())
+      .execute();
   }
 
   @Test
   public void fail_when_using_branch_db_key() throws Exception {
-    OrganizationDto organization = db.organizations().insert();
+    OrganizationDto organization = db.getDefaultOrganization();
     ComponentDto project = db.components().insertMainBranch(organization);
     userSession.logIn().addProjectPermission(UserRole.ADMIN, project);
     ComponentDto branch = db.components().insertProjectBranch(project);
-    String gateId = String.valueOf(gate.getId());
 
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage(format("Component key '%s' not found", branch.getDbKey()));
 
-    callByKey(branch.getDbKey());
+    ws.newRequest()
+      .setParam("projectKey", branch.getDbKey())
+      .execute();
   }
 
   @Test
-  public void fail_when_using_branch_id() throws Exception {
-    OrganizationDto organization = db.organizations().insert();
+  public void fail_when_using_branch_id() {
+    OrganizationDto organization = db.getDefaultOrganization();
     ComponentDto project = db.components().insertMainBranch(organization);
     userSession.logIn().addProjectPermission(UserRole.ADMIN, project);
     ComponentDto branch = db.components().insertProjectBranch(project);
-    String gateId = String.valueOf(gate.getId());
 
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage(format("Component id '%s' not found", branch.uuid()));
 
-    callByUuid(branch.uuid());
-  }
-
-  private QualityGateDto insertQualityGate() {
-    QualityGateDto gate = new QualityGateDto().setName("Custom").setUuid(Uuids.createFast());
-    dbClient.qualityGateDao().insert(dbSession, gate);
-    dbSession.commit();
-    return gate;
-  }
-
-  private void callByKey(String projectKey) {
     ws.newRequest()
-      .setParam("projectKey", projectKey)
+      .setParam("projectId", branch.uuid())
       .execute();
   }
 
-  private void callById(Long projectId) {
-    ws.newRequest()
-      .setParam("projectId", String.valueOf(projectId))
-      .execute();
-  }
+  @Test
+  public void definition() {
+    WebService.Action def = ws.getDef();
 
-  private void callByUuid(String projectUuid) {
-    ws.newRequest()
-      .setParam("projectId", projectUuid)
-      .execute();
+    assertThat(def.description()).isNotEmpty();
+    assertThat(def.isPost()).isTrue();
+    assertThat(def.since()).isEqualTo("4.3");
+    assertThat(def.changelog()).extracting(Change::getVersion, Change::getDescription).containsExactly(
+      tuple("6.6", "The parameter 'gateId' was removed"));
+
+    assertThat(def.params()).extracting(WebService.Param::key)
+      .containsExactlyInAnyOrder("projectId", "projectKey");
+
+    WebService.Param projectId = def.param("projectId");
+    assertThat(projectId.isRequired()).isFalse();
+    assertThat(projectId.deprecatedSince()).isEqualTo("6.1");
+    assertThat(projectId.description()).isNotEmpty();
+    assertThat(projectId.exampleValue()).isNotEmpty();
+
+    WebService.Param projectKey = def.param("projectKey");
+    assertThat(projectKey.isRequired()).isFalse();
+    assertThat(projectKey.since()).isEqualTo("6.1");
+    assertThat(projectKey.description()).isNotEmpty();
+    assertThat(projectKey.exampleValue()).isNotEmpty();
   }
 
   private void associateProjectToQualityGate(long projectId, String gateId) {
@@ -273,7 +262,4 @@ public class DeselectActionTest {
     assertThat(dbClient.propertiesDao().selectProjectProperty(projectId, SONAR_QUALITYGATE_PROPERTY).getValue()).isEqualTo(qGateId);
   }
 
-  private void logInAsRoot() {
-    userSession.logIn().setRoot();
-  }
 }