fix tests

apereo · May 20, 2022 · 5ae4069 · 5ae4069
1 parent 3673e33
commit 5ae4069
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/...tion/src/test/java/org/apereo/cas/authentication/FileTrustStoreSslSocketFactoryTests.java b/...tion/src/test/java/org/apereo/cas/authentication/FileTrustStoreSslSocketFactoryTests.java
@@ -27,9 +27,7 @@
  */
 @Tag("FileSystem")
 public class FileTrustStoreSslSocketFactoryTests {
-
     private static final ClassPathResource RESOURCE = new ClassPathResource("truststore.jks");
-
     private static final ClassPathResource RESOURCE_P12 = new ClassPathResource("truststore.p12");
 
     @SneakyThrows

diff --git a/core/cas-server-core-authentication/src/test/resources/truststore.jks b/core/cas-server-core-authentication/src/test/resources/truststore.jks
diff --git a/.../test/java/org/apereo/cas/authentication/principal/WebApplicationServiceFactoryTests.java b/.../test/java/org/apereo/cas/authentication/principal/WebApplicationServiceFactoryTests.java
@@ -33,7 +33,7 @@ public void verifyServiceAttributes() {
         val factory = new WebApplicationServiceFactory();
         val service = factory.createService(request);
         assertNotNull(service);
-        assertEquals(4, service.getAttributes().size());
+        assertEquals(5, service.getAttributes().size());
         assertTrue(service.getAttributes().containsKey("p1"));
         assertTrue(service.getAttributes().containsKey("p2"));
         assertTrue(service.getAttributes().containsKey("p3"));

diff --git a/...idc/src/test/java/org/apereo/cas/oidc/slo/OidcSingleLogoutServiceMessageHandlerTests.java b/...idc/src/test/java/org/apereo/cas/oidc/slo/OidcSingleLogoutServiceMessageHandlerTests.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.oidc.slo;
 
+import org.apereo.cas.CasProtocolConstants;
 import org.apereo.cas.logout.SingleLogoutExecutionRequest;
 import org.apereo.cas.logout.slo.SingleLogoutServiceMessageHandler;
 import org.apereo.cas.mock.MockTicketGrantingTicket;
@@ -26,11 +27,8 @@
  */
 @Tag("OIDC")
 public class OidcSingleLogoutServiceMessageHandlerTests extends AbstractOidcTests {
-
     private static final String LOGOUT_URL_OK = "https://mocky.io/post";
-
     private static final String LOGOUT_URL_BAD = "https://unknown-1234-unknown.xyz";
-
     @Autowired
     @Qualifier("oidcSingleLogoutServiceMessageHandler")
     private SingleLogoutServiceMessageHandler oidcSingleLogoutServiceMessageHandler;
@@ -60,6 +58,7 @@ private void verifyCreateLogoutRequests(final RegisteredServiceLogoutType type,
         registeredService.setLogoutType(type);
         registeredService.setLogoutUrl(logoutUrl);
         val service = RegisteredServiceTestUtils.getService(logoutUrl + "?client_id=" + registeredService.getClientId());
+        service.getAttributes().remove(CasProtocolConstants.PARAMETER_SERVICE);
         servicesManager.save(registeredService);
 
         val executionRequest = SingleLogoutExecutionRequest.builder()