Fix recurring FPs in PermissionTemplateDaoTest#user_count_by_template_and_permission

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
index e7c25e3d7b291505eb10d1f55546024ecebbfe69..e7d22969d9402a2f0985e52fca8d68c2d827122e 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.db.permission.template;
 
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -307,25 +306,28 @@ public class PermissionTemplateDaoTest {
     PermissionTemplateDto template1 = templateDb.insertTemplate();
     PermissionTemplateDto template2 = templateDb.insertTemplate();
     PermissionTemplateDto template3 = templateDb.insertTemplate();
+    PermissionTemplateDto anotherTemplate = templateDb.insertTemplate();
 
     UserDto user1 = db.users().insertUser();
     UserDto user2 = db.users().insertUser();
     UserDto user3 = db.users().insertUser();
 
-    templateDb.addUserToTemplate(42L, user1.getId(), ISSUE_ADMIN);
     templateDb.addUserToTemplate(template1.getId(), user1.getId(), ADMIN);
     templateDb.addUserToTemplate(template1.getId(), user2.getId(), ADMIN);
     templateDb.addUserToTemplate(template1.getId(), user3.getId(), ADMIN);
     templateDb.addUserToTemplate(template1.getId(), user1.getId(), USER);
     templateDb.addUserToTemplate(template2.getId(), user1.getId(), USER);
+    templateDb.addUserToTemplate(anotherTemplate.getId(), user1.getId(), ISSUE_ADMIN);
 
     final List<CountByTemplateAndPermissionDto> result = new ArrayList<>();
     underTest.usersCountByTemplateIdAndPermission(dbSession, asList(template1.getId(), template2.getId(), template3.getId()),
       context -> result.add(context.getResultObject()));
-    assertThat(result).hasSize(3);
-    assertThat(result).extracting("permission").containsOnly(ADMIN, USER);
-    assertThat(result).extracting("templateId").containsOnly(template1.getId(), template2.getId());
-    assertThat(result).extracting("count").containsOnly(3, 1);
+    assertThat(result)
+      .extracting(CountByTemplateAndPermissionDto::getPermission, CountByTemplateAndPermissionDto::getTemplateId, CountByTemplateAndPermissionDto::getCount)
+      .containsExactlyInAnyOrder(
+        tuple(ADMIN, template1.getId(), 3),
+        tuple(USER, template1.getId(), 1),
+        tuple(USER, template2.getId(), 1));
   }
 
   @Test