API updates

6Glory9 · Dec 20, 2015 · 25cffb5 · 25cffb5
1 parent 25feffb
commit 25cffb5
Show file tree

Hide file tree

Showing 50 changed files with 89 additions and 128 deletions.
diff --git a/cas-management-webapp-support/src/test/java/org/jasig/cas/WiringTests.java b/cas-management-webapp-support/src/test/java/org/jasig/cas/WiringTests.java
@@ -8,7 +8,7 @@
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Unit test to verify Spring context wiring.

diff --git a/...audit/src/test/java/org/jasig/cas/audit/spi/TicketOrCredentialPrincipalResolverTests.java b/...audit/src/test/java/org/jasig/cas/audit/spi/TicketOrCredentialPrincipalResolverTests.java
@@ -10,10 +10,8 @@
 import org.jasig.inspektr.common.spi.PrincipalResolver;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * Unit tests for {@link TicketOrCredentialPrincipalResolver}

diff --git a/...ion/src/test/java/org/jasig/cas/authentication/PolicyBasedAuthenticationManagerTests.java b/...ion/src/test/java/org/jasig/cas/authentication/PolicyBasedAuthenticationManagerTests.java
@@ -6,11 +6,10 @@
 
 import javax.security.auth.login.FailedLoginException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
 
 /**
  * Unit test for {@link PolicyBasedAuthenticationManager}.

diff --git a/...cas/authentication/principal/cache/AbstractCachingPrincipalAttributesRepositoryTests.java b/...cas/authentication/principal/cache/AbstractCachingPrincipalAttributesRepositoryTests.java
@@ -17,9 +17,8 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 
 /**
  * Parent class for test cases around {@link org.jasig.cas.authentication.principal.PrincipalAttributesRepository}.

diff --git a/...st/java/org/jasig/cas/util/TrustedProxyAuthenticationTrustStoreSslSocketFactoryTests.java b/...st/java/org/jasig/cas/util/TrustedProxyAuthenticationTrustStoreSslSocketFactoryTests.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * @author Misagh Moayyed

diff --git a/...hentication/src/test/java/org/jasig/cas/web/flow/AuthenticationExceptionHandlerTests.java b/...hentication/src/test/java/org/jasig/cas/web/flow/AuthenticationExceptionHandlerTests.java
@@ -11,8 +11,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Marvin S. Addison

diff --git a/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/AbstractPoolMonitorTests.java b/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/AbstractPoolMonitorTests.java
@@ -5,7 +5,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link AbstractPoolMonitor} class.

diff --git a/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/HealthCheckMonitorTests.java b/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/HealthCheckMonitorTests.java
@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link HealthCheckMonitor} class.

diff --git a/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/MemoryMonitorTests.java b/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/MemoryMonitorTests.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link MemoryMonitor} class.

diff --git a/...erver-core-services/src/test/java/org/jasig/cas/services/RegexRegisteredServiceTests.java b/...erver-core-services/src/test/java/org/jasig/cas/services/RegexRegisteredServiceTests.java
@@ -9,7 +9,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link RegexRegisteredService}.

diff --git a/...server-core-services/src/test/java/org/jasig/cas/services/RegisteredServiceImplTests.java b/...server-core-services/src/test/java/org/jasig/cas/services/RegisteredServiceImplTests.java
@@ -9,7 +9,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link RegisteredServiceImpl}.

diff --git a/...ore-services/src/test/java/org/jasig/cas/services/UnauthorizedProxyingExceptionTests.java b/...ore-services/src/test/java/org/jasig/cas/services/UnauthorizedProxyingExceptionTests.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * @author Misagh Moayyed

diff --git a/cas-server-core-tickets/src/test/java/org/jasig/cas/ticket/TicketCreationExceptionTests.java b/cas-server-core-tickets/src/test/java/org/jasig/cas/ticket/TicketCreationExceptionTests.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * @author Scott Battaglia

diff --git a/cas-server-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplTests.java b/cas-server-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplTests.java
@@ -31,13 +31,8 @@
 
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Scott Battaglia

diff --git a/...er-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplWithMockitoTests.java b/...er-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplWithMockitoTests.java
@@ -49,17 +49,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.argThat;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * Unit tests with the help of Mockito framework.

diff --git a/cas-server-core/src/test/java/org/jasig/cas/MultifactorAuthenticationTests.java b/cas-server-core/src/test/java/org/jasig/cas/MultifactorAuthenticationTests.java
@@ -26,9 +26,7 @@
 
 import javax.validation.constraints.NotNull;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * High-level MFA functionality tests that leverage registered service metadata

diff --git a/...clearpass/src/test/java/org/jasig/cas/extension/clearpass/EncryptedMapDecoratorTests.java b/...clearpass/src/test/java/org/jasig/cas/extension/clearpass/EncryptedMapDecoratorTests.java
@@ -1,8 +1,6 @@
 package org.jasig.cas.extension.clearpass;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.Map;
 

diff --git a/...-integration-ehcache-monitor/src/test/java/org/jasig/cas/monitor/EhCacheMonitorTests.java b/...-integration-ehcache-monitor/src/test/java/org/jasig/cas/monitor/EhCacheMonitorTests.java
@@ -8,7 +8,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link EhCacheMonitor} class.

diff --git a/...on-memcached/src/test/java/org/jasig/cas/ticket/registry/MemCacheTicketRegistryTests.java b/...on-memcached/src/test/java/org/jasig/cas/ticket/registry/MemCacheTicketRegistryTests.java
@@ -21,8 +21,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 

diff --git a/...mcached/src/test/java/org/jasig/cas/ticket/registry/support/kryo/KryoTranscoderTests.java b/...mcached/src/test/java/org/jasig/cas/ticket/registry/support/kryo/KryoTranscoderTests.java
@@ -47,7 +47,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link KryoTranscoder} class.

diff --git a/...-integration-mongo/src/test/java/org/jasig/cas/services/MongoServiceRegistryDaoTests.java b/...-integration-mongo/src/test/java/org/jasig/cas/services/MongoServiceRegistryDaoTests.java
@@ -14,8 +14,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Test cases for {@link MongoServiceRegistryDao}.

diff --git a/...rvice-registry/src/test/java/org/jasig/cas/services/CouchbaseServiceRegistryDaoTests.java b/...rvice-registry/src/test/java/org/jasig/cas/services/CouchbaseServiceRegistryDaoTests.java
@@ -10,16 +10,15 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
+
 
 /**
  * This is {@link CouchbaseServiceRegistryDaoTests}.

diff --git a/...service-registry/src/test/java/org/jasig/cas/services/JpaServiceRegistryDaoImplTests.java b/...service-registry/src/test/java/org/jasig/cas/services/JpaServiceRegistryDaoImplTests.java
@@ -14,8 +14,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
+
 
 /**
  * Handles tests for {@link JpaServiceRegistryDaoImpl}

diff --git a/.../src/test/java/org/jasig/cas/authorization/generator/LdapAuthorizationGeneratorTests.java b/.../src/test/java/org/jasig/cas/authorization/generator/LdapAuthorizationGeneratorTests.java
@@ -29,7 +29,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for the {@link LdapAuthorizationGenerator} class.

diff --git a/...ort-mongo/src/test/java/org/jasig/cas/authentication/MongoAuthenticationHandlerTests.java b/...ort-mongo/src/test/java/org/jasig/cas/authentication/MongoAuthenticationHandlerTests.java
@@ -7,8 +7,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Test cases for {@link MongoAuthenticationHandler}.

diff --git a/...rc/test/java/org/jasig/cas/support/oauth/web/OAuth20CallbackAuthorizeControllerTests.java b/...rc/test/java/org/jasig/cas/support/oauth/web/OAuth20CallbackAuthorizeControllerTests.java
@@ -1,6 +1,6 @@
 package org.jasig.cas.support.oauth.web;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Map;
 

diff --git a/...rt-oauth/src/test/java/org/jasig/cas/support/oauth/web/OAuth20WrapperControllerTests.java b/...rt-oauth/src/test/java/org/jasig/cas/support/oauth/web/OAuth20WrapperControllerTests.java
@@ -1,6 +1,6 @@
 package org.jasig.cas.support.oauth.web;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.jasig.cas.support.oauth.OAuthConstants;
 import org.junit.Test;

diff --git a/...c/test/java/org/jasig/cas/support/openid/authentication/principal/OpenIdServiceTests.java b/...c/test/java/org/jasig/cas/support/openid/authentication/principal/OpenIdServiceTests.java
@@ -10,11 +10,8 @@
 import org.openid4java.association.Association;
 import org.springframework.mock.web.MockHttpServletRequest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Scott Battaglia

diff --git a/...ig/cas/support/pac4j/authentication/handler/support/ClientAuthenticationHandlerTests.java b/...ig/cas/support/pac4j/authentication/handler/support/ClientAuthenticationHandlerTests.java
@@ -1,7 +1,7 @@
 package org.jasig.cas.support.pac4j.authentication.handler.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.security.GeneralSecurityException;
 

diff --git a/...r-support-pac4j/src/test/java/org/jasig/cas/support/pac4j/web/flow/ClientActionTests.java b/...r-support-pac4j/src/test/java/org/jasig/cas/support/pac4j/web/flow/ClientActionTests.java
@@ -26,12 +26,8 @@
 
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * This class tests the {@link ClientAction} class.

diff --git a/...ver-support-radius/src/test/java/org/jasig/cas/adaptors/radius/JRadiusServerImplTest.java b/...ver-support-radius/src/test/java/org/jasig/cas/adaptors/radius/JRadiusServerImplTest.java
@@ -6,7 +6,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 /**
  * Unit test for {@link JRadiusServerImpl}.

diff --git a/cas-server-support-rest/src/test/java/org/jasig/cas/support/rest/TicketsResourceTests.java b/cas-server-support-rest/src/test/java/org/jasig/cas/support/rest/TicketsResourceTests.java
@@ -26,16 +26,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
 
 /**
  * Unit tests for {@link org.jasig.cas.support.rest.TicketsResource}.

diff --git a/...a/org/jasig/cas/support/saml/authentication/GoogleAppsSamlAuthenticationRequestTests.java b/...a/org/jasig/cas/support/saml/authentication/GoogleAppsSamlAuthenticationRequestTests.java
@@ -6,7 +6,7 @@
 import org.jasig.cas.util.CompressionUtils;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  * This is {@link GoogleAppsSamlAuthenticationRequestTests}.

diff --git a/.../java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsServiceTests.java b/.../java/org/jasig/cas/support/saml/authentication/principal/GoogleAccountsServiceTests.java
@@ -22,9 +22,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 /**

diff --git a/...a/org/jasig/cas/support/saml/authentication/SamlAuthenticationMetaDataPopulatorTests.java b/...a/org/jasig/cas/support/saml/authentication/SamlAuthenticationMetaDataPopulatorTests.java
@@ -17,8 +17,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 /**
  * @author Scott Battaglia