]> source.dussan.org Git - sonarqube.git/commitdiff
rename UserSession.login=>getLogin and UserSessionRule.logon=>login 299/head
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 12 May 2015 08:47:32 +0000 (10:47 +0200)
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 12 May 2015 09:40:53 +0000 (11:40 +0200)
allow using the method name login() for the login action in UserSessionRule

90 files changed:
server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java
server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java
server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java
server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java
server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java
server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java
server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java
server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java
server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java
server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java
server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java
server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java
server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java
server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java
server/sonar-server/src/test/java/org/sonar/server/search/QueryContextTest.java
server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java
server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java
server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java
server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java
server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java
server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerMediumTest.java

index 81d7779ada4584edc6ca19b7121e6f72fe1e185c..d08a36ff518526215923192e5a623a43f86e64fd 100644 (file)
@@ -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()))
index 83aa5dd8f1df025769baafdc07c46cad188db0ff..8566ea5848cf5c72959f5619cb068bedf666309f 100644 (file)
@@ -121,7 +121,7 @@ public class ComponentAppAction implements RequestHandler {
     List<PropertyDto> propertyDtos = dbClient.propertiesDao().selectByQuery(PropertyQuery.builder()
       .setKey("favourite")
       .setComponentId(component.getId())
-      .setUserId(userSession.userId())
+      .setUserId(userSession.getUserId())
       .build(),
       session
       );
index 2ac0799b78b2750618b6172254740bb51e521c1e..1ba691ccae62a479fcd29366a0be5ed81350dc11 100644 (file)
@@ -95,7 +95,7 @@ public class SearchAction implements RequestHandler {
       userSession.checkProjectUuidPermission(UserRole.USER, componentDto.projectUuid());
 
       Set<Long> projectIds = newLinkedHashSet(dbClient.componentIndexDao().selectProjectIdsFromQueryAndViewOrSubViewUuid(session, query, componentDto.uuid()));
-      Collection<Long> authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.userId(), UserRole.USER);
+      Collection<Long> authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.getUserId(), UserRole.USER);
 
       SearchOptions options = new SearchOptions();
       options.setPage(request.mandatoryParamAsInt(PAGE), request.mandatoryParamAsInt(PAGE_SIZE));
index 1c053863f4bbbaf0157caffc79267f3ebba2770f..71e26c747dd9be7f683bab2a19dce54e9a95c813 100644 (file)
@@ -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) {
index d6f46b7dd0cff6e3dacebeb3969ba986679b1526..056d6e75575d1d3ae6a88f66371bad9813799917 100644 (file)
@@ -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()) {
index f6f0058ad1080697d889ee07d316a8e882e51adb..38d3594632d7e98d34f59e22893a44dc108d05f7 100644 (file)
@@ -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
index 3737eb05dbd4d992d452582af7d2662723bbe3d7..e29eb8cde12417cddb123c3fda634508d0b52ee3 100644 (file)
@@ -95,7 +95,7 @@ public class IssueBulkChangeService {
     Repository repository = new Repository(issues);
 
     List<Action> bulkActions = getActionsToApply(issueBulkChangeQuery, issues, userSession);
-    IssueChangeContext issueChangeContext = IssueChangeContext.createUser(new Date(), userSession.login());
+    IssueChangeContext issueChangeContext = IssueChangeContext.createUser(new Date(), userSession.getLogin());
     Set<String> concernedProjects = new HashSet<>();
     for (Issue issue : issues) {
       ActionContext actionContext = new ActionContext(issue, issueChangeContext);
index 8e1af0d3916e84bfab42ef367eae3ef88b18aa00..34cedf47052cf94cd3194ecb345710f679f65496 100644 (file)
@@ -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");
     }
 
index efe306caf7c086b2375f314b9c7cc6bb559774ee..26c35fe6d8c0f1f01fff9ac0ff4940f5eb8ef31d 100644 (file)
@@ -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<String> l) {
index 16220ab9603121ca15eb8af527706517b8417565..f6923d6fa76041386e61efd6b52bec7fd1bcc6c6 100644 (file)
@@ -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 {
index e73c04426f647e6f0504c6973081ff8c7ada4288..3f5489fccbfa1190f581ad74b91e36e7b87d0242 100644 (file)
@@ -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);
       }
index d71d9c3d5cf07616c376099e7c3d1e103f9ea73b..1d7299a8a20390e25717cebb1b5f9423790c42ad 100644 (file)
@@ -104,7 +104,7 @@ public class ActionPlanService {
    */
   private void unplanIssues(DefaultActionPlan actionPlan, UserSession userSession) {
     List<IssueDto> dtos = findIssuesByActionPlan(actionPlan.key());
-    IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.login());
+    IssueChangeContext context = IssueChangeContext.createUser(new Date(), userSession.getLogin());
     List<DefaultIssue> issues = newArrayList();
     for (IssueDto issueDto : dtos) {
       DefaultIssue issue = issueDto.toDefaultIssue();
index 8b8909c4edc3b5ae30ee1dd05b8b0e1e8a4d63dd..a7e6e9d0ee04030293e68da74ff97ee5adee7d64 100644 (file)
@@ -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");
     }
index 8308be1b662cf1e158965487efdc55a9ec9da93c..064cc2e5caa2a21dea1a3cc8b272f9cfaae34c93 100644 (file)
@@ -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));
   }
 
 }
