diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-12-20 13:55:19 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-12-20 14:56:05 +0100 |
| commit | 9b2e99b4b950689e4e610c5421cd436b4b9846ad (patch) | |
| tree | 819aa827d03e8123b3463f038671e3b50f20e8b0 /tests/src | |
| parent | bc027f57cdaa5bd33776d09d56652e7cf15c7ebf (diff) | |
| download | sonarqube-9b2e99b4b950689e4e610c5421cd436b4b9846ad.tar.gz sonarqube-9b2e99b4b950689e4e610c5421cd436b4b9846ad.zip | |
SONAR-10134 Remove 'organization' parameter from project_status ws
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateForSmallChangesetsTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateForSmallChangesetsTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateForSmallChangesetsTest.java index 717e26d888f..98cb9a9b162 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateForSmallChangesetsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateForSmallChangesetsTest.java @@ -87,7 +87,7 @@ public class OrganizationQualityGateForSmallChangesetsTest { .setDebugLogs(true); orchestrator.executeBuild(analysis); assertThat(getMeasure(orchestrator, project.getKey(), "alert_status").getValue()).isEqualTo("OK"); - assertIgnoredConditions(organization,"qualitygate/small-changesets/v1-1000-lines", false); + assertIgnoredConditions("qualitygate/small-changesets/v1-1000-lines", false); // small leak => ignore coverage warning or error SonarScanner analysis2 = SonarScanner @@ -102,7 +102,7 @@ public class OrganizationQualityGateForSmallChangesetsTest { .setDebugLogs(true); orchestrator.executeBuild(analysis2); assertThat(getMeasure(orchestrator, project.getKey(), "alert_status").getValue()).isEqualTo("OK"); - assertIgnoredConditions(organization, "qualitygate/small-changesets/v2-1019-lines", true); + assertIgnoredConditions("qualitygate/small-changesets/v2-1019-lines", true); // small leak => if coverage is OK anyways, we do not have to ignore anything tester.wsClient().qualitygates().updateCondition(new UpdateConditionRequest() @@ -125,7 +125,7 @@ public class OrganizationQualityGateForSmallChangesetsTest { .setDebugLogs(true); orchestrator.executeBuild(analysis3); assertThat(getMeasure(orchestrator, project.getKey(), "alert_status").getValue()).isEqualTo("OK"); - assertIgnoredConditions(organization, "qualitygate/small-changesets/v2-1019-lines", false); + assertIgnoredConditions("qualitygate/small-changesets/v2-1019-lines", false); // big leak => use usual behaviour tester.wsClient().qualitygates().updateCondition(new UpdateConditionRequest() @@ -148,13 +148,13 @@ public class OrganizationQualityGateForSmallChangesetsTest { .setDebugLogs(true); orchestrator.executeBuild(analysis4); assertThat(getMeasure(orchestrator, project.getKey(), "alert_status").getValue()).isEqualTo("ERROR"); - assertIgnoredConditions(organization, "qualitygate/small-changesets/v2-1020-lines", false); + assertIgnoredConditions("qualitygate/small-changesets/v2-1020-lines", false); } - private void assertIgnoredConditions(Organizations.Organization organization, String projectDir, boolean expected) throws IOException { + private void assertIgnoredConditions(String projectDir, boolean expected) throws IOException { String analysisId = getAnalysisId(getTaskIdInLocalReport(projectDir(projectDir))); boolean ignoredConditions = tester.wsClient().qualitygates() - .projectStatus(new ProjectStatusRequest().setOrganization(organization.getKey()).setAnalysisId(analysisId)) + .projectStatus(new ProjectStatusRequest().setAnalysisId(analysisId)) .getProjectStatus() .getIgnoredConditions(); assertThat(ignoredConditions).isEqualTo(expected); |