From fb26284c00e09e656732eb7ca4570afd052e0067 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 21 Jun 2024 11:47:01 +0000
Subject: [PATCH] Improve error reporting in CAS ticket validation
---
src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
index 826213f..bdd024a 100644
--- a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
+++ b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
@@ -1,27 +1,27 @@
package org.keycloak.protocol.cas;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-import org.jboss.resteasy.mock.MockHttpRequest;
-import org.jboss.resteasy.mock.MockHttpResponse;
-import org.jboss.resteasy.specimpl.RequestImpl;
+import jakarta.ws.rs.core.*;
import org.junit.Test;
import org.keycloak.protocol.cas.utils.ContentTypeHelper;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
public class ContentTypeHelperTest {
@Test
- public void test() throws Exception {
- assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/").selectResponseType());
- assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=json").selectResponseType());
- assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=xml").selectResponseType());
- assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=JSON").selectResponseType());
- assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=XML").selectResponseType());
+ public void test() {
+ assertEquals(MediaType.APPLICATION_XML_TYPE, get("").selectResponseType());
+ assertEquals(MediaType.APPLICATION_JSON_TYPE, get("json").selectResponseType());
+ assertEquals(MediaType.APPLICATION_XML_TYPE, get("xml").selectResponseType());
+ assertEquals(MediaType.APPLICATION_JSON_TYPE, get("JSON").selectResponseType());
+ assertEquals(MediaType.APPLICATION_XML_TYPE, get("XML").selectResponseType());
}
- private ContentTypeHelper get(String uri) throws Exception {
- MockHttpRequest req = MockHttpRequest.get(uri);
- return new ContentTypeHelper(req.getUri());
+ private ContentTypeHelper get(String format) {
+ MultivaluedHashMap<String,String> queryParams = mock(MultivaluedHashMap.class);
+ when(queryParams.getFirst(CASLoginProtocol.FORMAT_PARAM)).thenReturn(format);
+ UriInfo uriInfo = mock(UriInfo.class);
+ when(uriInfo.getQueryParameters()).thenReturn(queryParams);
+ return new ContentTypeHelper(uriInfo);
}
}
--
Gitblit v1.9.1