diff options
Diffstat (limited to 'org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java')
| -rw-r--r-- | org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java index 0ea15d39e5..d569431684 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java @@ -18,10 +18,11 @@ import java.io.IOException; import java.net.URI; import java.util.HashMap; import java.util.List; +import java.util.Map; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.lib.Repository; @@ -57,7 +58,7 @@ public class SetAdditionalHeadersTest extends AllFactoriesHttpTestCase { final URI base = srcGit.getParentFile().toURI(); ServletContextHandler app = server.addContext("/git"); - app.setResourceBase(base.toString()); + app.setBaseResourceAsString(base.toString()); ServletHolder holder = app.addServlet(DefaultServlet.class, "/"); // The tmp directory is symlinked on OS X holder.setInitParameter("aliases", "true"); @@ -84,8 +85,15 @@ public class SetAdditionalHeadersTest extends AllFactoriesHttpTestCase { HashMap<String, String> headers = new HashMap<>(); headers.put("Cookie", "someTokenValue=23gBog34"); headers.put("AnotherKey", "someValue"); - ((TransportHttp) t).setAdditionalHeaders(headers); + + @SuppressWarnings("resource") + TransportHttp th = (TransportHttp) t; + th.setAdditionalHeaders(headers); t.openFetch(); + + Map<String, String> h = th.getAdditionalHeaders(); + assertEquals("someTokenValue=23gBog34", h.get("Cookie")); + assertEquals("someValue", h.get("AnotherKey")); } List<AccessEvent> requests = getRequests(); |