diff options
| author | Lukasz Jarocki <lukasz.jarocki@sonarsource.com> | 2021-11-16 15:19:28 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2021-11-16 20:03:55 +0000 |
| commit | 769e6a497f24c71e3d11a711d5bd12f8cef413c5 (patch) | |
| tree | cbdb002b79aecaa9854ec3a72ff57ebe79c182dd /server | |
| parent | 6984a2e2db012d49ebbf7992b6a371f78fd9a3c7 (diff) | |
| download | sonarqube-769e6a497f24c71e3d11a711d5bd12f8cef413c5.tar.gz sonarqube-769e6a497f24c71e3d11a711d5bd12f8cef413c5.zip | |
SONAR-13427 implement ITs
Diffstat (limited to 'server')
4 files changed, 7 insertions, 5 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectBadgeTokenDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectBadgeTokenDao.java index 9565bf0a0a7..8a6a00d1eda 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectBadgeTokenDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/project/ProjectBadgeTokenDao.java @@ -65,5 +65,6 @@ public class ProjectBadgeTokenDao implements Dao { @CheckForNull public ProjectBadgeTokenDto selectTokenByProject(DbSession session, ProjectDto projectDto) { return mapper(session).selectTokenByProjectUuid(projectDto.getUuid()); + } } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java index 981f8a7b947..405cdef4dca 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/badge/ws/ProjectBadgesSupport.java @@ -40,6 +40,7 @@ public class ProjectBadgesSupport { private static final String PARAM_PROJECT = "project"; private static final String PARAM_BRANCH = "branch"; private static final String PARAM_TOKEN = "token"; + public static final String PROJECT_HAS_NOT_BEEN_FOUND = "Project has not been found"; private final ComponentFinder componentFinder; private final DbClient dbClient; @@ -83,7 +84,7 @@ public class ProjectBadgesSupport { return branch; } catch (NotFoundException e) { - throw new NotFoundException("Project has not been found"); + throw new NotFoundException(PROJECT_HAS_NOT_BEEN_FOUND); } } @@ -98,11 +99,11 @@ public class ProjectBadgesSupport { try { projectDto = componentFinder.getProjectOrApplicationByKey(dbSession, projectKey); } catch (NotFoundException e) { - throw new NotFoundException("Project has not been found"); + throw new NotFoundException(PROJECT_HAS_NOT_BEEN_FOUND); } String token = request.param(PARAM_TOKEN); if (projectDto.isPrivate() && !isTokenValid(dbSession, projectDto, token)) { - throw generateInvalidProjectException(); + throw new NotFoundException(PROJECT_HAS_NOT_BEEN_FOUND); } } } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java index e4e55bf1da3..e319a912e71 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/MeasureActionTest.java @@ -329,7 +329,7 @@ public class MeasureActionTest { .setParam("metric", metric.getKey()) .execute(); - checkError(response, "Project is invalid"); + checkError(response, "Project has not been found"); } @Test diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java index f139f890bf0..29fc9c9d4d2 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/badge/ws/QualityGateActionTest.java @@ -197,7 +197,7 @@ public class QualityGateActionTest { .setParam("project", project.getKey()) .execute(); - checkError(response, "Project is invalid"); + checkError(response, "Project has not been found"); } @Test |