Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

This commit is contained in:
Simone Bordet 2020-02-17 00:54:22 +01:00
parent 612a70b5be ed7f337856
commit f2c977d619
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java
View File

@ -321,7 +321,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorToNextDetector() throws Exception
public void testDetectorToNextDetector() throws Exception
{
String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -351,7 +351,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorWithDetectionUnsuccessful() throws Exception
public void testDetectorWithDetectionUnsuccessful() throws Exception
{
AtomicBoolean detectionSuccessful = new AtomicBoolean(true);
ProxyConnectionFactory proxy = new ProxyConnectionFactory(HttpVersion.HTTP_1_1.asString());
@ -386,7 +386,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorWithProxyThatHasNoNextProto() throws Exception
public void testDetectorWithProxyThatHasNoNextProto() throws Exception
{
String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -412,7 +412,7 @@ public class DetectorConnectionTest
}
@Test
void testOptionalSsl() throws Exception
public void testOptionalSsl() throws Exception
{
String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -439,7 +439,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorThatHasNoConfiguredNextProto() throws Exception
public void testDetectorThatHasNoConfiguredNextProto() throws Exception
{
String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -462,7 +462,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorWithNextProtocolThatDoesNotExist() throws Exception
public void testDetectorWithNextProtocolThatDoesNotExist() throws Exception
{
HttpConnectionFactory http = new HttpConnectionFactory();
ProxyConnectionFactory proxy = new ProxyConnectionFactory("does-not-exist");
@ -497,7 +497,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectingWithNextProtocolThatDoesNotImplementUpgradeTo() throws Exception
public void testDetectingWithNextProtocolThatDoesNotImplementUpgradeTo() throws Exception
{
ConnectionFactory.Detecting noUpgradeTo = new ConnectionFactory.Detecting()
{
@ -564,7 +564,7 @@ public class DetectorConnectionTest
}
@Test
void testDetectorWithNextProtocolThatDoesNotImplementUpgradeTo() throws Exception
public void testDetectorWithNextProtocolThatDoesNotImplementUpgradeTo() throws Exception
{
ConnectionFactory noUpgradeTo = new ConnectionFactory()
{
@ -610,7 +610,7 @@ public class DetectorConnectionTest
}
@Test
void testGeneratedProtocolNames()
public void testGeneratedProtocolNames()
{
String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
@ -625,13 +625,13 @@ public class DetectorConnectionTest
}
@Test
void testDetectorWithNoDetectingFails()
public void testDetectorWithNoDetectingFails()
{
assertThrows(IllegalArgumentException.class, DetectorConnectionFactory::new);
}
@Test
void testExerciseDetectorNotEnoughBytes() throws Exception
public void testExerciseDetectorNotEnoughBytes() throws Exception
{
ConnectionFactory.Detecting detectingNeverRecognizes = new ConnectionFactory.Detecting()
{

2
jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java
View File

@ -205,7 +205,7 @@ public class OptionalSslConnectionTest
}
@Test
void testNextProtocolIsNotNullButNotConfiguredEither() throws Exception
public void testNextProtocolIsNotNullButNotConfiguredEither() throws Exception
{
QueuedThreadPool serverThreads = new QueuedThreadPool();
serverThreads.setName("server");

6
jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
View File

@ -189,7 +189,7 @@ public class ProxyConnectionTest
@ParameterizedTest
@MethodSource("requestProcessors")
void testSimple(RequestProcessor p) throws Exception
public void testSimple(RequestProcessor p) throws Exception
{
String request = "PROXY TCP 1.2.3.4 5.6.7.8 111 222\r\n" +
"GET /path HTTP/1.1\n" +
@ -207,7 +207,7 @@ public class ProxyConnectionTest
@ParameterizedTest
@MethodSource("requestProcessors")
void testSimpleV2(RequestProcessor p) throws Exception
public void testSimpleV2(RequestProcessor p) throws Exception
{
String proxy =
// Preamble
@ -243,7 +243,7 @@ public class ProxyConnectionTest
@ParameterizedTest
@MethodSource("requestProcessors")
void testMaxHeaderLengthV2(RequestProcessor p) throws Exception
public void testMaxHeaderLengthV2(RequestProcessor p) throws Exception
{
p.customize((connector) ->
{