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

Merge branch `jetty-9.4.x-3427-classpath-with-spaces` into `jetty-9.4.x`

This commit is contained in:
Joakim Erdfelt 2019-03-21 14:26:00 -05:00
parent 0bd7008fcf 0bccaf0246
commit 10d3ea2548
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java
View File

@ -18,17 +18,15 @@
package org.eclipse.jetty.server.handler;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -37,11 +35,20 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.resource.Resource;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ContextHandlerTest
{
@Test
@ -717,6 +724,29 @@ public class ContextHandlerTest
}
}
@Test
public void testClassPath_WithSpaces() throws IOException
{
ContextHandler handler = new ContextHandler();
handler.setServer(new Server());
handler.setContextPath("/");
Path baseDir = MavenTestingUtils.getTargetTestingPath("testClassPath_WithSpaces");
FS.ensureEmpty(baseDir);
Path spacey = baseDir.resolve("and extra directory");
FS.ensureEmpty(spacey);
Path jar = spacey.resolve("empty.jar");
FS.touch(jar);
URLClassLoader cl = new URLClassLoader(new URL[]{jar.toUri().toURL()});
handler.setClassLoader(cl);
String classpath = handler.getClassPath();
assertThat("classpath", classpath, containsString(jar.toString()));
}
private void checkResourcePathsForExampleWebApp(String root) throws IOException
{
File testDirectory = setupTestDirectory();