index 5a6930663a524c5aa41cdb0cc86493bdb4f02cb9..b73dc7a7a0b5645dad287b65fd9d226d6ced9ec3 100644 (file)
@@ -521,7 +521,7 @@ public class IssueIndex extends BaseIndex {
   }
 
   private void addAssignedToMeFacetIfNeeded(SearchRequestBuilder builder, SearchOptions options, IssueQuery query, Map<String, FilterBuilder> 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<IssueDoc> 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()) {
index 2db4b0b35efbb817d33fa27b57f39d9989b14ece..a165eeaa5c178ac098d172ae4bc96b59939ba941 100644 (file)
@@ -66,7 +66,7 @@ public class IssueActionsWriter {
 
   private List<String> actions(Issue issue) {
     List<String> actions = newArrayList();
-    String login = userSession.login();
+    String login = userSession.getLogin();
     if (login != null) {
       actions.add("comment");
       if (issue.resolution() == null) {
index 3e0a84f26a60a75a6e8f10c80b7e907be323a33f..93d94ccada87cef31b168d1afe82ccee646c6423 100644 (file)
@@ -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<String, User> usersByLogin = newHashMap();
     List<DefaultIssueComment> comments = commentService.findComments(issue.key());
index 87f867b01a84066f0a5d06d130b54fa8def881cd..2956de301339d9c2ed4bf774a7b7043f6d0407c0 100644 (file)
@@ -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<DefaultIssueComment> issueComments, Map<String, User> 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;
index 31b4ca2c40024d13846e4d0042e793d71d5a0d31..a4ca8e3f1bed8bcce1f7795a8b896fa18a5414fc 100644 (file)
@@ -60,7 +60,7 @@ public class QProfileProjectLookup {
       }
 
       List<Component> result = Lists.newArrayList();
-      Collection<String> authorizedProjectKeys = db.authorizationDao().selectAuthorizedRootProjectsKeys(userSession.userId(), UserRole.USER);
+      Collection<String> authorizedProjectKeys = db.authorizationDao().selectAuthorizedRootProjectsKeys(userSession.getUserId(), UserRole.USER);
       for (Map.Entry<String, Component> entry : componentsByKeys.entrySet()) {
         if (authorizedProjectKeys.contains(entry.getKey())) {
           result.add(entry.getValue());
index 7b9f8cbf5164a86adfe5e370eaada414713396d2..aabf7126c45bc728183f4036b7225024d796f1cb 100644 (file)
@@ -118,7 +118,7 @@ public class QProfileProjectsAction implements BaseQProfileWsAction {
         }
       });
 
-      final Collection<Long> authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.userId(), UserRole.USER);
+      final Collection<Long> authorizedProjectIds = dbClient.authorizationDao().keepAuthorizedProjectIds(session, projectIds, userSession.getUserId(), UserRole.USER);
       Iterable<ProjectQprofileAssociationDto> authorizedProjects = Iterables.filter(projects, new Predicate<ProjectQprofileAssociationDto>() {
         @Override
         public boolean apply(ProjectQprofileAssociationDto input) {
index 4e715408d05213ebe7691f419e67f3f34f3f5a61..e9e2200f6d87adc4836a1dbd856e79ad3911cc5e 100644 (file)
@@ -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());
     }
   }
 
index 8e24491b34591161a3ce145fb1c29339961dc855..cc881eee494f1c0ae814d67477ba55a34042a613 100644 (file)
@@ -51,8 +51,8 @@ public class QueryContext {
   private Set<String> userGroups = newHashSet();
 
   public QueryContext(UserSession userSession) {
-    this.userLogin = userSession.login();
-    this.userGroups = userSession.userGroups();
+    this.userLogin = userSession.getLogin();
+    this.userGroups = userSession.getUserGroups();
   }
 
   /**
index 75fdda425dac64f14baff716dd168b02956b125f..dfa22076e81f2e0d5246b6bec6e59fda80f25c54 100644 (file)
@@ -136,7 +136,7 @@ public class ComponentNavigationAction implements NavigationAction {
       .prop("canBeFavorite", userSession.isLoggedIn())
       .prop("isFavorite", isFavourite(session, component, userSession));
 
-    List<DashboardDto> dashboards = activeDashboardDao.selectProjectDashboardsForUserLogin(session, userSession.login());
+    List<DashboardDto> 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();
index 95f7a80f50293b740bb8951b8f8fcccc53ada5b8..3c8ae6b9a36847a40d14b2d1731dece3f1e8094e 100644 (file)
@@ -65,7 +65,7 @@ public class GlobalNavigationAction implements NavigationAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    List<DashboardDto> dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(userSession.login());
+    List<DashboardDto> dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(userSession.getLogin());
     if (dashboards.isEmpty()) {
       dashboards = activeDashboardDao.selectGlobalDashboardsForUserLogin(ANONYMOUS);
     }
index e83ed9b046b549c80a780d1b8f8f134e012663c0..8c91da197306a654ba584aa75d837056b094883b 100644 (file)
@@ -60,7 +60,7 @@ public abstract class AbstractUserSession<T extends AbstractUserSession> impleme
 
   @Override
   @CheckForNull
-  public String login() {
+  public String getLogin() {
     return login;
   }
 
@@ -71,7 +71,7 @@ public abstract class AbstractUserSession<T extends AbstractUserSession> impleme
 
   @Override
   @CheckForNull
-  public String name() {
+  public String getName() {
     return name;
   }
 
@@ -82,7 +82,7 @@ public abstract class AbstractUserSession<T extends AbstractUserSession> impleme
 
   @Override
   @CheckForNull
-  public Integer userId() {
+  public Integer getUserId() {
     return userId;
   }
 
@@ -92,7 +92,7 @@ public abstract class AbstractUserSession<T extends AbstractUserSession> impleme
   }
 
   @Override
-  public Set<String> userGroups() {
+  public Set<String> getUserGroups() {
     return userGroups;
   }
 
index 3655ee6661da68d6fc495394bad793908ccc6c5c..ac4aaeabf079d2c3fb01c8627cc3187191ee5eb1 100644 (file)
@@ -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);
index 2a8b84e1782400f8ec4e273ab02b81d15a6ad2de..70fe607e91318c3984eadb1739c7a5e88836d33f 100644 (file)
@@ -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<String> userGroups() {
-    return get().userGroups();
+  public Set<String> getUserGroups() {
+    return get().getUserGroups();
   }
 
   @Override
index 9e683613dfd3b0656151b86a6e6ff39524f5b608..64a7b3f6d0e26bc65fe345e1a262d7d872d90b42 100644 (file)
@@ -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<String> userGroups();
+  Set<String> getUserGroups();
 
   boolean isLoggedIn();
 
index 0b28b42bb75b7c3799d92452b0a4af2e40e3e063..037f5deb12f2af4a5bd63cb4c9af7fecefd648da 100644 (file)
@@ -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);
   }
 
index b4de673212ec06b1fe20d808064f083c9be9cacc..c2bb32d819710c7e1ed44f8a95ee01fd4180e0e5 100644 (file)
@@ -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;
index 691cd7802f149dd6f6ec7a05880ee966100ec288..95ee7c4603e941b9c746f44c0871903cb6621228 100644 (file)
@@ -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();
index d3901cf98fdb7447525a9535d661265ade979ea3..8b1e5e2516663d34c14d4dbc4f7ec96e5966338d 100644 (file)
@@ -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
index b7ef762d0fb9b03a76854bd651c485cedfa9eea6..43c000cafaebe59603b9b8968611ef2fe8f7698c 100644 (file)
@@ -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");
 
index 4ef699790858af3ca7b80c483e1593af8e032c3a..e1d3b0dbfb8072310919dc7cc4e73c0e54580004 100644 (file)
@@ -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);
index e3176625da28d3a06bd49949f36eec2b0f7ea828..0c70e06c6eebbea0d0eb247646c939bb64498bba 100644 (file)
@@ -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<String, String> 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<String, String> 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;
index 81b374179f56e741d71f79b65beea8e0722b7974..815f60ca46451712fb46229fcab11b388aff8bdc 100644 (file)
@@ -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 {
index 6a13468a02e4ab870fbde3a80ee1e2ac56058afe..c63ff362391d97e9c33a0751a7ea0bf53e5c7ff1 100644 (file)
@@ -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");
 
index d94ff01ccd5def6b77e419982452bef9255a0158..da1d066b7961ac0faf64326acfb2241395f0966a 100644 (file)
@@ -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"));
index 6a6065e547ce9a5beb73333dff99fde59b50a6c0..bf6b9e8a2e44a06010753f1bb1ccc1bd7ced8881 100644 (file)
@@ -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());
   }
 
index 914e2584e2c592c094980a35b9e1eb4c72fc70af..7723f024513b78170b3683cab4fe2c2afb52afef 100644 (file)
@@ -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));
   }
index 2eb0a14762594d54d82c2c0b0138aac1d0a2b478..f3978d66bf0e642fe48d9b067359452450e00596 100644 (file)
@@ -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();
   }
index 456a53d0a6e1e2b671eb24465c54559464717ea2..49f18628b803c993ed7f1fcdc850341363aab730 100644 (file)
@@ -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() {
index 494dc0f85978ac8a210c4090994e7d9d99bb0de1..474954387061c431cae775879e2a4845dd152b97 100644 (file)
@@ -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;
   }
index ee80ba9d5a7535688c4848b7d1f9bc449e27bc58..31821775dca3fe0c5db72ee879f25308f56d3b75 100644 (file)
@@ -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)
     );
index f65c6cc731c3ef272032377bb59bff85bcbfaff3..bc03da1f778f916f67b0530f4061a0eb6986f33a 100644 (file)
@@ -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)
     ));
index bf7eff3a0782b42075e2cffe3c10ecf0b0a1986c..392736f87fe5e1f99e2c12336c9eb327b298ffab 100644 (file)
@@ -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 {
index 01ef670374a047d41082edbb0c347c9422673651..9bb25207e18427a9a6cd7e76253a9bdb855087e5 100644 (file)
@@ -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);
   }
 
index 28ba950a7f9d9007f9770e3843abe84472373fd3..34aab044a418bdb3acb91cea3157df8c638fddd3 100644 (file)
@@ -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\": []}");
index 07923c3b45466ad862708f52cb2a6cd610bdd8f4..b9e6343413aa832148474c034b1bdaecb05ed8c7 100644 (file)
@@ -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");
   }
index fd1144b14952c11d8883c15ddee8779c1e231a02..0a5e71aa09f7730ae43663131eb5c8abd3343f3d 100644 (file)
@@ -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));
   }
 
index 46858518bae649837112adf79866683151c9fb43..714cc6b1b126e8dbb164b7329db7d09e84c6eb7a 100644 (file)
@@ -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) {
index 57190440976e521df061f12a0209dc11cf52fcad..6023df7133eba1740cfcd44d5042d91ea15d5e51 100644 (file)
@@ -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();
index 530450cdcc20fda119d4c945a309852437a6e158..815c63980b92e4a0a0b4f76375f823b84349607b 100644 (file)
@@ -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");
index 4d62088342f041659bac80bf9b5a1952c603555e..d18eb7b79d2edfc5a442e104be8226bb8129b3e3 100644 (file)
@@ -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
index 86517b09fdf7b3b795e8dbfbf981760d9e4643ba..f93b1fd2992869d7ed4490ca6b03da0316e8aa03 100644 (file)
@@ -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);
index 22f97568b4fa887fcad33767fef371839083de12..28f09a659cbe5a21e4907b26bb0d8376dfa9436c 100644 (file)
@@ -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();
index 8578e79503f6b019811f583618a7bc1e6244171c..e635ee2d7baef82fe618abf564debbc80180ec25 100644 (file)
@@ -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();
 
index f5ceee8a51667d633cf9c41cbdd3a7ccc0453534..14beeb84bc1fdb8047767bd5dc28f3892486d2c1 100644 (file)
@@ -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")
index 3681fdc3b83ce65d5ef1d858957252ab4108f6aa..bf14f0935bbc51d83aabb68be354fc10698e3d5c 100644 (file)
@@ -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")
index 431a070b3c4c59e228a38ddba7a93072124d5568..d0c187dd61ff10773cadf5b1c63fed626b0a7fed 100644 (file)
@@ -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")
index 1f785995342a67fec78ec70a92ae67cb0f400fd9..d3085347f1392cfa9931a53855f91e30f968b6fb 100644 (file)
@@ -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");
index 7ba826b07ab7f9cc20ade13c596d62b586394849..ec94fb144457d7cfb030f0114ac57c0de9e7fd61 100644 (file)
@@ -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();
   }
 }
index 29cb83fcfe27b6a129fbd5f2a833dd06d0392a80..23fec4a8451656041c8af2874edc1650cb9d6cb3 100644 (file)
@@ -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)
index 0374142ccef1b722b0065f83563763801855a5c7..fc6a0536b22ed4f975fff8d0c53bdf036cb83f32 100644 (file)
@@ -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")
index 70bb0eaf12a373118475d562ed1079455c190f67..4d53849978284b37f8eaebb12529d8e53303eb34 100644 (file)
@@ -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", "<polop><palap/></polop>").execute();
   }
index a01c788be43b2f42e7e36a03984afe3d44021d98..e621bd0d0b5fde749b3cc5fc727c3b3568b2dbb9 100644 (file)
@@ -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();
index fce5c1e8d373d6da9e8be3187357eaa11fd9591e..985b0f521438c7ab628024acbdeee16ad7fcb090 100644 (file)
@@ -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;
index 9b45602d1dd737c69defcbdee66a8ceb452b0330..c9d52563aab1e1a8a51476b42489ae072792040c 100644 (file)
@@ -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();
index 320f6ec9ebae3217b7d65211a2bbe197bcc73a90..c571bf9683699cd17a1ed8446b4bc456b1460b8d 100644 (file)
@@ -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("<div>Manual rule desc</div>");
@@ -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");
index 78f192c8bed408897526aa6095f5805174e5f754..5a5888725efd2a9c4b9ce4809e6b03aa51f90086 100644 (file)
@@ -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)
index df8e83952e4bbe1b927360894a5acefbfd206541..3180807140b686c9cebd390a76ed66f5880180e0 100644 (file)
@@ -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;
index 3a63e84a41a3072775957f66b598500d2dda1674..2ca529121ef63e14967f63740318d08419327feb 100644 (file)
@@ -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;
index fa6bae4d8870e4f79e7b17c9a37220e8c48524be..0997d956ec42ca92edf2e8bc162281ad3c76fa28 100644 (file)
@@ -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;
 
index fa621d6a04ddf9ae0251114b23c98d0c631dccdf..650200e55a8ad03dd399e39dee9ffa909fb44eca 100644 (file)
@@ -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;
 
index e25e14ddf964233e7aabbb67190f238fa0014852..3b1dde59945faf4655d6747e78a8f2d477ca597e 100644 (file)
@@ -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();
   }
 }
index e838bbd5233d822625e16158a06536e3f437353f..b93a8a23b3d7422caed57850cdafb77454e8901c 100644 (file)
@@ -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)
index f324062cb8e9d3f4cc7daf79f890fe78a1ac8673..ec3ba7a0b125a9f41a6a52b5d87141c159f2cd03 100644 (file)
@@ -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();
   }
index 32ab416fb7ec98b5c7efbd4c52b4b0deed9c4c22..4a35ad5473e4223ceb517a89f0964406920deb0f 100644 (file)
@@ -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.:
  * <pre>
  * {@literal @}Rule
- * public UserSessionRule userSessionRule = UserSessionRule.standalone().logon("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
+ * public UserSessionRule userSessionRule = UserSessionRule.standalone().login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
  * </pre>
  * </p>
  * <p>
@@ -71,8 +71,9 @@ import static com.google.common.base.Preconditions.checkState;
  * {@code UserSessionRule.standalone().anonymous()}.
  * </p>
  * <p>
- * 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).
  * </p>
  */
 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<String> userGroups() {
-    return currentUserSession.userGroups();
+  public Set<String> getUserGroups() {
+    return currentUserSession.getUserGroups();
   }
 
   @Override
index 497b6b49d012bd69e54044dbed9b311159ab02a2..00d5ab1c7a13e8fa3dcf59294558e7dfa23ca4e3 100644 (file)
@@ -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);
 
index 94fe1731ba6a63d683957a9f734d8d1d1e515d76..337c8b36e9243371154ce49645d5c005204c68b8 100644 (file)
@@ -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");
   }
index c4598b2685c27b88ae664e866b19a332f64485e8..d757d3ab17ff6039443085be7d3fa3f166e7f621 100644 (file)
@@ -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();
index 80b6b61e735862fbce78af64f332618f2d04c326..eb6160d5717ad4fe18fc912c9799dc89d883138c 100644 (file)
@@ -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);
   }
index d9c6ba1cfff566fe581336d2249ccf469eb43b8a..a333e4232586f86fe149829976c8812ae05bb390 100644 (file)
@@ -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();
   }
 
index 69de8cc00bd6a1732298e65914d368a05afca6d8..40a64d627ed80a386e266f3132df09445aa0610e 100644 (file)
@@ -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);
   }
index bf11bb03311e6d0e4cd76938f4d3401dc068dfdc..407337ab5aa795b36517b9c098ef492c2cb06cdd 100644 (file)
@@ -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();
index 3ef6f083c88d5c95bc037d6a6e40470c7890aacd..aa41c94be68efbc6a7555dbab84fa9f0ccb38d2d 100644 (file)
@@ -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")
index 2a6d65028960c3cf09ff8ad9f25936d56e324929..3ee91682a3fe355aa154005ff806faa4dc7c9378 100644 (file)
@@ -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");
   }
index 005ec57c260d61b49b32026fff955a7961df96ff..8a1ee1daf748c5287f71cea6018ff5a6415fee10 100644 (file)
@@ -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();
   }
index 42c31591d839b73c3d14aa2d71afb2ea1152d967..84f19cd13a43116fa8728ac21eb5a605473a177c 100644 (file)
@@ -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();
index 0493cc734efd9a7bebe07ade0fc1df13d3ffb9ae..6f9ae0d9a0ff3144673b5e36574fe0e497ec487e 100644 (file)
@@ -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));
   }