]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-19558 Made QG tests use different uuids for project and main branch
authorLukasz Jarocki <lukasz.jarocki@sonarsource.com>
Thu, 29 Jun 2023 08:53:15 +0000 (10:53 +0200)
committersonartech <sonartech@sonarsource.com>
Thu, 29 Jun 2023 20:05:13 +0000 (20:05 +0000)
18 files changed:
server/sonar-webserver-core/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/QualityGateCaycCheckerIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/QualityGateUpdaterIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/RegisterQualityGatesIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/AddGroupActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/AddUserActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/CopyActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/CreateActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DeselectActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/DestroyActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/GetByProjectActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchGroupsActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SelectActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SetAsDefaultActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/ShowActionIT.java
server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/UpdateConditionActionIT.java

index 53be54528701a7179a97822f0b30148fa1b2a968..3d4d17d1eccae5a6c60b7dd495199151cb2c0da2 100644 (file)
@@ -59,15 +59,15 @@ public class ProjectsInWarningDaemonTest {
   @Rule
   public LogTester logger = new LogTester().setLevel(LoggerLevel.DEBUG);
 
-  private PermissionIndexerTester authorizationIndexerTester = new PermissionIndexerTester(es, new ProjectMeasuresIndexer(db.getDbClient(), es.client()));
-  private ProjectMeasuresIndexer projectMeasuresIndexer = new ProjectMeasuresIndexer(db.getDbClient(), es.client());
-  private ProjectMeasuresIndex projectMeasuresIndex = new ProjectMeasuresIndex(es.client(), new WebAuthorizationTypeSupport(null), System2.INSTANCE);
+  private final PermissionIndexerTester authorizationIndexerTester = new PermissionIndexerTester(es, new ProjectMeasuresIndexer(db.getDbClient(), es.client()));
+  private final ProjectMeasuresIndexer projectMeasuresIndexer = new ProjectMeasuresIndexer(db.getDbClient(), es.client());
+  private final ProjectMeasuresIndex projectMeasuresIndex = new ProjectMeasuresIndex(es.client(), new WebAuthorizationTypeSupport(null), System2.INSTANCE);
 
-  private MapSettings settings = new MapSettings();
-  private GlobalLockManager lockManager = mock(GlobalLockManagerImpl.class);
-  private ProjectsInWarning projectsInWarning = new ProjectsInWarning();
+  private final MapSettings settings = new MapSettings();
+  private final GlobalLockManager lockManager = mock(GlobalLockManagerImpl.class);
+  private final ProjectsInWarning projectsInWarning = new ProjectsInWarning();
 
-  private ProjectsInWarningDaemon underTest = new ProjectsInWarningDaemon(db.getDbClient(), projectMeasuresIndex, settings.asConfig(), lockManager, projectsInWarning);
+  private final ProjectsInWarningDaemon underTest = new ProjectsInWarningDaemon(db.getDbClient(), projectMeasuresIndex, settings.asConfig(), lockManager, projectsInWarning);
 
   @Before
   public void setUp() {
index 9356d24c83481324fbb0be7acc1c5c169baec567..372154dc36352566b091b558847a74291340bffd 100644 (file)
@@ -47,7 +47,7 @@ import static org.sonar.server.qualitygate.QualityGateCaycStatus.OVER_COMPLIANT;
 public class QualityGateCaycCheckerIT {
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
   QualityGateCaycChecker underTest = new QualityGateCaycChecker(db.getDbClient());
 
   @Test
index f960e64feea15b7b818aa0703fd32b562a3aa840..d8711b9f7aa4ef163589f7667ce860b6a29659c8 100644 (file)
@@ -56,7 +56,7 @@ import static org.sonar.api.measures.Metric.ValueType.WORK_DUR;
 public class QualityGateConditionsUpdaterIT {
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final QualityGateConditionsUpdater underTest = new QualityGateConditionsUpdater(db.getDbClient());
 
index f0c480d6d57b20fd6e7d85927767816409b43f4b..61ef16ba8f07cb270c998feec86c1df18cebd0b3 100644 (file)
@@ -35,9 +35,8 @@ public class QualityGateUpdaterIT {
 
   static final String QGATE_NAME = "Default";
 
-
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final DbSession dbSession = db.getSession();
index 73e651eca7cb9a240d75242e4c85f6ea88e9f7f5..2b2efe7107c9e0d6d35c1d48f2bd4b92dbc940cf 100644 (file)
@@ -58,7 +58,7 @@ import static org.sonar.db.qualitygate.QualityGateConditionDto.OPERATOR_LESS_THA
 public class RegisterQualityGatesIT {
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
   @Rule
   public LogTester logTester = new LogTester();
 
@@ -71,7 +71,6 @@ public class RegisterQualityGatesIT {
   private final QualityGateConditionDao gateConditionDao = dbClient.gateConditionDao();
   private final MetricDao metricDao = dbClient.metricDao();
   private final QualityGateConditionsUpdater qualityGateConditionsUpdater = new QualityGateConditionsUpdater(dbClient);
-  private final QualityGateFinder qualityGateFinder = new QualityGateFinder(dbClient);
 
   private final RegisterQualityGates underTest = new RegisterQualityGates(dbClient, qualityGateConditionsUpdater,
     UuidFactoryFast.getInstance(), System2.INSTANCE);
index 838bf13b26d28867a9631a058056a7e3dea798a2..ffe01a6c05ff97e21203b877bc83f23b0aedee83 100644 (file)
@@ -51,7 +51,7 @@ public class AddGroupActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final QualityGatesWsSupport wsSupport = new QualityGatesWsSupport(dbClient, userSession, TestComponentFinder.from(db));
index 55f53c200ea08cf7564efb4414aaf2f0fdc4221b..b747573a8908ce0c5a3a3a3787e68c8a76f4ceae 100644 (file)
@@ -47,7 +47,7 @@ public class AddUserActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final QualityGatesWsSupport wsSupport = new QualityGatesWsSupport(dbClient, userSession, TestComponentFinder.from(db));
index d1ec184027eae22fc4f72a1e1ca132ee53bf783f..f31ecc7bec762abd331166c1e9cd3aa942fcce07 100644 (file)
@@ -56,12 +56,11 @@ import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_SOU
 @RunWith(DataProviderRunner.class)
 public class CopyActionIT {
 
-
   @Rule
   public final UserSessionRule userSession = UserSessionRule.standalone();
 
   @Rule
-  public final DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final DbSession dbSession = db.getSession();
index 3452f945b9803be993471c9b11b786e9fab92329..2045830f12542e962c6ab1723d68f2dd617e7940 100644 (file)
@@ -61,7 +61,7 @@ public class CreateActionIT {
   public UserSessionRule userSession = UserSessionRule.standalone();
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final DbSession dbSession = db.getSession();
index 1176bb827b05c09bf30834e5664f70040837b019..b653222ab5524c297ba38499df431060dda3e014 100644 (file)
@@ -37,7 +37,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
 
-import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.tuple;
index 213ed67a087e4dccde90c39c99e23ba41ae9ba04..d729b29361d9aae1b5e7bb57c0f6420625a6814a 100644 (file)
@@ -54,7 +54,7 @@ public class DestroyActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final QualityGateFinder qualityGateFinder = new QualityGateFinder(dbClient);
index df891b060df00b8c088df32799e42366b1a75b22..4025c51221a2f978bbb0bd58078689b7ef756d09 100644 (file)
@@ -47,7 +47,7 @@ public class GetByProjectActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
 
@@ -134,7 +134,7 @@ public class GetByProjectActionIT {
 
   @Test
   public void get_with_project_admin_permission() {
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
     QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
     db.qualityGates().setDefaultQualityGate(qualityGate);
     userSession.logIn().addProjectPermission(UserRole.ADMIN, project);
@@ -148,7 +148,7 @@ public class GetByProjectActionIT {
 
   @Test
   public void get_with_project_user_permission() {
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
     QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
     db.qualityGates().setDefaultQualityGate(qualityGate);
     userSession.logIn().addProjectPermission(UserRole.USER, project);
index f5bdf51833b4fa61fadbb467e022d571851b6237..90a4c60e06fd20f965be07ff5d9e4cfbe16cb109 100644 (file)
@@ -51,7 +51,6 @@ import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_SELECTED;
 
 public class SearchActionIT {
 
-
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 
index f1aa83aeb3455c9327c3dcb487dfa510a6a1e483..dad8c604f767eecf57985afd5dff1a9bee9a02e0 100644 (file)
@@ -47,8 +47,6 @@ import static org.sonar.test.JsonAssert.assertJson;
 import static org.sonarqube.ws.MediaTypes.JSON;
 
 public class SearchGroupsActionIT {
-  private static final String XOO = "xoo";
-  private static final String FOO = "foo";
 
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
index 6c3c621c024af58d0b6de50cb6a9b79b8b714083..a1c6f2710e16dcc68cfdcf3ebca3d38fdb415967 100644 (file)
@@ -26,6 +26,7 @@ import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.project.ProjectDto;
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.component.TestComponentFinder;
@@ -46,7 +47,7 @@ public class SelectActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final ComponentFinder componentFinder = TestComponentFinder.from(db);
@@ -58,7 +59,7 @@ public class SelectActionIT {
   public void select_by_key() {
     userSession.addPermission(ADMINISTER_QUALITY_GATES);
     QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
 
     ws.newRequest()
       .setParam(PARAM_GATE_NAME, qualityGate.getName())
@@ -73,7 +74,7 @@ public class SelectActionIT {
     userSession.addPermission(ADMINISTER_QUALITY_GATES);
     QualityGateDto initialQualityGate = db.qualityGates().insertQualityGate();
     QualityGateDto secondQualityGate = db.qualityGates().insertQualityGate();
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
 
     ws.newRequest()
       .setParam(PARAM_GATE_NAME, initialQualityGate.getName())
@@ -92,7 +93,7 @@ public class SelectActionIT {
   public void select_same_quality_gate_for_project_twice() {
     userSession.addPermission(ADMINISTER_QUALITY_GATES);
     QualityGateDto initialQualityGate = db.qualityGates().insertQualityGate();
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
 
     ws.newRequest()
       .setParam(PARAM_GATE_NAME, initialQualityGate.getName())
@@ -110,7 +111,7 @@ public class SelectActionIT {
   @Test
   public void project_admin() {
     QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
     userSession.logIn().addProjectPermission(ADMIN, project);
 
     ws.newRequest()
@@ -125,7 +126,7 @@ public class SelectActionIT {
   public void gate_administrator_can_associate_a_gate_to_a_project() {
     userSession.addPermission(ADMINISTER_QUALITY_GATES);
     QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
-    ComponentDto project = db.components().insertPrivateProject().getMainBranchComponent();
+    ProjectDto project = db.components().insertPrivateProject().getProjectDto();
 
     ws.newRequest()
       .setParam(PARAM_GATE_NAME, qualityGate.getName())
@@ -198,8 +199,8 @@ public class SelectActionIT {
       .isInstanceOf(ForbiddenException.class);
   }
 
-  private void assertSelected(QualityGateDto qualityGate, ComponentDto project) {
-    Optional<String> qGateUuid = db.qualityGates().selectQGateUuidByProjectUuid(project.uuid());
+  private void assertSelected(QualityGateDto qualityGate, ProjectDto project) {
+    Optional<String> qGateUuid = db.qualityGates().selectQGateUuidByProjectUuid(project.getUuid());
     assertThat(qGateUuid)
       .isNotNull()
       .isNotEmpty()
index c9edf61221609b7131eb425bccac5649bb7a3c3a..2f8921910b588397da2b51655fce5644786aa8d1 100644 (file)
@@ -38,7 +38,7 @@ public class SetAsDefaultActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final WsActionTester ws = new WsActionTester(
     new SetAsDefaultAction(db.getDbClient(), userSession, new QualityGatesWsSupport(db.getDbClient(), userSession, TestComponentFinder.from(db))));
index eedca4b3f2efa99a15066cb347e1c72f77352c55..75b1c621d4cf80321f348bae592f7f06b0feceb3 100644 (file)
@@ -61,7 +61,7 @@ public class ShowActionIT {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
   private final QualityGateCaycChecker qualityGateCaycChecker = mock(QualityGateCaycChecker.class);
 
   private final WsActionTester ws = new WsActionTester(
index 4eb98c6e8b867685650521f9c744002de3f13048..91636612fd269249f8b8d6a0544639067ff0ca59 100644 (file)
@@ -59,12 +59,11 @@ import static org.sonar.server.qualitygate.ws.QualityGatesWsParameters.PARAM_OPE
 @RunWith(DataProviderRunner.class)
 public class UpdateConditionActionIT {
 
-
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 
   @Rule
-  public DbTester db = DbTester.create(System2.INSTANCE);
+  public DbTester db = DbTester.create(true);
 
   private final DbClient dbClient = db.getDbClient();
   private final DbSession dbSession = db.getSession();