Refactor UserServiceTest imports and add eventPublisher mock for improved test setup

Author: devondragon

src/test/java/com/digitalsanctuary/spring/user/service/UserServiceTest.java

@@ -1,27 +1,26 @@
 package com.digitalsanctuary.spring.user.service;
 
-import com.digitalsanctuary.spring.user.dto.UserDto;
-import com.digitalsanctuary.spring.user.exceptions.UserAlreadyExistException;
-import com.digitalsanctuary.spring.user.persistence.model.Role;
-import com.digitalsanctuary.spring.user.persistence.model.User;
-import com.digitalsanctuary.spring.user.persistence.repository.PasswordResetTokenRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.RoleRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.UserRepository;
-import com.digitalsanctuary.spring.user.persistence.repository.VerificationTokenRepository;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import java.util.Collections;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.crypto.password.PasswordEncoder;
-
-import java.util.Collections;
-
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
+import com.digitalsanctuary.spring.user.dto.UserDto;
+import com.digitalsanctuary.spring.user.exceptions.UserAlreadyExistException;
+import com.digitalsanctuary.spring.user.persistence.model.Role;
+import com.digitalsanctuary.spring.user.persistence.model.User;
+import com.digitalsanctuary.spring.user.persistence.repository.PasswordResetTokenRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.RoleRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.UserRepository;
+import com.digitalsanctuary.spring.user.persistence.repository.VerificationTokenRepository;
 
 @ExtendWith(MockitoExtension.class)
 @Disabled("Temporarily disabled due to OAuth2 dependency issues")
@@ -46,6 +45,8 @@ public class UserServiceTest {
     public UserVerificationService userVerificationService;
     @Mock
     private DSUserDetailsService dsUserDetailsService;
+    @Mock
+    private ApplicationEventPublisher eventPublisher;
 
     @Mock
     private AuthorityService authorityService;
@@ -72,7 +73,7 @@ void setUp() {
         testUserDto.setRole(1);
 
         userService = new UserService(userRepository, tokenRepository, passwordTokenRepository, passwordEncoder, roleRepository, sessionRegistry,
-                userEmailService, userVerificationService, authorityService, dsUserDetailsService);
+                userEmailService, userVerificationService, authorityService, dsUserDetailsService, eventPublisher);
     }
 
     @Test
@@ -103,25 +104,25 @@ void checkIfValidOldPassword_returnTrueIfValid() {
         when(passwordEncoder.matches(anyString(), anyString())).thenReturn(true);
         Assertions.assertTrue(userService.checkIfValidOldPassword(testUser, testUser.getPassword()));
     }
-    
+
     // Tests temporarily disabled until OAuth2 dependency issue is resolved
-//    @Test
-//    void checkIfValidOldPassword_returnFalseIfInvalid() {
-//        when(passwordEncoder.matches(anyString(), anyString())).thenReturn(false);
-//        Assertions.assertFalse(userService.checkIfValidOldPassword(testUser, "wrongPassword"));
-//    }
-//
-//    @Test
-//    void changeUserPassword_encodesAndSavesNewPassword() {
-//        String newPassword = "newTestPassword";
-//        String encodedPassword = "encodedNewPassword";
-//
-//        when(passwordEncoder.encode(newPassword)).thenReturn(encodedPassword);
-//        when(userRepository.save(any(User.class))).thenReturn(testUser);
-//
-//        userService.changeUserPassword(testUser, newPassword);
-//
-//        Assertions.assertEquals(encodedPassword, testUser.getPassword());
-//    }
+    // @Test
+    // void checkIfValidOldPassword_returnFalseIfInvalid() {
+    // when(passwordEncoder.matches(anyString(), anyString())).thenReturn(false);
+    // Assertions.assertFalse(userService.checkIfValidOldPassword(testUser, "wrongPassword"));
+    // }
+    //
+    // @Test
+    // void changeUserPassword_encodesAndSavesNewPassword() {
+    // String newPassword = "newTestPassword";
+    // String encodedPassword = "encodedNewPassword";
+    //
+    // when(passwordEncoder.encode(newPassword)).thenReturn(encodedPassword);
+    // when(userRepository.save(any(User.class))).thenReturn(testUser);
+    //
+    // userService.changeUserPassword(testUser, newPassword);
+    //
+    // Assertions.assertEquals(encodedPassword, testUser.getPassword());
+    // }
 
 }