From a59263ada4b7a37c4e03e757b15f3bad9ebf3b46 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Mon, 10 Dec 2018 16:21:35 -0600 Subject: [PATCH] SONAR-11464 Refactor ITs --- .../main/java/org/sonar/server/component/ws/TreeAction.java | 5 +---- .../java/org/sonar/server/component/ws/TreeActionTest.java | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java index 179d3a33552..96f153ee5c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java @@ -188,10 +188,7 @@ public class TreeAction implements ComponentsWsAction { OrganizationDto organizationDto = componentFinder.getOrganization(dbSession, baseComponent); ComponentTreeQuery query = toComponentTreeQuery(treeRequest, baseComponent); - List components = dbClient.componentDao().selectDescendants(dbSession, query) - .stream() - .filter(c -> !c.qualifier().equals(Qualifiers.MODULE)) - .collect(Collectors.toList()); + List components = dbClient.componentDao().selectDescendants(dbSession, query); int total = components.size(); components = sortComponents(components, treeRequest); components = paginateComponents(components, treeRequest); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java index ca4e5904ed9..91bca5682cf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java @@ -259,9 +259,7 @@ public class TreeActionTest { .setParam(Param.SORT, "qualifier, name") .setParam(PARAM_COMPONENT_ID, "project-uuid").executeProtobuf(TreeWsResponse.class); - assertThat(response.getComponentsList()).extracting("id") - .containsExactly("path/directory/", "file-uuid-1", "file-uuid-2") - .doesNotContain("module-uuid-1"); + assertThat(response.getComponentsList()).extracting("id").containsExactly("module-uuid-1", "path/directory/", "file-uuid-1", "file-uuid-2"); } @Test -- 2.39.5