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

fix compilation error and re-enable tests 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2022-07-26 19:23:58 +02:00
parent 905352816d
commit 1cb80cf4ca
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/test/java/org/eclipse/jetty/ee10/demos/JarServerTest.java
View File

@ -13,15 +13,25 @@
package org.eclipse.jetty.ee10.demos;
import java.io.FileNotFoundException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.ee10.servlet.DefaultServlet;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.resource.Resource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -31,11 +41,21 @@ import static org.hamcrest.Matchers.is;
public class JarServerTest extends AbstractEmbeddedTest
{
private Server server;
private Resource.Mount mount;
@BeforeEach
public void startServer() throws Exception
{
server = JarServer.createServer(0);
Path jarFile = Paths.get("src/main/other/content.jar");
if (!Files.exists(jarFile))
throw new FileNotFoundException(jarFile.toString());
mount = Resource.mountJar(jarFile);
server = new Server(0);
ServletContextHandler context = new ServletContextHandler();
context.setBaseResource(mount.root().getPath());
context.addServlet(new ServletHolder(new DefaultServlet()), "/");
server.setHandler(new Handler.Collection(context, new DefaultHandler()));
server.start();
}
@ -43,9 +63,9 @@ public class JarServerTest extends AbstractEmbeddedTest
public void stopServer() throws Exception
{
server.stop();
IO.close(mount);
}
@Disabled //TODO
@Test
public void testGetDir0Test0() throws Exception
{
@ -62,7 +82,6 @@ public class JarServerTest extends AbstractEmbeddedTest
assertThat("Response Content", responseBody, containsString("test0"));
}
@Disabled //TODO
@Test
public void testGetDir1Test1() throws Exception
{