Update RolePermissionsControllerTest

Author: pieperm

server/src/test/java/com/objectcomputing/checkins/services/role/role_permissions/RolePermissionsControllerTest.java

@@ -2,19 +2,13 @@
 
 import com.objectcomputing.checkins.security.permissions.Permissions;
 import com.objectcomputing.checkins.services.TestContainersSuite;
-import com.objectcomputing.checkins.services.feedback_answer.FeedbackAnswer;
-import com.objectcomputing.checkins.services.feedback_answer.FeedbackAnswerCreateDTO;
-import com.objectcomputing.checkins.services.feedback_request.FeedbackRequest;
-import com.objectcomputing.checkins.services.feedback_template.FeedbackTemplate;
-import com.objectcomputing.checkins.services.feedback_template.template_question.TemplateQuestion;
 import com.objectcomputing.checkins.services.fixture.MemberProfileFixture;
 import com.objectcomputing.checkins.services.fixture.PermissionFixture;
 import com.objectcomputing.checkins.services.fixture.RoleFixture;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.permissions.Permission;
 import com.objectcomputing.checkins.services.role.Role;
 import com.objectcomputing.checkins.services.role.RoleType;
-import com.tc.text.StringFormatter;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -28,7 +22,6 @@
 import jakarta.inject.Inject;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -52,7 +45,7 @@ void testGetAllRolePermissions() {
         MemberProfile user = createADefaultMemberProfile();
         assignAdminRole(user);
 
-        Role adminRole = getRoleRepository().findByRole(RoleType.ADMIN.name()).get();
+        Role adminRole = getRoleRepository().findByRole(RoleType.ADMIN.name()).orElseThrow();
 
         final HttpRequest<Object> request = HttpRequest.
                 GET("/").basicAuth(user.getWorkEmail(), RoleType.Constants.ADMIN_ROLE);
@@ -64,13 +57,14 @@ void testGetAllRolePermissions() {
         assertEquals(HttpStatus.OK, response.getStatus());
         assertTrue(response.getBody().isPresent());
 
-        List<RolePermissionsResponseDTO> actual = response.getBody().get();
-        assertEquals(adminRole.getId(), actual.get(0).getRoleId());
-        assertEquals(adminRole.getRole(), actual.get(0).getRole());
-        assertNotNull(actual.get(0).getDescription());
-        assertEquals(17, actual.get(0).getPermissions().size());
-        List<Permission> assigned = actual.get(0).getPermissions();
-        for(Permissions permission: adminPermissions) {
+        RolePermissionsResponseDTO actual = response.getBody().get().get(0);
+        assertEquals(adminRole.getId(), actual.getRoleId());
+        assertEquals(adminRole.getRole(), actual.getRole());
+        assertNotNull(actual.getDescription());
+        assertEquals(adminPermissions.size(), actual.getPermissions().size());
+
+        List<Permission> assigned = actual.getPermissions();
+        for (Permissions permission : adminPermissions) {
             Permission stored = getPermissionRepository().findByPermission(permission.name()).get(0);
             assertTrue(assigned.contains(stored));
         }
@@ -91,14 +85,14 @@ void testAssignPermissionToRole() {
         MemberProfile sender = createADefaultMemberProfile();
         assignAdminRole(sender);
 
-        Role memberRole = getRoleRepository().findByRole(RoleType.MEMBER.name()).get();
+        Role memberRole = getRoleRepository().findByRole(RoleType.MEMBER.name()).orElseThrow();
         Permission birthdayPermission = getPermissionRepository().findByPermission(Permissions.CAN_VIEW_BIRTHDAY_REPORT.name()).get(0);
 
         RolePermissionDTO dto = new RolePermissionDTO(memberRole.getId(), birthdayPermission.getId());
 
         final HttpRequest<?> request = HttpRequest.POST("/", dto)
                 .basicAuth(sender.getWorkEmail(), RoleType.Constants.ADMIN_ROLE);
-        final HttpResponse response = client.toBlocking().exchange(request, Map.class);
+        final HttpResponse<?> response = client.toBlocking().exchange(request, Map.class);
 
         assertEquals(HttpStatus.CREATED, response.getStatus());
         assertEquals(1, getRolePermissionRepository().findByIds(memberRole.getId().toString(), birthdayPermission.getId().toString()).size());
@@ -109,13 +103,13 @@ void testRemovePermissionFromRole() {
         MemberProfile sender = createADefaultMemberProfile();
         assignAdminRole(sender);
 
-        Role memberRole = getRoleRepository().findByRole(RoleType.MEMBER.name()).get();
+        Role memberRole = getRoleRepository().findByRole(RoleType.MEMBER.name()).orElseThrow();
         Permission birthdayPermission = getPermissionRepository().findByPermission(Permissions.CAN_VIEW_BIRTHDAY_REPORT.name()).get(0);
         setRolePermission(memberRole.getId(), birthdayPermission.getId());
 
         final HttpRequest<?> request = HttpRequest.DELETE("/", new RolePermissionDTO(memberRole.getId(), birthdayPermission.getId()))
                 .basicAuth(sender.getWorkEmail(), RoleType.Constants.ADMIN_ROLE);
-        final HttpResponse response = client.toBlocking().exchange(request, Map.class);
+        final HttpResponse<?> response = client.toBlocking().exchange(request, Map.class);
 
         assertEquals(HttpStatus.OK, response.getStatus());
         assertEquals(0, getRolePermissionRepository().findByIds(memberRole.getId().toString(), birthdayPermission.getId().toString()).size());