diff options
author | Aurelien Poscia <aurelien.poscia@sonarsource.com> | 2024-07-03 17:55:41 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-07-23 20:02:46 +0000 |
commit | a3a746153fea0b91dd0cd86307c8092d898bd82c (patch) | |
tree | 5d2f6d2749615d5f173ca8f8be965d0cfa957f85 /server/sonar-webserver-common | |
parent | 04bd7628152bc52451c9ac593a2cd1398b44f91b (diff) | |
download | sonarqube-a3a746153fea0b91dd0cd86307c8092d898bd82c.tar.gz sonarqube-a3a746153fea0b91dd0cd86307c8092d898bd82c.zip |
SONAR-22557 Fix quality gate
Diffstat (limited to 'server/sonar-webserver-common')
-rw-r--r-- | server/sonar-webserver-common/src/test/java/org/sonar/server/common/almsettings/github/GithubProjectCreatorFactoryTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/almsettings/github/GithubProjectCreatorFactoryTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/almsettings/github/GithubProjectCreatorFactoryTest.java index eebe1c535a0..e2a31f07c3c 100644 --- a/server/sonar-webserver-common/src/test/java/org/sonar/server/common/almsettings/github/GithubProjectCreatorFactoryTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/common/almsettings/github/GithubProjectCreatorFactoryTest.java @@ -33,8 +33,6 @@ import org.sonar.alm.client.github.GithubPermissionConverter; import org.sonar.auth.github.AppInstallationToken; import org.sonar.auth.github.GitHubSettings; import org.sonar.auth.github.client.GithubApplicationClient; -import org.sonar.auth.github.security.AccessToken; -import org.sonar.auth.github.security.UserAccessToken; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.alm.pat.AlmPatDto; @@ -164,7 +162,7 @@ public class GithubProjectCreatorFactoryTest { when(devOpsProjectService.createDevOpsProject(almSettingDto, GITHUB_PROJECT_DESCRIPTOR, appInstallationToken)).thenReturn(DEV_OPS_PROJECT); DevOpsProjectCreator devOpsProjectCreator = githubProjectCreatorFactory.getDevOpsProjectCreator(dbSession, VALID_GITHUB_PROJECT_COORDINATES).orElseThrow(); - GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(almSettingDto, false, appInstallationToken); + GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(false); assertThat(devOpsProjectCreator).usingRecursiveComparison().isEqualTo(expectedGithubProjectCreator); } @@ -184,7 +182,7 @@ public class GithubProjectCreatorFactoryTest { when(devOpsProjectService.createDevOpsProject(almSettingDto, GITHUB_PROJECT_DESCRIPTOR, authAppInstallationToken)).thenReturn(DEV_OPS_PROJECT); DevOpsProjectCreator devOpsProjectCreator = githubProjectCreatorFactory.getDevOpsProjectCreator(dbSession, VALID_GITHUB_PROJECT_COORDINATES).orElseThrow(); - GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(almSettingDto, true, appInstallationToken); + GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(true); assertThat(devOpsProjectCreator).usingRecursiveComparison().isEqualTo(expectedGithubProjectCreator); } @@ -199,7 +197,7 @@ public class GithubProjectCreatorFactoryTest { when(devOpsProjectService.createDevOpsProject(matchingAlmSettingDto, GITHUB_PROJECT_DESCRIPTOR, appInstallationToken)).thenReturn(DEV_OPS_PROJECT); DevOpsProjectCreator devOpsProjectCreator = githubProjectCreatorFactory.getDevOpsProjectCreator(dbSession, VALID_GITHUB_PROJECT_COORDINATES).orElseThrow(); - GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(matchingAlmSettingDto, false, appInstallationToken); + GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(false); assertThat(devOpsProjectCreator).usingRecursiveComparison().isEqualTo(expectedGithubProjectCreator); } @@ -213,7 +211,7 @@ public class GithubProjectCreatorFactoryTest { when(devOpsProjectService.create(mockAlmSettingDto, GITHUB_PROJECT_DESCRIPTOR)).thenReturn(DEV_OPS_PROJECT); DevOpsProjectCreator devOpsProjectCreator = githubProjectCreatorFactory.getDevOpsProjectCreator(mockAlmSettingDto, GITHUB_PROJECT_DESCRIPTOR).orElseThrow(); - GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(mockAlmSettingDto, false, new UserAccessToken(USER_ACCESS_TOKEN)); + GithubProjectCreator expectedGithubProjectCreator = getExpectedGithubProjectCreator(false); assertThat(devOpsProjectCreator).usingRecursiveComparison().isEqualTo(expectedGithubProjectCreator); } @@ -247,7 +245,7 @@ public class GithubProjectCreatorFactoryTest { when(githubApplicationClient.createAppInstallationToken(any(), eq(APP_INSTALLATION_ID))).thenReturn(Optional.of(appInstallationToken)); } - private GithubProjectCreator getExpectedGithubProjectCreator(AlmSettingDto almSettingDto, boolean isInstanceManaged, AccessToken accessToken) { + private GithubProjectCreator getExpectedGithubProjectCreator(boolean isInstanceManaged) { AppInstallationToken authAppInstallToken = isInstanceManaged ? authAppInstallationToken : null; return new GithubProjectCreator(dbClient, DEV_OPS_PROJECT, projectKeyGenerator, gitHubSettings, projectCreator, permissionService, permissionUpdater, managedProjectService, githubApplicationClient, |