aboutsummaryrefslogtreecommitdiffstats
path: root/it/it-tests/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2017-06-12 22:57:00 +0200
committerEric Hartmann <hartmann.eric@gmail.com>2017-06-14 15:43:13 +0200
commitbce59a878501872b105e120bc0d8e13494f79aee (patch)
tree44862b1c6e1887eddd561223ed12b8ffefcd7044 /it/it-tests/src
parentdd5713279b5b6beccdb5cc65681dbde25898f035 (diff)
downloadsonarqube-bce59a878501872b105e120bc0d8e13494f79aee.tar.gz
sonarqube-bce59a878501872b105e120bc0d8e13494f79aee.zip
SONAR-9305 Built-in quality profiles should be updated automatically
Diffstat (limited to 'it/it-tests/src')
-rw-r--r--it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java b/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java
index 2de56eaf33b..adf96f5fa1c 100644
--- a/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java
+++ b/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java
@@ -46,6 +46,7 @@ import util.QualityProfileRule;
import util.QualityProfileSupport;
import util.user.UserRule;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.assertj.core.api.Assertions.assertThat;
import static util.ItUtils.expectForbiddenError;
import static util.ItUtils.expectMissingError;
@@ -254,14 +255,15 @@ public class CustomQualityProfilesTest {
QualityProfileSupport adminProfiles = profiles.as(user.getLogin(), A_PASSWORD);
- String projectKey = "test-project";
+ String projectKey = randomAlphanumeric(10);
+ String projectName = randomAlphanumeric(10);
orchestrator.executeBuild(
SonarScanner.create(projectDir("shared/xoo-sample"),
"sonar.login", user.getLogin(),
"sonar.password", A_PASSWORD,
"sonar.organization", org.getKey())
.setProjectKey(projectKey)
- .setProjectName("my-project")
+ .setProjectName(projectName)
);
QualityProfiles.SearchWsResponse.QualityProfile defaultProfile = getProfile(org, p -> "xoo".equals(p.getLanguage()) && p.getIsDefault());
@@ -276,7 +278,7 @@ public class CustomQualityProfilesTest {
"sonar.password", A_PASSWORD,
"sonar.organization", org.getKey())
.setProjectKey(projectKey)
- .setProjectName("my-project")
+ .setProjectName(projectName)
);
assertThatQualityProfileIsUsedFor(projectKey, newXooProfile.getKey());
@@ -286,8 +288,8 @@ public class CustomQualityProfilesTest {
public void analysis_must_use_associated_profile() {
Organization org = organizations.create();
User user = users.createAdministrator(org, A_PASSWORD);
- String projectKey = "test-project";
- String projectName = "my-project";
+ String projectKey = randomAlphanumeric(10);
+ String projectName = randomAlphanumeric(10);
QualityProfileSupport adminProfiles = profiles.as(user.getLogin(), A_PASSWORD);
QualityProfile newXooProfile = adminProfiles.createXooProfile(org);