From 7fc4e35033a515fb04b0c82e8171cc58c34b6dff Mon Sep 17 00:00:00 2001 From: Kirill Knize Date: Tue, 4 Feb 2025 09:36:51 +0100 Subject: [PATCH] Fix quality gate --- .../connection/ConnectionGetProjectNameByKeyMediumTests.java | 5 +++-- .../java/mediumtest/connection/OrganizationMediumTests.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/medium-tests/src/test/java/mediumtest/connection/ConnectionGetProjectNameByKeyMediumTests.java b/medium-tests/src/test/java/mediumtest/connection/ConnectionGetProjectNameByKeyMediumTests.java index 3f233b8810..c9daa8abc0 100644 --- a/medium-tests/src/test/java/mediumtest/connection/ConnectionGetProjectNameByKeyMediumTests.java +++ b/medium-tests/src/test/java/mediumtest/connection/ConnectionGetProjectNameByKeyMediumTests.java @@ -26,6 +26,7 @@ import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.projects.GetProjectNamesByKeyParams; import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.projects.GetProjectNamesByKeyResponse; import org.sonarsource.sonarlint.core.rpc.protocol.common.Either; +import org.sonarsource.sonarlint.core.rpc.protocol.common.SonarCloudRegion; import org.sonarsource.sonarlint.core.rpc.protocol.common.TokenDto; import org.sonarsource.sonarlint.core.test.utils.SonarLintTestRpcServer; import org.sonarsource.sonarlint.core.test.utils.junit5.SonarLintTest; @@ -60,7 +61,7 @@ void it_should_return_null_if_no_projects_in_sonarcloud_organization(SonarLintTe .withSonarCloudUrl(server.baseUrl()) .start(); - var response = getProjectNamesByKey(backend, new TransientSonarCloudConnectionDto("myOrg", Either.forLeft(new TokenDto("token"))), List.of( + var response = getProjectNamesByKey(backend, new TransientSonarCloudConnectionDto("myOrg", Either.forLeft(new TokenDto("token")), SonarCloudRegion.EU), List.of( "myProject")); assertThat(response.getProjectNamesByKey().entrySet()).extracting(Map.Entry::getKey, Map.Entry::getValue) @@ -97,7 +98,7 @@ void it_should_find_project_names_if_available_on_sonarcloud(SonarLintTestHarnes .withSonarCloudUrl(server.baseUrl()) .start(); - var response = getProjectNamesByKey(backend, new TransientSonarCloudConnectionDto("myOrg", Either.forLeft(new TokenDto("token"))), + var response = getProjectNamesByKey(backend, new TransientSonarCloudConnectionDto("myOrg", Either.forLeft(new TokenDto("token")), SonarCloudRegion.EU), List.of("projectKey2", "projectKey3", "projectKey4")); assertThat(response.getProjectNamesByKey().entrySet()).extracting(Map.Entry::getKey, Map.Entry::getValue) diff --git a/medium-tests/src/test/java/mediumtest/connection/OrganizationMediumTests.java b/medium-tests/src/test/java/mediumtest/connection/OrganizationMediumTests.java index 295bcc857d..a7a8b1fef2 100644 --- a/medium-tests/src/test/java/mediumtest/connection/OrganizationMediumTests.java +++ b/medium-tests/src/test/java/mediumtest/connection/OrganizationMediumTests.java @@ -30,6 +30,7 @@ import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.org.ListUserOrganizationsParams; import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.org.OrganizationDto; import org.sonarsource.sonarlint.core.rpc.protocol.common.Either; +import org.sonarsource.sonarlint.core.rpc.protocol.common.SonarCloudRegion; import org.sonarsource.sonarlint.core.rpc.protocol.common.TokenDto; import org.sonarsource.sonarlint.core.rpc.protocol.common.UsernamePasswordDto; import org.sonarsource.sonarlint.core.serverapi.proto.sonarcloud.ws.Organizations; @@ -65,7 +66,7 @@ void it_should_list_empty_user_organizations(SonarLintTestHarness harness) throw .willReturn(aResponse().withStatus(200).withResponseBody(protobufBody(Organizations.SearchWsResponse.newBuilder() .build())))); - var details = backend.getConnectionService().listUserOrganizations(new ListUserOrganizationsParams(Either.forLeft(new TokenDto("token")))); + var details = backend.getConnectionService().listUserOrganizations(new ListUserOrganizationsParams(Either.forLeft(new TokenDto("token")), SonarCloudRegion.EU)); assertThat(details.get().getUserOrganizations()).isEmpty(); } @@ -121,7 +122,7 @@ void it_should_get_organizations_by_key(SonarLintTestHarness harness) throws Exe sonarcloudMock.stubFor(get("/api/organizations/search.protobuf?organizations=myCustomOrg&ps=500&p=2") .willReturn(aResponse().withStatus(200).withResponseBody(protobufBody(Organizations.SearchWsResponse.newBuilder().build())))); - var details = backend.getConnectionService().getOrganization(new GetOrganizationParams(Either.forRight(new UsernamePasswordDto("user", "pwd")), "myCustomOrg")); + var details = backend.getConnectionService().getOrganization(new GetOrganizationParams(Either.forRight(new UsernamePasswordDto("user", "pwd")), "myCustomOrg", SonarCloudRegion.EU)); var organization = details.get().getOrganization(); assertThat(organization.getKey()).isEqualTo("myCustom");