From 5f0dab109c0a8f9ef8e1ee0494a1c3d670413cd3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 22:14:10 +0000 Subject: [PATCH 1/2] chore(deps): update mockito to v4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9d3c0f75320..d453c34a793 100644 --- a/gradle.properties +++ b/gradle.properties @@ -87,7 +87,7 @@ junitVersion=4.13.2 lesscssVersion=1.7.0.1.1 logbackVersion=1.2.6 lombokVersion=1.18.22 -mockitoVersion=3.12.4 +mockitoVersion=4.0.0 luceneVersion=8.9.0 nodejsVersion=16.2.0 oauthVersion=20100527 From 1ff2f1991f4fcae7d629c4faa4efb9315aa19297 Mon Sep 17 00:00:00 2001 From: Christian Murphy Date: Mon, 11 Oct 2021 17:11:15 -0700 Subject: [PATCH 2/2] test: replace removed mockito methods with their modern equivalent --- .../profile/StickyProfileMapperImplTest.java | 6 +-- .../RenderingPipelineBranchPointTest.java | 2 +- .../portal/url/MaxInactiveFilterTest.java | 38 +++++++++---------- .../BasicAuthInterceptorTest.java | 4 +- .../ZeroLeggedOAuthInterceptorTest.java | 14 ++++--- .../locking/ClusterLockServiceImplTest.java | 4 +- ...rationComponentEventSerializationTest.java | 2 +- .../AggregationIntervalHelperImplTest.java | 2 +- .../events/aggr/IntervalHelperImplTest.java | 2 +- ...PortalEventDimensionPopulatorImplTest.java | 16 ++++---- .../PortalRawEventsAggregatorImplTest.java | 4 +- .../io/xml/IdentityImportExportTest.java | 2 +- .../xml/JaxbPortalDataHandlerServiceTest.java | 4 +- .../jpa/VersionedDataUpdaterImplTest.java | 2 +- .../CachingPortletOutputHandlerTest.java | 2 +- ...chingPortletResourceOutputHandlerTest.java | 2 +- .../cache/HeaderSettingCacheControlTest.java | 6 +-- .../PortletCacheControlServiceImplTest.java | 2 +- ...PortletEventCoordinatationServiceTest.java | 4 +- .../rendering/PortletRendererImplTest.java | 6 +-- ...mailPasswordResetNotificationImplTest.java | 8 ++-- .../google/GoogleCustomSearchServiceTest.java | 2 +- .../RenderingPipelineIntegrationTest.java | 6 +-- .../StAXSerializingComponentTest.java | 8 ++-- ...etAttributeSourceForSpELVariablesTest.java | 4 +- .../url/SingleTabUrlNodeSyntaxHelperTest.java | 2 +- .../portal/url/UrlSyntaxProviderImplTest.java | 10 ++--- .../url/xml/XsltPortalUrlProviderTest.java | 2 +- .../portal/version/VersionVerifierTest.java | 2 +- 29 files changed, 86 insertions(+), 82 deletions(-) diff --git a/uPortal-layout/uPortal-layout-core/src/test/java/org/apereo/portal/layout/profile/StickyProfileMapperImplTest.java b/uPortal-layout/uPortal-layout-core/src/test/java/org/apereo/portal/layout/profile/StickyProfileMapperImplTest.java index 41fda14216c..17eebab96f4 100644 --- a/uPortal-layout/uPortal-layout-core/src/test/java/org/apereo/portal/layout/profile/StickyProfileMapperImplTest.java +++ b/uPortal-layout/uPortal-layout-core/src/test/java/org/apereo/portal/layout/profile/StickyProfileMapperImplTest.java @@ -130,7 +130,7 @@ public void testIngoresGuestUserProfileSelections() { stickyMapper.onApplicationEvent(selectionEvent); - verifyZeroInteractions(registry); + verifyNoMoreInteractions(registry); } /** @@ -164,7 +164,7 @@ public void testIgnoresSelectionWhenIdentitySwapped() { stickyMapper.onApplicationEvent(selectionEvent); - verifyZeroInteractions(registry); + verifyNoMoreInteractions(registry); } /** @@ -178,7 +178,7 @@ public void testIgnoresInvalidProfileKey() { stickyMapper.onApplicationEvent(selectionEvent); - verifyZeroInteractions(registry); + verifyNoMoreInteractions(registry); } /** diff --git a/uPortal-rendering/src/test/java/org/apereo/portal/rendering/RenderingPipelineBranchPointTest.java b/uPortal-rendering/src/test/java/org/apereo/portal/rendering/RenderingPipelineBranchPointTest.java index 9cbe5b34c88..00f5a070570 100644 --- a/uPortal-rendering/src/test/java/org/apereo/portal/rendering/RenderingPipelineBranchPointTest.java +++ b/uPortal-rendering/src/test/java/org/apereo/portal/rendering/RenderingPipelineBranchPointTest.java @@ -85,7 +85,7 @@ public void rendersFalsePipeWhenPredicateIsFalse() throws ServletException, IOEx boolean outcome = renderingPipelineBranchPoint.renderStateIfApplicable(request, response); assertFalse("Expected outcome == true", outcome); - verifyZeroInteractions(alternatePipe); + verifyNoMoreInteractions(alternatePipe); } /** Test that RenderingPipelineBranchPoint has a friendly toString() implementation. */ diff --git a/uPortal-security/uPortal-security-mvc/src/test/java/org/apereo/portal/url/MaxInactiveFilterTest.java b/uPortal-security/uPortal-security-mvc/src/test/java/org/apereo/portal/url/MaxInactiveFilterTest.java index 88810ab1427..84c9b1da2ca 100644 --- a/uPortal-security/uPortal-security-mvc/src/test/java/org/apereo/portal/url/MaxInactiveFilterTest.java +++ b/uPortal-security/uPortal-security-mvc/src/test/java/org/apereo/portal/url/MaxInactiveFilterTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.only; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.io.IOException; @@ -78,8 +78,8 @@ public void timeSetOutsideRefreshDurationWorkflow() throws IOException, ServletE verify(person, times(1)).getAttribute(SESSION_MAX_INACTIVE_SET_ATTR); verify(person, times(1)).getAttribute(IPerson.USERNAME); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(resp); - verifyZeroInteractions(session); + verifyNoMoreInteractions(resp); + verifyNoMoreInteractions(session); verify(chain, only()).doFilter(req, resp); } @@ -119,7 +119,7 @@ public void noTimeSetWorkflow() throws IOException, ServletException { verify(person, times(1)).getAttribute(SESSION_MAX_INACTIVE_SET_ATTR); verify(person, times(2)).getAttribute(IPerson.USERNAME); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(resp); + verifyNoMoreInteractions(resp); verify(chain, only()).doFilter(req, resp); } @@ -154,9 +154,9 @@ public void timeSetInsideRefreshDurationWorkflow() throws IOException, ServletEx verify(person, times(1)).getAttribute(SESSION_MAX_INACTIVE_SET_ATTR); verify(person, times(1)).getAttribute(IPerson.USERNAME); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(maxInactiveStrategy); - verifyZeroInteractions(resp); - verifyZeroInteractions(session); + verifyNoMoreInteractions(maxInactiveStrategy); + verifyNoMoreInteractions(resp); + verifyNoMoreInteractions(session); verify(chain, only()).doFilter(req, resp); } @@ -188,9 +188,9 @@ public void notAuthenticatedWorkflow() throws IOException, ServletException { verify(person, times(1)).getSecurityContext(); verify(person, times(1)).getAttribute(IPerson.USERNAME); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(maxInactiveStrategy); - verifyZeroInteractions(resp); - verifyZeroInteractions(session); + verifyNoMoreInteractions(maxInactiveStrategy); + verifyNoMoreInteractions(resp); + verifyNoMoreInteractions(session); verify(chain, only()).doFilter(req, resp); } @@ -219,9 +219,9 @@ public void noSecurityContextWorkflow() throws IOException, ServletException { verify(person, times(1)).getSecurityContext(); verify(person, times(1)).getAttribute(IPerson.USERNAME); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(maxInactiveStrategy); - verifyZeroInteractions(resp); - verifyZeroInteractions(session); + verifyNoMoreInteractions(maxInactiveStrategy); + verifyNoMoreInteractions(resp); + verifyNoMoreInteractions(session); verify(chain, only()).doFilter(req, resp); } @@ -245,9 +245,9 @@ public void noPersonWorkflow() throws IOException, ServletException { filter.doFilter(req, resp, chain); verify(personManager, times(1)).getPerson(req); - verifyZeroInteractions(maxInactiveStrategy); - verifyZeroInteractions(resp); - verifyZeroInteractions(session); + verifyNoMoreInteractions(maxInactiveStrategy); + verifyNoMoreInteractions(resp); + verifyNoMoreInteractions(session); verify(chain, only()).doFilter(req, resp); } @@ -268,9 +268,9 @@ public void noSessionWorkflow() throws IOException, ServletException { filter.doFilter(req, resp, chain); - verifyZeroInteractions(personManager); - verifyZeroInteractions(maxInactiveStrategy); - verifyZeroInteractions(resp); + verifyNoMoreInteractions(personManager); + verifyNoMoreInteractions(maxInactiveStrategy); + verifyNoMoreInteractions(resp); verify(req, only()).getSession(false); verify(chain, only()).doFilter(req, resp); } diff --git a/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/BasicAuthInterceptorTest.java b/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/BasicAuthInterceptorTest.java index 631440cb737..bfa3a4e60d7 100644 --- a/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/BasicAuthInterceptorTest.java +++ b/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/BasicAuthInterceptorTest.java @@ -17,8 +17,8 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.hasKey; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/ZeroLeggedOAuthInterceptorTest.java b/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/ZeroLeggedOAuthInterceptorTest.java index d7e10d5aa65..4b8fdbad775 100644 --- a/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/ZeroLeggedOAuthInterceptorTest.java +++ b/uPortal-spring/src/test/java/org/springframework/web/client/interceptors/ZeroLeggedOAuthInterceptorTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.springframework.core.env.PropertyResolver; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -50,13 +50,16 @@ public void testInterceptor() throws Exception { final String secretKey = "secretKey"; PropertyResolver resolver = mock(PropertyResolver.class); - when(resolver.getProperty(Matchers.eq("org.jasig.rest.interceptor.oauth." + id + ".realm"))) + when(resolver.getProperty( + ArgumentMatchers.eq("org.jasig.rest.interceptor.oauth." + id + ".realm"))) .thenReturn(realm); when(resolver.getProperty( - Matchers.eq("org.jasig.rest.interceptor.oauth." + id + ".consumerKey"))) + ArgumentMatchers.eq( + "org.jasig.rest.interceptor.oauth." + id + ".consumerKey"))) .thenReturn(consumerKey); when(resolver.getProperty( - Matchers.eq("org.jasig.rest.interceptor.oauth." + id + ".secretKey"))) + ArgumentMatchers.eq( + "org.jasig.rest.interceptor.oauth." + id + ".secretKey"))) .thenReturn(secretKey); // holder for the headers... @@ -74,7 +77,8 @@ public void testInterceptor() throws Exception { when(client.execute()).thenReturn(resp); ClientHttpRequestFactory factory = mock(ClientHttpRequestFactory.class); - when(factory.createRequest(Matchers.any(URI.class), Matchers.any(HttpMethod.class))) + when(factory.createRequest( + ArgumentMatchers.any(URI.class), ArgumentMatchers.any(HttpMethod.class))) .thenReturn(client); // add the new interceptor... diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/concurrency/locking/ClusterLockServiceImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/concurrency/locking/ClusterLockServiceImplTest.java index 0672f72813a..d707ac606a4 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/concurrency/locking/ClusterLockServiceImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/concurrency/locking/ClusterLockServiceImplTest.java @@ -19,7 +19,7 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,7 +40,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; // @Ignore diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/AnalyticsIncorporationComponentEventSerializationTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/AnalyticsIncorporationComponentEventSerializationTest.java index 1701947546a..5546a146422 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/events/AnalyticsIncorporationComponentEventSerializationTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/events/AnalyticsIncorporationComponentEventSerializationTest.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class AnalyticsIncorporationComponentEventSerializationTest { diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/AggregationIntervalHelperImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/AggregationIntervalHelperImplTest.java index 53d156cf1b9..148682f71e4 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/AggregationIntervalHelperImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/AggregationIntervalHelperImplTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class AggregationIntervalHelperImplTest { diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/IntervalHelperImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/IntervalHelperImplTest.java index 145ded33138..6116c640231 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/IntervalHelperImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/IntervalHelperImplTest.java @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** */ @RunWith(MockitoJUnitRunner.class) diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalEventDimensionPopulatorImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalEventDimensionPopulatorImplTest.java index acd457850b8..7a3f51c55c2 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalEventDimensionPopulatorImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalEventDimensionPopulatorImplTest.java @@ -14,9 +14,9 @@ */ package org.apereo.portal.events.aggr; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -38,10 +38,10 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @Ignore // Breaks on move to Gradlde @RunWith(MockitoJUnitRunner.class) @@ -82,7 +82,7 @@ public void populateAllTimeDimensions() { verify(timeDimensionDao).getTimeDimensions(); verify(timeDimensionDao, times(60 * 24)) - .createTimeDimension(Matchers.anyObject()); + .createTimeDimension(ArgumentMatchers.any()); verifyNoMoreInteractions(timeDimensionDao, dateDimensionDao); } @@ -112,7 +112,7 @@ public void populateSomeTimeDimensions() { verify(timeDimensionDao).getTimeDimensions(); verify(timeDimensionDao, times((60 * 24) - existingTimeDimensions.size())) - .createTimeDimension(Matchers.anyObject()); + .createTimeDimension(ArgumentMatchers.any()); verifyNoMoreInteractions(timeDimensionDao, dateDimensionDao); } @@ -154,7 +154,7 @@ public void populateDefaultDateDimensions() { .getDateDimensionsBetween(any(DateMidnight.class), any(DateMidnight.class)); verify(dateDimensionDao, times(365)) - .createDateDimension(Matchers.anyObject(), anyInt(), anyString()); + .createDateDimension(ArgumentMatchers.any(), anyInt(), anyString()); verifyNoMoreInteractions(timeDimensionDao, dateDimensionDao); } } diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java index 2ec41b1c9a4..955370b88a0 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java @@ -16,7 +16,7 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -37,7 +37,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java index 802c0556683..30f482bcf16 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java @@ -14,7 +14,7 @@ */ package org.apereo.portal.io.xml; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import com.google.common.base.Function; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/JaxbPortalDataHandlerServiceTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/JaxbPortalDataHandlerServiceTest.java index 80bdd4d6856..02be52e739f 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/JaxbPortalDataHandlerServiceTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/io/xml/JaxbPortalDataHandlerServiceTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -53,7 +53,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/jpa/VersionedDataUpdaterImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/jpa/VersionedDataUpdaterImplTest.java index 6e7abfd1baa..d234defb7eb 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/jpa/VersionedDataUpdaterImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/jpa/VersionedDataUpdaterImplTest.java @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class VersionedDataUpdaterImplTest { diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandlerTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandlerTest.java index 7cfff7c7fdf..7bb4d2ff92f 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandlerTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandlerTest.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Test CachingPortletOutputHandler */ @Ignore // Breaks on move to Gradlde diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletResourceOutputHandlerTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletResourceOutputHandlerTest.java index a32de3c420f..bc87569f16b 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletResourceOutputHandlerTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/CachingPortletResourceOutputHandlerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Test CachingPortletResourceOutputHandler */ @Ignore // Breaks on move to Gradlde diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/HeaderSettingCacheControlTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/HeaderSettingCacheControlTest.java index 5cb2dea3f2a..76d45e47f2d 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/HeaderSettingCacheControlTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/HeaderSettingCacheControlTest.java @@ -14,8 +14,8 @@ */ package org.apereo.portal.portlet.container.cache; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** */ @Ignore // Breaks on move to Gradlde diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/PortletCacheControlServiceImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/PortletCacheControlServiceImplTest.java index 65bff31c84d..9620288102c 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/PortletCacheControlServiceImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/PortletCacheControlServiceImplTest.java @@ -46,7 +46,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpSession; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationServiceTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationServiceTest.java index 3217341907a..78ce8cbf55c 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationServiceTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationServiceTest.java @@ -15,7 +15,7 @@ package org.apereo.portal.portlet.rendering; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** */ @Ignore // Breaks on move to Gradlde diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletRendererImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletRendererImplTest.java index ab57d9ab78b..cdc462669ba 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletRendererImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/rendering/PortletRendererImplTest.java @@ -15,8 +15,8 @@ package org.apereo.portal.portlet.rendering; import static org.junit.Assert.assertArrayEquals; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlets/account/EmailPasswordResetNotificationImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlets/account/EmailPasswordResetNotificationImplTest.java index c352e7d4df7..9902e9115d6 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlets/account/EmailPasswordResetNotificationImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlets/account/EmailPasswordResetNotificationImplTest.java @@ -17,9 +17,9 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -42,7 +42,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.springframework.context.MessageSource; import org.springframework.mail.javamail.JavaMailSender; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlets/search/google/GoogleCustomSearchServiceTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlets/search/google/GoogleCustomSearchServiceTest.java index 800fb49580a..bdca15aafa9 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/portlets/search/google/GoogleCustomSearchServiceTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/portlets/search/google/GoogleCustomSearchServiceTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/RenderingPipelineIntegrationTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/RenderingPipelineIntegrationTest.java index df197f645c3..274a8d10752 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/RenderingPipelineIntegrationTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/RenderingPipelineIntegrationTest.java @@ -15,9 +15,9 @@ package org.apereo.portal.rendering; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StAXSerializingComponentTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StAXSerializingComponentTest.java index cba06d0b962..c9bcea9ff30 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StAXSerializingComponentTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StAXSerializingComponentTest.java @@ -53,10 +53,10 @@ import org.apereo.portal.xml.XmlUtilities; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -83,10 +83,10 @@ public void testSerializing() throws Exception { final IPortletWindow portletWindow = mock(IPortletWindow.class); when(portletWindowRegistry.getPortletWindow( - Matchers.eq(request), Matchers.any(StartElement.class))) + ArgumentMatchers.eq(request), ArgumentMatchers.any(StartElement.class))) .thenReturn(new Tuple(portletWindow, null)); when(portletWindowRegistry.getOrCreateDefaultPortletWindowByLayoutNodeId( - Matchers.eq(request), Matchers.anyString())) + ArgumentMatchers.eq(request), ArgumentMatchers.anyString())) .thenReturn(portletWindow); final PortletContentPlaceholderEventSource contentPlaceholderEventSource = diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StylesheetAttributeSourceForSpELVariablesTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StylesheetAttributeSourceForSpELVariablesTest.java index 6889b8c1e15..78bd42e4aa2 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StylesheetAttributeSourceForSpELVariablesTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/rendering/StylesheetAttributeSourceForSpELVariablesTest.java @@ -15,9 +15,9 @@ package org.apereo.portal.rendering; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/url/SingleTabUrlNodeSyntaxHelperTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/url/SingleTabUrlNodeSyntaxHelperTest.java index 3370fc1b179..0c999c34ce9 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/url/SingleTabUrlNodeSyntaxHelperTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/url/SingleTabUrlNodeSyntaxHelperTest.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockHttpServletRequest; /** */ diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/url/UrlSyntaxProviderImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/url/UrlSyntaxProviderImplTest.java index 4ef655b0dc5..6601b11c4ff 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/url/UrlSyntaxProviderImplTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/url/UrlSyntaxProviderImplTest.java @@ -48,10 +48,10 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockHttpServletRequest; /** Test harness for {@link UrlSyntaxProviderImpl}. */ @@ -1166,10 +1166,10 @@ public void testLegacyTargetedTabParsing() throws Exception { when(this.portalRequestUtils.getOriginalPortalRequest(request)).thenReturn(request); when(this.xpathOperations.doWithExpression( - Mockito.eq( + ArgumentMatchers.eq( "/layout/folder/folder[@type='regular' and @hidden='false'][position() = $activeTabId]/@ID"), - Mockito.eq(Collections.singletonMap("activeTabId", "1")), - Mockito.anyObject())) + ArgumentMatchers.eq(Collections.singletonMap("activeTabId", "1")), + ArgumentMatchers.any())) .thenReturn("n12"); when(this.userInstanceManager.getUserInstance(request)).thenReturn(userInstance); diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/url/xml/XsltPortalUrlProviderTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/url/xml/XsltPortalUrlProviderTest.java index f9f197b0f0e..0b5bbf1c230 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/url/xml/XsltPortalUrlProviderTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/url/xml/XsltPortalUrlProviderTest.java @@ -50,7 +50,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassRelativeResourceLoader; diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/version/VersionVerifierTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/version/VersionVerifierTest.java index 3e4f3bb9d44..50a2aef9687 100644 --- a/uPortal-webapp/src/test/java/org/apereo/portal/version/VersionVerifierTest.java +++ b/uPortal-webapp/src/test/java/org/apereo/portal/version/VersionVerifierTest.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.context.ApplicationContextException; @RunWith(MockitoJUnitRunner.class)