From 0d46d49aa3494e2fecbd1979bbb1bdb3ef7452f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 12 May 2015 10:47:32 +0200 Subject: [PATCH] rename UserSession.login=>getLogin and UserSessionRule.logon=>login allow using the method name login() for the login action in UserSessionRule --- .../server/activity/ActivityService.java | 2 +- .../component/ws/ComponentAppAction.java | 2 +- .../server/component/ws/SearchAction.java | 2 +- .../dashboard/ws/DashboardsShowAction.java | 2 +- .../org/sonar/server/issue/ActionService.java | 2 +- .../issue/InternalRubyIssueService.java | 2 +- .../server/issue/IssueBulkChangeService.java | 2 +- .../server/issue/IssueCommentService.java | 6 +-- .../org/sonar/server/issue/IssueQuery.java | 4 +- .../sonar/server/issue/IssueQueryService.java | 2 +- .../org/sonar/server/issue/IssueService.java | 12 ++--- .../issue/actionplan/ActionPlanService.java | 2 +- .../issue/filter/IssueFilterService.java | 4 +- .../issue/filter/IssueFilterWriter.java | 2 +- .../sonar/server/issue/index/IssueIndex.java | 4 +- .../server/issue/ws/IssueActionsWriter.java | 2 +- .../server/issue/ws/IssueShowAction.java | 2 +- .../sonar/server/issue/ws/SearchAction.java | 6 +-- .../qualityprofile/QProfileProjectLookup.java | 2 +- .../ws/QProfileProjectsAction.java | 2 +- .../org/sonar/server/rule/RuleUpdater.java | 2 +- .../org/sonar/server/search/QueryContext.java | 4 +- .../ui/ws/ComponentNavigationAction.java | 4 +- .../server/ui/ws/GlobalNavigationAction.java | 2 +- .../server/user/AbstractUserSession.java | 8 +-- .../sonar/server/user/DefaultUserService.java | 2 +- .../server/user/ThreadLocalUserSession.java | 16 +++--- .../org/sonar/server/user/UserSession.java | 8 +-- .../server/user/ws/CurrentUserAction.java | 4 +- .../server/activity/ActivityServiceTest.java | 2 +- .../sonar/server/batch/IssuesActionTest.java | 14 ++--- .../ProjectRepositoryLoaderMediumTest.java | 54 +++++++++---------- .../sonar/server/batch/UsersActionTest.java | 2 +- .../ComponentCleanerServiceMediumTest.java | 2 +- .../component/ComponentServiceMediumTest.java | 34 ++++++------ .../component/ws/ComponentAppActionTest.java | 4 +- .../server/component/ws/SearchActionTest.java | 12 ++--- .../sonar/server/issue/ActionServiceTest.java | 4 +- .../IssueBulkChangeServiceMediumTest.java | 4 +- .../issue/IssueChangelogServiceTest.java | 2 +- .../issue/IssueCommentServiceMediumTest.java | 4 +- .../server/issue/IssueCommentServiceTest.java | 2 +- .../server/issue/IssueServiceMediumTest.java | 40 +++++++------- .../server/issue/filter/AppActionTest.java | 8 +-- .../issue/filter/FavoritesActionTest.java | 4 +- .../server/issue/filter/ShowActionTest.java | 4 +- .../server/issue/index/IssueIndexTest.java | 20 +++---- .../issue/ws/IssueActionsWriterTest.java | 12 ++--- .../server/issue/ws/IssueShowActionTest.java | 6 +-- .../ws/SearchActionComponentsMediumTest.java | 12 ++--- .../issue/ws/SearchActionMediumTest.java | 20 +++---- .../InternalPermissionServiceMediumTest.java | 8 +-- ...InternalPermissionTemplateServiceTest.java | 4 +- .../PermissionTemplateUpdaterTest.java | 4 +- .../platform/ws/SystemInfoWsActionTest.java | 2 +- .../QProfileProjectOperationsMediumTest.java | 2 +- .../QProfileServiceMediumTest.java | 20 +++---- .../QProfileChangeParentActionMediumTest.java | 4 +- .../ws/QProfileCopyActionTest.java | 10 ++-- .../ws/QProfileCreateActionMediumTest.java | 6 +-- .../ws/QProfileCreateActionTest.java | 2 +- .../ws/QProfileDeleteActionTest.java | 16 +++--- .../ws/QProfileProjectsActionTest.java | 2 +- .../ws/QProfileRenameActionTest.java | 12 ++--- .../ws/QProfileRestoreActionTest.java | 6 +-- .../ws/QProfileSetDefaultActionTest.java | 10 ++-- .../ws/QProfilesWsMediumTest.java | 2 +- .../server/rule/RegisterRulesMediumTest.java | 6 +-- .../server/rule/RuleServiceMediumTest.java | 12 ++--- .../server/rule/RuleUpdaterMediumTest.java | 2 +- .../rule/ws/CreateActionMediumTest.java | 2 +- .../server/rule/ws/ShowActionMediumTest.java | 2 +- .../rule/ws/UpdateActionMediumTest.java | 2 +- .../sonar/server/search/QueryContextTest.java | 2 +- .../server/source/ws/HashActionTest.java | 8 +-- .../server/source/ws/LinesActionTest.java | 12 ++--- .../server/tester/MockUserSessionTest.java | 4 +- .../sonar/server/tester/UserSessionRule.java | 33 ++++++------ .../ui/ws/ComponentNavigationActionTest.java | 14 ++--- .../ui/ws/GlobalNavigationActionTest.java | 6 +-- .../server/user/DefaultUserServiceTest.java | 8 +-- .../server/user/RubyUserSessionTest.java | 16 +++--- .../server/user/ServerUserSessionTest.java | 2 +- .../user/ThreadLocalUserSessionTest.java | 8 +-- .../user/ws/ChangePasswordActionTest.java | 4 +- .../server/user/ws/CreateActionTest.java | 6 +-- .../server/user/ws/CurrentUserActionTest.java | 2 +- .../server/user/ws/DeactivateActionTest.java | 6 +-- .../server/user/ws/UpdateActionTest.java | 4 +- .../view/index/ViewIndexerMediumTest.java | 2 +- 90 files changed, 327 insertions(+), 326 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java index 81d7779ada4..d08a36ff518 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java @@ -43,7 +43,7 @@ public class ActivityService { public void save(Activity activity) { ActivityDto dto = new ActivityDto() .setKey(Uuids.create()) - .setAuthor(userSession.login()) + .setAuthor(userSession.getLogin()) .setAction(activity.getAction()) .setMessage(activity.getMessage()) .setData(KeyValueFormat.format(activity.getData())) diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java index 83aa5dd8f1d..8566ea5848c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java @@ -121,7 +121,7 @@ public class ComponentAppAction implements RequestHandler { List propertyDtos = dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() .setKey("favourite") .setComponentId(component.getId()) - .setUserId(userSession.userId()) + .setUserId(userSession.getUserId()) .build(), session ); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java index 2ac0799b78b..1ba691ccae6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java @@ -95,7 +95,7 @@ public class SearchAction implements RequestHandler { userSession.checkProjectUuidPermission(UserRole.USER, componentDto.projectUuid()); Set projectIds = newLinkedHashSet(dbClient.componentIndexDao().selectProjectIdsFromQueryAndViewOrSubViewUuid(session, query, componentDto.uuid())); - Collection authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.userId(), UserRole.USER); + Collection authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.getUserId(), UserRole.USER); SearchOptions options = new SearchOptions(); options.setPage(request.mandatoryParamAsInt(PAGE), request.mandatoryParamAsInt(PAGE_SIZE)); diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java index 1c053863f4b..71e26c747dd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java @@ -62,7 +62,7 @@ public class DashboardsShowAction implements DashboardsAction { public void handle(Request request, Response response) throws Exception { DbSession dbSession = dbClient.openSession(false); try { - Integer userId = userSession.userId(); + Integer userId = userSession.getUserId(); DashboardDto dashboard = dbClient.dashboardDao().getAllowedByKey(dbSession, request.mandatoryParamAsLong(PARAM_KEY), userId != null ? userId.longValue() : null); if (dashboard == null) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java index d6f46b7dd0c..056d6e75575 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java @@ -110,7 +110,7 @@ public class ActionService { throw new IllegalStateException("A condition is not respected"); } - IssueChangeContext changeContext = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext changeContext = IssueChangeContext.createUser(new Date(), userSession.getLogin()); Component project = dbClient.componentDao().getByKey(session, issue.projectKey()); FunctionContext functionContext = new FunctionContext(issue, updater, changeContext, getProjectSettings(project)); for (Function function : action.functions()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java index f6f0058ad10..38d3594632d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java @@ -352,7 +352,7 @@ public class InternalRubyIssueService { if (result.ok()) { DefaultActionPlan actionPlan = DefaultActionPlan.create(name) .setDescription(description) - .setUserLogin(userSession.login()) + .setUserLogin(userSession.getLogin()) .setDeadLine(deadLine); // Can only set project on creation diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java index 3737eb05dbd..e29eb8cde12 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java @@ -95,7 +95,7 @@ public class IssueBulkChangeService { Repository repository = new Repository(issues); List bulkActions = getActionsToApply(issueBulkChangeQuery, issues, userSession); - IssueChangeContext issueChangeContext = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext issueChangeContext = IssueChangeContext.createUser(new Date(), userSession.getLogin()); Set concernedProjects = new HashSet<>(); for (Issue issue : issues) { ActionContext actionContext = new ActionContext(issue, issueChangeContext); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java index 8e1af0d3916..34cedf47052 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java @@ -97,7 +97,7 @@ public class IssueCommentService { DbSession session = dbClient.openSession(false); try { DefaultIssue issue = issueService.getByKeyForUpdate(session, issueKey).toDefaultIssue(); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); updater.addComment(issue, text, context); issueService.saveIssue(session, issue, context, text); @@ -118,7 +118,7 @@ public class IssueCommentService { if (comment == null) { throw new NotFoundException("Comment not found: " + commentKey); } - if (Strings.isNullOrEmpty(comment.userLogin()) || !Objects.equal(comment.userLogin(), userSession.login())) { + if (Strings.isNullOrEmpty(comment.userLogin()) || !Objects.equal(comment.userLogin(), userSession.getLogin())) { throw new ForbiddenException("You can only delete your own comments"); } @@ -137,7 +137,7 @@ public class IssueCommentService { if (comment == null) { throw new NotFoundException("Comment not found: " + commentKey); } - if (Strings.isNullOrEmpty(comment.userLogin()) || !Objects.equal(comment.userLogin(), userSession.login())) { + if (Strings.isNullOrEmpty(comment.userLogin()) || !Objects.equal(comment.userLogin(), userSession.getLogin())) { throw new ForbiddenException("You can only edit your own comments"); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java index efe306caf7c..26c35fe6d8c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java @@ -321,8 +321,8 @@ public class IssueQuery { private boolean checkAuthorization = true; private Builder(UserSession userSession) { - this.userLogin = userSession.login(); - this.userGroups = userSession.userGroups(); + this.userLogin = userSession.getLogin(); + this.userGroups = userSession.getUserGroups(); } public Builder issueKeys(@Nullable Collection l) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java index 16220ab9603..f6923d6fa76 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java @@ -214,7 +214,7 @@ public class IssueQueryService { assignees.addAll(assigneesFromParams); } if (assignees.contains(LOGIN_MYSELF)) { - String login = userSession.login(); + String login = userSession.getLogin(); if (login == null) { assignees.add(UNKNOWN); } else { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index e73c04426f6..3f5489fccbf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -152,7 +152,7 @@ public class IssueService { DbSession session = dbClient.openSession(false); try { DefaultIssue defaultIssue = getByKeyForUpdate(session, issueKey).toDefaultIssue(); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); checkTransitionPermission(transitionKey, userSession, defaultIssue); if (workflow.doTransition(defaultIssue, transitionKey, context)) { saveIssue(session, defaultIssue, context, null); @@ -187,7 +187,7 @@ public class IssueService { throw new NotFoundException("Unknown user: " + assignee); } } - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); if (issueUpdater.assign(issue, user, context)) { saveIssue(session, issue, context, null); } @@ -212,7 +212,7 @@ public class IssueService { } DefaultIssue issue = getByKeyForUpdate(session, issueKey).toDefaultIssue(); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); if (issueUpdater.plan(issue, actionPlan, context)) { saveIssue(session, issue, context, null); } @@ -231,7 +231,7 @@ public class IssueService { DefaultIssue issue = getByKeyForUpdate(session, issueKey).toDefaultIssue(); userSession.checkProjectPermission(UserRole.ISSUE_ADMIN, issue.projectKey()); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); if (issueUpdater.setManualSeverity(issue, severity, context)) { saveIssue(session, issue, context, null); } @@ -267,7 +267,7 @@ public class IssueService { .severity(Objects.firstNonNull(severity, Severity.MAJOR)) .effortToFix(effortToFix) .ruleKey(ruleKey) - .reporter(userSession.login()) + .reporter(userSession.getLogin()) .assignee(findSourceLineUser(component.uuid(), line)) .build(); @@ -346,7 +346,7 @@ public class IssueService { DbSession session = dbClient.openSession(false); try { DefaultIssue issue = getByKeyForUpdate(session, issueKey).toDefaultIssue(); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); if (issueUpdater.setTags(issue, tags, context)) { saveIssue(session, issue, context, null); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java index d71d9c3d5cf..1d7299a8a20 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java @@ -104,7 +104,7 @@ public class ActionPlanService { */ private void unplanIssues(DefaultActionPlan actionPlan, UserSession userSession) { List dtos = findIssuesByActionPlan(actionPlan.key()); - IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login()); + IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin()); List issues = newArrayList(); for (IssueDto issueDto : dtos) { DefaultIssue issue = issueDto.toDefaultIssue(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java index 8b8909c4edc..a7e6e9d0ee0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java @@ -213,14 +213,14 @@ public class IssueFilterService { public boolean canShareFilter(UserSession userSession) { if (userSession.isLoggedIn()) { - String user = userSession.login(); + String user = userSession.getLogin(); return hasUserSharingPermission(user); } return false; } public String getLoggedLogin(UserSession userSession) { - String user = userSession.login(); + String user = userSession.getLogin(); if (!userSession.isLoggedIn()) { throw new UnauthorizedException("User is not logged in"); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java index 8308be1b662..064cc2e5caa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java @@ -44,7 +44,7 @@ public class IssueFilterWriter { private boolean canModifyFilter(UserSession session, IssueFilterDto filter) { return session.isLoggedIn() && - (StringUtils.equals(filter.getUserLogin(), session.login()) || session.hasGlobalPermission(GlobalPermissions.SYSTEM_ADMIN)); + (StringUtils.equals(filter.getUserLogin(), session.getLogin()) || session.hasGlobalPermission(GlobalPermissions.SYSTEM_ADMIN)); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java index 5a6930663a5..b73dc7a7a0b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java @@ -521,7 +521,7 @@ public class IssueIndex extends BaseIndex { } private void addAssignedToMeFacetIfNeeded(SearchRequestBuilder builder, SearchOptions options, IssueQuery query, Map filters, QueryBuilder queryBuilder) { - String login = userSession.login(); + String login = userSession.getLogin(); if (!options.getFacets().contains(IssueFilterParameters.FACET_ASSIGNED_TO_ME) || StringUtils.isEmpty(login)) { return; @@ -713,7 +713,7 @@ public class IssueIndex extends BaseIndex { */ public Iterator selectIssuesForBatch(ComponentDto component) { BoolFilterBuilder filter = FilterBuilders.boolFilter() - .must(createAuthorizationFilter(true, userSession.login(), userSession.userGroups())) + .must(createAuthorizationFilter(true, userSession.getLogin(), userSession.getUserGroups())) .mustNot(FilterBuilders.termsFilter(IssueIndexDefinition.FIELD_ISSUE_STATUS, Issue.STATUS_CLOSED)); switch (component.scope()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java index 2db4b0b35ef..a165eeaa5c1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java @@ -66,7 +66,7 @@ public class IssueActionsWriter { private List actions(Issue issue) { List actions = newArrayList(); - String login = userSession.login(); + String login = userSession.getLogin(); if (login != null) { actions.add("comment"); if (issue.resolution() == null) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java index 3e0a84f26a6..93d94ccada8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java @@ -191,7 +191,7 @@ public class IssueShowAction implements BaseIssuesWsAction { private void writeComments(Issue issue, JsonWriter json) { json.name("comments").beginArray(); - String login = userSession.login(); + String login = userSession.getLogin(); Map usersByLogin = newHashMap(); List comments = commentService.findComments(issue.key()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java index 87f867b01a8..2956de30133 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -343,7 +343,7 @@ public class SearchAction implements BaseIssuesWsAction { collectFacetsData(request, result, projectUuids, componentUuids, userLogins, actionPlanKeys); if (userSession.isLoggedIn()) { - userLogins.add(userSession.login()); + userLogins.add(userSession.getLogin()); } DbSession session = dbClient.openSession(false); @@ -418,7 +418,7 @@ public class SearchAction implements BaseIssuesWsAction { assignees.remove(IssueQueryService.LOGIN_MYSELF); } addMandatoryFacetValues(results, IssueFilterParameters.ASSIGNEES, assignees); - addMandatoryFacetValues(results, IssueFilterParameters.FACET_ASSIGNED_TO_ME, Arrays.asList(userSession.login())); + addMandatoryFacetValues(results, IssueFilterParameters.FACET_ASSIGNED_TO_ME, Arrays.asList(userSession.getLogin())); addMandatoryFacetValues(results, IssueFilterParameters.REPORTERS, request.paramAsStrings(IssueFilterParameters.REPORTERS)); addMandatoryFacetValues(results, IssueFilterParameters.RULES, request.paramAsStrings(IssueFilterParameters.RULES)); addMandatoryFacetValues(results, IssueFilterParameters.LANGUAGES, request.paramAsStrings(IssueFilterParameters.LANGUAGES)); @@ -574,7 +574,7 @@ public class SearchAction implements BaseIssuesWsAction { private void writeIssueComments(Collection issueComments, Map usersByLogin, JsonWriter json) { if (!issueComments.isEmpty()) { json.name("comments").beginArray(); - String login = userSession.login(); + String login = userSession.getLogin(); for (IssueComment comment : issueComments) { String userLogin = comment.userLogin(); User user = userLogin != null ? usersByLogin.get(userLogin) : null; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java index 31b4ca2c400..a4ca8e3f1be 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java @@ -60,7 +60,7 @@ public class QProfileProjectLookup { } List result = Lists.newArrayList(); - Collection authorizedProjectKeys = db.authorizationDao().selectAuthorizedRootProjectsKeys(userSession.userId(), UserRole.USER); + Collection authorizedProjectKeys = db.authorizationDao().selectAuthorizedRootProjectsKeys(userSession.getUserId(), UserRole.USER); for (Map.Entry entry : componentsByKeys.entrySet()) { if (authorizedProjectKeys.contains(entry.getKey())) { result.add(entry.getValue()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java index 7b9f8cbf516..aabf7126c45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java @@ -118,7 +118,7 @@ public class QProfileProjectsAction implements BaseQProfileWsAction { } }); - final Collection authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.userId(), UserRole.USER); + final Collection authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.getUserId(), UserRole.USER); Iterable authorizedProjects = Iterables.filter(projects, new Predicate() { @Override public boolean apply(ProjectQprofileAssociationDto input) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java index 4e715408d05..e9e2200f6d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java @@ -252,7 +252,7 @@ public class RuleUpdater { context.rule.setNoteData(update.getMarkdownNote()); context.rule.setNoteCreatedAt(context.rule.getNoteCreatedAt() != null ? context.rule.getNoteCreatedAt() : now); context.rule.setNoteUpdatedAt(now); - context.rule.setNoteUserLogin(userSession.login()); + context.rule.setNoteUserLogin(userSession.getLogin()); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java b/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java index 8e24491b345..cc881eee494 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java @@ -51,8 +51,8 @@ public class QueryContext { private Set userGroups = newHashSet(); public QueryContext(UserSession userSession) { - this.userLogin = userSession.login(); - this.userGroups = userSession.userGroups(); + this.userLogin = userSession.getLogin(); + this.userGroups = userSession.getUserGroups(); } /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java index 75fdda425da..dfa22076e81 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java @@ -136,7 +136,7 @@ public class ComponentNavigationAction implements NavigationAction { .prop("canBeFavorite", userSession.isLoggedIn()) .prop("isFavorite", isFavourite(session, component, userSession)); - List dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, userSession.login()); + List dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, userSession.getLogin()); if (dashboards.isEmpty()) { dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, ANONYMOUS); } @@ -153,7 +153,7 @@ public class ComponentNavigationAction implements NavigationAction { private boolean isFavourite(DbSession session, ComponentDto component, UserSession userSession) { PropertyQuery propertyQuery = PropertyQuery.builder() - .setUserId(userSession.userId()) + .setUserId(userSession.getUserId()) .setKey("favourite") .setComponentId(component.getId()) .build(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java index 95f7a80f502..3c8ae6b9a36 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java @@ -65,7 +65,7 @@ public class GlobalNavigationAction implements NavigationAction { @Override public void handle(Request request, Response response) throws Exception { - List dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(userSession.login()); + List dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(userSession.getLogin()); if (dashboards.isEmpty()) { dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(ANONYMOUS); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java index e83ed9b046b..8c91da19730 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java @@ -60,7 +60,7 @@ public abstract class AbstractUserSession impleme @Override @CheckForNull - public String login() { + public String getLogin() { return login; } @@ -71,7 +71,7 @@ public abstract class AbstractUserSession impleme @Override @CheckForNull - public String name() { + public String getName() { return name; } @@ -82,7 +82,7 @@ public abstract class AbstractUserSession impleme @Override @CheckForNull - public Integer userId() { + public Integer getUserId() { return userId; } @@ -92,7 +92,7 @@ public abstract class AbstractUserSession impleme } @Override - public Set userGroups() { + public Set getUserGroups() { return userGroups; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java b/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java index 3655ee6661d..ac4aaeabf07 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java @@ -111,7 +111,7 @@ public class DefaultUserService implements RubyUserService { throw new BadRequestException("Login is missing"); } userSession.checkGlobalPermission(GlobalPermissions.SYSTEM_ADMIN); - if (Objects.equal(userSession.login(), login)) { + if (Objects.equal(userSession.getLogin(), login)) { throw new BadRequestException("Self-deactivation is not possible"); } userUpdater.deactivateUserByLogin(login); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java index 2a8b84e1782..70fe607e913 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java @@ -51,25 +51,25 @@ public class ThreadLocalUserSession implements UserSession { @Override @CheckForNull - public String login() { - return get().login(); + public String getLogin() { + return get().getLogin(); } @Override @CheckForNull - public String name() { - return get().name(); + public String getName() { + return get().getName(); } @Override @CheckForNull - public Integer userId() { - return get().userId(); + public Integer getUserId() { + return get().getUserId(); } @Override - public Set userGroups() { - return get().userGroups(); + public Set getUserGroups() { + return get().getUserGroups(); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java index 9e683613dfd..64a7b3f6d0e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java @@ -27,15 +27,15 @@ import javax.annotation.Nullable; public interface UserSession { @CheckForNull - String login(); + String getLogin(); @CheckForNull - String name(); + String getName(); @CheckForNull - Integer userId(); + Integer getUserId(); - Set userGroups(); + Set getUserGroups(); boolean isLoggedIn(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java index 0b28b42bb75..037f5deb12f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java @@ -54,8 +54,8 @@ public class CurrentUserAction implements BaseUsersWsAction { private void writeUserDetails(JsonWriter json, UserSession session) { json.prop("isLoggedIn", session.isLoggedIn()) - .prop("login", session.login()) - .prop("name", session.name()); + .prop("login", session.getLogin()) + .prop("name", session.getName()); writePermissions(json, session); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java index b4de673212e..c2bb32d8197 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java @@ -49,7 +49,7 @@ public class ActivityServiceTest { @ClassRule public static EsTester es = new EsTester().addDefinitions(new ActivityIndexDefinition(new Settings())); @Rule - public UserSessionRule userSession = UserSessionRule.standalone().logon(); + public UserSessionRule userSession = UserSessionRule.standalone().login(); System2 system = mock(System2.class); ActivityService service; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java index 691cd7802f1..95ee7c4603e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java @@ -125,7 +125,7 @@ public class IssuesActionTest { .setChecksum(null) .setAssignee(null)); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY); @@ -164,7 +164,7 @@ public class IssuesActionTest { .setChecksum("123456") .setAssignee("john")); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY); @@ -203,7 +203,7 @@ public class IssuesActionTest { .setChecksum("123456") .setAssignee("john")); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", MODULE_KEY); ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output())); @@ -241,7 +241,7 @@ public class IssuesActionTest { .setChecksum("123456") .setAssignee("john")); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", FILE_KEY); ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output())); @@ -278,7 +278,7 @@ public class IssuesActionTest { .setChecksum("123456") .setAssignee("john")); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", MODULE_KEY); ServerIssue previousIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output())); @@ -317,7 +317,7 @@ public class IssuesActionTest { .setChecksum("123456") .setAssignee("john")); - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY); ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output())); @@ -328,7 +328,7 @@ public class IssuesActionTest { @Test(expected = ForbiddenException.class) public void fail_without_preview_permission() throws Exception { - userSessionRule.logon("henry").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PROVISIONING); WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY); request.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java index d3901cf98fd..8b1e5e25166 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java @@ -89,7 +89,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_project_settings() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -113,7 +113,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void not_returned_secured_settings_with_only_preview_permission() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION).addProjectUuidPermissions(UserRole.USER, project.uuid()); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION).addProjectUuidPermissions(UserRole.USER, project.uuid()); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -136,7 +136,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_project_with_module_settings() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -172,7 +172,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_project_with_module_settings_inherited_from_project() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -203,7 +203,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_project_with_module_with_sub_module() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -251,7 +251,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_project_with_two_modules() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -296,7 +296,7 @@ public class ProjectRepositoryLoaderMediumTest { public void return_provisioned_project_settings() { // No snapshot attached on the project -> provisioned project ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -326,7 +326,7 @@ public class ProjectRepositoryLoaderMediumTest { // No module properties ComponentDto subModule = ComponentTesting.newModuleDto(module); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, subModule); // Sub module properties @@ -362,7 +362,7 @@ public class ProjectRepositoryLoaderMediumTest { tester.get(DbClient.class).propertiesDao().setProperty(new PropertyDto().setKey("sonar.jira.login.secured").setValue("john").setResourceId(module.getId()), dbSession); ComponentDto subModule = ComponentTesting.newModuleDto(module); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, subModule); // Sub module properties @@ -396,7 +396,7 @@ public class ProjectRepositoryLoaderMediumTest { // No module property ComponentDto subModule = ComponentTesting.newModuleDto(module); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, subModule); // No sub module property @@ -429,7 +429,7 @@ public class ProjectRepositoryLoaderMediumTest { tester.get(DbClient.class).propertiesDao().setProperty(new PropertyDto().setKey("sonar.jira.project.key").setValue("SONAR-SERVER").setResourceId(module.getId()), dbSession); ComponentDto subModule = ComponentTesting.newModuleDto(module); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, subModule); // No sub module property @@ -450,7 +450,7 @@ public class ProjectRepositoryLoaderMediumTest { Date ruleUpdatedAt = DateUtils.parseDateTime("2014-01-14T13:00:00+0100"); ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -474,7 +474,7 @@ public class ProjectRepositoryLoaderMediumTest { Date ruleUpdatedAt = DateUtils.parseDateTime("2014-01-14T13:00:00+0100"); ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -497,7 +497,7 @@ public class ProjectRepositoryLoaderMediumTest { Date ruleUpdatedAt = DateUtils.parseDateTime("2014-01-14T13:00:00+0100"); ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -517,7 +517,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_quality_profiles_even_when_project_does_not_exists() { - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); Date ruleUpdatedAt = DateUtils.parseDateTime("2014-01-14T13:00:00+0100"); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -541,7 +541,7 @@ public class ProjectRepositoryLoaderMediumTest { // No snapshot attached on the project -> provisioned project ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -563,7 +563,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void fail_when_no_quality_profile_for_a_language() { ComponentDto project = ComponentTesting.newProjectDto().setKey("org.codehaus.sonar:sonar"); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); dbSession.commit(); @@ -578,7 +578,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_active_rules() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -613,7 +613,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_only_active_rules_from_project_profile() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); RuleKey ruleKey1 = RuleKey.of("squid", "AvoidCycle"); @@ -651,7 +651,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_more_than_10_active_rules() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd") @@ -675,7 +675,7 @@ public class ProjectRepositoryLoaderMediumTest { Date ruleUpdatedAt = DateUtils.parseDateTime("2014-01-14T13:00:00+0100"); ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); QualityProfileDto profileDto = QProfileTesting.newDto(QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt( @@ -705,7 +705,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_manual_rules() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -725,7 +725,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void fail_if_no_permission() { - userSessionRule.logon("john").setGlobalPermissions(); + userSessionRule.login("john").setGlobalPermissions(); ComponentDto project = ComponentTesting.newProjectDto(); tester.get(DbClient.class).componentDao().insert(dbSession, project); @@ -741,7 +741,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void fail_when_not_preview_and_only_dry_run_permission() { - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); ComponentDto project = ComponentTesting.newProjectDto(); tester.get(DbClient.class).componentDao().insert(dbSession, project); @@ -760,7 +760,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_file_data_from_single_project() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -779,7 +779,7 @@ public class ProjectRepositoryLoaderMediumTest { @Test public void return_file_data_from_multi_modules() { ComponentDto project = ComponentTesting.newProjectDto(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, project); addDefaultProfile(); @@ -815,7 +815,7 @@ public class ProjectRepositoryLoaderMediumTest { tester.get(FileSourceDao.class).insert(newFileSourceDto(projectFile).setSrcHash("123456")); ComponentDto module = ComponentTesting.newModuleDto(project); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); tester.get(DbClient.class).componentDao().insert(dbSession, module); // File on module diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java index b7ef762d0fb..43c000cafae 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java @@ -69,7 +69,7 @@ public class UsersActionTest { new UserDoc().setLogin("ada.lovelace").setName("Ada Lovelace").setActive(false), new UserDoc().setLogin("grace.hopper").setName("Grace Hopper").setActive(true)); - userSessionRule.logon("sonarqtech").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); + userSessionRule.login("sonarqtech").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION); WsTester.TestRequest request = tester.newGetRequest("batch", "users").setParam("logins", "ada.lovelace,grace.hopper"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceMediumTest.java index 4ef69979085..e1d3b0dbfb8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceMediumTest.java @@ -95,7 +95,7 @@ public class ComponentCleanerServiceMediumTest { // project can be seen by anyone session.commit(); - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); assertThat(countIssueAuthorizationDocs()).isEqualTo(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java index e3176625da2..0c70e06c6ee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java @@ -110,7 +110,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); service.updateKey(project.key(), "sample2:root"); session.commit(); @@ -134,7 +134,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); service.updateKey(module.key(), "sample:root2:module"); session.commit(); @@ -157,7 +157,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, provisionedProject.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, provisionedProject.uuid()); service.updateKey(provisionedProject.key(), "provisionedProject2"); session.commit(); @@ -169,7 +169,7 @@ public class ComponentServiceMediumTest { @Test(expected = ForbiddenException.class) public void fail_to_update_project_key_without_admin_permission() { ComponentDto project = createProject("sample:root"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, project.uuid()); service.updateKey(project.key(), "sample2:root"); } @@ -184,7 +184,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); Map result = service.checkModuleKeysBeforeRenaming(project.key(), "sample", "sample2"); assertThat(result).hasSize(2); @@ -203,7 +203,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); Map result = service.checkModuleKeysBeforeRenaming(project.key(), "sample:root", "foo"); assertThat(result).hasSize(2); @@ -214,7 +214,7 @@ public class ComponentServiceMediumTest { @Test(expected = ForbiddenException.class) public void fail_to_check_module_keys_before_renaming_without_admin_permission() { ComponentDto project = createProject("sample:root"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, project.uuid()); service.checkModuleKeysBeforeRenaming(project.key(), "sample", "sample2"); } @@ -229,7 +229,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, project.uuid()); service.bulkUpdateKey(project.key(), "sample", "sample2"); session.commit(); @@ -253,7 +253,7 @@ public class ComponentServiceMediumTest { session.commit(); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ADMIN, provisionedProject.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ADMIN, provisionedProject.uuid()); service.bulkUpdateKey(provisionedProject.key(), "provisionedProject", "provisionedProject2"); session.commit(); @@ -265,14 +265,14 @@ public class ComponentServiceMediumTest { @Test(expected = ForbiddenException.class) public void fail_to_bulk_update_project_key_without_admin_permission() { ComponentDto project = createProject("sample:root"); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); service.bulkUpdateKey("sample:root", "sample", "sample2"); } @Test public void create_project() { executeStartupTasksToCreateDefaultPermissionTemplate(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); String key = service.create(NewComponent.create("struts", "Struts project")); @@ -293,7 +293,7 @@ public class ComponentServiceMediumTest { @Test public void create_new_project_with_branch() { executeStartupTasksToCreateDefaultPermissionTemplate(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); String key = service.create(NewComponent.create("struts", "Struts project").setBranch("origin/branch")); @@ -305,7 +305,7 @@ public class ComponentServiceMediumTest { @Test public void create_view() { executeStartupTasksToCreateDefaultPermissionTemplate(); - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); String key = service.create(NewComponent.create("all-project", "All Projects").setQualifier(Qualifiers.VIEW)); @@ -325,7 +325,7 @@ public class ComponentServiceMediumTest { @Test public void fail_to_create_new_component_on_invalid_key() { - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); try { service.create(NewComponent.create("struts?parent", "Struts project")); @@ -338,7 +338,7 @@ public class ComponentServiceMediumTest { @Test public void fail_to_create_new_component_on_invalid_branch() { - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); try { service.create(NewComponent.create("struts", "Struts project").setBranch("origin?branch")); @@ -351,7 +351,7 @@ public class ComponentServiceMediumTest { @Test public void fail_to_create_new_component_if_key_already_exists() { - userSessionRule.logon("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); + userSessionRule.login("john").setGlobalPermissions(GlobalPermissions.PROVISIONING); ComponentDto project = ComponentTesting.newProjectDto().setKey("struts"); tester.get(ComponentDao.class).insert(session, project); @@ -408,7 +408,7 @@ public class ComponentServiceMediumTest { session.commit(); // project can be seen by anyone - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); return project; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java index 81b374179f5..815f60ca464 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java @@ -109,7 +109,7 @@ public class ComponentAppActionTest { @Test public void app() throws Exception { - userSessionRule.logon("john").addComponentPermission(UserRole.USER, SUB_PROJECT_KEY, COMPONENT_KEY); + userSessionRule.login("john").addComponentPermission(UserRole.USER, SUB_PROJECT_KEY, COMPONENT_KEY); ComponentDto project = newProject(); ComponentDto file = ComponentTesting.newFileDto(project) @@ -194,7 +194,7 @@ public class ComponentAppActionTest { @Test public void fail_on_unknown_component() { - userSessionRule.logon("john").addComponentPermission(UserRole.USER, SUB_PROJECT_KEY, COMPONENT_KEY); + userSessionRule.login("john").addComponentPermission(UserRole.USER, SUB_PROJECT_KEY, COMPONENT_KEY); when(componentDao.getNullableByUuid(session, COMPONENT_UUID)).thenReturn(null); try { diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index 6a13468a02e..c63ff362391 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -61,7 +61,7 @@ public class SearchActionTest { @Test public void return_projects_from_view() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "EFGH").setParam("q", "st"); request.execute().assertJson(getClass(), "return_projects_from_view.json"); @@ -70,7 +70,7 @@ public class SearchActionTest { @Test public void return_projects_from_subview() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("john").addComponentUuidPermission(UserRole.USER, "EFGH", "FGHI"); + userSessionRule.login("john").addComponentUuidPermission(UserRole.USER, "EFGH", "FGHI"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "FGHI").setParam("q", "st"); request.execute().assertJson(getClass(), "return_projects_from_subview.json"); @@ -79,7 +79,7 @@ public class SearchActionTest { @Test public void return_only_authorized_projects_from_view() throws Exception { dbTester.prepareDbUnit(getClass(), "return_only_authorized_projects_from_view.xml"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "EFGH").setParam("q", "st"); request.execute().assertJson(getClass(), "return_only_authorized_projects_from_view.json"); @@ -88,7 +88,7 @@ public class SearchActionTest { @Test public void return_paged_result() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "EFGH").setParam("q", "st").setParam("p", "2").setParam("ps", "1"); request.execute().assertJson(getClass(), "return_paged_result.json"); @@ -97,7 +97,7 @@ public class SearchActionTest { @Test public void return_only_first_page() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "EFGH").setParam("q", "st").setParam("p", "1").setParam("ps", "1"); request.execute().assertJson(getClass(), "return_only_first_page.json"); @@ -106,7 +106,7 @@ public class SearchActionTest { @Test public void fail_when_search_param_is_too_short() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, "EFGH"); WsTester.TestRequest request = tester.newGetRequest("api/components", "search").setParam("componentUuid", "EFGH").setParam("q", "s"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java index d94ff01ccd5..da1d066b796 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java @@ -110,7 +110,7 @@ public class ActionServiceTest { Function function = new TweetFunction(); UserSession userSession = mock(ThreadLocalUserSession.class); - when(userSession.login()).thenReturn("arthur"); + when(userSession.getLogin()).thenReturn("arthur"); when(componentDao.getByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class)); when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue); @@ -127,7 +127,7 @@ public class ActionServiceTest { Function function = new TweetFunction(); UserSession userSession = mock(ThreadLocalUserSession.class); - when(userSession.login()).thenReturn("arthur"); + when(userSession.getLogin()).thenReturn("arthur"); when(componentDao.getByKey(session, "struts")).thenReturn(new ComponentDto().setKey("struts")); when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue.setProjectKey("struts")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java index 6a6065e547c..bf6b9e8a2e4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java @@ -96,10 +96,10 @@ public class IssueBulkChangeServiceMediumTest { // project can be seen by anyone session.commit(); - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); - userSession = userSessionRule.logon("john") + userSession = userSessionRule.login("john") .addProjectPermissions(UserRole.USER, project.key()); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java index 914e2584e2c..7723f024513 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java @@ -87,7 +87,7 @@ public class IssueChangelogServiceTest { @Test public void format_diffs() { FieldDiffs diffs = new FieldDiffs().setUserLogin("arthur").setDiff("severity", "MAJOR", "BLOCKER"); - userSessionRule.logon(); + userSessionRule.login(); service.formatDiffs(diffs); verify(formatter).format(any(Locale.class), eq(diffs)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java index 2eb0a147625..f3978d66bf0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java @@ -93,10 +93,10 @@ public class IssueCommentServiceMediumTest { // project can be seen by anyone session.commit(); - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); - userSessionRule.logon("gandalf"); + userSessionRule.login("gandalf"); session.commit(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java index 456a53d0a6e..49f18628b80 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java @@ -80,7 +80,7 @@ public class IssueCommentServiceTest { @Rule public ExpectedException throwable = ExpectedException.none(); @Rule - public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + public UserSessionRule userSessionRule = UserSessionRule.standalone().login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); @Before public void setUp() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index 494dc0f8597..47495438706 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -157,7 +157,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project).setStatus(Issue.STATUS_OPEN)); @@ -173,7 +173,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project)); @@ -194,7 +194,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project).setAssignee("perceval")); @@ -215,7 +215,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project)); @@ -232,7 +232,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project)); @@ -253,7 +253,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); String actionPlanKey = "EFGH"; db.actionPlanDao().save(new ActionPlanDto().setKey(actionPlanKey).setProjectId(project.getId())); @@ -271,7 +271,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project)); try { @@ -287,7 +287,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.ISSUE_ADMIN, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.ISSUE_ADMIN, project.key()); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project).setSeverity(Severity.BLOCKER)); @@ -302,7 +302,7 @@ public class IssueServiceMediumTest { public void create_manual_issue() { ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -328,7 +328,7 @@ public class IssueServiceMediumTest { newSourceLine(file, 1, "arthur"); createDefaultGroup(); newUser("arthur"); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -352,7 +352,7 @@ public class IssueServiceMediumTest { public void create_manual_issue_with_major_severity_when_no_severity() { ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -368,7 +368,7 @@ public class IssueServiceMediumTest { public void create_manual_issue_with_rule_name_when_no_message() { ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey").setName("Manual rule name"); tester.get(RuleDao.class).insert(session, manualRule); @@ -388,7 +388,7 @@ public class IssueServiceMediumTest { newSourceLine(file, 1, "unknown"); createDefaultGroup(); newUser("arthur"); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -406,7 +406,7 @@ public class IssueServiceMediumTest { ComponentDto file = newFile(project); // No author on line 1 newSourceLine(file, 1, ""); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -423,7 +423,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); try { service.createManualIssue(file.key(), rule.getKey(), null, "Fix it", null, 2d); @@ -437,7 +437,7 @@ public class IssueServiceMediumTest { public void fail_create_manual_issue_if_rule_does_not_exists() { ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john").addProjectPermissions(UserRole.USER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.USER, project.key()); service.createManualIssue(file.key(), RuleKey.of("rule", "unknown"), 10, "Fix it", null, 2d); } @@ -449,7 +449,7 @@ public class IssueServiceMediumTest { ComponentDto file = newFile(project); // User has not the 'user' role on the project - userSessionRule.logon("john").addProjectPermissions(UserRole.CODEVIEWER, project.key()); + userSessionRule.login("john").addProjectPermissions(UserRole.CODEVIEWER, project.key()); RuleDto manualRule = RuleTesting.newManualRule("manualRuleKey"); tester.get(RuleDao.class).insert(session, manualRule); @@ -492,7 +492,7 @@ public class IssueServiceMediumTest { RuleDto rule = newRule(); ComponentDto project = newProject(); ComponentDto file = newFile(project); - userSessionRule.logon("john"); + userSessionRule.login("john"); IssueDto issue = saveIssue(IssueTesting.newDto(rule, file, project)); @@ -570,12 +570,12 @@ public class IssueServiceMediumTest { ComponentDto project = ComponentTesting.newProjectDto(); tester.get(ComponentDao.class).insert(session, project); - userSessionRule.logon("admin").addProjectPermissions(UserRole.USER, project.key()).setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").addProjectPermissions(UserRole.USER, project.key()).setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); session.commit(); // project can be seen by group "anyone" tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); - userSessionRule.logon(); + userSessionRule.login(); return project; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java index ee80ba9d5a7..31821775dca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java @@ -62,14 +62,14 @@ public class AppActionTest { @Test public void logged_in_app() throws Exception { - userSessionRule.logon("eric").setUserId(123); + userSessionRule.login("eric").setUserId(123); tester.newGetRequest("api/issue_filters", "app").execute() .assertJson(getClass(), "logged_in_page.json"); } @Test public void logged_in_app_with_favorites() throws Exception { - userSessionRule.logon("eric").setUserId(123); + userSessionRule.login("eric").setUserId(123); when(service.findFavoriteFilters(userSessionRule)).thenReturn(Arrays.asList( new IssueFilterDto().setId(6L).setName("My issues"), new IssueFilterDto().setId(13L).setName("Blocker issues") @@ -80,7 +80,7 @@ public class AppActionTest { @Test public void logged_in_app_with_selected_filter() throws Exception { - userSessionRule.logon("eric").setUserId(123); + userSessionRule.login("eric").setUserId(123); when(service.find(13L, userSessionRule)).thenReturn( new IssueFilterDto().setId(13L).setName("Blocker issues").setData("severity=BLOCKER").setUserLogin("eric") ); @@ -92,7 +92,7 @@ public class AppActionTest { @Test public void app_selected_filter_can_not_be_modified() throws Exception { // logged-in user is 'eric' but filter is owned by 'simon' - userSessionRule.logon("eric").setUserId(123).setGlobalPermissions("none"); + userSessionRule.login("eric").setUserId(123).setGlobalPermissions("none"); when(service.find(13L, userSessionRule)).thenReturn( new IssueFilterDto().setId(13L).setName("Blocker issues").setData("severity=BLOCKER").setUserLogin("simon").setShared(true) ); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java index f65c6cc731c..bc03da1f778 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java @@ -57,7 +57,7 @@ public class FavoritesActionTest { @Test public void favorites_of_anonymous() throws Exception { - userSessionRule.logon(); + userSessionRule.login(); tester.newGetRequest("api/issue_filters", "favorites").execute() .assertJson("{\"favoriteFilters\": []}"); @@ -65,7 +65,7 @@ public class FavoritesActionTest { @Test public void favorites_of_logged_in_user() throws Exception { - userSessionRule.logon("eric").setUserId(123); + userSessionRule.login("eric").setUserId(123); when(service.findFavoriteFilters(userSessionRule)).thenReturn(Arrays.asList( new IssueFilterDto().setId(13L).setName("Blocker issues").setData("severity=BLOCKER").setUserLogin("simon").setShared(true) )); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java index bf7eff3a078..392736f87fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java @@ -59,7 +59,7 @@ public class ShowActionTest { @Test public void show_filter() throws Exception { // logged-in user is 'eric' but filter is owned by 'simon' - userSessionRule.logon("eric").setUserId(123).setGlobalPermissions("none"); + userSessionRule.login("eric").setUserId(123).setGlobalPermissions("none"); when(service.find(13L, userSessionRule)).thenReturn( new IssueFilterDto().setId(13L).setName("Blocker issues").setDescription("All Blocker Issues").setData("severity=BLOCKER").setUserLogin("simon").setShared(true) ); @@ -70,7 +70,7 @@ public class ShowActionTest { @Test public void show_unknown_filter() throws Exception { - userSessionRule.logon("eric").setUserId(123).setGlobalPermissions("none"); + userSessionRule.login("eric").setUserId(123).setGlobalPermissions("none"); when(service.find(42L, userSessionRule)).thenThrow(new NotFoundException("Filter 42 does not exist")); try { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java index 01ef670374a..9bb25207e18 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java @@ -1122,19 +1122,19 @@ public class IssueIndexTest { // project3 can be seen by nobody indexIssue(IssueTesting.newDoc("ISSUE3", file3), null, null); - userSessionRule.logon().setUserGroups("sonar-users"); + userSessionRule.login().setUserGroups("sonar-users"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(1); - userSessionRule.logon().setUserGroups("sonar-admins"); + userSessionRule.login().setUserGroups("sonar-admins"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(1); - userSessionRule.logon().setUserGroups("sonar-users", "sonar-admins"); + userSessionRule.login().setUserGroups("sonar-users", "sonar-admins"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(2); - userSessionRule.logon().setUserGroups("another group"); + userSessionRule.login().setUserGroups("another group"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).isEmpty(); - userSessionRule.logon().setUserGroups("sonar-users", "sonar-admins"); + userSessionRule.login().setUserGroups("sonar-users", "sonar-admins"); assertThat(index.search(IssueQuery.builder(userSessionRule).projectUuids(newArrayList(project3.uuid())).build(), new SearchOptions()).getDocs()).isEmpty(); } @@ -1153,17 +1153,17 @@ public class IssueIndexTest { indexIssue(IssueTesting.newDoc("ISSUE2", file2), null, "max"); indexIssue(IssueTesting.newDoc("ISSUE3", file3), null, null); - userSessionRule.logon("john"); + userSessionRule.login("john"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(1); - userSessionRule.logon("max"); + userSessionRule.login("max"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(1); - userSessionRule.logon("another guy"); + userSessionRule.login("another guy"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(0); - userSessionRule.logon("john"); + userSessionRule.login("john"); assertThat(index.search(IssueQuery.builder(userSessionRule).projectUuids(newArrayList(project3.key())).build(), new SearchOptions()).getDocs()).hasSize(0); } @@ -1179,7 +1179,7 @@ public class IssueIndexTest { indexIssue(IssueTesting.newDoc("ISSUE1", file1), "sonar-users", "john"); indexIssue(IssueTesting.newDoc("ISSUE2", file2), null, "max"); - userSessionRule.logon("john").setUserGroups("sonar-users"); + userSessionRule.login("john").setUserGroups("sonar-users"); assertThat(index.search(IssueQuery.builder(userSessionRule).build(), new SearchOptions()).getDocs()).hasSize(1); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java index 28ba950a7f9..34aab044a41 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java @@ -72,7 +72,7 @@ public class IssueActionsWriterTest { .setProjectKey("sample") .setRuleKey(RuleKey.of("squid", "AvoidCycle")); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.ISSUE_ADMIN, "ABCD"); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.ISSUE_ADMIN, "ABCD"); testActions(issue, "{\"actions\": " + @@ -89,7 +89,7 @@ public class IssueActionsWriterTest { .setProjectKey("sample") .setRuleKey(RuleKey.of("squid", "AvoidCycle")); - userSessionRule.logon("john"); + userSessionRule.login("john"); Action action = mock(Action.class); when(action.key()).thenReturn("link-to-jira"); when(actionService.listAvailableActions(eq(issue))).thenReturn(newArrayList(action)); @@ -110,7 +110,7 @@ public class IssueActionsWriterTest { .setRuleKey(RuleKey.of("squid", "AvoidCycle")) .setResolution("CLOSED"); - userSessionRule.logon("john"); + userSessionRule.login("john"); testActions(issue, "{\"actions\": " + @@ -140,7 +140,7 @@ public class IssueActionsWriterTest { .setRuleKey(RuleKey.of("squid", "AvoidCycle")) .setAssignee("john"); - userSessionRule.logon("john"); + userSessionRule.login("john"); testActions(issue, "{\"actions\": " + @@ -158,7 +158,7 @@ public class IssueActionsWriterTest { .setRuleKey(RuleKey.of("squid", "AvoidCycle")); when(issueService.listTransitions(eq(issue))).thenReturn(newArrayList(Transition.create("reopen", "RESOLVED", "REOPEN"))); - userSessionRule.logon("john"); + userSessionRule.login("john"); testTransitions(issue, "{\"transitions\": [\n" + @@ -174,7 +174,7 @@ public class IssueActionsWriterTest { .setProjectKey("sample") .setRuleKey(RuleKey.of("squid", "AvoidCycle")); - userSessionRule.logon("john"); + userSessionRule.login("john"); testTransitions(issue, "{\"transitions\": []}"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java index 07923c3b454..b9e6343413a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java @@ -436,7 +436,7 @@ public class IssueShowActionTest { when(i18n.ageFromNow(any(Locale.class), eq(date1))).thenReturn("9 days"); when(i18n.ageFromNow(any(Locale.class), eq(date2))).thenReturn("10 days"); - userSessionRule.logon("arthur"); + userSessionRule.login("arthur"); WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key()); request.execute().assertJson(getClass(), "show_issue_with_comments.json"); } @@ -450,7 +450,7 @@ public class IssueShowActionTest { when(issueService.listTransitions(eq(issue))).thenReturn(newArrayList(Transition.create("reopen", "RESOLVED", "REOPEN"))); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key()); request.execute().assertJson(getClass(), "show_issue_with_transitions.json"); } @@ -461,7 +461,7 @@ public class IssueShowActionTest { .setStatus("OPEN"); when(issueService.getByKey(issue.key())).thenReturn(issue); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.TestRequest request = tester.newGetRequest("api/issues", "show").setParam("key", issue.key()); request.execute().assertJson(getClass(), "show_issue_with_actions.json"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java index fd1144b1495..0a5e71aa09f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java @@ -363,7 +363,7 @@ public class SearchActionComponentsMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("resolved", "false") .setParam(WebService.Param.FACETS, "directories") @@ -382,7 +382,7 @@ public class SearchActionComponentsMediumTest { indexView(view.uuid(), newArrayList(project.uuid())); setAnyoneProjectPermission(view, UserRole.USER); - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.USER, view.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.USER, view.uuid()); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam(IssueFilterParameters.COMPONENT_UUIDS, view.uuid()) @@ -402,7 +402,7 @@ public class SearchActionComponentsMediumTest { setAnyoneProjectPermission(view, UserRole.USER); // User has wrong permission on the view, no issue will be returned - userSessionRule.logon("john").addProjectUuidPermissions(UserRole.CODEVIEWER, view.uuid()); + userSessionRule.login("john").addProjectUuidPermissions(UserRole.CODEVIEWER, view.uuid()); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam(IssueFilterParameters.COMPONENT_UUIDS, view.uuid()) @@ -423,7 +423,7 @@ public class SearchActionComponentsMediumTest { indexView(subView.uuid(), newArrayList(project.uuid())); setAnyoneProjectPermission(view, UserRole.USER); - userSessionRule.logon("john").addComponentUuidPermission(UserRole.USER, view.uuid(), subView.uuid()); + userSessionRule.login("john").addComponentUuidPermission(UserRole.USER, view.uuid(), subView.uuid()); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam(IssueFilterParameters.COMPONENT_UUIDS, subView.uuid()) @@ -445,7 +445,7 @@ public class SearchActionComponentsMediumTest { setAnyoneProjectPermission(view, UserRole.USER); // User has wrong permission on the view, no issue will be returned - userSessionRule.logon("john").addComponentUuidPermission(UserRole.CODEVIEWER, view.uuid(), subView.uuid()); + userSessionRule.login("john").addComponentUuidPermission(UserRole.CODEVIEWER, view.uuid(), subView.uuid()); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam(IssueFilterParameters.COMPONENT_UUIDS, subView.uuid()) @@ -549,7 +549,7 @@ public class SearchActionComponentsMediumTest { } private void setAnyoneProjectPermission(ComponentDto project, String permission) { - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(permission)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java index 46858518bae..714cc6b1b12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java @@ -163,7 +163,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION).execute(); result.assertJson(this.getClass(), "issue_with_comment.json"); } @@ -197,7 +197,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION).setParam(IssueFilterParameters.HIDE_COMMENTS, "true").execute(); result.assertJson(this.getClass(), "issue_with_comment_hidden.json"); assertThat(result.outputAsString()).doesNotContain("fabrice"); @@ -271,7 +271,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("extra_fields", "actions,transitions,assigneeName,reporterName,actionPlanName").execute(); result.assertJson(this.getClass(), "issue_with_extra_fields.json"); @@ -405,7 +405,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("resolved", "false") .setParam(WebService.Param.FACETS, "statuses,severities,resolutions,projectUuids,rules,fileUuids,assignees,languages,actionPlans") @@ -429,7 +429,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); WsTester.Result result = wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("resolved", "false") .setParam("severities", "MAJOR,MINOR") @@ -472,7 +472,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john"); + userSessionRule.login("john"); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("resolved", "false") .setParam("assignees", "__me__") @@ -483,7 +483,7 @@ public class SearchActionMediumTest { @Test public void filter_by_assigned_to_me_unauthenticated() throws Exception { - userSessionRule.logon(); + userSessionRule.login(); ComponentDto project = insertComponent(ComponentTesting.newProjectDto("ABCD").setKey("MyProject")); setDefaultProjectPermission(project); @@ -544,7 +544,7 @@ public class SearchActionMediumTest { session.commit(); tester.get(IssueIndexer.class).indexAll(); - userSessionRule.logon("john-bob.polop"); + userSessionRule.login("john-bob.polop"); wsTester.newGetRequest(IssuesWs.API_ENDPOINT, SearchAction.SEARCH_ACTION) .setParam("resolved", "false") .setParam("assignees", "alice") @@ -681,9 +681,9 @@ public class SearchActionMediumTest { private void setDefaultProjectPermission(ComponentDto project) { // project can be seen by anyone and by code viewer - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); - userSessionRule.logon(); + userSessionRule.login(); } private ComponentDto insertComponent(ComponentDto component) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java index 57190440976..6023df7133e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java @@ -82,7 +82,7 @@ public class InternalPermissionServiceMediumTest { @Test public void add_project_permission_to_user() { // init - userSessionRule.logon("admin").addProjectPermissions(UserRole.ADMIN, project.key()); + userSessionRule.login("admin").addProjectPermissions(UserRole.ADMIN, project.key()); UserDto user = new UserDto().setLogin("john").setName("John"); db.userDao().insert(session, user); session.commit(); @@ -102,7 +102,7 @@ public class InternalPermissionServiceMediumTest { @Test public void remove_project_permission_to_user() { - userSessionRule.logon("admin").addProjectPermissions(UserRole.ADMIN, project.key()); + userSessionRule.login("admin").addProjectPermissions(UserRole.ADMIN, project.key()); UserDto user1 = new UserDto().setLogin("user1").setName("User1"); db.userDao().insert(session, user1); @@ -126,7 +126,7 @@ public class InternalPermissionServiceMediumTest { @Test public void remove_all_component_user_permissions() { - userSessionRule.logon("admin").addProjectPermissions(UserRole.ADMIN, project.key()); + userSessionRule.login("admin").addProjectPermissions(UserRole.ADMIN, project.key()); UserDto user = new UserDto().setLogin("user1").setName("User1"); db.userDao().insert(session, user); @@ -154,7 +154,7 @@ public class InternalPermissionServiceMediumTest { @Test public void add_and_remove_permission_to_group() { // init - userSessionRule.logon("admin").addProjectPermissions(UserRole.ADMIN, project.key()); + userSessionRule.login("admin").addProjectPermissions(UserRole.ADMIN, project.key()); GroupDto group = new GroupDto().setName("group1"); db.groupDao().insert(session, group); session.commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java index 530450cdcc2..815c63980b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java @@ -90,7 +90,7 @@ public class InternalPermissionTemplateServiceTest { @Before public void setUp() { - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); MyBatis myBatis = mock(MyBatis.class); when(myBatis.openSession(false)).thenReturn(session); @@ -216,7 +216,7 @@ public class InternalPermissionTemplateServiceTest { @Test public void should_retrieve_all_permission_templates_from_project() { - userSessionRule.logon("admin").addProjectPermissions(UserRole.ADMIN, "org.sample.Sample"); + userSessionRule.login("admin").addProjectPermissions(UserRole.ADMIN, "org.sample.Sample"); PermissionTemplateDto template1 = new PermissionTemplateDto().setId(1L).setName("template1").setDescription("template1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java index 4d62088342f..d18eb7b79d2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java @@ -56,7 +56,7 @@ public class PermissionTemplateUpdaterTest { @Before public void setUpCommonMocks() { - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); userDao = mock(UserDao.class); stub(userDao.selectActiveUserByLogin("user")).toReturn(DEFAULT_USER); stub(userDao.selectGroupByName("group")).toReturn(DEFAULT_GROUP); @@ -134,7 +134,7 @@ public class PermissionTemplateUpdaterTest { expected.expect(ForbiddenException.class); expected.expectMessage("Insufficient privileges"); - userSessionRule.logon("user").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); + userSessionRule.login("user").setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); PermissionTemplateUpdater updater = new PermissionTemplateUpdater(null, null, null, null, null, userSessionRule) { @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java index 86517b09fdf..f93b1fd2992 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; public class SystemInfoWsActionTest { @Rule - public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("login") + public UserSessionRule userSessionRule = UserSessionRule.standalone().login("login") .setName("name"); Monitor monitor1 = mock(Monitor.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java index 22f97568b4f..28f09a659cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java @@ -146,7 +146,7 @@ public class QProfileProjectOperationsMediumTest { db.userDao().insert(dbSession, user); tester.get(PermissionFacade.class).insertUserPermission(project1.getId(), user.getId(), UserRole.USER, dbSession); tester.get(PermissionFacade.class).insertUserPermission(project2.getId(), user.getId(), UserRole.USER, dbSession); - UserSession userSession = userSessionRule.logon("john").setUserId(user.getId().intValue()).setName("John") + UserSession userSession = userSessionRule.login("john").setUserId(user.getId().intValue()).setName("John") .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); dbSession.commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java index 8578e79503f..e635ee2d7ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java @@ -100,7 +100,7 @@ public class QProfileServiceMediumTest { @Test public void create_profile() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); QualityProfileDto profile = service.create(QProfileName.createFor("xoo", "New Profile"), null).profile(); @@ -111,7 +111,7 @@ public class QProfileServiceMediumTest { @Test public void create_profile_with_xml() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); db.ruleDao().insert(dbSession, RuleTesting.newDto(RuleKey.of("xoo", "R1")).setLanguage("xoo").setSeverity("MINOR")); dbSession.commit(); @@ -129,7 +129,7 @@ public class QProfileServiceMediumTest { @Test public void count_by_all_profiles() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); service.activate(XOO_P1_KEY, new RuleActivation(RuleTesting.XOO_X1).setSeverity("BLOCKER")); service.activate(XOO_P2_KEY, new RuleActivation(RuleTesting.XOO_X1).setSeverity("BLOCKER")); @@ -144,7 +144,7 @@ public class QProfileServiceMediumTest { @Test public void stat_for_all_profiles() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); service.activate(XOO_P1_KEY, new RuleActivation(RuleTesting.XOO_X1).setSeverity("MINOR")); service.activate(XOO_P2_KEY, new RuleActivation(RuleTesting.XOO_X1).setSeverity("BLOCKER")); @@ -161,7 +161,7 @@ public class QProfileServiceMediumTest { @Test public void count_by_deprecated() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); // create deprecated rule RuleDto deprecatedXooRule = RuleTesting.newDto(RuleKey.of("xoo", "deprecated1")) @@ -179,7 +179,7 @@ public class QProfileServiceMediumTest { @Test public void search_qprofile_activity() { - userSessionRule.logon("david").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("david").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); UserDto user = new UserDto().setLogin("david").setName("David").setEmail("dav@id.com").setCreatedAt(System.currentTimeMillis()).setUpdatedAt(System.currentTimeMillis()); db.userDao().insert(dbSession, user); @@ -212,7 +212,7 @@ public class QProfileServiceMediumTest { @Test public void search_qprofile_activity_without_severity() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleKey ruleKey = RuleKey.of("xoo", "deleted_rule"); @@ -231,7 +231,7 @@ public class QProfileServiceMediumTest { @Test public void search_qprofile_activity_with_user_not_found() { - userSessionRule.logon("david").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("david").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); // We need an actual rule in DB to test RuleName in Activity db.ruleDao().getByKey(dbSession, RuleTesting.XOO_X1); @@ -254,7 +254,7 @@ public class QProfileServiceMediumTest { @Test public void search_qprofile_activity_with_rule_not_found() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleKey ruleKey = RuleKey.of("xoo", "deleted_rule"); @@ -310,7 +310,7 @@ public class QProfileServiceMediumTest { @Test public void set_default() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); assertThat(service.getDefault("xoo")).isNull(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java index f5ceee8a516..14beeb84bc1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java @@ -64,7 +64,7 @@ public class QProfileChangeParentActionMediumTest { ws = tester.get(QProfilesWs.class); wsTester = tester.get(WsTester.class); session = db.openSession(false); - userSessionRule.logon("gandalf").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("gandalf").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); } @After @@ -259,7 +259,7 @@ public class QProfileChangeParentActionMediumTest { @Test(expected = ForbiddenException.class) public void fail_if_missing_permission() throws Exception { - userSessionRule.logon("anakin"); + userSessionRule.login("anakin"); wsTester.newGetRequest(QProfilesWs.API_ENDPOINT, "change_parent") .setParam(QProfileIdentificationParamUtils.PARAM_PROFILE_KEY, "polop") .setParam("parentKey", "pulup") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java index 3681fdc3b83..bf14f0935bb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java @@ -60,7 +60,7 @@ public class QProfileCopyActionTest { @Test public void copy_nominal() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); String fromProfileKey = "xoo-sonar-way-23456"; String toName = "Other Sonar Way"; @@ -80,7 +80,7 @@ public class QProfileCopyActionTest { @Test public void copy_with_parent() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); String fromProfileKey = "xoo-sonar-way-23456"; String toName = "Other Sonar Way"; @@ -101,7 +101,7 @@ public class QProfileCopyActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_missing_key() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "copy") .setParam("name", "Other Sonar Way") @@ -110,7 +110,7 @@ public class QProfileCopyActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_missing_name() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "copy") .setParam("key", "sonar-way-xoo1-13245") @@ -119,7 +119,7 @@ public class QProfileCopyActionTest { @Test(expected = ForbiddenException.class) public void fail_on_missing_permission() throws Exception { - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); tester.newPostRequest("api/qualityprofiles", "copy") .setParam("key", "sonar-way-xoo1-13245") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java index 431a070b3c4..d0c187dd61f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java @@ -74,7 +74,7 @@ public class QProfileCreateActionMediumTest { @Test public void create_nominal() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); wsTester.newPostRequest("api/qualityprofiles", "create") .setParam("backup_XooProfileImporter", "a value for xoo importer") @@ -85,7 +85,7 @@ public class QProfileCreateActionMediumTest { @Test public void create_with_messages() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); wsTester.newPostRequest("api/qualityprofiles", "create") .setParam("backup_XooProfileImporter", "a value for xoo importer") @@ -97,7 +97,7 @@ public class QProfileCreateActionMediumTest { @Test(expected = BadRequestException.class) public void fail_on_error_from_importer() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); wsTester.newPostRequest("api/qualityprofiles", "create") .setParam("backup_XooProfileImporter", "a value for xoo importer") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java index 1f785995342..d3085347f13 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java @@ -56,7 +56,7 @@ public class QProfileCreateActionTest { Action create = wsTester.controller("api/qualityprofiles").action("create"); assertThat(create.params()).hasSize(2); - userSessionRule.logon("anakin").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("anakin").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); wsTester.newPostRequest("api/qualityprofiles", "create") .setParam("language", xooKey).setParam("name", "Yeehaw!").execute().assertJson(getClass(), "create-no-importer.json"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java index 7ba826b07ab..ec94fb14445 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java @@ -101,7 +101,7 @@ public class QProfileDeleteActionTest { qualityProfileDao.insertProjectProfileAssociation(project.uuid(), profileKey, session); session.commit(); - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("profileKey", "sonar-way-xoo1-12345").execute().assertNoContent(); @@ -119,7 +119,7 @@ public class QProfileDeleteActionTest { qualityProfileDao.insertProjectProfileAssociation(project.uuid(), profileKey, session); session.commit(); - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("profileName", "Sonar way").setParam("language", xoo1.getKey()).execute().assertNoContent(); @@ -129,37 +129,37 @@ public class QProfileDeleteActionTest { @Test(expected = ForbiddenException.class) public void fail_on_missing_permission() throws Exception { - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); tester.newPostRequest("api/qualityprofiles", "delete").execute(); } @Test(expected = IllegalArgumentException.class) public void fail_on_missing_arguments() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").execute(); } @Test(expected = IllegalArgumentException.class) public void fail_on_missing_language() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("profileName", "Polop").execute(); } @Test(expected = IllegalArgumentException.class) public void fail_on_missing_name() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("language", xoo1.getKey()).execute(); } @Test(expected = IllegalArgumentException.class) public void fail_on_too_many_arguments() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("profileName", "Polop").setParam("language", xoo1.getKey()).setParam("profileKey", "polop").execute(); } @Test(expected = NotFoundException.class) public void fail_on_unexisting_profile() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "delete").setParam("profileName", "Polop").setParam("language", xoo1.getKey()).execute(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java index 29cb83fcfe2..23fec4a8451 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java @@ -84,7 +84,7 @@ public class QProfileProjectsActionTest { mock(ProjectAssociationActions.class), new QProfileProjectsAction(dbClient, userSessionRule))); - userSessionRule.logon("obiwan").setUserId(userId.intValue()); + userSessionRule.login("obiwan").setUserId(userId.intValue()); new UserDao(dbTester.myBatis(), mock(System2.class)) .insert(session, new UserDto() .setActive(true) diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java index 0374142ccef..fc6a0536b22 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java @@ -81,7 +81,7 @@ public class QProfileRenameActionTest { @Test public void rename_nominal() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("key", "sonar-way-xoo2-23456") @@ -93,7 +93,7 @@ public class QProfileRenameActionTest { @Test(expected = BadRequestException.class) public void do_nothing_on_conflict() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("key", "sonar-way-xoo2-23456") @@ -103,7 +103,7 @@ public class QProfileRenameActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_missing_key() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("name", "Other Sonar Way") @@ -112,7 +112,7 @@ public class QProfileRenameActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_missing_name() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("key", "sonar-way-xoo1-13245") @@ -121,7 +121,7 @@ public class QProfileRenameActionTest { @Test(expected = ForbiddenException.class) public void fail_on_missing_permission() throws Exception { - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("key", "sonar-way-xoo1-13245") @@ -131,7 +131,7 @@ public class QProfileRenameActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_unknown_profile() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "rename") .setParam("key", "polop") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java index 70bb0eaf12a..4d538499782 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java @@ -64,7 +64,7 @@ public class QProfileRestoreActionTest { @Test public void restore_profile() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); QualityProfileDto profile = QualityProfileDto.createFor("xoo-sonar-way-12345") .setDefault(false).setLanguage("xoo").setName("Sonar way"); @@ -78,14 +78,14 @@ public class QProfileRestoreActionTest { @Test(expected = IllegalArgumentException.class) public void fail_on_missing_backup() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newGetRequest("api/qualityprofiles", "restore").execute(); } @Test(expected = ForbiddenException.class) public void fail_on_misssing_permission() throws Exception { - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); tester.newPostRequest("api/qualityprofiles", "restore").setParam("backup", "").execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java index a01c788be43..e621bd0d0b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java @@ -84,7 +84,7 @@ public class QProfileSetDefaultActionTest { @Test public void set_default_profile_using_key() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); checkDefaultProfile(xoo1Key, "sonar-way-xoo1-12345"); @@ -105,7 +105,7 @@ public class QProfileSetDefaultActionTest { @Test public void set_default_profile_using_language_and_name() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); tester.newPostRequest("api/qualityprofiles", "set_default").setParam("language", xoo2Key).setParam("profileName", "Sonar way").execute().assertNoContent(); @@ -115,7 +115,7 @@ public class QProfileSetDefaultActionTest { @Test public void fail_to_set_default_profile_using_key() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); try { tester.newPostRequest("api/qualityprofiles", "set_default").setParam("profileKey", "unknown-profile-666").execute(); @@ -130,7 +130,7 @@ public class QProfileSetDefaultActionTest { @Test public void fail_to_set_default_profile_using_language_and_name() throws Exception { - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); try { tester.newPostRequest("api/qualityprofiles", "set_default").setParam("language", xoo2Key).setParam("profileName", "Unknown").execute(); @@ -144,7 +144,7 @@ public class QProfileSetDefaultActionTest { @Test public void fail_on_missing_permission() throws Exception { - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); try { tester.newPostRequest("api/qualityprofiles", "set_default").setParam("profileKey", "sonar-way-xoo2-23456").execute().assertNoContent(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java index fce5c1e8d37..985b0f52143 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java @@ -60,7 +60,7 @@ public class QProfilesWsMediumTest { public static ServerTester tester = new ServerTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester) - .logon("gandalf").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + .login("gandalf").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); QProfilesWs ws; DbClient db; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java index 9b45602d1dd..c9d52563aab 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java @@ -357,7 +357,7 @@ public class RegisterRulesMediumTest { }); // Create a profile and activate rule - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1()); dbSession.commit(); dbSession.clearCache(); @@ -387,7 +387,7 @@ public class RegisterRulesMediumTest { register(rules); // create a profile and activate rule - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1()); dbSession.commit(); dbSession.clearCache(); @@ -419,7 +419,7 @@ public class RegisterRulesMediumTest { }); // Create profile and activate rule - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); db.qualityProfileDao().insert(dbSession, QProfileTesting.newXooP1()); dbSession.commit(); dbSession.clearCache(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java index 320f6ec9eba..c571bf96836 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java @@ -71,7 +71,7 @@ public class RuleServiceMediumTest { @Test public void get_rule_by_key() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleKey key = RuleKey.of("java", "S001"); @@ -87,7 +87,7 @@ public class RuleServiceMediumTest { @Test public void get_non_null_rule_by_key() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleKey key = RuleKey.of("java", "S001"); @@ -106,7 +106,7 @@ public class RuleServiceMediumTest { @Test public void get_rule_by_key_escape_description_on_manual_rule() { - userSessionRule.logon().logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleDto manualRule = RuleTesting.newManualRule("My manual") .setDescription("
Manual rule desc
"); @@ -157,7 +157,7 @@ public class RuleServiceMediumTest { @Test public void update_rule() { - userSessionRule.logon("me").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("me").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); RuleKey key = RuleKey.of("java", "S001"); @@ -192,7 +192,7 @@ public class RuleServiceMediumTest { @Test public void create_rule() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); // Create template rule RuleKey templateRuleKey = RuleKey.of("java", "S001"); @@ -223,7 +223,7 @@ public class RuleServiceMediumTest { @Test public void delete_rule() { - userSessionRule.logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); // Create template rule RuleKey templateRuleKey = RuleKey.of("java", "S001"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java index 78f192c8bed..5a5888725ef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java @@ -125,7 +125,7 @@ public class RuleUpdaterMediumTest { @Test public void set_markdown_note() { - userSessionRule.logon("me"); + userSessionRule.login("me"); ruleDao.insert(dbSession, RuleTesting.newDto(RULE_KEY) .setNoteData(null) diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java index df8e83952e4..3180807140b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java @@ -51,7 +51,7 @@ public class CreateActionMediumTest { @ClassRule public static ServerTester tester = new ServerTester(); @Rule - public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester).logon() + public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester).login() .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); WsTester wsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java index 3a63e84a41a..2ca529121ef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java @@ -51,7 +51,7 @@ public class ShowActionMediumTest { @ClassRule public static ServerTester tester = new ServerTester(); @Rule - public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester).logon() + public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester).login() .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); WsTester wsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java index fa6bae4d887..0997d956ec4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java @@ -51,7 +51,7 @@ public class UpdateActionMediumTest { public static ServerTester tester = new ServerTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester). - logon().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + login().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); WsTester wsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/QueryContextTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/QueryContextTest.java index fa621d6a04d..650200e55a8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/search/QueryContextTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/search/QueryContextTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.fail; public class QueryContextTest { @Rule - public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("john").setUserGroups("sonar-users"); + public UserSessionRule userSessionRule = UserSessionRule.standalone().login("john").setUserGroups("sonar-users"); QueryContext options; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java index e25e14ddf96..3b1dde59945 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java @@ -76,7 +76,7 @@ public class HashActionTest { @Test public void show_hashes() throws Exception { db.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); + userSessionRule.login("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); WsTester.TestRequest request = tester.newGetRequest("api/sources", "hash").setParam("key", COMPONENT_KEY); assertThat(request.execute().outputAsString()).isEqualTo("987654"); @@ -85,7 +85,7 @@ public class HashActionTest { @Test public void hashes_empty_if_no_source() throws Exception { db.prepareDbUnit(getClass(), "no_source.xml"); - userSessionRule.logon("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); + userSessionRule.login("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); WsTester.TestRequest request = tester.newGetRequest("api/sources", "hash").setParam("key", COMPONENT_KEY); request.execute().assertNoContent(); @@ -93,7 +93,7 @@ public class HashActionTest { @Test public void fail_to_show_hashes_if_file_does_not_exist() { - userSessionRule.logon("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); + userSessionRule.login("polop").addProjectUuidPermissions(UserRole.USER, PROJECT_UUID); try { WsTester.TestRequest request = tester.newGetRequest("api/sources", "hash").setParam("key", COMPONENT_KEY); request.execute(); @@ -107,7 +107,7 @@ public class HashActionTest { public void fail_on_missing_permission() throws Exception { db.prepareDbUnit(getClass(), "shared.xml"); - userSessionRule.logon("polop"); + userSessionRule.login("polop"); tester.newGetRequest("api/sources", "hash").setParam("key", COMPONENT_KEY).execute(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java index e838bbd5233..b93a8a23b3d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java @@ -155,7 +155,7 @@ public class LinesActionTest { esTester.putDocuments(SourceLineIndexDefinition.INDEX, SourceLineIndexDefinition.TYPE, line1, line2, line3); - userSessionRule.logon("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); + userSessionRule.login("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); WsTester.TestRequest request = wsTester.newGetRequest("api/sources", "lines").setParam("uuid", FILE_UUID); request.execute().assertJson(getClass(), "show_source.json"); @@ -165,7 +165,7 @@ public class LinesActionTest { public void fail_to_show_source_if_no_source_found() { newFile(); - userSessionRule.logon("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); + userSessionRule.login("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); try { WsTester.TestRequest request = wsTester.newGetRequest("api/sources", "lines").setParam("uuid", FILE_UUID); @@ -180,7 +180,7 @@ public class LinesActionTest { public void show_source_with_from_and_to_params() throws Exception { newFile(); - userSessionRule.logon("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); + userSessionRule.login("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); esTester.putDocuments(SourceLineIndexDefinition.INDEX, SourceLineIndexDefinition.TYPE, new SourceLineDoc() @@ -236,7 +236,7 @@ public class LinesActionTest { .setUpdateDate(new Date()) ); - userSessionRule.logon("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); + userSessionRule.login("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); WsTester.TestRequest request = wsTester.newGetRequest("api/sources", "lines").setParam("key", FILE_KEY); request.execute().assertJson(getClass(), "show_source_by_file_key.json"); @@ -245,7 +245,7 @@ public class LinesActionTest { @Test public void fail_when_no_uuid_or_key_param() throws Exception { newFile(); - userSessionRule.logon("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); + userSessionRule.login("login").addProjectUuidPermissions(UserRole.CODEVIEWER, PROJECT_UUID); WsTester.TestRequest request = wsTester.newGetRequest("api/sources", "lines"); try { @@ -260,7 +260,7 @@ public class LinesActionTest { public void should_check_permission() throws Exception { newFile(); - userSessionRule.logon("login"); + userSessionRule.login("login"); wsTester.newGetRequest("api/sources", "lines") .setParam("uuid", FILE_UUID) diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java index f324062cb8e..ec3ba7a0b12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java @@ -28,8 +28,8 @@ public class MockUserSessionTest { public void set_mock_session() { MockUserSession mock = new MockUserSession("simon").setUserGroups("sonar-users"); - assertThat(mock.login()).isEqualTo("simon"); - assertThat(mock.userGroups()).containsOnly("sonar-users", "Anyone"); + assertThat(mock.getLogin()).isEqualTo("simon"); + assertThat(mock.getUserGroups()).containsOnly("sonar-users", "Anyone"); assertThat(mock.globalPermissions()).isEmpty(); assertThat(mock.isLoggedIn()).isTrue(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java index 32ab416fb7e..4a35ad5473e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java @@ -50,7 +50,7 @@ import static com.google.common.base.Preconditions.checkState; * In both cases, one can define user session behavior which should apply on all tests directly on the property, eg.: * 
  * {@literal @}Rule
- * public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
+ * public UserSessionRule userSessionRule = UserSessionRule.standalone().login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
  *
*

*

@@ -71,8 +71,9 @@ import static com.google.common.base.Preconditions.checkState; * {@code UserSessionRule.standalone().anonymous()}. *

*

- * To emulate an identified user, either use method {@link #logon(String)} if you want to specify the user's login, or - * method {@link #logon()} which will do the same but using the value of {@link #DEFAULT_LOGIN} as the user's login. + * To emulate an identified user, either use method {@link #login(String)} if you want to specify the user's login, or + * method {@link #login()} which will do the same but using the value of {@link #DEFAULT_LOGIN} as the user's login + * (use the latest override if you don't care about the actual value of the login, it will save noise in your test). *

*/ public class UserSessionRule implements TestRule, UserSession { @@ -96,16 +97,16 @@ public class UserSessionRule implements TestRule, UserSession { } /** - * Log on with the default login {@link #DEFAULT_LOGIN} + * Log in with the default login {@link #DEFAULT_LOGIN} */ - public UserSessionRule logon() { - return logon(DEFAULT_LOGIN); + public UserSessionRule login() { + return login(DEFAULT_LOGIN); } /** - * Log on with the specified login + * Log in with the specified login */ - public UserSessionRule logon(String login) { + public UserSessionRule login(String login) { setCurrentUserSession(new MockUserSession(login)); return this; } @@ -241,25 +242,25 @@ public class UserSessionRule implements TestRule, UserSession { @Override @CheckForNull - public String login() { - return currentUserSession.login(); + public String getLogin() { + return currentUserSession.getLogin(); } @Override @CheckForNull - public String name() { - return currentUserSession.name(); + public String getName() { + return currentUserSession.getName(); } @Override @CheckForNull - public Integer userId() { - return currentUserSession.userId(); + public Integer getUserId() { + return currentUserSession.getUserId(); } @Override - public Set userGroups() { - return currentUserSession.userGroups(); + public Set getUserGroups() { + return currentUserSession.getUserGroups(); } @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java index 497b6b49d01..00d5ab1c7a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java @@ -168,7 +168,7 @@ public class ComponentNavigationActionTest { dbClient.propertiesDao().setProperty(new PropertyDto().setKey("favourite").setResourceId(project.getId()).setUserId((long) userId), session); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId).addProjectUuidPermissions(UserRole.USER, "abcd"); + userSessionRule.login("obiwan").setUserId(userId).addProjectUuidPermissions(UserRole.USER, "abcd"); wsTester = new WsTester(new NavigationWs(new ComponentNavigationAction(dbClient, activeDashboardDao, new Views(userSessionRule), i18n, resourceTypes, userSessionRule))); @@ -187,7 +187,7 @@ public class ComponentNavigationActionTest { .setLast(true).setQualifier(project.qualifier()).setResourceId(project.getId()).setRootProjectId(project.getId()).setScope(project.scope())); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId).addProjectUuidPermissions(UserRole.USER, "abcd"); + userSessionRule.login("obiwan").setUserId(userId).addProjectUuidPermissions(UserRole.USER, "abcd"); wsTester = new WsTester(new NavigationWs(new ComponentNavigationAction(dbClient, activeDashboardDao, new Views(userSessionRule), i18n, resourceTypes, userSessionRule))); @@ -221,7 +221,7 @@ public class ComponentNavigationActionTest { activeDashboardDao.insert(new ActiveDashboardDto().setDashboardId(dashboard.getId())); session.commit(); - userSessionRule.logon("obiwan").addProjectUuidPermissions(UserRole.USER, "abcd"); + userSessionRule.login("obiwan").addProjectUuidPermissions(UserRole.USER, "abcd"); wsTester = new WsTester(new NavigationWs(new ComponentNavigationAction(dbClient, activeDashboardDao, new Views(userSessionRule), i18n, resourceTypes, userSessionRule))); @@ -331,7 +331,7 @@ public class ComponentNavigationActionTest { .setKey("polop").setName("Polop").setLanguage(language)); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId) + userSessionRule.login("obiwan").setUserId(userId) .addProjectUuidPermissions(UserRole.USER, "abcd") .addProjectUuidPermissions(UserRole.ADMIN, "abcd"); @@ -383,7 +383,7 @@ public class ComponentNavigationActionTest { dbClient.componentDao().insert(session, project); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId) + userSessionRule.login("obiwan").setUserId(userId) .addProjectUuidPermissions(UserRole.USER, "abcd") .addProjectUuidPermissions(UserRole.ADMIN, "abcd"); @@ -414,7 +414,7 @@ public class ComponentNavigationActionTest { dbClient.componentDao().insert(session, project, module); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId) + userSessionRule.login("obiwan").setUserId(userId) .addProjectUuidPermissions(UserRole.USER, "abcd") .addProjectUuidPermissions(UserRole.ADMIN, "abcd"); @@ -432,7 +432,7 @@ public class ComponentNavigationActionTest { .setKey("polop").setName("Polop").setLanguage(language)); session.commit(); - userSessionRule.logon("obiwan").setUserId(userId) + userSessionRule.login("obiwan").setUserId(userId) .addProjectUuidPermissions(UserRole.USER, "abcd") .setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java index 94fe1731ba6..337c8b36e92 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java @@ -133,7 +133,7 @@ public class GlobalNavigationActionTest { public void nominal_call_for_user() throws Exception { nominalSetup(); - userSessionRule.logon("obiwan"); + userSessionRule.login("obiwan"); wsTester.newGetRequest("api/navigation", "global").execute().assertJson(getClass(), "user.json"); } @@ -142,7 +142,7 @@ public class GlobalNavigationActionTest { public void nominal_call_for_admin() throws Exception { nominalSetup(); - userSessionRule.logon("obiwan").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("obiwan").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); wsTester.newGetRequest("api/navigation", "global").execute().assertJson(getClass(), "admin.json"); } @@ -151,7 +151,7 @@ public class GlobalNavigationActionTest { public void nominal_call_for_user_without_configured_dashboards() throws Exception { nominalSetup(); - userSessionRule.logon("anakin"); + userSessionRule.login("anakin"); wsTester.newGetRequest("api/navigation", "global").execute().assertJson(getClass(), "anonymous.json"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java index c4598b2685c..d757d3ab17f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java @@ -95,7 +95,7 @@ public class DefaultUserServiceTest { @Test public void self_deactivation_is_not_possible() { try { - userSessionRule.logon("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); service.deactivate("simon"); fail(); } catch (BadRequestException e) { @@ -107,7 +107,7 @@ public class DefaultUserServiceTest { @Test public void user_deactivation_requires_admin_permission() { try { - userSessionRule.logon("simon").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); + userSessionRule.login("simon").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); service.deactivate("julien"); fail(); } catch (ForbiddenException e) { @@ -117,14 +117,14 @@ public class DefaultUserServiceTest { @Test public void deactivate_user() { - userSessionRule.logon("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); service.deactivate("julien"); verify(userUpdater).deactivateUserByLogin("julien"); } @Test public void fail_to_deactivate_when_blank_login() { - userSessionRule.logon("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("simon").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); try { service.deactivate(""); fail(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java index 80b6b61e735..eb6160d5717 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java @@ -49,10 +49,10 @@ public class RubyUserSessionTest { UserSession session = threadLocalUserSession.get(); assertThat(session).isNotNull(); - assertThat(session.login()).isEqualTo("karadoc"); - assertThat(session.name()).isEqualTo("Karadoc"); - assertThat(session.userId()).isEqualTo(123); - assertThat(session.userGroups()).containsOnly("sonar-users", "Anyone"); + assertThat(session.getLogin()).isEqualTo("karadoc"); + assertThat(session.getName()).isEqualTo("Karadoc"); + assertThat(session.getUserId()).isEqualTo(123); + assertThat(session.getUserGroups()).containsOnly("sonar-users", "Anyone"); assertThat(session.isLoggedIn()).isTrue(); assertThat(session.locale()).isEqualTo(Locale.FRENCH); } @@ -64,10 +64,10 @@ public class RubyUserSessionTest { UserSession session = threadLocalUserSession.get(); assertThat(session).isNotNull(); - assertThat(session.login()).isNull(); - assertThat(session.name()).isNull(); - assertThat(session.userId()).isNull(); - assertThat(session.userGroups()).containsOnly("Anyone"); + assertThat(session.getLogin()).isNull(); + assertThat(session.getName()).isNull(); + assertThat(session.getUserId()).isNull(); + assertThat(session.getUserGroups()).containsOnly("Anyone"); assertThat(session.isLoggedIn()).isFalse(); assertThat(session.locale()).isEqualTo(Locale.FRENCH); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java index d9c6ba1cfff..a333e423258 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java @@ -42,7 +42,7 @@ public class ServerUserSessionTest { @Test public void login_should_not_be_empty() { UserSession session = newServerUserSession().setLogin(""); - assertThat(session.login()).isNull(); + assertThat(session.getLogin()).isNull(); assertThat(session.isLoggedIn()).isFalse(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java index 69de8cc00bd..40a64d627ed 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java @@ -43,8 +43,8 @@ public class ThreadLocalUserSessionTest { UserSession session = threadLocalUserSession.get(); assertThat(session).isNotNull(); - assertThat(session.login()).isNull(); - assertThat(session.userId()).isNull(); + assertThat(session.getLogin()).isNull(); + assertThat(session.getUserId()).isNull(); assertThat(session.isLoggedIn()).isFalse(); // default locale assertThat(session.locale()).isEqualTo(Locale.ENGLISH); @@ -56,8 +56,8 @@ public class ThreadLocalUserSessionTest { UserSession session = threadLocalUserSession.get(); assertThat(session).isNotNull(); - assertThat(session.userId()).isEqualTo(123); - assertThat(session.login()).isEqualTo("karadoc"); + assertThat(session.getUserId()).isEqualTo(123); + assertThat(session.getLogin()).isEqualTo("karadoc"); assertThat(session.isLoggedIn()).isTrue(); assertThat(session.locale()).isEqualTo(Locale.FRENCH); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index bf11bb03311..407337ab5aa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -62,7 +62,7 @@ public class ChangePasswordActionTest { @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); @Rule - public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + public UserSessionRule userSessionRule = UserSessionRule.standalone().login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); WebService.Controller controller; @@ -105,7 +105,7 @@ public class ChangePasswordActionTest { public void fail_on_missing_permission() throws Exception { createUser(); - userSessionRule.logon("polop"); + userSessionRule.login("polop"); tester.newPostRequest("api/users", "change_password") .setParam("login", "john") .execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index 3ef6f083c88..aa41c94be68 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -116,7 +116,7 @@ public class CreateActionTest { @Test public void create_user() throws Exception { - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.newPostRequest("api/users", "create") .setParam("login", "john") @@ -136,7 +136,7 @@ public class CreateActionTest { @Test public void reactivate_user() throws Exception { - userSessionRule.logon("admin").setLocale(Locale.FRENCH).setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setLocale(Locale.FRENCH).setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); dbClient.userDao().insert(session, new UserDto() .setEmail("john@email.com") @@ -163,7 +163,7 @@ public class CreateActionTest { @Test(expected = ForbiddenException.class) public void fail_on_missing_permission() throws Exception { - userSessionRule.logon("not_admin"); + userSessionRule.login("not_admin"); tester.newPostRequest("api/users", "create") .setParam("login", "john") diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java index 2a6d6502896..3ee91682a3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java @@ -44,7 +44,7 @@ public class CurrentUserActionTest { @Test public void authenticated() throws Exception { - userSessionRule.logon("obiwan.kenobi").setName("Obiwan Kenobi") + userSessionRule.login("obiwan.kenobi").setName("Obiwan Kenobi") .setGlobalPermissions(GlobalPermissions.ALL.toArray(new String[0])); tester.newGetRequest("api/users", "current").execute().assertJson(getClass(), "authenticated.json"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java index 005ec57c260..8a1ee1daf74 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java @@ -108,7 +108,7 @@ public class DeactivateActionTest { public void deactivate_user() throws Exception { createUser(); - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.newPostRequest("api/users", "deactivate") .setParam("login", "john") .execute() @@ -122,14 +122,14 @@ public class DeactivateActionTest { public void fail_on_missing_permission() throws Exception { createUser(); - userSessionRule.logon("not_admin"); + userSessionRule.login("not_admin"); tester.newPostRequest("api/users", "deactivate") .setParam("login", "john").execute(); } @Test(expected = NotFoundException.class) public void fail_on_unknown_user() throws Exception { - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.newPostRequest("api/users", "deactivate") .setParam("login", "john").execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index 42c31591d83..84f19cd13a4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -59,7 +59,7 @@ public class UpdateActionTest { @ClassRule public static final EsTester esTester = new EsTester().addDefinitions(new UserIndexDefinition(settings)); @Rule - public final UserSessionRule userSessionRule = UserSessionRule.standalone().logon("admin") + public final UserSessionRule userSessionRule = UserSessionRule.standalone().login("admin") .setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); WebService.Controller controller; @@ -104,7 +104,7 @@ public class UpdateActionTest { public void fail_on_missing_permission() throws Exception { createUser(); - userSessionRule.logon("polop"); + userSessionRule.login("polop"); tester.newPostRequest("api/users", "update") .setParam("login", "john") .execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerMediumTest.java index 0493cc734ef..6f9ae0d9a0f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerMediumTest.java @@ -134,7 +134,7 @@ public class ViewIndexerMediumTest { private void setDefaultProjectPermission(ComponentDto project) { // project can be seen by anyone and by code viewer - userSessionRule.logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); + userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN); tester.get(InternalPermissionService.class).addPermission(new PermissionChange().setComponentKey(project.getKey()).setGroup(DefaultGroups.ANYONE).setPermission(UserRole.USER)); } -- 2.39.5