External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Align RestEasy version with Quarkus.

Browse Source 
Closes #29351

Fix failing tests after RestEasy 6.2.7.Final upgrade.
See changes related to RESTEASY-3380.

Signed-off-by: Peter Skopek <pskopek@redhat.com>
This commit is contained in:
Peter Skopek 2024-05-07 13:19:38 +02:00 committed by Marek Posolda
parent 109f20e073
commit 828ea04e7a
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -113,7 +113,7 @@
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version>
<resteasy-legacy.version>4.7.7.Final</resteasy-legacy.version>
<resteasy.version>6.2.4.Final</resteasy.version>
<resteasy.version>6.2.7.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20220608.1</owasp.html.sanitizer.version>
<slf4j.version>2.0.6</slf4j.version>

25
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java
View File

@ -16,12 +16,10 @@ import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.broker.provider.util.SimpleHttp;
import org.keycloak.common.util.StreamUtil;
import org.keycloak.models.BrowserSecurityHeaders;
import org.keycloak.representations.idm.OAuth2ErrorRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.testsuite.AbstractKeycloakTest;
import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected;
import org.keycloak.testsuite.pages.ErrorPage;
import org.keycloak.util.JsonSerialization;
import org.keycloak.utils.MediaType;
import org.openqa.selenium.By;
@ -90,11 +88,9 @@ public class UncaughtErrorPageTest extends AbstractKeycloakTest {
post.setHeader("Content-Type", "application/json");
CloseableHttpResponse response = client.execute(post);
assertEquals(400, response.getStatusLine().getStatusCode());
assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusLine().getStatusCode());
OAuth2ErrorRepresentation error = JsonSerialization.readValue(response.getEntity().getContent(), OAuth2ErrorRepresentation.class);
assertEquals("unknown_error", error.getError());
assertNull(error.getErrorDescription());
assertThat(EntityUtils.toString(response.getEntity()), CoreMatchers.containsString("Not able to deserialize data provided"));
}
}
@ -110,11 +106,13 @@ public class UncaughtErrorPageTest extends AbstractKeycloakTest {
post.setHeader("Content-Type", "application/json");
CloseableHttpResponse response = client.execute(post);
assertEquals(400, response.getStatusLine().getStatusCode());
OAuth2ErrorRepresentation error = JsonSerialization.readValue(response.getEntity().getContent(), OAuth2ErrorRepresentation.class);
assertEquals("unknown_error", error.getError());
assertNull(error.getErrorDescription());
assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusLine().getStatusCode());
Header header = response.getFirstHeader("Content-Type");
assertThat(header, notNullValue());
assertEquals(jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM, header.getValue());
assertThat(EntityUtils.toString(response.getEntity()), CoreMatchers.containsString("Not able to deserialize data provided"));
}
}
@ -248,14 +246,13 @@ public class UncaughtErrorPageTest extends AbstractKeycloakTest {
post.setHeader("Content-Type", "application/json");
try (CloseableHttpResponse response = client.execute(post)) {
assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusLine().getStatusCode());
Header header = response.getFirstHeader("Content-Type");
assertThat(header, notNullValue());
assertEquals(MediaType.APPLICATION_JSON, header.getValue());
assertEquals(jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM, header.getValue());
OAuth2ErrorRepresentation error = JsonSerialization.readValue(response.getEntity().getContent(), OAuth2ErrorRepresentation.class);
assertEquals("unknown_error", error.getError());
assertThat(EntityUtils.toString(response.getEntity()), CoreMatchers.containsString("Not able to deserialize data provided"));
}
}
}