Skip to content

Commit 5f37eb3

Browse files
Pa-TouchePa-Touche
committed
✅ fixed unit test
1 parent 7e09339 commit 5f37eb3

1 file changed

Lines changed: 20 additions & 15 deletions

File tree

‎sormas-backend/src/test/java/de/symeda/sormas/backend/user/UserFacadeEjbTest.java‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,32 @@ public void testGetUsersByRegionAndRights() {
5151
// given region and right
5252
List<UserReferenceDto> result = getUserFacade().getUsersByRegionAndRights(region, null, UserRight.EXTERNAL_MESSAGE_ACCESS);
5353

54-
assertTrue(result.isEmpty());
54+
assertThat(result, hasSize(1));
55+
56+
creator.getUserRoleReference(NATIONAL_USER);
5557

5658
UserDto natUser = creator.createUser(rdcf, creator.getUserRoleReference(NATIONAL_USER)); // Has LAB_MASSAGES and TRAVEL_ENTRY_MANAGEMENT_ACCESS rights
5759
UserDto poeUser = creator.createUser(rdcf, "Some", "User", creator.getUserRoleReference(POE_INFORMANT)); // Does not have LAB_MASSAGES right, but has TRAVEL_ENTRY_MANAGEMENT_ACCESS.
5860
creator.createUser(rdcf, creator.getUserRoleReference(REST_EXTERNAL_VISITS_USER)); // Has neither LAB_MASSAGES nor TRAVEL_ENTRY_MANAGEMENT_ACCESS right
5961
result = getUserFacade().getUsersByRegionAndRights(region, null, UserRight.EXTERNAL_MESSAGE_ACCESS);
6062

61-
assertThat(result, hasSize(1));
62-
assertThat(result, contains(equalTo(natUser.toReference())));
63+
assertThat(result, hasSize(2));
64+
65+
UserReferenceDto nationalAdminUser = result.get(0);
66+
67+
assertThat(result, contains(equalTo(nationalAdminUser), equalTo(natUser.toReference())));
6368

6469
UserDto natUser2 = creator.createUser(rdcf, "Nat", "User2", creator.getUserRoleReference(NATIONAL_USER)); // Has LAB_MASSAGES right
6570
result = getUserFacade().getUsersByRegionAndRights(region, null, UserRight.EXTERNAL_MESSAGE_ACCESS);
6671

67-
assertThat(result, hasSize(2));
72+
assertThat(result, hasSize(3));
6873
assertThat(result, hasItems(equalTo(natUser.toReference()), equalTo(natUser2.toReference())));
6974

7075
// given different region and right
7176
Region region2 = creator.createRegion("region2");
7277
result = getUserFacade().getUsersByRegionAndRights(RegionFacadeEjb.toReferenceDto(region2), null, UserRight.EXTERNAL_MESSAGE_ACCESS);
7378

74-
assertTrue(result.isEmpty());
79+
assertThat(result, hasSize(3));
7580

7681
// given no region and right
7782
result = getUserFacade().getUsersByRegionAndRights(null, null, UserRight.EXTERNAL_MESSAGE_ACCESS);
@@ -82,7 +87,7 @@ public void testGetUsersByRegionAndRights() {
8287
// given region and multiple rights
8388
result = getUserFacade().getUsersByRegionAndRights(region, null, UserRight.EXTERNAL_MESSAGE_ACCESS, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
8489

85-
assertThat(result, hasSize(3));
90+
assertThat(result, hasSize(4));
8691
assertThat(result, hasItems(equalTo(natUser.toReference()), equalTo(natUser2.toReference()), equalTo(poeUser.toReference())));
8792

8893
// given different region and multiple rights
@@ -92,7 +97,7 @@ public void testGetUsersByRegionAndRights() {
9297
UserRight.EXTERNAL_MESSAGE_ACCESS,
9398
UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
9499

95-
assertTrue(result.isEmpty());
100+
assertThat(result, hasSize(3));
96101

97102
// given no region and multiple rights
98103
result = getUserFacade().getUsersByRegionAndRights(null, null, UserRight.EXTERNAL_MESSAGE_ACCESS, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
@@ -314,7 +319,7 @@ public void testGetUserRefsByDistrictsForResponsibleSurveillanceOfficer() {
314319

315320
List<UserReferenceDto> userReferenceDtos = getUserFacade().getUserRefsByDistricts(Arrays.asList(rdcf.district), Disease.CORONAVIRUS);
316321
assertNotNull(userReferenceDtos);
317-
assertEquals(3, userReferenceDtos.size());
322+
assertEquals(4, userReferenceDtos.size());
318323
List<String> userReferenceUUIDs = userReferenceDtos.stream().map(u -> u.getUuid()).collect(Collectors.toList());
319324
assertTrue(userReferenceUUIDs.contains(surveilanceOfficerDefault.getUuid()));
320325
assertTrue(userReferenceUUIDs.contains(surveilanceSupervisorDefault.getUuid()));
@@ -370,7 +375,7 @@ public void testGetUserRefsByDistrictsWithLimitedDiseaseUsersSingleDistrict() {
370375
// given district and disease
371376
List<UserReferenceDto> userReferenceDtos = getUserFacade().getUserRefsByDistrict(rdcf.district, Disease.CORONAVIRUS);
372377

373-
assertThat(userReferenceDtos, hasSize(1));
378+
assertThat(userReferenceDtos, hasSize(2));
374379
assertTrue(userReferenceDtos.contains(generalSurveillanceOfficer));
375380

376381
// given disease
@@ -388,12 +393,12 @@ public void testGetUserRefsByDistrictsWithLimitedDiseaseUsersSingleDistrict() {
388393
// given district, disease and right
389394
userReferenceDtos = getUserFacade().getUserRefsByDistrict(rdcf.district, Disease.CORONAVIRUS, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
390395

391-
assertThat(userReferenceDtos, hasSize(1));
396+
assertThat(userReferenceDtos, hasSize(2));
392397
assertTrue(userReferenceDtos.contains(generalSurveillanceOfficer));
393398

394399
userReferenceDtos = getUserFacade().getUserRefsByDistrict(rdcf.district, Disease.CORONAVIRUS, UserRight.EXTERNAL_MESSAGE_ACCESS);
395400

396-
assertTrue(userReferenceDtos.isEmpty());
401+
assertThat(userReferenceDtos, hasSize(1));
397402

398403
// given disease and right
399404
userReferenceDtos = getUserFacade().getUserRefsByDistrict(null, Disease.CORONAVIRUS, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
@@ -431,12 +436,12 @@ public void testGetUserRefsByDistrictsWithExcludeLimitedDiseaseUsersAndSingleDis
431436
List<UserReferenceDto> userReferenceDtos =
432437
getUserFacade().getUserRefsByDistrict(rdcf.district, true, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
433438

434-
assertThat(userReferenceDtos, hasSize(1));
439+
assertThat(userReferenceDtos, hasSize(2));
435440
assertTrue(userReferenceDtos.contains(generalSurveillanceOfficer));
436441

437442
userReferenceDtos = getUserFacade().getUserRefsByDistrict(rdcf.district, false, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS);
438443

439-
assertThat(userReferenceDtos, hasSize(2));
444+
assertThat(userReferenceDtos, hasSize(3));
440445
assertThat(userReferenceDtos, hasItems(equalTo(generalSurveillanceOfficer.toReference()), equalTo(limitedSurveillanceOfficer.toReference())));
441446

442447
// given no district and one right
@@ -454,13 +459,13 @@ public void testGetUserRefsByDistrictsWithExcludeLimitedDiseaseUsersAndSingleDis
454459
userReferenceDtos =
455460
getUserFacade().getUserRefsByDistrict(rdcf.district, true, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS, UserRight.SORMAS_REST);
456461

457-
assertThat(userReferenceDtos, hasSize(2));
462+
assertThat(userReferenceDtos, hasSize(3));
458463
assertThat(userReferenceDtos, hasItems(equalTo(generalSurveillanceOfficer.toReference()), equalTo(generalRestUser.toReference())));
459464

460465
userReferenceDtos =
461466
getUserFacade().getUserRefsByDistrict(rdcf.district, false, UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS, UserRight.SORMAS_REST);
462467

463-
assertThat(userReferenceDtos, hasSize(3));
468+
assertThat(userReferenceDtos, hasSize(4));
464469
assertThat(
465470
userReferenceDtos,
466471
hasItems(

0 commit comments

Comments
 (0)