Skip to content

Commit

Permalink
SONAR-10136 Update tests with BuiltIn QG already created
Browse files Browse the repository at this point in the history
  • Loading branch information
@ehartmann @julienlancelot
ehartmann authored and julienlancelot committed Dec 14, 2017
1 parent 03c66a8 commit 9c8d12d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 50 deletions.
26 changes: 4 additions & 22 deletions ...onar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java
View file
Expand Up @@ -53,6 +53,7 @@
import org.sonar.db.user.UserMembershipQuery; import org.sonar.db.user.UserMembershipQuery;
import org.sonar.server.es.EsTester; import org.sonar.server.es.EsTester;
import org.sonar.server.es.SearchOptions; import org.sonar.server.es.SearchOptions;
import org.sonar.server.qualitygate.QualityGateFinder;
import org.sonar.server.qualityprofile.BuiltInQProfile; import org.sonar.server.qualityprofile.BuiltInQProfile;
import org.sonar.server.qualityprofile.BuiltInQProfileRepositoryRule; import org.sonar.server.qualityprofile.BuiltInQProfileRepositoryRule;
import org.sonar.server.qualityprofile.QProfileName; import org.sonar.server.qualityprofile.QProfileName;
Expand Down Expand Up @@ -107,6 +108,7 @@ public class OrganizationCreationImplTest {
private UserIndexer userIndexer = new UserIndexer(dbClient, es.client()); private UserIndexer userIndexer = new UserIndexer(dbClient, es.client());
private UserIndex userIndex = new UserIndex(es.client(), system2); private UserIndex userIndex = new UserIndex(es.client(), system2);
private DefaultGroupCreator defaultGroupCreator = new DefaultGroupCreatorImpl(dbClient); private DefaultGroupCreator defaultGroupCreator = new DefaultGroupCreatorImpl(dbClient);
private QualityGateFinder qualityGateFinder = new QualityGateFinder(dbClient);
private OrganizationCreationImpl underTest = new OrganizationCreationImpl(dbClient, system2, uuidFactory, organizationValidation, settings.asConfig(), userIndexer, private OrganizationCreationImpl underTest = new OrganizationCreationImpl(dbClient, system2, uuidFactory, organizationValidation, settings.asConfig(), userIndexer,
builtInQProfileRepositoryRule, defaultGroupCreator); builtInQProfileRepositoryRule, defaultGroupCreator);


Expand Down Expand Up @@ -166,7 +168,6 @@ private void createThrowsExceptionThrownByOrganizationValidation() throws Organi


@Test @Test
public void create_fails_with_ISE_if_BuiltInQProfileRepository_has_not_been_initialized() throws OrganizationCreation.KeyConflictException { public void create_fails_with_ISE_if_BuiltInQProfileRepository_has_not_been_initialized() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();


expectedException.expect(IllegalStateException.class); expectedException.expect(IllegalStateException.class);
expectedException.expectMessage("initialize must be called first"); expectedException.expectMessage("initialize must be called first");
Expand All @@ -186,7 +187,6 @@ public void create_fails_with_KeyConflictException_if_org_with_key_in_NewOrganiz


@Test @Test
public void create_creates_unguarded_organization_with_properties_from_NewOrganization_arg() throws OrganizationCreation.KeyConflictException { public void create_creates_unguarded_organization_with_properties_from_NewOrganization_arg() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION); underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION);
Expand All @@ -206,7 +206,6 @@ public void create_creates_unguarded_organization_with_properties_from_NewOrgani


@Test @Test
public void create_creates_owners_group_with_all_permissions_for_new_organization_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException { public void create_creates_owners_group_with_all_permissions_for_new_organization_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(); UserDto user = db.users().insertUser();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


Expand All @@ -217,7 +216,6 @@ public void create_creates_owners_group_with_all_permissions_for_new_organizatio


@Test @Test
public void create_creates_members_group_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException { public void create_creates_members_group_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(); UserDto user = db.users().insertUser();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


Expand All @@ -228,7 +226,6 @@ public void create_creates_members_group_and_add_current_user_to_it() throws Org


@Test @Test
public void create_does_not_require_description_url_and_avatar_to_be_non_null() throws OrganizationCreation.KeyConflictException { public void create_does_not_require_description_url_and_avatar_to_be_non_null() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


underTest.create(dbSession, someUser, newOrganizationBuilder() underTest.create(dbSession, someUser, newOrganizationBuilder()
Expand All @@ -248,7 +245,6 @@ public void create_does_not_require_description_url_and_avatar_to_be_non_null()


@Test @Test
public void create_creates_default_template_for_new_organization() throws OrganizationCreation.KeyConflictException { public void create_creates_default_template_for_new_organization() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION); underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION);
Expand All @@ -271,7 +267,6 @@ public void create_creates_default_template_for_new_organization() throws Organi


@Test @Test
public void create_add_current_user_as_member_of_organization() throws OrganizationCreation.KeyConflictException { public void create_add_current_user_as_member_of_organization() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(); UserDto user = db.users().insertUser();
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();
userIndexer.commitAndIndex(db.getSession(), someUser); userIndexer.commitAndIndex(db.getSession(), someUser);
Expand All @@ -284,7 +279,6 @@ public void create_add_current_user_as_member_of_organization() throws Organizat


@Test @Test
public void create_associates_to_built_in_quality_profiles() throws OrganizationCreation.KeyConflictException { public void create_associates_to_built_in_quality_profiles() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
BuiltInQProfile builtIn1 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp1", true); BuiltInQProfile builtIn1 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp1", true);
BuiltInQProfile builtIn2 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp2"); BuiltInQProfile builtIn2 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp2");
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();
Expand Down Expand Up @@ -313,7 +307,7 @@ private void insertRulesProfile(BuiltInQProfile builtIn) {


@Test @Test
public void create_associates_to_built_in_quality_gate() throws OrganizationCreation.KeyConflictException { public void create_associates_to_built_in_quality_gate() throws OrganizationCreation.KeyConflictException {
QualityGateDto builtInQualityGate = insertBuiltInQualityGate(); QualityGateDto builtInQualityGate = qualityGateFinder.getBuiltInQualityGate(dbSession);
builtInQProfileRepositoryRule.initialize(); builtInQProfileRepositoryRule.initialize();


underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION); underTest.create(dbSession, someUser, FULL_POPULATED_NEW_ORGANIZATION);
Expand Down Expand Up @@ -353,7 +347,6 @@ private void checkSizeOfTables() {


@Test @Test
public void createForUser_creates_guarded_organization_with_key_name_and_description_generated_from_user_login_and_name_and_associated_to_user() { public void createForUser_creates_guarded_organization_with_key_name_and_description_generated_from_user_login_and_name_and_associated_to_user() {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(A_LOGIN); UserDto user = db.users().insertUser(A_LOGIN);
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand Down Expand Up @@ -390,7 +383,6 @@ public void createForUser_fails_with_ISE_if_organization_with_slug_of_login_alre


@Test @Test
public void createForUser_gives_all_permissions_for_new_organization_to_current_user() throws OrganizationCreation.KeyConflictException { public void createForUser_gives_all_permissions_for_new_organization_to_current_user() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME)); UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME));
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand All @@ -405,7 +397,6 @@ public void createForUser_gives_all_permissions_for_new_organization_to_current_


@Test @Test
public void createForUser_creates_members_group_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException { public void createForUser_creates_members_group_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME)); UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME));
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand All @@ -418,7 +409,6 @@ public void createForUser_creates_members_group_and_add_current_user_to_it() thr


@Test @Test
public void createForUser_creates_default_template_for_new_organization() throws OrganizationCreation.KeyConflictException { public void createForUser_creates_default_template_for_new_organization() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME)); UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME));
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand Down Expand Up @@ -446,7 +436,6 @@ public void createForUser_creates_default_template_for_new_organization() throws


@Test @Test
public void createForUser_add_current_user_as_member_of_organization() throws OrganizationCreation.KeyConflictException { public void createForUser_add_current_user_as_member_of_organization() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME)); UserDto user = db.users().insertUser(dto -> dto.setLogin(A_LOGIN).setName(A_NAME));
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand All @@ -460,7 +449,6 @@ public void createForUser_add_current_user_as_member_of_organization() throws Or


