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

fix tests 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2022-08-03 16:09:21 +02:00
parent 2459e7a2cc
commit cbff6840d6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/PropertyUserStore.java
View File

@ -94,7 +94,7 @@ public class PropertyUserStore extends UserStore implements PathWatcher.Listener
{
if (!FileID.isArchive(uri))
{
_configPath = Path.of(uri);
_configPath = Path.of(config);
}
else
{

3
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java
View File

@ -15,6 +15,7 @@ package org.eclipse.jetty.ee10.servlet;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -77,6 +78,7 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.eclipse.jetty.util.Decorator;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.resource.ResourceFactory;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@ -1863,6 +1865,7 @@ public class ServletContextHandlerTest
ServletHandler shandler = servletContextHandler.getServletHandler();
ResourceHandler rh = new ResourceHandler();
rh.setBaseResource(ResourceFactory.of(rh).newResource(Paths.get(".")));
servletContextHandler.insertHandler(rh);
assertEquals(shandler, servletContextHandler.getServletHandler());

2
jetty-ee9/jetty-ee9-security/src/main/java/org/eclipse/jetty/ee9/security/PropertyUserStore.java
View File

@ -94,7 +94,7 @@ public class PropertyUserStore extends UserStore implements PathWatcher.Listener
{
if (!FileID.isArchive(uri))
{
_configPath = Path.of(uri);
_configPath = Path.of(config);
}
else
{