Bug 526150 - HttpService createDefaultHttpContext does not comply withS4_8_0_M3aS4_8_0_M3I20171103-1105I20171103-0715I20171103-0405I20171102-2000I20171101-2000I20171031-2000I20171030-2000I20171030-0400I20171029-2000I20171028-1500I20171027-2340I20171027-2000I20171025-2000I20171025-0800I20171024-2000I20171024-0800I20171023-2000I20171023-0800I20171022-2000I20171022-0800I20171021-1500I20171020-2000I20171019-2000

the OSGi spec

Change-Id: I918a6adecaf2808914f9a6dec5804fdde12c6e37
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

1 files changed, 26 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
index a0f8b4863..11ee568b5 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2016 IBM Corporation and others.
+ * Copyright (c) 2011, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -2198,6 +2198,31 @@ public class ServletTest extends BaseTest {
 //	}
 
 	@Test
+	public void test_Servlet18() throws Exception {
+		Servlet sA = new HttpServlet() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void service(HttpServletRequest request, HttpServletResponse response)
+				throws ServletException, IOException {
+				// get a resource that is imported
+				URL url = request.getServletContext().getResource("org/osgi/service/http/HttpService.class");
+				response.getWriter().write(url == null ? "null" : url.getProtocol());
+			}
+
+		};
+
+		HttpService httpService = getHttpService();
+
+		HttpContext httpContext = httpService.createDefaultHttpContext();
+
+		httpService.registerServlet("/testDefaultHttpContextResource", sA, null, httpContext);
+
+		// just making sure bundleresource protocol is used as proof that Bundle.getResource was called
+		Assert.assertEquals("bundleresource", requestAdvisor.request("testDefaultHttpContextResource"));
+	}
+
+	@Test
 	public void test_commonsFileUpload() throws Exception {
 		Servlet servlet = new HttpServlet() {
 			private static final long serialVersionUID = 1L;