|
|
@@ -543,7 +543,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForGlobalProperties(); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -563,7 +564,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForProjectProperties(); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "global.secret.secured", "secret.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).contains("global.secret.secured", "secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -576,7 +578,7 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForProjectProperties("not-defined.secured"); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("not-defined.secured"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("not-defined.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -591,7 +593,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForGlobalProperties(); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -610,8 +613,9 @@ public class ValuesActionTest { |
|
|
|
ValuesWsResponse result = executeRequestForProjectProperties(); |
|
|
|
|
|
|
|
List<Settings.Setting> settingsList = result.getSettingsList().stream().sorted(comparing(Settings.Setting::getKey)).collect(Collectors.toList()); |
|
|
|
assertThat(settingsList).extracting(Settings.Setting::getKey).containsExactly("foo", "global.secret.secured", "secret.secured"); |
|
|
|
assertThat(settingsList).extracting(Settings.Setting::hasValue).containsExactly(true, false, false); |
|
|
|
assertThat(settingsList).extracting(Settings.Setting::getKey).containsExactly("foo"); |
|
|
|
assertThat(settingsList).extracting(Settings.Setting::hasValue).containsExactly(true); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("global.secret.secured", "secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -622,7 +626,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForProjectProperties("not-defined.secured"); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("not-defined.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).isEmpty(); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("not-defined.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -654,7 +659,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForGlobalProperties(); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -669,7 +675,8 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
ValuesWsResponse result = executeRequestForProjectProperties(); |
|
|
|
|
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured"); |
|
|
|
assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo"); |
|
|
|
assertThat(result.getSetSecuredSettingsList()).containsOnly("secret.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
@@ -738,7 +745,7 @@ public class ValuesActionTest { |
|
|
|
|
|
|
|
@Test |
|
|
|
public void test_example_json_response() { |
|
|
|
logIn(); |
|
|
|
logInAsAdmin(); |
|
|
|
definitions.addComponent(PropertyDefinition |
|
|
|
.builder("sonar.test.jira") |
|
|
|
.defaultValue("abc") |
|
|
@@ -757,8 +764,15 @@ public class ValuesActionTest { |
|
|
|
.build()); |
|
|
|
propertyDb.insertPropertySet("sonar.demo", null, ImmutableMap.of("text", "foo", "boolean", "true"), ImmutableMap.of("text", "bar", "boolean", "false")); |
|
|
|
|
|
|
|
definitions.addComponent(PropertyDefinition |
|
|
|
.builder("email.smtp_port.secured") |
|
|
|
.defaultValue("25") |
|
|
|
.build()); |
|
|
|
propertyDb.insertProperties(null, null, null, null, |
|
|
|
newGlobalPropertyDto().setKey("email.smtp_port.secured").setValue("25")); |
|
|
|
|
|
|
|
String result = newTester().newRequest() |
|
|
|
.setParam("keys", "sonar.test.jira,sonar.autogenerated,sonar.demo") |
|
|
|
.setParam("keys", "sonar.test.jira,sonar.autogenerated,sonar.demo,email.smtp_port.secured") |
|
|
|
.setMediaType(JSON) |
|
|
|
.execute() |
|
|
|
.getInput(); |
|
|
@@ -824,21 +838,18 @@ public class ValuesActionTest { |
|
|
|
userSession.logIn() |
|
|
|
.addPermission(GlobalPermission.SCAN); |
|
|
|
response = executeRequest(tester, null, securedDef.key(), standardDef.key()); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::getKey).containsExactly("my.password.secured", "my.property"); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::hasValue).containsExactly(false, true); |
|
|
|
assertThat(response.getSetSecuredSettingsList()).contains("my.password.secured"); |
|
|
|
|
|
|
|
// global administrator |
|
|
|
userSession.logIn() |
|
|
|
.addPermission(GlobalPermission.ADMINISTER); |
|
|
|
response = executeRequest(tester, null, securedDef.key(), standardDef.key()); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::getKey).containsExactly("my.password.secured", "my.property"); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::hasValue).containsExactly(false, true); |
|
|
|
assertThat(response.getSetSecuredSettingsList()).contains("my.password.secured"); |
|
|
|
|
|
|
|
// system administrator |
|
|
|
userSession.logIn().setSystemAdministrator(); |
|
|
|
response = executeRequest(tester, null, securedDef.key(), standardDef.key()); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::getKey).containsExactly("my.password.secured", "my.property"); |
|
|
|
assertThat(response.getSettingsList()).extracting(Settings.Setting::hasValue).containsExactly(false, true); |
|
|
|
assertThat(response.getSetSecuredSettingsList()).contains("my.password.secured"); |
|
|
|
} |
|
|
|
|
|
|
|
private ValuesWsResponse executeRequestForComponentProperties(ComponentDto componentDto, String... keys) { |