fixed test cases

6Glory9 · Dec 16, 2015 · b66079b · b66079b
1 parent 1f5fabe
commit b66079b
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 13 deletions.
diff --git a/cas-server-core-api-ticket/src/main/java/org/jasig/cas/ticket/TicketState.java b/cas-server-core-api-ticket/src/main/java/org/jasig/cas/ticket/TicketState.java
@@ -5,7 +5,7 @@
 /**
  * @author Scott Battaglia
 
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 public interface TicketState {
 

diff --git a/...src/main/java/org/jasig/cas/authentication/handler/support/JaasAuthenticationHandler.java b/...src/main/java/org/jasig/cas/authentication/handler/support/JaasAuthenticationHandler.java
@@ -57,7 +57,7 @@
  * @see javax.security.auth.callback.CallbackHandler
  * @see javax.security.auth.callback.PasswordCallback
  * @see javax.security.auth.callback.NameCallback
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("jaasAuthenticationHandler")
 public class JaasAuthenticationHandler extends AbstractUsernamePasswordAuthenticationHandler {

diff --git a/...ts/src/main/java/org/jasig/cas/ticket/support/ThrottledUseAndTimeoutExpirationPolicy.java b/...ts/src/main/java/org/jasig/cas/ticket/support/ThrottledUseAndTimeoutExpirationPolicy.java
@@ -12,7 +12,7 @@
  * clients from consuming resources by doing constant redirects.
  *
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("throttledUseAndTimeoutExpirationPolicy")
 public final class ThrottledUseAndTimeoutExpirationPolicy extends AbstractCasExpirationPolicy {

diff --git a/...ore-web/src/main/java/org/jasig/cas/web/flow/AbstractNonInteractiveCredentialsAction.java b/...ore-web/src/main/java/org/jasig/cas/web/flow/AbstractNonInteractiveCredentialsAction.java
@@ -164,6 +164,14 @@ protected void onSuccess(final RequestContext context,
         // default implementation does nothing
     }
 
+    public PrincipalFactory getPrincipalFactory() {
+        return principalFactory;
+    }
+
+    public AuthenticationObjectsRepository getAuthenticationObjectsRepository() {
+        return authenticationObjectsRepository;
+    }
+
     /**
      * Abstract method to implement to construct the credential from the
      * request object.

diff --git a/...sted/authentication/handler/support/PrincipalBearingCredentialsAuthenticationHandler.java b/...sted/authentication/handler/support/PrincipalBearingCredentialsAuthenticationHandler.java
@@ -19,7 +19,7 @@
  * true.
  *
  * @author Andrew Petro
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("principalBearingCredentialsAuthenticationHandler")
 public final class PrincipalBearingCredentialsAuthenticationHandler extends AbstractAuthenticationHandler {

diff --git a/...a/org/jasig/cas/adaptors/trusted/authentication/principal/PrincipalBearingCredential.java b/...a/org/jasig/cas/adaptors/trusted/authentication/principal/PrincipalBearingCredential.java
@@ -16,7 +16,7 @@
  * credentials.
  *
  * @author Andrew Petro
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 public final class PrincipalBearingCredential extends AbstractCredential {
 

diff --git a/...asig/cas/adaptors/trusted/authentication/principal/PrincipalBearingPrincipalResolver.java b/...asig/cas/adaptors/trusted/authentication/principal/PrincipalBearingPrincipalResolver.java
@@ -10,7 +10,7 @@
  * already bear the ready-to-go Principal.
  *
  * @author Andrew Petro
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("trustedPrincipalResolver")
 public final class PrincipalBearingPrincipalResolver extends PersonDirectoryPrincipalResolver {

diff --git a/...ptors/trusted/web/flow/PrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java b/...ptors/trusted/web/flow/PrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java
@@ -20,7 +20,7 @@
  * could not find any credentials.
  *
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("principalFromRemoteUserAction")
 public final class PrincipalFromRequestRemoteUserNonInteractiveCredentialsAction

diff --git a/...authentication/handler/support/PrincipalBearingCredentialsAuthenticationHandlerTests.java b/...authentication/handler/support/PrincipalBearingCredentialsAuthenticationHandlerTests.java
@@ -9,7 +9,7 @@
 
 /**
  * @author Andrew Petro
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 public final class PrincipalBearingCredentialsAuthenticationHandlerTests {
 

diff --git a/...jasig/cas/adaptors/trusted/authentication/principal/PrincipalBearingCredentialsTests.java b/...jasig/cas/adaptors/trusted/authentication/principal/PrincipalBearingCredentialsTests.java
@@ -8,7 +8,7 @@
 
 /**
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 public class PrincipalBearingCredentialsTests {
 

diff --git a/...trusted/authentication/principal/PrincipalBearingCredentialsToPrincipalResolverTests.java b/...trusted/authentication/principal/PrincipalBearingCredentialsToPrincipalResolverTests.java
@@ -9,7 +9,7 @@
 
 /**
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 public class PrincipalBearingCredentialsToPrincipalResolverTests {
     private PrincipalBearingPrincipalResolver resolver;

diff --git a/.../trusted/web/flow/PrincipalFromRequestRemoteUserNonInteractiveCredentialsActionTests.java b/.../trusted/web/flow/PrincipalFromRequestRemoteUserNonInteractiveCredentialsActionTests.java
@@ -23,7 +23,7 @@
 
 /**
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  *
  */
 public class PrincipalFromRequestRemoteUserNonInteractiveCredentialsActionTests extends AbstractCentralAuthenticationServiceTests {
@@ -46,6 +46,8 @@ public void setUp() throws Exception {
                 getCentralAuthenticationService();
 
         this.action.setCentralAuthenticationService(centralAuthenticationService);
+        this.action.getAuthenticationObjectsRepository().getAuthenticationTransactionManager()
+                .setAuthenticationManager(authenticationManager);
     }
 
     @Test

diff --git a/...usted/web/flow/PrincipalFromRequestUserPrincipalNonInteractiveCredentialsActionTests.java b/...usted/web/flow/PrincipalFromRequestUserPrincipalNonInteractiveCredentialsActionTests.java
@@ -44,6 +44,8 @@ public void setUp() throws Exception {
         final AbstractCentralAuthenticationService centralAuthenticationService = (AbstractCentralAuthenticationService)
                 getCentralAuthenticationService();
         this.action.setCentralAuthenticationService(centralAuthenticationService);
+        this.action.getAuthenticationObjectsRepository().getAuthenticationTransactionManager()
+                .setAuthenticationManager(authenticationManager);
     }
 
     @Test

diff --git a/...rver-webapp-actions/src/test/java/org/jasig/cas/web/flow/InitialFlowSetupActionTests.java b/...rver-webapp-actions/src/test/java/org/jasig/cas/web/flow/InitialFlowSetupActionTests.java
@@ -25,7 +25,7 @@
 /**
  *
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  *
  */
 public class InitialFlowSetupActionTests {

diff --git a/...g/jasig/cas/web/support/AbstractInMemoryThrottledSubmissionHandlerInterceptorAdapter.java b/...g/jasig/cas/web/support/AbstractInMemoryThrottledSubmissionHandlerInterceptorAdapter.java
@@ -39,7 +39,7 @@
  * (i.e. a Quartz Job) and runs independent of the threshold of the parent.
  *
  * @author Scott Battaglia
- * @since 3.0.0.5
+ * @since 3.0.0
  */
 @Component("abstractInMemoryThrottledSubmissionHandlerInterceptorAdapter")
 public abstract class AbstractInMemoryThrottledSubmissionHandlerInterceptorAdapter