diff --git a/service/src/main/java/bio/terra/externalcreds/services/ProviderOAuthClientCache.java b/service/src/main/java/bio/terra/externalcreds/services/ProviderOAuthClientCache.java index b2143904..4fd463cd 100644 --- a/service/src/main/java/bio/terra/externalcreds/services/ProviderOAuthClientCache.java +++ b/service/src/main/java/bio/terra/externalcreds/services/ProviderOAuthClientCache.java @@ -36,10 +36,11 @@ public ClientRegistration getProviderClient(Provider provider) { ClientRegistration.Builder builder = switch (provider) { - case RAS -> ClientRegistrations.fromOidcIssuerLocation(providerInfo.getIssuer()) - .clientId(providerInfo.getClientId()) - .clientSecret(providerInfo.getClientSecret()) - .issuerUri(providerInfo.getIssuer()); + case RAS -> + ClientRegistrations.fromOidcIssuerLocation(providerInfo.getIssuer()) + .clientId(providerInfo.getClientId()) + .clientSecret(providerInfo.getClientSecret()) + .issuerUri(providerInfo.getIssuer()); case GITHUB -> { String redirectUri = providerInfo.getAllowedRedirectUriPatterns().stream() @@ -54,12 +55,12 @@ public ClientRegistration getProviderClient(Provider provider) { .redirectUri(redirectUri) .userNameAttributeName(providerInfo.getUserNameAttributeName()); } - case FENCE, DCF_FENCE, ANVIL, KIDS_FIRST -> ClientRegistrations.fromOidcIssuerLocation( - providerInfo.getIssuer()) - .clientId(providerInfo.getClientId()) - .clientSecret(providerInfo.getClientSecret()) - .issuerUri(providerInfo.getIssuer()) - .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS); + case FENCE, DCF_FENCE, ANVIL, KIDS_FIRST -> + ClientRegistrations.fromOidcIssuerLocation(providerInfo.getIssuer()) + .clientId(providerInfo.getClientId()) + .clientSecret(providerInfo.getClientSecret()) + .issuerUri(providerInfo.getIssuer()) + .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS); case ERA_COMMONS -> { if (externalCredsConfig.getEraCommonsLinkingEnabled()) { yield ClientRegistrations.fromOidcIssuerLocation(providerInfo.getIssuer()) diff --git a/service/src/main/java/bio/terra/externalcreds/services/ProviderTokenClientCache.java b/service/src/main/java/bio/terra/externalcreds/services/ProviderTokenClientCache.java index 43d9f116..5abd5ddf 100644 --- a/service/src/main/java/bio/terra/externalcreds/services/ProviderTokenClientCache.java +++ b/service/src/main/java/bio/terra/externalcreds/services/ProviderTokenClientCache.java @@ -37,11 +37,11 @@ public ClientRegistration getProviderClient(Provider provider) { ClientRegistration.Builder builder = switch (provider) { - case RAS, FENCE, DCF_FENCE, ANVIL, KIDS_FIRST -> ClientRegistrations - .fromOidcIssuerLocation(providerInfo.getIssuer()) - .clientId(providerInfo.getClientId()) - .clientSecret(providerInfo.getClientSecret()) - .issuerUri(providerInfo.getIssuer()); + case RAS, FENCE, DCF_FENCE, ANVIL, KIDS_FIRST -> + ClientRegistrations.fromOidcIssuerLocation(providerInfo.getIssuer()) + .clientId(providerInfo.getClientId()) + .clientSecret(providerInfo.getClientSecret()) + .issuerUri(providerInfo.getIssuer()); case GITHUB -> { String redirectUri = providerInfo.getAllowedRedirectUriPatterns().stream() diff --git a/service/src/main/java/bio/terra/externalcreds/visaComparators/VisaComparator.java b/service/src/main/java/bio/terra/externalcreds/visaComparators/VisaComparator.java index bc9905e8..e9c279c7 100644 --- a/service/src/main/java/bio/terra/externalcreds/visaComparators/VisaComparator.java +++ b/service/src/main/java/bio/terra/externalcreds/visaComparators/VisaComparator.java @@ -3,7 +3,9 @@ import bio.terra.externalcreds.models.GA4GHVisa; public interface VisaComparator { - /** @return true if visas represent the same authorizations */ + /** + * @return true if visas represent the same authorizations + */ boolean authorizationsMatch(GA4GHVisa visa1, GA4GHVisa visa2); boolean matchesCriterion(GA4GHVisa visa, VisaCriterionInternal criterion); diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/AdminApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/AdminApiControllerTest.java index 61c52d6d..9fbf2174 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/AdminApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/AdminApiControllerTest.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @AutoConfigureMockMvc @@ -38,9 +38,9 @@ class AdminApiControllerTest extends BaseTest { @Autowired private MockMvc mvc; @Autowired private ExternalCredsConfig externalCredsConfig; - @MockBean private LinkedAccountService linkedAccountService; - @MockBean private PassportService passportService; - @MockBean private ExternalCredsSamUserFactory samUserFactoryMock; + @MockitoBean private LinkedAccountService linkedAccountService; + @MockitoBean private PassportService passportService; + @MockitoBean private ExternalCredsSamUserFactory samUserFactoryMock; @Nested class PutLinkedAccountWithFakeToken { diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/FenceAccountKeyApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/FenceAccountKeyApiControllerTest.java index 009f8fa2..42455409 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/FenceAccountKeyApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/FenceAccountKeyApiControllerTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @AutoConfigureMockMvc @@ -33,12 +33,12 @@ class FenceAccountKeyApiControllerTest extends BaseTest { @Autowired private MockMvc mvc; - @MockBean private LinkedAccountService linkedAccountServiceMock; - @MockBean private FenceProviderService fenceProviderServiceMock; + @MockitoBean private LinkedAccountService linkedAccountServiceMock; + @MockitoBean private FenceProviderService fenceProviderServiceMock; - @MockBean private ExternalCredsSamUserFactory samUserFactoryMock; - @MockBean private FenceAccountKeyService fenceAccountKeyServiceMock; - @MockBean private AuditLogger auditLoggerMock; + @MockitoBean private ExternalCredsSamUserFactory samUserFactoryMock; + @MockitoBean private FenceAccountKeyService fenceAccountKeyServiceMock; + @MockitoBean private AuditLogger auditLoggerMock; private Provider provider = Provider.FENCE; @Nested diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/GlobalExceptionHandlerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/GlobalExceptionHandlerTest.java index 5b1e228d..7e326da5 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/GlobalExceptionHandlerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/GlobalExceptionHandlerTest.java @@ -9,12 +9,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @AutoConfigureMockMvc public class GlobalExceptionHandlerTest extends BaseTest { - @MockBean PublicApiController publicApiControllerMock; + @MockitoBean PublicApiController publicApiControllerMock; @Autowired private MockMvc mvc; @Test diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/OauthApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/OauthApiControllerTest.java index 9f8c3448..0fcc559d 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/OauthApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/OauthApiControllerTest.java @@ -39,8 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; @@ -50,26 +50,26 @@ class OauthApiControllerTest extends BaseTest { @Autowired private MockMvc mvc; - @MockBean private LinkedAccountService linkedAccountServiceMock; + @MockitoBean private LinkedAccountService linkedAccountServiceMock; - @MockBean + @MockitoBean @Qualifier("providerService") private ProviderService providerServiceMock; - @MockBean + @MockitoBean @Qualifier("passportProviderService") private PassportProviderService passportProviderServiceMock; - @MockBean + @MockitoBean @Qualifier("tokenProviderService") private TokenProviderService tokenProviderServiceMock; - @MockBean + @MockitoBean @Qualifier("fenceProviderService") private FenceProviderService fenceProviderServiceMock; - @MockBean private ExternalCredsSamUserFactory samUserFactoryMock; - @MockBean private AuditLogger auditLoggerMock; + @MockitoBean private ExternalCredsSamUserFactory samUserFactoryMock; + @MockitoBean private AuditLogger auditLoggerMock; private Provider provider = Provider.RAS; @@ -79,7 +79,10 @@ void testListProviders() throws Exception { .thenReturn(Set.of("fake-provider2", "fake-provider1")); mvc.perform(get("/api/oidc/v1/providers")) - .andExpect(content().json(""" + .andExpect( + content() + .json( + """ ["fake-provider1","fake-provider2"]""")); } diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/OidcApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/OidcApiControllerTest.java index cd5115f6..523a226b 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/OidcApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/OidcApiControllerTest.java @@ -40,7 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; @@ -51,19 +51,19 @@ class OidcApiControllerTest extends BaseTest { @Autowired private MockMvc mvc; - @MockBean private LinkedAccountService linkedAccountServiceMock; + @MockitoBean private LinkedAccountService linkedAccountServiceMock; - @MockBean + @MockitoBean @Qualifier("providerService") private ProviderService providerServiceMock; - @MockBean + @MockitoBean @Qualifier("passportProviderService") private PassportProviderService passportProviderServiceMock; - @MockBean private ExternalCredsSamUserFactory samUserFactoryMock; - @MockBean private PassportService passportServiceMock; - @MockBean private AuditLogger auditLoggerMock; + @MockitoBean private ExternalCredsSamUserFactory samUserFactoryMock; + @MockitoBean private PassportService passportServiceMock; + @MockitoBean private AuditLogger auditLoggerMock; private Provider provider = Provider.RAS; @Test @@ -72,7 +72,10 @@ void testListProviders() throws Exception { .thenReturn(Set.of("fake-provider2", "fake-provider1")); mvc.perform(get("/api/oidc/v1/providers")) - .andExpect(content().json(""" + .andExpect( + content() + .json( + """ ["fake-provider1","fake-provider2"]""")); } diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/PassportApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/PassportApiControllerTest.java index b1560b07..388f4cc2 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/PassportApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/PassportApiControllerTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @AutoConfigureMockMvc @@ -31,7 +31,7 @@ public class PassportApiControllerTest extends BaseTest { @Autowired private ObjectMapper objectMapper; - @MockBean private PassportService passportServiceMock; + @MockitoBean private PassportService passportServiceMock; @Test void testValidatePassport() throws Exception { diff --git a/service/src/test/java/bio/terra/externalcreds/controllers/PublicApiControllerTest.java b/service/src/test/java/bio/terra/externalcreds/controllers/PublicApiControllerTest.java index fd984e31..52600957 100644 --- a/service/src/test/java/bio/terra/externalcreds/controllers/PublicApiControllerTest.java +++ b/service/src/test/java/bio/terra/externalcreds/controllers/PublicApiControllerTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @AutoConfigureMockMvc @@ -22,15 +22,18 @@ public class PublicApiControllerTest extends BaseTest { @Autowired private MockMvc mvc; - @MockBean private ExternalCredsConfig externalCredsConfig; - @MockBean private StatusService statusService; + @MockitoBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private StatusService statusService; @Test void testGetStatus() throws Exception { when(statusService.getSystemStatus()) .thenReturn(new SystemStatus().ok(true).putSystemsItem("postgres", true)); mvc.perform(get("/status")) - .andExpect(content().json(""" + .andExpect( + content() + .json( + """ {"ok": true,"systems": { "postgres": true }}""")); } diff --git a/service/src/test/java/bio/terra/externalcreds/dataAccess/GA4GHPassportDAOTest.java b/service/src/test/java/bio/terra/externalcreds/dataAccess/GA4GHPassportDAOTest.java index 688b6753..31b8d36c 100644 --- a/service/src/test/java/bio/terra/externalcreds/dataAccess/GA4GHPassportDAOTest.java +++ b/service/src/test/java/bio/terra/externalcreds/dataAccess/GA4GHPassportDAOTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.dao.DuplicateKeyException; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class GA4GHPassportDAOTest extends BaseTest { @@ -25,7 +25,7 @@ class GA4GHPassportDAOTest extends BaseTest { @Autowired private GA4GHPassportDAO passportDAO; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private ExternalCredsConfig externalCredsConfig; @Test void testGetMissingPassport() { diff --git a/service/src/test/java/bio/terra/externalcreds/dataAccess/LinkedAccountDAOTest.java b/service/src/test/java/bio/terra/externalcreds/dataAccess/LinkedAccountDAOTest.java index 4383dcaf..110fa165 100644 --- a/service/src/test/java/bio/terra/externalcreds/dataAccess/LinkedAccountDAOTest.java +++ b/service/src/test/java/bio/terra/externalcreds/dataAccess/LinkedAccountDAOTest.java @@ -25,14 +25,14 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class LinkedAccountDAOTest extends BaseTest { @Autowired private LinkedAccountDAO linkedAccountDAO; @Autowired private GA4GHPassportDAO passportDAO; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private ExternalCredsConfig externalCredsConfig; @BeforeEach void setUp() { diff --git a/service/src/test/java/bio/terra/externalcreds/pact/VerifyServicePacts.java b/service/src/test/java/bio/terra/externalcreds/pact/VerifyServicePacts.java index 4961448b..7a59df7e 100644 --- a/service/src/test/java/bio/terra/externalcreds/pact/VerifyServicePacts.java +++ b/service/src/test/java/bio/terra/externalcreds/pact/VerifyServicePacts.java @@ -37,13 +37,13 @@ import org.junit.platform.commons.util.StringUtils; import org.mockito.Mock; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2AccessToken.TokenType; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @@ -71,12 +71,12 @@ public static SelectorBuilder consumerVersionSelectors() { } } - @MockBean StatusDAO statusDAO; - @MockBean LinkedAccountDAO linkedAccountDAO; - @MockBean AccessTokenCacheDAO accessTokenCacheDAO; - @MockBean SamUserFactory samUserFactory; - @MockBean OAuth2Service oAuth2Service; - @MockBean StatusServiceCache statusServiceCache; + @MockitoBean StatusDAO statusDAO; + @MockitoBean LinkedAccountDAO linkedAccountDAO; + @MockitoBean AccessTokenCacheDAO accessTokenCacheDAO; + @MockitoBean SamUserFactory samUserFactory; + @MockitoBean OAuth2Service oAuth2Service; + @MockitoBean StatusServiceCache statusServiceCache; @Mock private OAuth2AccessTokenResponse mockAccessTokenResponse; @BeforeEach diff --git a/service/src/test/java/bio/terra/externalcreds/services/AccessTokenCacheServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/AccessTokenCacheServiceTest.java index f52f712a..d055f0ae 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/AccessTokenCacheServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/AccessTokenCacheServiceTest.java @@ -22,20 +22,20 @@ import java.util.UUID; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class AccessTokenCacheServiceTest extends BaseTest { @Autowired private AccessTokenCacheService accessTokenCacheService; - @MockBean private LinkedAccountService linkedAccountService; - @MockBean private ProviderTokenClientCache providerTokenClientCacheMock; - @MockBean private OAuth2Service oAuth2ServiceMock; - @MockBean private AccessTokenCacheDAO accessTokenCacheDAO; - @MockBean private AuditLogger auditLoggerMock; + @MockitoBean private LinkedAccountService linkedAccountService; + @MockitoBean private ProviderTokenClientCache providerTokenClientCacheMock; + @MockitoBean private OAuth2Service oAuth2ServiceMock; + @MockitoBean private AccessTokenCacheDAO accessTokenCacheDAO; + @MockitoBean private AuditLogger auditLoggerMock; private final String clientIP = "127.0.0.1"; private final Random random = new Random(); diff --git a/service/src/test/java/bio/terra/externalcreds/services/AuthorizationCodeExchangeTest.java b/service/src/test/java/bio/terra/externalcreds/services/AuthorizationCodeExchangeTest.java index e28c72ee..a6aa8c0b 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/AuthorizationCodeExchangeTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/AuthorizationCodeExchangeTest.java @@ -35,7 +35,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.OAuth2AccessToken.TokenType; @@ -44,11 +43,12 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; import org.springframework.security.oauth2.core.user.DefaultOAuth2User; import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class AuthorizationCodeExchangeTest extends BaseTest { - @MockBean OAuth2Service oAuth2ServiceMock; - @MockBean ProviderOAuthClientCache providerOAuthClientCacheMock; - @MockBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean OAuth2Service oAuth2ServiceMock; + @MockitoBean ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; @Autowired PassportProviderService passportProviderService; @Autowired PassportService passportService; diff --git a/service/src/test/java/bio/terra/externalcreds/services/FenceKeyRetrieverTest.java b/service/src/test/java/bio/terra/externalcreds/services/FenceKeyRetrieverTest.java index 2a51bac2..57fe32e0 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/FenceKeyRetrieverTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/FenceKeyRetrieverTest.java @@ -30,27 +30,27 @@ import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2ErrorCodes; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; class FenceKeyRetrieverTest extends BaseTest { @Autowired private FenceKeyRetriever fenceKeyRetriever; @Autowired private LinkedAccountService linkedAccountService; - @SpyBean private DistributedLockDAO distributedLockDAO; - @SpyBean private FenceAccountKeyService fenceAccountKeyService; + @MockitoSpyBean private DistributedLockDAO distributedLockDAO; + @MockitoSpyBean private FenceAccountKeyService fenceAccountKeyService; - @MockBean private ExternalCredsConfig externalCredsConfig; - @MockBean private ProviderOAuthClientCache providerOAuthClientCache; - @MockBean private OAuth2Service oAuth2Service; - @MockBean private AccessTokenCacheService accessTokenCacheService; + @MockitoBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private ProviderOAuthClientCache providerOAuthClientCache; + @MockitoBean private OAuth2Service oAuth2Service; + @MockitoBean private AccessTokenCacheService accessTokenCacheService; @Nested class FenceAccountKeyLocking { diff --git a/service/src/test/java/bio/terra/externalcreds/services/FenceProviderServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/FenceProviderServiceTest.java index bba7dc0a..0291b899 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/FenceProviderServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/FenceProviderServiceTest.java @@ -26,7 +26,6 @@ import java.util.UUID; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.OAuth2AccessToken; @@ -34,17 +33,18 @@ import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; import org.springframework.security.oauth2.core.user.DefaultOAuth2User; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class FenceProviderServiceTest extends BaseTest { @Autowired private FenceProviderService fenceProviderService; @Autowired private ObjectMapper objectMapper; - @MockBean private LinkedAccountService linkedAccountService; - @MockBean private FenceAccountKeyService fenceAccountKeyService; - @MockBean private ProviderOAuthClientCache providerOAuthClientCache; - @MockBean private OAuth2Service oAuth2Service; - @MockBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private LinkedAccountService linkedAccountService; + @MockitoBean private FenceAccountKeyService fenceAccountKeyService; + @MockitoBean private ProviderOAuthClientCache providerOAuthClientCache; + @MockitoBean private OAuth2Service oAuth2Service; + @MockitoBean private ExternalCredsConfig externalCredsConfig; private static final Random random = new Random(); diff --git a/service/src/test/java/bio/terra/externalcreds/services/JwtUtilsTest.java b/service/src/test/java/bio/terra/externalcreds/services/JwtUtilsTest.java index 2a4c5b7b..aa3fb80d 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/JwtUtilsTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/JwtUtilsTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.TestComponent; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; public class JwtUtilsTest extends BaseTest { @@ -46,7 +46,7 @@ static void tearDown() { class DecodeJwt { @Autowired JwtUtils jwtUtils; - @MockBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; @Test void testInvalidJwtSignature() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/LinkedAccountServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/LinkedAccountServiceTest.java index 95d7a1a5..346205d5 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/LinkedAccountServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/LinkedAccountServiceTest.java @@ -30,7 +30,7 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.TestComponent; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; public class LinkedAccountServiceTest extends BaseTest { @@ -58,15 +58,15 @@ void testSaveAndGetLinkedAccount() { @TestComponent class UpsertLinkedAccountWithPassportAndVisas { - @MockBean EventPublisher eventPublisherMock; + @MockitoBean EventPublisher eventPublisherMock; @Autowired private LinkedAccountService linkedAccountService; @Autowired private GA4GHPassportDAO passportDAO; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean(name = "test1") + @MockitoBean(name = "test1") private VisaComparator visaComparatorMock1; - @MockBean(name = "test2") + @MockitoBean(name = "test2") private VisaComparator visaComparatorMock2; @Test @@ -338,7 +338,7 @@ class DeleteLinkedAccount { @Autowired private GA4GHPassportDAO passportDAO; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean private EventPublisher eventPublisherMock; + @MockitoBean private EventPublisher eventPublisherMock; @Test void testDeleteNonExistingLinkedAccount() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/PassportServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/PassportServiceTest.java index 1e4c940f..ad7bc6c9 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/PassportServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/PassportServiceTest.java @@ -44,9 +44,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.TestComponent; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class PassportServiceTest extends BaseTest { private static final JwtSigningTestUtils jwtSigningTestUtils = new JwtSigningTestUtils(); @@ -110,8 +110,8 @@ class ValidatePassport { @Autowired LinkedAccountService linkedAccountService; @Autowired ObjectMapper objectMapper; - @MockBean ExternalCredsConfig externalCredsConfigMock; - @MockBean ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean ProviderOAuthClientCache providerOAuthClientCacheMock; @Test void testValidPassportMatchingCriteria() throws URISyntaxException { diff --git a/service/src/test/java/bio/terra/externalcreds/services/ProviderOAuthClientCacheTest.java b/service/src/test/java/bio/terra/externalcreds/services/ProviderOAuthClientCacheTest.java index b5967207..24634139 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/ProviderOAuthClientCacheTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/ProviderOAuthClientCacheTest.java @@ -16,14 +16,14 @@ import org.mockserver.model.HttpResponse; import org.mockserver.model.MediaType; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.*; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class ProviderOAuthClientCacheTest extends BaseTest { @Autowired private ProviderOAuthClientCache providerOAuthClientCache; - @MockBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private ExternalCredsConfig externalCredsConfig; @Test void testGitHubBuildClientRegistration() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/ProviderServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/ProviderServiceTest.java index d9fc099c..b8101484 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/ProviderServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/ProviderServiceTest.java @@ -58,7 +58,6 @@ import org.mockserver.verify.VerificationTimes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.TestComponent; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.HttpStatus; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; @@ -68,6 +67,7 @@ import org.springframework.security.oauth2.core.OAuth2ErrorCodes; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; +import org.springframework.test.context.bean.override.mockito.MockitoBean; public class ProviderServiceTest extends BaseTest { @@ -78,11 +78,11 @@ class DeleteLink { @Autowired private ProviderService providerService; @Autowired private ObjectMapper objectMapper; - @MockBean private LinkedAccountService linkedAccountServiceMock; - @MockBean private ExternalCredsConfig externalCredsConfigMock; - @MockBean private OAuth2Service oAuth2ServiceMock; - @MockBean private ProviderOAuthClientCache providerOAuthClientCacheMock; - @MockBean private FenceAccountKeyService fenceAccountKeyServiceMock; + @MockitoBean private LinkedAccountService linkedAccountServiceMock; + @MockitoBean private ExternalCredsConfig externalCredsConfigMock; + @MockitoBean private OAuth2Service oAuth2ServiceMock; + @MockitoBean private ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean private FenceAccountKeyService fenceAccountKeyServiceMock; @Test void testGetProviders() { @@ -370,10 +370,10 @@ class AuthAndRefreshPassport { @Autowired private LinkedAccountDAO linkedAccountDAO; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean private ExternalCredsConfig externalCredsConfigMock; - @MockBean private ProviderOAuthClientCache providerOAuthClientCacheMock; - @MockBean private OAuth2Service oAuth2ServiceMock; - @MockBean private JwtUtils jwtUtilsMock; + @MockitoBean private ExternalCredsConfig externalCredsConfigMock; + @MockitoBean private ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean private OAuth2Service oAuth2ServiceMock; + @MockitoBean private JwtUtils jwtUtilsMock; @Test void testExpiredLinkedAccountIsMarkedInvalid() { @@ -685,7 +685,7 @@ class RefreshExpiringPassports { @Autowired private LinkedAccountDAO linkedAccountDAO; @Autowired private PassportProviderService passportProviderService; - @MockBean private ExternalCredsConfig externalCredsConfigMock; + @MockitoBean private ExternalCredsConfig externalCredsConfigMock; @Test void testOnlyExpiringPassportsAreRefreshed() { @@ -726,7 +726,7 @@ class ValidateVisaWithProvider { @Autowired private LinkedAccountService linkedAccountService; @Autowired private GA4GHVisaDAO visaDAO; - @MockBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; @Test void testSuccessfullyValidatePassportWithProvider() { @@ -923,9 +923,9 @@ private LinkedAccountWithPassportAndVisas createLinkedAccountWithOldVisa( @Nested @TestComponent class OAuth2StateTest { - @MockBean OAuth2Service oAuth2ServiceMock; - @MockBean ProviderOAuthClientCache providerOAuthClientCacheMock; - @MockBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean OAuth2Service oAuth2ServiceMock; + @MockitoBean ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; @Autowired ProviderService providerService; @Autowired PassportProviderService passportProviderService; @@ -1149,9 +1149,9 @@ void testWrongJson() { @Nested @TestComponent class RedirectUriValidation { - @MockBean OAuth2Service oAuth2ServiceMock; - @MockBean ProviderOAuthClientCache providerOAuthClientCacheMock; - @MockBean ExternalCredsConfig externalCredsConfigMock; + @MockitoBean OAuth2Service oAuth2ServiceMock; + @MockitoBean ProviderOAuthClientCache providerOAuthClientCacheMock; + @MockitoBean ExternalCredsConfig externalCredsConfigMock; @Autowired ProviderService providerService; diff --git a/service/src/test/java/bio/terra/externalcreds/services/ProviderTokenClientCacheTest.java b/service/src/test/java/bio/terra/externalcreds/services/ProviderTokenClientCacheTest.java index 8dbf862c..fa7c4b44 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/ProviderTokenClientCacheTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/ProviderTokenClientCacheTest.java @@ -16,14 +16,14 @@ import org.mockserver.model.HttpResponse; import org.mockserver.model.MediaType; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.*; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class ProviderTokenClientCacheTest extends BaseTest { @Autowired private ProviderTokenClientCache providerTokenClientCache; - @MockBean private ExternalCredsConfig externalCredsConfig; + @MockitoBean private ExternalCredsConfig externalCredsConfig; @Test void testGitHubBuildClientRegistration() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/StatusServiceCacheTest.java b/service/src/test/java/bio/terra/externalcreds/services/StatusServiceCacheTest.java index 215845e1..8de452e9 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/StatusServiceCacheTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/StatusServiceCacheTest.java @@ -15,15 +15,15 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class StatusServiceCacheTest extends BaseTest { @Autowired private StatusServiceCache statusServiceCache; - @MockBean private ProviderOAuthClientCache providerOAuthClientCache; - @MockBean private SamStatusDAO samStatusDAO; + @MockitoBean private ProviderOAuthClientCache providerOAuthClientCache; + @MockitoBean private SamStatusDAO samStatusDAO; @BeforeEach void setUp() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/StatusServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/StatusServiceTest.java index feab80bb..b3427b74 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/StatusServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/StatusServiceTest.java @@ -10,13 +10,13 @@ import bio.terra.externalcreds.generated.model.SubsystemStatusDetail; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; class StatusServiceTest extends BaseTest { @Autowired private StatusService statusService; - @MockBean private StatusServiceCache statusServiceCache; - @MockBean private StatusDAO statusDAO; + @MockitoBean private StatusServiceCache statusServiceCache; + @MockitoBean private StatusDAO statusDAO; @Test void testgetSystemStatusDetail() { diff --git a/service/src/test/java/bio/terra/externalcreds/services/TokenProviderServiceTest.java b/service/src/test/java/bio/terra/externalcreds/services/TokenProviderServiceTest.java index f665f8dd..9a862426 100644 --- a/service/src/test/java/bio/terra/externalcreds/services/TokenProviderServiceTest.java +++ b/service/src/test/java/bio/terra/externalcreds/services/TokenProviderServiceTest.java @@ -24,16 +24,16 @@ import java.util.UUID; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.core.*; +import org.springframework.test.context.bean.override.mockito.MockitoBean; public class TokenProviderServiceTest extends BaseTest { @Autowired private TokenProviderService tokenProviderService; - @MockBean private AuditLogger auditLoggerMock; - @MockBean private LinkedAccountService linkedAccountService; - @MockBean private ProviderTokenClientCache providerTokenClientCacheMock; - @MockBean private OAuth2Service oAuth2ServiceMock; + @MockitoBean private AuditLogger auditLoggerMock; + @MockitoBean private LinkedAccountService linkedAccountService; + @MockitoBean private ProviderTokenClientCache providerTokenClientCacheMock; + @MockitoBean private OAuth2Service oAuth2ServiceMock; private final Provider provider = Provider.GITHUB; private final String userId = UUID.randomUUID().toString();