aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2017-09-04 17:44:40 +0200
committerStas Vilchik <stas.vilchik@sonarsource.com>2017-09-11 11:28:29 +0200
commit205cd6c0fa154a9fc8bff8607134c6eb53d234ad (patch)
tree1f861068750eaf9273f8483daf9ef3e05e08c17a /tests
parent09e1d1190d89d44d4168996532ee8223e62d87ca (diff)
downloadsonarqube-205cd6c0fa154a9fc8bff8607134c6eb53d234ad.tar.gz
sonarqube-205cd6c0fa154a9fc8bff8607134c6eb53d234ad.zip
SONAR-9181 WS api/projects/search filters on provisioned projects
Diffstat (limited to 'tests')
-rw-r--r--tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectSearchTest.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectSearchTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectSearchTest.java
index 01099139738..4882176d567 100644
--- a/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectSearchTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectSearchTest.java
@@ -31,6 +31,7 @@ import org.sonarqube.tests.Tester;
import org.sonarqube.ws.Organizations;
import org.sonarqube.ws.WsProjects.CreateWsResponse;
import org.sonarqube.ws.WsProjects.SearchWsResponse;
+import org.sonarqube.ws.WsProjects.SearchWsResponse.Component;
import org.sonarqube.ws.client.GetRequest;
import org.sonarqube.ws.client.project.SearchWsRequest;
@@ -63,7 +64,7 @@ public class ProjectSearchTest {
.setQualifiers(singletonList("TRK"))
.setAnalyzedBefore(formatDate(oneYearAgo)).build());
- assertThat(result.getComponentsList()).extracting(SearchWsResponse.Component::getKey).containsExactlyInAnyOrder(oldProject.getKey());
+ assertThat(result.getComponentsList()).extracting(Component::getKey).containsExactlyInAnyOrder(oldProject.getKey());
}
@Test
@@ -83,7 +84,7 @@ public class ProjectSearchTest {
.setQuery("JeCt-K")
.build());
- assertThat(result.getComponentsList()).extracting(SearchWsResponse.Component::getKey)
+ assertThat(result.getComponentsList()).extracting(Component::getKey)
.containsExactlyInAnyOrder(lowerCaseProject.getKey(), upperCaseProject.getKey())
.doesNotContain(anotherProject.getKey());
}
@@ -100,9 +101,14 @@ public class ProjectSearchTest {
String result = tester.wsClient().wsConnector().call(new GetRequest("api/projects/provisioned")
.setParam("organization", organization.getKey()))
.failIfNotSuccessful().content();
-
- assertThat(result)
- .contains(firstProvisionedProject.getKey(), secondProvisionedProject.getKey())
+ SearchWsResponse searchResult = tester.wsClient().projects().search(SearchWsRequest.builder()
+ .setQualifiers(singletonList("TRK"))
+ .setOrganization(organization.getKey())
+ .setOnProvisionedOnly(true).build());
+
+ assertThat(result).contains(firstProvisionedProject.getKey(), secondProvisionedProject.getKey()).doesNotContain(analyzedProject.getKey());
+ assertThat(searchResult.getComponentsList()).extracting(Component::getKey)
+ .containsOnly(firstProvisionedProject.getKey(), secondProvisionedProject.getKey())
.doesNotContain(analyzedProject.getKey());
}