Skip to content

Commit

Permalink
Replace deprecated MockBean with MockitoBean
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nonononoki
Nonononoki committed Dec 27, 2024
1 parent 7d35ce0 commit ced5c59
Show file tree
Hide file tree
Showing 14 changed files with 118 additions and 155 deletions.
13 changes: 5 additions & 8 deletions src/test/java/com/nonononoki/alovoa/html/AdminResourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
package com.nonononoki.alovoa.html;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.AuthService;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.AuthService;

import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
@Transactional
Expand All @@ -25,7 +22,7 @@ class AdminResourceTest {
@Autowired
private UserRepository userRepo;

@MockBean
@MockitoBean
private AuthService authService;

@Test
Expand Down
26 changes: 10 additions & 16 deletions src/test/java/com/nonononoki/alovoa/html/DeleteAccountResourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
package com.nonononoki.alovoa.html;

import static org.mockito.ArgumentMatchers.any;

import java.util.List;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.AuthService;
import com.nonononoki.alovoa.service.CaptchaService;
import com.nonononoki.alovoa.service.MailService;
import com.nonononoki.alovoa.service.RegisterService;
import com.nonononoki.alovoa.service.RegisterServiceTest;
import com.nonononoki.alovoa.service.UserService;
import java.util.List;

import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
Expand Down Expand Up @@ -54,10 +48,10 @@ class DeleteAccountResourceTest {
@Autowired
private DeleteAccountResource deleteAccountResource;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

private List<User> testUsers;
Expand Down
26 changes: 10 additions & 16 deletions src/test/java/com/nonononoki/alovoa/html/PasswordResourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
package com.nonononoki.alovoa.html;

import static org.mockito.ArgumentMatchers.any;

import java.util.List;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.AuthService;
import com.nonononoki.alovoa.service.CaptchaService;
import com.nonononoki.alovoa.service.MailService;
import com.nonononoki.alovoa.service.RegisterService;
import com.nonononoki.alovoa.service.RegisterServiceTest;
import com.nonononoki.alovoa.service.UserService;
import java.util.List;

import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
Expand Down Expand Up @@ -54,10 +48,10 @@ class PasswordResourceTest {
@Autowired
private PasswordResource passwordResource;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

private List<User> testUsers;
Expand Down
26 changes: 10 additions & 16 deletions src/test/java/com/nonononoki/alovoa/html/ProfileResourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
package com.nonononoki.alovoa.html;

import static org.mockito.ArgumentMatchers.any;

import java.util.List;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import com.nonononoki.alovoa.service.AuthService;
import com.nonononoki.alovoa.service.CaptchaService;
import com.nonononoki.alovoa.service.MailService;
import com.nonononoki.alovoa.service.RegisterService;
import com.nonononoki.alovoa.service.RegisterServiceTest;
import com.nonononoki.alovoa.service.UserService;
import java.util.List;

import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
Expand Down Expand Up @@ -54,10 +48,10 @@ class ProfileResourceTest {
@Autowired
private ProfileResource profileResource;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

private List<User> testUsers;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/nonononoki/alovoa/service/AdminServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import java.net.URLDecoder;
Expand Down Expand Up @@ -66,10 +66,10 @@ class AdminServiceTest {
@Value("${app.first-name.length-min}")
private int firstNameLengthMin;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

@Autowired
Expand Down
33 changes: 16 additions & 17 deletions src/test/java/com/nonononoki/alovoa/service/DonateServiceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
package com.nonononoki.alovoa.service;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;

import java.util.List;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.model.DonationBmac;
import com.nonononoki.alovoa.model.DonationBmac.DonationBmacResponse;
import com.nonononoki.alovoa.model.DonationKofi;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserDonationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.model.DonationBmac;
import com.nonononoki.alovoa.model.DonationBmac.DonationBmacResponse;
import com.nonononoki.alovoa.model.DonationKofi;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserDonationRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
Expand Down Expand Up @@ -58,10 +57,10 @@ class DonateServiceTest {
@Value("${app.donate.bmac.key}")
private String bmacKey;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

@Autowired
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/com/nonononoki/alovoa/service/MailServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collections;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertFalse;
Expand Down Expand Up @@ -52,7 +50,7 @@ class MailServiceTest {
@Autowired
private TextEncryptorConverter textEncryptor;

@MockBean
@MockitoBean
private AuthService authService;

@Autowired
Expand Down
31 changes: 15 additions & 16 deletions src/test/java/com/nonononoki/alovoa/service/PasswordServiceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
package com.nonononoki.alovoa.service;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;

import java.util.List;

import com.nonononoki.alovoa.entity.Captcha;
import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.entity.user.UserPasswordToken;
import com.nonononoki.alovoa.model.PasswordChangeDto;
import com.nonononoki.alovoa.model.PasswordResetDto;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserPasswordTokenRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;

import com.nonononoki.alovoa.entity.Captcha;
import com.nonononoki.alovoa.entity.User;
import com.nonononoki.alovoa.entity.user.UserPasswordToken;
import com.nonononoki.alovoa.model.PasswordChangeDto;
import com.nonononoki.alovoa.model.PasswordResetDto;
import com.nonononoki.alovoa.repo.ConversationRepository;
import com.nonononoki.alovoa.repo.UserPasswordTokenRepository;
import com.nonononoki.alovoa.repo.UserRepository;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;

@SpringBootTest
@ActiveProfiles("test")
Expand Down Expand Up @@ -59,10 +58,10 @@ class PasswordServiceTest {
@Value("${app.first-name.length-min}")
private int firstNameLengthMin;

@MockBean
@MockitoBean
private AuthService authService;

@MockBean
@MockitoBean
private MailService mailService;

@Autowired
Expand Down
Loading

0 comments on commit ced5c59

Please sign in to comment.