From e3e192bc4cb1fb4c7aa5eee57eab525500388ce7 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Fri, 24 Nov 2023 15:29:53 +0000 Subject: [PATCH] ValidateEndpoint: remove obsolete usage of StringBuilder --- src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java index c08ab47..826213f 100644 --- a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java +++ b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java @@ -1,45 +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 org.junit.Test; import org.keycloak.protocol.cas.utils.ContentTypeHelper; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - import static org.junit.Assert.assertEquals; public class ContentTypeHelperTest { @Test public void test() throws Exception { - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/", null).selectResponseType()); - assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=json", null).selectResponseType()); - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=xml", null).selectResponseType()); - assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=JSON", null).selectResponseType()); - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=XML", null).selectResponseType()); - - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/", MediaType.APPLICATION_XML).selectResponseType()); - assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=json", MediaType.APPLICATION_XML).selectResponseType()); - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=xml", MediaType.APPLICATION_XML).selectResponseType()); - - assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/", MediaType.APPLICATION_JSON).selectResponseType()); - assertEquals(MediaType.APPLICATION_JSON_TYPE, get("http://example.com/?format=json", MediaType.APPLICATION_JSON).selectResponseType()); - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/?format=xml", MediaType.APPLICATION_JSON).selectResponseType()); - - assertEquals(MediaType.APPLICATION_XML_TYPE, get("http://example.com/", MediaType.TEXT_PLAIN).selectResponseType()); + 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()); } - private ContentTypeHelper get(String uri, String acceptHeader) throws Exception { + private ContentTypeHelper get(String uri) throws Exception { MockHttpRequest req = MockHttpRequest.get(uri); - MockHttpResponse res = new MockHttpResponse(); - RequestImpl restReq = new RequestImpl(req, res); - - if (acceptHeader != null) { - req = req.header(HttpHeaders.ACCEPT, acceptHeader); - } - - return new ContentTypeHelper(req, restReq, req.getUri()); + return new ContentTypeHelper(req.getUri()); } } -- Gitblit v1.9.1