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

fix merge 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2018-09-22 21:29:29 +10:00
parent 49c12ae0f0
commit 2f96792937
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -63,7 +63,7 @@ def getFullBuild(jdk, os, mainJdk) {
",**/org/eclipse/jetty/demo/**" + ",**/org/eclipse/jetty/demo/**" +
// special environments / late integrations // special environments / late integrations
",**/org/eclipse/jetty/gcloud/**" + ",**/org/eclipse/jetty/infinispan/**" + ",**/org/eclipse/jetty/gcloud/**" + ",**/org/eclipse/jetty/infinispan/**" +
",**/org/eclipse/jetty/osgi/**" + ",**/org/eclipse/jetty/spring/**" + ",**/org/eclipse/jetty/osgi/**" + ",**/org/eclipse/jetty/spring/**" +SPIServerTest
",**/org/eclipse/jetty/http/spi/**" + ",**/org/eclipse/jetty/http/spi/**" +
// test classes // test classes
",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**"; ",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**";

31
jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java
View File

@ -18,8 +18,16 @@
package org.eclipse.jetty.http.spi; package org.eclipse.jetty.http.spi;
import static org.hamcrest.Matchers.is; import com.sun.net.httpserver.BasicAuthenticator;
import static org.junit.Assert.assertThat; import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpContext;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
import org.eclipse.jetty.util.IO;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -31,19 +39,8 @@ import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Base64; import java.util.Base64;
import javax.net.ssl.HttpsURLConnection; import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.eclipse.jetty.util.IO;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.sun.net.httpserver.BasicAuthenticator;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpContext;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
public class SPIServerTest public class SPIServerTest
{ {
@ -51,7 +48,7 @@ public class SPIServerTest
HttpServer server; HttpServer server;
int port; int port;
@Before @BeforeEach
public void before() throws Exception public void before() throws Exception
{ {
server = new JettyHttpServerProvider().createHttpServer(new InetSocketAddress(host,0),10); server = new JettyHttpServerProvider().createHttpServer(new InetSocketAddress(host,0),10);
@ -61,7 +58,7 @@ public class SPIServerTest
System.err.println(port); System.err.println(port);
} }
@After @AfterEach
public void after() throws Exception public void after() throws Exception
{ {
server.stop(0); server.stop(0);