From d9212df91042bdb88d45160c6bb3e5a80fa59a1b Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 16 Feb 2016 16:36:00 +0100 Subject: [PATCH] SONAR-7352 Deterministic order of groups in My Account page --- .../resources/org/sonar/db/user/GroupMembershipMapper.xml | 1 + .../test/java/org/sonar/db/user/GroupMembershipDaoTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml index 36591ceea05..5e9302d33d9 100644 --- a/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml @@ -56,6 +56,7 @@ #{login} + ORDER BY u.login, g.name, g.id diff --git a/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java index 8545c960628..6b82b32bf70 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java @@ -175,8 +175,8 @@ public class GroupMembershipDaoTest { assertThat(dao.selectGroupsByLogins(dbTester.getSession(), Arrays.asList()).keys()).isEmpty(); Multimap groupsByLogin = dao.selectGroupsByLogins(dbTester.getSession(), Arrays.asList("two-hundred", "two-hundred-one", "two-hundred-two")); - assertThat(groupsByLogin.get("two-hundred")).containsOnly("sonar-administrators", "sonar-users", "sonar-reviewers"); - assertThat(groupsByLogin.get("two-hundred-one")).containsOnly("sonar-users"); + assertThat(groupsByLogin.get("two-hundred")).containsExactly("sonar-administrators", "sonar-reviewers", "sonar-users"); + assertThat(groupsByLogin.get("two-hundred-one")).containsExactly("sonar-users"); assertThat(groupsByLogin.get("two-hundred-two")).isEmpty(); } -- 2.39.5