From 9bf664ba9a153a404f03c39d5ba0f99eb32c4419 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime
Date: Thu, 28 Jul 2022 15:10:47 +0200
Subject: Convert container-core to junit5
---
.../http/server/jetty/AccessLogRequestLogTest.java | 18 +-
.../http/server/jetty/ConnectionThrottlerTest.java | 10 +-
.../http/server/jetty/ConnectorFactoryTest.java | 16 +-
.../jetty/ErrorResponseContentCreatorTest.java | 28 +--
.../http/server/jetty/ExceptionWrapperTest.java | 8 +-
.../jdisc/http/server/jetty/FilterTestCase.java | 56 ++---
.../http/server/jetty/HttpRequestFactoryTest.java | 20 +-
.../jetty/HttpResponseStatisticsCollectorTest.java | 18 +-
.../server/jetty/HttpServerConformanceTest.java | 12 +-
.../jdisc/http/server/jetty/HttpServerTest.java | 225 ++++++++++-----------
.../http/server/jetty/JDiscHttpServletTest.java | 20 +-
.../jdisc/http/server/jetty/SimpleHttpClient.java | 9 +-
.../jetty/SslHandshakeFailedListenerTest.java | 6 +-
13 files changed, 221 insertions(+), 225 deletions(-)
(limited to 'container-core/src/test/java/com/yahoo/jdisc/http/server')
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
index 65f871e47ea..766c7918882 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
@@ -7,7 +7,7 @@ import com.yahoo.container.logging.RequestLogEntry;
import com.yahoo.jdisc.http.ServerConfig;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Optional;
@@ -16,8 +16,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Oyvind Bakksjo
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
*/
public class AccessLogRequestLogTest {
@Test
- public void requireThatQueryWithUnquotedSpecialCharactersIsHandled() {
+ void requireThatQueryWithUnquotedSpecialCharactersIsHandled() {
Request jettyRequest = createRequestBuilder()
.uri("http", "localhost", 12345, "/search/", "query=year:>2010")
.build();
@@ -39,7 +39,7 @@ public class AccessLogRequestLogTest {
}
@Test
- public void requireThatDoubleQuotingIsNotPerformed() {
+ void requireThatDoubleQuotingIsNotPerformed() {
String path = "/search/";
String query = "query=year%252010+%3B&customParameter=something";
Request jettyRequest = createRequestBuilder()
@@ -56,7 +56,7 @@ public class AccessLogRequestLogTest {
}
@Test
- public void raw_path_and_query_are_set_from_request() {
+ void raw_path_and_query_are_set_from_request() {
String rawPath = "//search/";
String rawQuery = "q=%%2";
Request jettyRequest = createRequestBuilder()
@@ -73,7 +73,7 @@ public class AccessLogRequestLogTest {
}
@Test
- public void verify_x_forwarded_for_precedence () {
+ void verify_x_forwarded_for_precedence() {
Request jettyRequest = createRequestBuilder()
.uri("http", "localhost", 12345, "//search/", "q=%%2")
.header("x-forwarded-for", List.of("1.2.3.4"))
@@ -87,7 +87,7 @@ public class AccessLogRequestLogTest {
}
@Test
- public void verify_x_forwarded_port_precedence () {
+ void verify_x_forwarded_port_precedence() {
Request jettyRequest = createRequestBuilder()
.uri("http", "localhost", 12345, "//search/", "q=%%2")
.header("X-Forwarded-Port", List.of("80"))
@@ -101,7 +101,7 @@ public class AccessLogRequestLogTest {
}
@Test
- public void defaults_to_peer_port_if_remote_port_header_is_invalid() {
+ void defaults_to_peer_port_if_remote_port_header_is_invalid() {
Request jettyRequest = createRequestBuilder()
.uri("http", "localhost", 12345, "/search/", null)
.header("X-Forwarded-Port", List.of("8o8o"))
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
index add7e458fbd..a65231db2b7 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
@@ -6,11 +6,11 @@ import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.statistic.RateStatistic;
import org.eclipse.jetty.util.thread.Scheduler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -23,14 +23,14 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
public class ConnectionThrottlerTest {
@Test
- public void throttles_when_any_resource_check_exceeds_configured_threshold() {
+ void throttles_when_any_resource_check_exceeds_configured_threshold() {
Runtime runtime = mock(Runtime.class);
when(runtime.maxMemory()).thenReturn(100l);
RateStatistic rateStatistic = new RateStatistic(1, TimeUnit.HOURS);
MockScheduler scheduler = new MockScheduler();
ConnectorConfig.Throttling config = new ConnectorConfig.Throttling(new ConnectorConfig.Throttling.Builder()
- .maxHeapUtilization(0.8)
- .maxAcceptRate(1));
+ .maxHeapUtilization(0.8)
+ .maxAcceptRate(1));
AbstractConnector connector = mock(AbstractConnector.class);
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index b47df9d5931..1ff2783cc53 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
@@ -8,9 +8,9 @@ import com.yahoo.jdisc.http.ssl.impl.ConfiguredSslContextFactoryProvider;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -18,7 +18,7 @@ import java.io.IOException;
import java.util.Map;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Einar M R Rosenvinge
@@ -28,12 +28,12 @@ public class ConnectorFactoryTest {
private Server server;
- @Before
+ @BeforeEach
public void createServer() {
server = new Server();
}
- @After
+ @AfterEach
public void stopServer() {
try {
server.stop();
@@ -44,7 +44,7 @@ public class ConnectorFactoryTest {
}
@Test
- public void requireThatServerCanBindChannel() throws Exception {
+ void requireThatServerCanBindChannel() throws Exception {
ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder());
ConnectorFactory factory = createConnectorFactory(config);
JDiscServerConnector connector = createConnectorFromFactory(factory);
@@ -59,7 +59,7 @@ public class ConnectorFactoryTest {
}
@Test
- public void constructed_connector_is_based_on_jdisc_connector_config() {
+ void constructed_connector_is_based_on_jdisc_connector_config() {
ConnectorConfig config = new ConnectorConfig.Builder()
.idleTimeout(25)
.name("my-server-name")
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
index 796adebb5e8..8b18c8cf09d 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
@@ -2,12 +2,12 @@
package com.yahoo.jdisc.http.server.jetty;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.servlet.http.HttpServletResponse;
import java.nio.charset.StandardCharsets;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -16,20 +16,20 @@ import static org.junit.Assert.assertEquals;
public class ErrorResponseContentCreatorTest {
@Test
- public void response_content_matches_expected_string() {
+ void response_content_matches_expected_string() {
String expectedHtml =
"\n" +
- "\n" +
- "\n" +
- "Error 200\n" +
- "\n" +
- "\n" +
- "HTTP ERROR: 200
\n" +
- "Problem accessing http://foo.bar. Reason:\n" +
- "
My custom error message
\n" +
- "
\n" +
- "\n" +
- "\n";
+ "\n" +
+ "\n" +
+ "Error 200\n" +
+ "\n" +
+ "\n" +
+ "HTTP ERROR: 200
\n" +
+ "Problem accessing http://foo.bar. Reason:\n" +
+ "
My custom error message
\n" +
+ "
\n" +
+ "\n" +
+ "