Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor correction in JRE execution for SslBytesClientTest now that Java 12-ea's are out

Browse Source
This commit is contained in:
Joakim Erdfelt 2018-09-07 09:55:37 -05:00
parent 82c04f3ae8
commit bcb5da0224
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java
View File

@ -18,6 +18,11 @@
package org.eclipse.jetty.client.ssl; package org.eclipse.jetty.client.ssl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
@ -46,16 +51,13 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.condition.JRE;
import static org.junit.jupiter.api.Assertions.assertEquals; /* This whole test is very specific to how TLS < 1.3 works.
import static org.junit.jupiter.api.Assertions.assertNull; * Starting in Java 11, TLS/1.3 is now enabled by default.
import static org.junit.jupiter.api.Assertions.assertThrows; */
import static org.junit.jupiter.api.Assertions.assertTrue; @EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10})
// This whole test is very specific to how TLS < 1.3 works.
@DisabledOnJre(JRE.JAVA_11)
public class SslBytesClientTest extends SslBytesTest public class SslBytesClientTest extends SslBytesTest
{ {
private ExecutorService threadPool; private ExecutorService threadPool;