fixed test cases

6Glory9 · Nov 29, 2015 · 76b1949 · 76b1949
1 parent 0f0f8ce
commit 76b1949
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
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
@@ -89,13 +89,11 @@ protected final Event doExecute(final RequestContext context) {
         }
 
         try {
-            WebUtils.putTicketGrantingTicketInScopes(
-                context,
-                this.centralAuthenticationService
-                    .createTicketGrantingTicket(credential));
+            WebUtils.putTicketGrantingTicketInScopes(context, this.centralAuthenticationService.createTicketGrantingTicket(credential));
             onSuccess(context, credential);
             return success();
         } catch (final Exception e) {
+            logger.warn(e.getMessage(), e);
             onError(context, credential);
             return error();
         }

diff --git a/cas-server-support-trusted/build.gradle b/cas-server-support-trusted/build.gradle
@@ -13,9 +13,18 @@ dependencies {
         exclude(module: 'spring-expression')
         exclude(module: 'spring-webmvc')
     }
+    testCompile(group: 'org.hibernate', name: 'hibernate-validator', version:hibernateValidatorVersion) {
+        exclude(module: 'slf4j-api')
+        exclude(module: 'jboss-logging')
+        exclude(module: 'xml-apis')
+    }
     testCompile project(':cas-server-core')
     testCompile project(':cas-server-core-tickets')
+    testCompile project(':cas-server-core-logout')
+    testCompile project(':cas-server-core-monitor')
+    testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
     testCompile project(path: ":cas-server-core", configuration: "tests")
 }
 
 
+
diff --git a/cas-server-support-trusted/src/test/resources/services/.donotdelete b/cas-server-support-trusted/src/test/resources/services/.donotdelete
diff --git a/cas-server-support-trusted/src/test/resources/truststore.jks b/cas-server-support-trusted/src/test/resources/truststore.jks
diff --git a/cas-server-support-x509/build.gradle b/cas-server-support-x509/build.gradle
@@ -34,4 +34,7 @@ dependencies {
     testCompile project(':cas-server-core-logout')
     testCompile project(':cas-server-core-services')
     testCompile project(':cas-server-core')
+    testCompile project(':cas-server-core-monitor')
+    testCompile project(path: ":cas-server-core-authentication", configuration: "tests")
+    testCompile project(path: ":cas-server-core", configuration: "tests")
 }
diff --git a/...va/org/jasig/cas/adaptors/x509/authentication/principal/AbstractX509CertificateTests.java b/...va/org/jasig/cas/adaptors/x509/authentication/principal/AbstractX509CertificateTests.java
@@ -1,5 +1,7 @@
 package org.jasig.cas.adaptors.x509.authentication.principal;
 
+import org.jasig.cas.AbstractCentralAuthenticationServiceTests;
+
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -19,13 +21,11 @@
  * @author Marvin S. Addison
  * @since 3.0.0
  */
-public abstract class AbstractX509CertificateTests {
+public abstract class AbstractX509CertificateTests extends AbstractCentralAuthenticationServiceTests {
 
-    public static final X509Certificate VALID_CERTIFICATE = new CasX509Certificate(
-            true);
+    public static final X509Certificate VALID_CERTIFICATE = new CasX509Certificate(true);
 
-    public static final X509Certificate INVALID_CERTIFICATE = new CasX509Certificate(
-            false);
+    public static final X509Certificate INVALID_CERTIFICATE = new CasX509Certificate(false);
 
     protected static class CasX509Certificate extends X509Certificate {
 

diff --git a/...jasig/cas/adaptors/x509/web/flow/X509CertificateCredentialsNonInteractiveActionTests.java b/...jasig/cas/adaptors/x509/web/flow/X509CertificateCredentialsNonInteractiveActionTests.java
@@ -1,20 +1,15 @@
 package org.jasig.cas.adaptors.x509.web.flow;
 
-import org.jasig.cas.CentralAuthenticationServiceImpl;
+import org.jasig.cas.AbstractCentralAuthenticationService;
 import org.jasig.cas.adaptors.x509.authentication.handler.support.X509CredentialsAuthenticationHandler;
 import org.jasig.cas.adaptors.x509.authentication.principal.AbstractX509CertificateTests;
 import org.jasig.cas.adaptors.x509.authentication.principal.X509SerialNumberPrincipalResolver;
 import org.jasig.cas.authentication.AuthenticationHandler;
 import org.jasig.cas.authentication.AuthenticationManager;
 import org.jasig.cas.authentication.PolicyBasedAuthenticationManager;
 import org.jasig.cas.authentication.principal.PrincipalResolver;
-import org.jasig.cas.logout.LogoutManager;
-import org.jasig.cas.services.ServicesManager;
-import org.jasig.cas.ticket.DefaultTicketFactory;
-import org.jasig.cas.ticket.registry.DefaultTicketRegistry;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
@@ -25,7 +20,6 @@
 import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
 
 /**
  * @author Marvin S. Addison
@@ -46,12 +40,10 @@ public void setUp() throws Exception {
                 Collections.<AuthenticationHandler, PrincipalResolver>singletonMap(
                         handler, new X509SerialNumberPrincipalResolver()));
 
-        final CentralAuthenticationServiceImpl centralAuthenticationService = new CentralAuthenticationServiceImpl(
-                new DefaultTicketRegistry(), authenticationManager, new DefaultTicketFactory(),
-                mock(ServicesManager.class), mock(LogoutManager.class));
-        centralAuthenticationService.setApplicationEventPublisher(mock(ApplicationEventPublisher.class));
+        final AbstractCentralAuthenticationService centralAuthenticationService = (AbstractCentralAuthenticationService)
+                getCentralAuthenticationService();
+        centralAuthenticationService.setAuthenticationManager(authenticationManager);
         this.action.setCentralAuthenticationService(centralAuthenticationService);
-        this.action.afterPropertiesSet();
     }
 
     @Test