fix: updated test cases

src/main/java/com/digitalsanctuary/spring/user/controller/AdminPageController.java

@@ -0,0 +1,27 @@
+package com.digitalsanctuary.spring.user.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * The AdminPageController for the admin pages.
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Controller
+public class AdminPageController {
+
+  /**
+   * Admin actions page.
+   *
+   * @return the string
+   */
+  @GetMapping("${admin.actionsURI:/admin/actions.html}")
+  @PreAuthorize("hasAuthority('ADMIN_PRIVILEGE')")
+  public String actions() {
+    return "admin/actions";
+  }
+}

src/main/resources/config/dsspringuserconfig.properties

@@ -94,6 +94,8 @@ user.security.changePasswordURI=/user/changePassword
 # The URI for the registration confirm page.
 user.security.registrationConfirmURI=/user/registrationConfirm
 
+admin.actionsURI=/admin/actions.html
+
 # The from address for all emails sent by the application.
 [email protected]
 # The cron expression for the token purge job.  This defaults to 3 am every day.

src/test/java/com/digitalsanctuary/spring/user/api/AdminApiTest.java

@@ -1,30 +1,61 @@
 package com.digitalsanctuary.spring.user.api;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.digitalsanctuary.spring.user.api.provider.ApiTestAccountUnlockArgumentProvider;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import com.digitalsanctuary.spring.user.api.data.ApiTestData;
 import com.digitalsanctuary.spring.user.api.data.DataStatus;
 import com.digitalsanctuary.spring.user.api.data.Response;
 import com.digitalsanctuary.spring.user.api.helper.AssertionsHelper;
-import com.digitalsanctuary.spring.user.api.provider.ApiTestAccountLockingArgumentsProvider;
+import com.digitalsanctuary.spring.user.api.provider.ApiTestAccountLockArgumentsProvider;
 import com.digitalsanctuary.spring.user.api.provider.holder.ApiTestArgumentsHolder;
 import com.digitalsanctuary.spring.user.dto.UserDto;
 import com.digitalsanctuary.spring.user.jdbc.Jdbc;
 
+import java.util.Collections;
+
 @ActiveProfiles("test")
 // @Disabled("Temporarily disabled due to dependency issues")
 public class AdminApiTest extends BaseApiTest {
     private static final String URL = "/admin";
     private static final UserDto baseAdminUser = ApiTestData.BASE_ADMIN_USER;
     private static final UserDto baseTestUser = ApiTestData.BASE_TEST_USER;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @BeforeAll
+    public static void beforeAll() {
+        Jdbc.saveTestUser(baseAdminUser);
+        Jdbc.saveTestUser(baseTestUser);
+    }
+
+    @BeforeEach
+    public void setup() {
+        UsernamePasswordAuthenticationToken authentication =
+                new UsernamePasswordAuthenticationToken(
+                        baseAdminUser.getEmail(),
+                        null,
+                        Collections.singletonList(new SimpleGrantedAuthority("ADMIN_PRIVILEGE"))
+                );
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
     @AfterAll
     public static void afterAll() {
         Jdbc.deleteTestUser(baseAdminUser);
@@ -37,10 +68,10 @@ public static void afterAll() {
      * @throws Exception testing with 3 params: existing email, non-existing email, no email
      */
     @ParameterizedTest
-    @ArgumentsSource(ApiTestAccountLockingArgumentsProvider.class)
+    @ArgumentsSource(ApiTestAccountLockArgumentsProvider.class)
     public void lockUserAccount(ApiTestArgumentsHolder argumentsHolder) throws Exception {
         ResultActions action = perform(MockMvcRequestBuilders.post(URL + "/lockAccount").contentType(MediaType.APPLICATION_JSON)
-                .content(String.valueOf(argumentsHolder.getLockAccountDto())));
+                .content(objectMapper.writeValueAsString(argumentsHolder.getLockAccountDto())));
 
         verifyResponse(action, argumentsHolder);
     }
@@ -52,10 +83,10 @@ public void lockUserAccount(ApiTestArgumentsHolder argumentsHolder) throws Excep
      * @throws Exception when the test fails
      */
     @ParameterizedTest
-    @ArgumentsSource(ApiTestAccountLockingArgumentsProvider.class)
+    @ArgumentsSource(ApiTestAccountUnlockArgumentProvider.class)
     public void unlockUserAccount(ApiTestArgumentsHolder argumentsHolder) throws Exception {
         ResultActions action = perform(MockMvcRequestBuilders.post(URL + "/unlockAccount").contentType(MediaType.APPLICATION_JSON)
-                .content(String.valueOf(argumentsHolder.getLockAccountDto())));
+                .content(objectMapper.writeValueAsString(argumentsHolder.getLockAccountDto())));
 
         verifyResponse(action, argumentsHolder);
     }

src/test/java/com/digitalsanctuary/spring/user/api/data/ApiTestData.java

@@ -120,14 +120,18 @@ public static Response deleteAccountFailry() {
     }
 
     public static Response successLockAccount() {
-        return new Response(true, null, null, new String[] {"Account Locked"}, null);
+        return new Response(true, null, null, new String[] {"User account locked successfully"}, null);
     }
 
     public static Response lockAccountFailry() {
-        return new Response(false, null, null, new String[] {"User not found"}, null);
+        return new Response(false, 2, null, new String[] {"User not found"}, null);
     }
 
     public static Response invalidBodyLockAccountFailry() {
         return new Response(false, 1, null, new String[] {"Email is required"}, null);
     }
+
+    public static Response successUnlockAccount() {
+        return new Response(true, null, null, new String[] {"User account unlocked successfully"}, null);
+    }
 }

src/test/java/com/digitalsanctuary/spring/user/api/provider/ApiTestAccountLockingArgumentsProvider.java → src/test/java/com/digitalsanctuary/spring/user/api/provider/ApiTestAccountLockArgumentsProvider.java

@@ -9,7 +9,7 @@
 
 import java.util.stream.Stream;
 
-public class ApiTestAccountLockingArgumentsProvider implements ArgumentsProvider {
+public class ApiTestAccountLockArgumentsProvider implements ArgumentsProvider {
   @Override
   public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
     return Stream.of(

src/test/java/com/digitalsanctuary/spring/user/api/provider/ApiTestAccountUnlockArgumentProvider.java

@@ -0,0 +1,35 @@
+package com.digitalsanctuary.spring.user.api.provider;
+
+import com.digitalsanctuary.spring.user.api.data.ApiTestData;
+import com.digitalsanctuary.spring.user.api.data.DataStatus;
+import com.digitalsanctuary.spring.user.api.provider.holder.ApiTestArgumentsHolder;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+
+import java.util.stream.Stream;
+
+public class ApiTestAccountUnlockArgumentProvider implements ArgumentsProvider {
+  @Override
+  public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+    return Stream.of(
+            new ApiTestArgumentsHolder(
+                    ApiTestData.getLockAccountDto(),
+                    DataStatus.VALID,
+                    ApiTestData.successUnlockAccount()
+            ),
+
+            new ApiTestArgumentsHolder(
+                    ApiTestData.getEmptyLockAccountDto(),
+                    DataStatus.INVALID,
+                    ApiTestData.invalidBodyLockAccountFailry()
+            ),
+
+            new ApiTestArgumentsHolder(
+                    ApiTestData.getLockAccountDtoForMissingUser(),
+                    DataStatus.NOT_FOUND,
+                    ApiTestData.lockAccountFailry()
+            )
+    ).map(Arguments::of);
+  }
+}