@Test @Test
public void createForUser_does_not_fail_if_name_is_too_long_for_an_organization_name() { public void createForUser_does_not_fail_if_name_is_too_long_for_an_organization_name() {
insertBuiltInQualityGate();
String nameTooLong = STRING_64_CHARS + "b"; String nameTooLong = STRING_64_CHARS + "b";
UserDto user = db.users().insertUser(dto -> dto.setName(nameTooLong).setLogin(A_LOGIN)); UserDto user = db.users().insertUser(dto -> dto.setName(nameTooLong).setLogin(A_LOGIN));
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
Expand All @@ -476,7 +464,6 @@ public void createForUser_does_not_fail_if_name_is_too_long_for_an_organization_


@Test @Test
public void createForUser_does_not_fail_if_name_is_empty_and_login_is_too_long_for_an_organization_name() { public void createForUser_does_not_fail_if_name_is_empty_and_login_is_too_long_for_an_organization_name() {
insertBuiltInQualityGate();
String login = STRING_64_CHARS + "b"; String login = STRING_64_CHARS + "b";
UserDto user = db.users().insertUser(dto -> dto.setName("").setLogin(login)); UserDto user = db.users().insertUser(dto -> dto.setName("").setLogin(login));
when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN);
Expand All @@ -492,7 +479,6 @@ public void createForUser_does_not_fail_if_name_is_empty_and_login_is_too_long_f


@Test @Test
public void createForUser_does_not_fail_if_name_is_null_and_login_is_too_long_for_an_organization_name() { public void createForUser_does_not_fail_if_name_is_null_and_login_is_too_long_for_an_organization_name() {
insertBuiltInQualityGate();
String login = STRING_64_CHARS + "b"; String login = STRING_64_CHARS + "b";
UserDto user = db.users().insertUser(dto -> dto.setName(null).setLogin(login)); UserDto user = db.users().insertUser(dto -> dto.setName(null).setLogin(login));
when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN);
Expand All @@ -508,7 +494,6 @@ public void createForUser_does_not_fail_if_name_is_null_and_login_is_too_long_fo


@Test @Test
public void createForUser_associates_to_built_in_quality_profiles() throws OrganizationCreation.KeyConflictException { public void createForUser_associates_to_built_in_quality_profiles() throws OrganizationCreation.KeyConflictException {
insertBuiltInQualityGate();
UserDto user = db.users().insertUser(A_LOGIN); UserDto user = db.users().insertUser(A_LOGIN);
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand All @@ -529,7 +514,7 @@ public void createForUser_associates_to_built_in_quality_profiles() throws Organ


@Test @Test
public void createForUser_associates_to_built_in_quality_gate() { public void createForUser_associates_to_built_in_quality_gate() {
QualityGateDto builtInQualityGate = insertBuiltInQualityGate(); QualityGateDto builtInQualityGate = qualityGateFinder.getBuiltInQualityGate(dbSession);
UserDto user = db.users().insertUser(A_LOGIN); UserDto user = db.users().insertUser(A_LOGIN);
when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN); when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
enableCreatePersonalOrg(true); enableCreatePersonalOrg(true);
Expand Down Expand Up @@ -586,8 +571,5 @@ private void verifyMembersGroup(UserDto user, String organizationKey) {
.containsOnly(user.getLogin()); .containsOnly(user.getLogin());
} }


private QualityGateDto insertBuiltInQualityGate(){
return db.qualityGates().insertBuiltInQualityGate();
}


} }
46 changes: 18 additions & 28 deletions server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java
View file
Expand Up @@ -77,10 +77,12 @@ public class RegisterQualityGatesTest {


private RegisterQualityGates underTest = new RegisterQualityGates(dbClient, qualityGateUpdater, qualityGateConditionsUpdater, qualityGateFinder, private RegisterQualityGates underTest = new RegisterQualityGates(dbClient, qualityGateUpdater, qualityGateConditionsUpdater, qualityGateFinder,
UuidFactoryFast.getInstance(), System2.INSTANCE); UuidFactoryFast.getInstance(), System2.INSTANCE);
private QualityGateDto builtInQG;


@Before @Before
public void setup() { public void setup() {
insertMetrics(); insertMetrics();
builtInQG = qualityGateFinder.getBuiltInQualityGate(dbSession);
} }


@After @After
Expand All @@ -90,6 +92,9 @@ public void after() {


@Test @Test
public void register_default_gate() { public void register_default_gate() {
dbClient.qualityGateDao().delete(builtInQG, dbSession);
dbSession.commit();

underTest.start(); underTest.start();


verifyCorrectBuiltInQualityGate(); verifyCorrectBuiltInQualityGate();
Expand All @@ -102,8 +107,6 @@ public void register_default_gate() {


@Test @Test
public void upgrade_empty_quality_gate() { public void upgrade_empty_quality_gate() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast());
qualityGateDao.insert(dbSession, builtin);
dbSession.commit(); dbSession.commit();


underTest.start(); underTest.start();
Expand All @@ -116,13 +119,10 @@ public void upgrade_empty_quality_gate() {


@Test @Test
public void upgrade_should_remove_deleted_condition() { public void upgrade_should_remove_deleted_condition() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast()); createBuiltInConditions(builtInQG);
qualityGateDao.insert(dbSession, builtin);

createBuiltInConditions(builtin);


// Add another condition // Add another condition
qualityGateConditionsUpdater.createCondition(dbSession, builtin, qualityGateConditionsUpdater.createCondition(dbSession, builtInQG,
NEW_SECURITY_REMEDIATION_EFFORT_KEY, OPERATOR_GREATER_THAN, null, "5", LEAK_PERIOD); NEW_SECURITY_REMEDIATION_EFFORT_KEY, OPERATOR_GREATER_THAN, null, "5", LEAK_PERIOD);


dbSession.commit(); dbSession.commit();
Expand All @@ -136,10 +136,7 @@ public void upgrade_should_remove_deleted_condition() {


@Test @Test
public void upgrade_should_add_missing_condition() { public void upgrade_should_add_missing_condition() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast()); List<QualityGateConditionDto> builtInConditions = createBuiltInConditions(builtInQG);
qualityGateDao.insert(dbSession, builtin);

List<QualityGateConditionDto> builtInConditions = createBuiltInConditions(builtin);


// Remove a condition // Remove a condition
QualityGateConditionDto conditionToBeDeleted = builtInConditions.get(new Random().nextInt(builtInConditions.size())); QualityGateConditionDto conditionToBeDeleted = builtInConditions.get(new Random().nextInt(builtInConditions.size()));
Expand All @@ -157,9 +154,9 @@ public void upgrade_should_add_missing_condition() {


@Test @Test
public void should_set_SonarWay_as_builtin_when_not_set() { public void should_set_SonarWay_as_builtin_when_not_set() {
dbClient.qualityGateDao().delete(builtInQG, dbSession);
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(false).setUuid(Uuids.createFast()); QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(false).setUuid(Uuids.createFast());
qualityGateDao.insert(dbSession, builtin); qualityGateDao.insert(dbSession, builtin);

createBuiltInConditions(builtin); createBuiltInConditions(builtin);
dbSession.commit(); dbSession.commit();


Expand All @@ -173,10 +170,7 @@ public void should_set_SonarWay_as_builtin_when_not_set() {


@Test @Test
public void should_not_update_builtin_quality_gate_if_already_uptodate() { public void should_not_update_builtin_quality_gate_if_already_uptodate() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast()); createBuiltInConditions(builtInQG);
qualityGateDao.insert(dbSession, builtin);

createBuiltInConditions(builtin);
dbSession.commit(); dbSession.commit();


underTest.start(); underTest.start();
Expand All @@ -194,6 +188,7 @@ public void should_not_update_builtin_quality_gate_if_already_uptodate() {


@Test @Test
public void ensure_only_one_built_in_quality_gate() { public void ensure_only_one_built_in_quality_gate() {
dbClient.qualityGateDao().delete(builtInQG, dbSession);
String qualityGateName = "IncorrectQualityGate"; String qualityGateName = "IncorrectQualityGate";
QualityGateDto builtin = new QualityGateDto().setName(qualityGateName).setBuiltIn(true).setUuid(Uuids.createFast()); QualityGateDto builtin = new QualityGateDto().setName(qualityGateName).setBuiltIn(true).setUuid(Uuids.createFast());
qualityGateDao.insert(dbSession, builtin); qualityGateDao.insert(dbSession, builtin);
Expand All @@ -217,23 +212,18 @@ public void ensure_only_one_built_in_quality_gate() {


@Test @Test
public void ensure_only_that_builtin_is_set_as_default_when_no_default_quality_gate() { public void ensure_only_that_builtin_is_set_as_default_when_no_default_quality_gate() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast());
qualityGateDao.insert(dbSession, builtin);
dbSession.commit();


underTest.start(); underTest.start();


assertThat(qualityGateFinder.getDefault(dbSession)).isPresent(); assertThat(qualityGateFinder.getDefault(dbSession)).isPresent();
assertThat(qualityGateFinder.getDefault(dbSession).get().getId()).isEqualTo(builtin.getId()); assertThat(qualityGateFinder.getDefault(dbSession).get().getId()).isEqualTo(builtInQG.getId());


assertThat( assertThat(
logTester.logs(LoggerLevel.INFO).contains("Built-in quality gate [Sonar way] has been set as default")).isTrue(); logTester.logs(LoggerLevel.INFO).contains("Built-in quality gate [Sonar way] has been set as default")).isTrue();
} }


@Test @Test
public void builtin_quality_gate_with_incorrect_metricId_should_not_throw_an_exception() { public void builtin_quality_gate_with_incorrect_metricId_should_not_throw_an_exception() {
QualityGateDto builtin = new QualityGateDto().setName(BUILT_IN_NAME).setBuiltIn(true).setUuid(Uuids.createFast());
qualityGateDao.insert(dbSession, builtin);
QualityGateConditionDto conditionDto = new QualityGateConditionDto() QualityGateConditionDto conditionDto = new QualityGateConditionDto()
.setMetricId(-1) // This Id does not exist .setMetricId(-1) // This Id does not exist
.setOperator(OPERATOR_GREATER_THAN) .setOperator(OPERATOR_GREATER_THAN)
Expand Down Expand Up @@ -283,18 +273,18 @@ private void verifyCorrectBuiltInQualityGate() {
tuple(newDuplication.getId().longValue(), OPERATOR_GREATER_THAN, null, "3", 1)); tuple(newDuplication.getId().longValue(), OPERATOR_GREATER_THAN, null, "3", 1));
} }


private List<QualityGateConditionDto> createBuiltInConditions(QualityGateDto builtin) { private List<QualityGateConditionDto> createBuiltInConditions(QualityGateDto qg) {
List<QualityGateConditionDto> conditions = new ArrayList<>(); List<QualityGateConditionDto> conditions = new ArrayList<>();


conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, builtin, conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, qg,
NEW_SECURITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD)); NEW_SECURITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD));
conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, builtin, conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, qg,
NEW_RELIABILITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD)); NEW_RELIABILITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD));
conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, builtin, conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, qg,
NEW_MAINTAINABILITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD)); NEW_MAINTAINABILITY_RATING_KEY, OPERATOR_GREATER_THAN, null, "1", LEAK_PERIOD));
conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, builtin, conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, qg,
NEW_COVERAGE_KEY, OPERATOR_LESS_THAN, null, "80", LEAK_PERIOD)); NEW_COVERAGE_KEY, OPERATOR_LESS_THAN, null, "80", LEAK_PERIOD));
conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, builtin, conditions.add(qualityGateConditionsUpdater.createCondition(dbSession, qg,
NEW_DUPLICATED_LINES_DENSITY_KEY, OPERATOR_GREATER_THAN, null, "3", LEAK_PERIOD)); NEW_DUPLICATED_LINES_DENSITY_KEY, OPERATOR_GREATER_THAN, null, "3", LEAK_PERIOD));


return conditions; return conditions;
Expand Down

0 comments on commit 9c8d12d

Please sign in to comment.