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

Remove old dump.war from WebAppContextTest and replace by generated war. (#11561) 

* Remove old dump.war from WebAppContextTest and replace by generated war.
This commit is contained in:
Jan Bartel 2024-03-25 19:16:02 +01:00 committed by GitHub
parent 2fc7ad87d8
commit cfa1bd9b51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 97 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/WebAppContextTest.java
View File

@ -16,12 +16,16 @@ package org.eclipse.jetty.ee10.webapp;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -43,10 +47,12 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.MavenPaths;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.eclipse.jetty.util.FileID;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.FileSystemPool;
@ -112,6 +118,36 @@ public class WebAppContextTest
return server;
}
/**
* Create a webapp as a war on the fly.
*
* @param tempDir the directory into which the war will be generated
* @param name the name of the war
* @return the Path of the generated war
*
* @throws Exception
*/
private Path createWar(Path tempDir, String name) throws Exception
{
// Create war on the fly
Path testWebappDir = MavenPaths.projectBase().resolve("src/test/webapp");
assertTrue(Files.exists(testWebappDir));
Path warFile = tempDir.resolve(name);
Map<String, String> env = new HashMap<>();
env.put("create", "true");
URI uri = URI.create("jar:" + warFile.toUri().toASCIIString());
// Use ZipFS so that we can create paths that are just "/"
try (FileSystem zipfs = FileSystems.newFileSystem(uri, env))
{
Path root = zipfs.getPath("/");
IO.copyDir(testWebappDir, root);
}
return warFile;
}
@Test
public void testDefaultContextPath() throws Exception
{
@ -478,23 +514,18 @@ public class WebAppContextTest
}
@Test
public void testBaseResourceAbsolutePath() throws Exception
public void testBaseResourceAbsolutePath(WorkDir workDir) throws Exception
{
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
// TODO this is not testing what it looks like. The war should be set with
// setWar (or converted to a jar:file before calling setBaseResource)
// However the war is currently a javax war, so it needs to be converted.
new Throwable("fixme").printStackTrace();
Path warPath = MavenTestingUtils.getTestResourcePathFile("wars/dump.war");
Path warPath = createWar(workDir.getEmptyPathDir(), "test.war");
warPath = warPath.toAbsolutePath();
assertTrue(warPath.isAbsolute(), "Path should be absolute: " + warPath);
// Use String reference to war
// On Unix / Linux this should have no issue.
// On Windows with fully qualified paths such as "E:\mybase\webapps\dump.war" the
// On Windows with fully qualified paths such as "E:\mybase\webapps\test.war" the
// resolution of the Resource can trigger various URI issues with the "E:" portion of the provided String.
context.setBaseResourceAsPath(warPath);
@ -691,11 +722,15 @@ public class WebAppContextTest
@MethodSource("extraClasspathGlob")
public void testExtraClasspathGlob(String description, String extraClasspathGlobReference) throws Exception
{
Path testPath = MavenPaths.targetTestDir("testExtraClasspathGlob");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenTestingUtils.getTestResourcePathFile("wars/dump.war");
Path warPath = createWar(testPath, "test.war");
context.setBaseResourceAsPath(warPath);
context.setExtraClasspath(extraClasspathGlobReference);
@ -764,11 +799,15 @@ public class WebAppContextTest
@MethodSource("extraClasspathDir")
public void testExtraClasspathDir(String extraClassPathReference) throws Exception
{
Path testPath = MavenPaths.targetTestDir("testExtraClasspathDir");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenTestingUtils.getTestResourcePathFile("wars/dump.war");
Path warPath = createWar(testPath, "test.war");
context.setBaseResourceAsPath(warPath);
context.setExtraClasspath(extraClassPathReference);

BIN
jetty-ee10/jetty-ee10-webapp/src/test/resources/wars/dump.war
View File

Binary file not shown.

53
jetty-ee9/jetty-ee9-webapp/src/test/java/org/eclipse/jetty/ee9/webapp/WebAppContextTest.java
View File

@ -16,12 +16,16 @@ package org.eclipse.jetty.ee9.webapp;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -48,6 +52,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.eclipse.jetty.util.FileID;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.FileSystemPool;
@ -104,6 +109,36 @@ public class WebAppContextTest
assertThat(FileSystemPool.INSTANCE.mounts(), empty());
}
/**
* Create a webapp as a war on the fly.
*
* @param tempDir the directory into which the war will be generated
* @param name the name of the war
* @return the Path of the generated war
*
* @throws Exception
*/
private Path createWar(Path tempDir, String name) throws Exception
{
// Create war on the fly
Path testWebappDir = MavenTestingUtils.getTargetPath("test-classes/webapp");
assertTrue(Files.exists(testWebappDir));
Path warFile = tempDir.resolve(name);
Map<String, String> env = new HashMap<>();
env.put("create", "true");
URI uri = URI.create("jar:" + warFile.toUri().toASCIIString());
// Use ZipFS so that we can create paths that are just "/"
try (FileSystem zipfs = FileSystems.newFileSystem(uri, env))
{
Path root = zipfs.getPath("/");
IO.copyDir(testWebappDir, root);
}
return warFile;
}
private Server newServer()
{
Server server = new Server();
@ -531,19 +566,19 @@ public class WebAppContextTest
}
@Test
public void testBaseResourceAbsolutePath() throws Exception
public void testBaseResourceAbsolutePath(WorkDir workDir) throws Exception
{
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenTestingUtils.getTargetPath("test-classes/wars/dump.war");
Path warPath = createWar(workDir.getEmptyPathDir(), "test.war");
warPath = warPath.toAbsolutePath();
assertTrue(warPath.isAbsolute(), "Path should be absolute: " + warPath);
// Use String reference to war
// On Unix / Linux this should have no issue.
// On Windows with fully qualified paths such as "E:\mybase\webapps\dump.war" the
// On Windows with fully qualified paths such as "E:\mybase\webapps\test.war" the
// resolution of the Resource can trigger various URI issues with the "E:" portion of the provided String.
context.setBaseResourceAsString(warPath.toString());
@ -705,11 +740,15 @@ public class WebAppContextTest
@MethodSource("extraClasspathGlob")
public void testExtraClasspathGlob(String description, String extraClasspathGlobReference) throws Exception
{
Path testPath = MavenPaths.targetTestDir("testExtraClasspathGlob");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenTestingUtils.getTargetPath("test-classes/wars/dump.war");
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
context.setExtraClasspath(extraClasspathGlobReference);
@ -779,11 +818,15 @@ public class WebAppContextTest
@MethodSource("extraClasspathDir")
public void testExtraClasspathDir(String extraClassPathReference) throws Exception
{
Path testPath = MavenPaths.targetTestDir("testExtraClasspathDir");
FS.ensureDirExists(testPath);
FS.ensureEmpty(testPath);
Server server = newServer();
WebAppContext context = new WebAppContext();
context.setContextPath("/");
Path warPath = MavenPaths.findTestResourceFile("wars/dump.war");
Path warPath = createWar(testPath, "test.war");
context.setBaseResource(context.getResourceFactory().newResource(warPath));
context.setExtraClasspath(extraClassPathReference);

BIN
jetty-ee9/jetty-ee9-webapp/src/test/resources/wars/dump.war
View File

Binary file not shown.