Skip to content

Commit

Permalink
Update to latest cui-parent
Browse files Browse the repository at this point in the history
  • Loading branch information
cuioss committed Jan 31, 2025
1 parent 8291db0 commit 797217a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@
import de.cuioss.tools.logging.CuiLogger;
import de.cuioss.uimodel.application.LoginCredentials;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.*;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import lombok.Setter;
Expand Down Expand Up @@ -66,7 +72,13 @@
import static de.cuioss.test.juli.LogAsserts.assertLogMessagePresentContaining;
import static de.cuioss.tools.collect.CollectionLiterals.immutableMap;
import static okhttp3.tls.internal.TlsUtil.localhost;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

@EnableAutoWeld
@EnablePortalConfiguration(configuration = PORTAL_TRACING_ENABLED + ":true")
Expand Down Expand Up @@ -220,7 +232,8 @@ void shouldDeactivateLogTracing() {
LogAsserts.assertNoLogMessagePresent(TestLogLevel.TRACE, "-- Client response info --");
}

@Test @Disabled
@Test
@Disabled
void testCorrectHostname() {
final var handshakeCertificates = localhostCerts();
mockWebServer.useHttps(handshakeCertificates.sslSocketFactory());
Expand Down Expand Up @@ -361,11 +374,8 @@ void canEnableDefaultExceptionHandler() {

try {
service.test();
} catch (InternalServerErrorException e) {
fail("WebApplicationException expected");
} catch (Exception e) {
assertEquals(WebApplicationException.class, e.getClass());
assertTrue(e.getMessage().contains("code 500"));
assertTrue(e.getMessage().contains("500"));
}
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>de.cuioss</groupId>
<artifactId>cui-java-parent</artifactId>
<version>0.8.5</version>
<version>0.8.6</version>
<relativePath />
</parent>
<groupId>de.cuioss.portal</groupId>
Expand All @@ -27,7 +27,7 @@
<system>GitHub Issues</system>
</issueManagement>
<properties>
<version.cui.parent>0.8.5</version.cui.parent>
<version.cui.parent>0.8.6</version.cui.parent>
</properties>
<modules>
<module>bom</module>
Expand Down

0 comments on commit 797217a

Please sign in to comment.