You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ja...@apache.org on 2014/06/25 11:52:06 UTC
svn commit: r1605310 [3/3] - in /felix/sandbox/http-rfc189: api/
api/src/main/java/org/apache/felix/http/api/ base/
base/src/main/java/org/apache/felix/http/base/internal/handler/
base/src/main/java/org/apache/felix/http/base/internal/service/ base/src...
Modified: felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerTest.java?rev=1605310&r1=1605309&r2=1605310&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerTest.java (original)
+++ felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerTest.java Wed Jun 25 09:52:05 2014
@@ -18,19 +18,26 @@
*/
package org.apache.felix.http.whiteboard.internal.manager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import java.util.Dictionary;
import javax.servlet.Filter;
import javax.servlet.Servlet;
-
-import junit.framework.TestCase;
+import javax.servlet.ServletException;
import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.bidimap.DualHashBidiMap;
import org.apache.felix.http.api.ExtHttpService;
import org.apache.felix.http.api.ExtHttpServiceRuntime;
+import org.apache.felix.http.api.FilterInfo;
+import org.apache.felix.http.api.ServletInfo;
import org.apache.felix.http.whiteboard.HttpWhiteboardConstants;
import org.junit.After;
import org.junit.Before;
@@ -39,79 +46,58 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.NamespaceException;
import org.osgi.service.http.runtime.dto.FilterDTO;
import org.osgi.service.http.runtime.dto.RequestInfoDTO;
import org.osgi.service.http.runtime.dto.RuntimeDTO;
import org.osgi.service.http.runtime.dto.ServletDTO;
+@SuppressWarnings({ "deprecation" })
@RunWith(MockitoJUnitRunner.class)
public class ExtenderManagerTest
{
-
private static final String SAMPLE_CONTEXT_ID = "some.context.id";
-
private static final long BUNDLE_1_ID = 1L;
-
private static final long BUNDLE_2_ID = 2L;
-
private static final String SERVLET_1_ALIAS = "/servet1";
-
private static final String SERVLET_1_1_ALIAS = "/servet1_1";
-
private static final String SERVLET_2_ALIAS = "/servet2";
private MockExtHttpService httpService;
- private MockHttpServiceRuntime httpServiceRuntime;
-
@Mock
private HttpContext sampleContext;
-
@Mock
private Bundle bundle1;
-
@Mock
private Bundle bundle2;
-
@Mock
private ExtServlet servlet1;
-
@Mock
private ExtServlet servlet1_1;
-
@Mock
private ExtServlet servlet2;
-
@Mock
private ExtFilter filter1;
-
@Mock
private ExtFilter filter1_1;
-
-
@Mock
private ExtFilter filter2;
-
@Mock
private ServiceReference servlet1Reference;
-
@Mock
private ServiceReference servlet1_1Reference;
-
@Mock
private ServiceReference servlet2Reference;
-
@Mock
private ServiceReference filter1Reference;
-
@Mock
private ServiceReference filter1_1Reference;
-
@Mock
private ServiceReference filter2Reference;
-
@Mock
private ServiceReference httpContextReference;
@@ -124,196 +110,199 @@ public class ExtenderManagerTest
when(servlet1Reference.getBundle()).thenReturn(bundle1);
when(servlet1Reference.getPropertyKeys()).thenReturn(new String[0]);
+ when(servlet1Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(1));
when(servlet1Reference.getProperty(HttpWhiteboardConstants.ALIAS)).thenReturn(SERVLET_1_ALIAS);
when(servlet1_1Reference.getBundle()).thenReturn(bundle1);
when(servlet1_1Reference.getPropertyKeys()).thenReturn(new String[0]);
+ when(servlet1_1Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(2));
when(servlet1_1Reference.getProperty(HttpWhiteboardConstants.ALIAS)).thenReturn(SERVLET_1_1_ALIAS);
when(servlet2Reference.getBundle()).thenReturn(bundle2);
when(servlet2Reference.getPropertyKeys()).thenReturn(new String[0]);
+ when(servlet2Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(3));
when(servlet2Reference.getProperty(HttpWhiteboardConstants.ALIAS)).thenReturn(SERVLET_2_ALIAS);
when(servlet2Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
when(filter1Reference.getBundle()).thenReturn(bundle1);
when(filter1Reference.getPropertyKeys()).thenReturn(new String[0]);
+ when(filter1Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(4));
when(filter1Reference.getProperty(HttpWhiteboardConstants.PATTERN)).thenReturn(SERVLET_1_ALIAS);
when(filter1_1Reference.getBundle()).thenReturn(bundle1);
when(filter1_1Reference.getPropertyKeys()).thenReturn(new String[0]);
+ when(filter1_1Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(5));
when(filter1_1Reference.getProperty(HttpWhiteboardConstants.PATTERN)).thenReturn(SERVLET_1_1_ALIAS);
when(filter2Reference.getBundle()).thenReturn(bundle2);
when(filter2Reference.getPropertyKeys()).thenReturn(new String[0]);
when(filter2Reference.getProperty(HttpWhiteboardConstants.PATTERN)).thenReturn(SERVLET_2_ALIAS);
+ when(filter2Reference.getProperty(Constants.SERVICE_ID)).thenReturn(Long.valueOf(6));
when(filter2Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
this.httpService = new MockExtHttpService();
- this.httpServiceRuntime = new MockHttpServiceRuntime();
}
@After
public void tearDown()
{
this.httpService = null;
- this.httpServiceRuntime = null;
}
@Test
- public void test_no_servlets_no_filters()
+ public void test_no_servlets_no_filters() throws Exception
{
ExtenderManager em = new ExtenderManager();
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
em.setHttpService(null);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
}
@Test
- public void test_servlet_per_bundle()
+ public void test_servlet_per_bundle() throws Exception
{
ExtenderManager em = new ExtenderManager();
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// setup a context without context ID
em.add(sampleContext, httpContextReference);
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
em.remove(sampleContext);
// set up a context with context ID and not shared
final String id = HttpContextManagerTest.createId(bundle1, SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// register servlet1 from bundle1
when(servlet1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(servlet1, servlet1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, servlet1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, servlet1.getHttpContext());
// register servlet2 from bundle2
em.add(servlet2, servlet2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertNull(this.httpService.getServlets().get(SERVLET_2_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(servlet2Reference)));
+ assertEquals(2, em.getMappings().size());
+ assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertNull(this.httpService.getServlets().get(SERVLET_2_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(servlet2Reference)));
// unregister servlet2
em.remove(servlet2Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister servlet1
em.remove(servlet1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister context
em.remove(sampleContext);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_servlet_shared()
+ public void test_servlet_shared() throws Exception
{
ExtenderManager em = new ExtenderManager();
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// set up a context with context ID and shared
final String id = HttpContextManagerTest.createId(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_SHARED)).thenReturn("true");
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// register servlet1 from bundle1
when(servlet1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(servlet1, servlet1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, servlet1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, servlet1.getHttpContext());
// register servlet2 from bundle2
em.add(servlet2, servlet2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
- TestCase.assertEquals(2, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(2, this.httpService.getServlets().size());
- TestCase.assertSame(servlet2, this.httpService.getServlets().get(SERVLET_2_ALIAS));
- TestCase.assertEquals(0, em.getOrphanMappings().size());
- TestCase.assertSame(sampleContext, servlet2.getHttpContext());
+ assertEquals(2, em.getMappings().size());
+ assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
+ assertEquals(2, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(2, this.httpService.getServlets().size());
+ assertSame(servlet2, this.httpService.getServlets().get(SERVLET_2_ALIAS));
+ assertEquals(0, em.getOrphanMappings().size());
+ assertSame(sampleContext, servlet2.getHttpContext());
// unregister servlet2
em.remove(servlet2Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister servlet1
em.remove(servlet1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister context
em.remove(sampleContext);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_servlet_no_context_id()
+ public void test_servlet_no_context_id() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id1 = HttpContextManagerTest.createId(bundle1, null);
@@ -321,308 +310,303 @@ public class ExtenderManagerTest
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
- TestCase.assertEquals(0, em.getHttpContexts().size());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
+ assertEquals(0, em.getHttpContexts().size());
// register servlet1 from bundle1
em.add(servlet1, servlet1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id1).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, servlet1.getHttpContext().getClass());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id1).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, servlet1.getHttpContext().getClass());
// register servlet2 from bundle2
when(servlet2Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn("");
em.add(servlet2, servlet2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id2).getMappings().size());
- TestCase.assertEquals(2, this.httpService.getServlets().size());
- TestCase.assertSame(servlet2, this.httpService.getServlets().get(SERVLET_2_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, servlet2.getHttpContext().getClass());
+ assertEquals(2, em.getMappings().size());
+ assertSame(servlet2, ((ServletMapping) em.getMappings().get(servlet2Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id2).getMappings().size());
+ assertEquals(2, this.httpService.getServlets().size());
+ assertSame(servlet2, this.httpService.getServlets().get(SERVLET_2_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, servlet2.getHttpContext().getClass());
// different HttpContext instances per servlet/per bundle
- TestCase.assertNotSame(servlet1.getHttpContext(), servlet2.getHttpContext());
+ assertNotSame(servlet1.getHttpContext(), servlet2.getHttpContext());
// register servlet 1_1 from bundle 1
em.add(servlet1_1, servlet1_1Reference);
- TestCase.assertEquals(3, em.getMappings().size());
- TestCase.assertSame(servlet1_1, ((ServletMapping) em.getMappings().get(servlet1_1Reference)).getServlet());
- TestCase.assertEquals(2, em.getHttpContexts().get(id1).getMappings().size());
- TestCase.assertEquals(3, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1_1, this.httpService.getServlets().get(SERVLET_1_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, servlet1_1.getHttpContext().getClass());
+ assertEquals(3, em.getMappings().size());
+ assertSame(servlet1_1, ((ServletMapping) em.getMappings().get(servlet1_1Reference)).getServlet());
+ assertEquals(2, em.getHttpContexts().get(id1).getMappings().size());
+ assertEquals(3, this.httpService.getServlets().size());
+ assertSame(servlet1_1, this.httpService.getServlets().get(SERVLET_1_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, servlet1_1.getHttpContext().getClass());
// same HttpContext instances per servlet in same bundle
- TestCase.assertSame(servlet1.getHttpContext(), servlet1_1.getHttpContext());
+ assertSame(servlet1.getHttpContext(), servlet1_1.getHttpContext());
}
@Test
- public void test_servlet_before_context_per_bundle()
+ public void test_servlet_before_context_per_bundle() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id = HttpContextManagerTest.createId(bundle1, SAMPLE_CONTEXT_ID);
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// register servlet1 from bundle1
when(servlet1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(servlet1, servlet1Reference);
// servlet not registered with HttpService yet
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(servlet1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(servlet1Reference)));
// set up a context with context ID and not shared
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// servlet registered with HttpService
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, servlet1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, servlet1.getHttpContext());
// unregister context
em.remove(sampleContext);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(servlet1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(servlet1Reference)));
// unregister servlet1
em.remove(servlet1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_servlet_before_context_shared()
+ public void test_servlet_before_context_shared() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id = HttpContextManagerTest.createId(SAMPLE_CONTEXT_ID);
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getServlets().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// register servlet1 from bundle1
when(servlet1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(servlet1, servlet1Reference);
// servlet not registered with HttpService yet
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(servlet1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(servlet1Reference)));
// set up a context with context ID and not shared
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_SHARED)).thenReturn(true);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// servlet registered with HttpService
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getServlets().size());
- TestCase.assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, servlet1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getServlets().size());
+ assertSame(servlet1, this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, servlet1.getHttpContext());
// unregister context
em.remove(sampleContext);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(servlet1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(servlet1, ((ServletMapping) em.getMappings().get(servlet1Reference)).getServlet());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertNull(this.httpService.getServlets().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(servlet1Reference)));
// unregister servlet1
em.remove(servlet1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getServlets().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getServlets().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_filter_per_bundle()
+ public void test_filter_per_bundle() throws Exception
{
ExtenderManager em = new ExtenderManager();
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// setup a context without context ID
em.add(sampleContext, httpContextReference);
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
em.remove(sampleContext);
// set up a context with context ID and not shared
final String id = HttpContextManagerTest.createId(bundle1, SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// register filter1 from bundle1
when(filter1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(filter1, filter1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, filter1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, filter1.getHttpContext());
// register filter2 from bundle2
em.add(filter2, filter2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertNull(this.httpService.getFilters().get(SERVLET_2_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(filter2Reference)));
+ assertEquals(2, em.getMappings().size());
+ assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertNull(this.httpService.getFilters().get(SERVLET_2_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(filter2Reference)));
// unregister filter2
em.remove(filter2Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister filter1
em.remove(filter1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister context
em.remove(sampleContext);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_filter_shared()
+ public void test_filter_shared() throws Exception
{
ExtenderManager em = new ExtenderManager();
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// set up a context with context ID and shared
final String id = HttpContextManagerTest.createId(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_SHARED)).thenReturn("true");
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// register filter1 from bundle1
when(filter1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(filter1, filter1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, filter1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, filter1.getHttpContext());
// register filter2 from bundle2
em.add(filter2, filter2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
- TestCase.assertEquals(2, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(2, this.httpService.getFilters().size());
- TestCase.assertSame(filter2, this.httpService.getFilters().get(SERVLET_2_ALIAS));
- TestCase.assertEquals(0, em.getOrphanMappings().size());
- TestCase.assertSame(sampleContext, filter2.getHttpContext());
+ assertEquals(2, em.getMappings().size());
+ assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
+ assertEquals(2, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(2, this.httpService.getFilters().size());
+ assertSame(filter2, this.httpService.getFilters().get(SERVLET_2_ALIAS));
+ assertEquals(0, em.getOrphanMappings().size());
+ assertSame(sampleContext, filter2.getHttpContext());
// unregister filter2
em.remove(filter2Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister filter1
em.remove(filter1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().get(id).getMappings().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
// unregister context
em.remove(sampleContext);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_filter_no_context_id()
+ public void test_filter_no_context_id() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id1 = HttpContextManagerTest.createId(bundle1, null);
@@ -630,167 +614,163 @@ public class ExtenderManagerTest
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
- TestCase.assertEquals(0, em.getHttpContexts().size());
+ assertTrue(this.httpService.getFilters().isEmpty());
+ assertEquals(0, em.getHttpContexts().size());
// register filter1 from bundle1
em.add(filter1, filter1Reference);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id1).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, filter1.getHttpContext().getClass());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id1).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, filter1.getHttpContext().getClass());
// register filter2 from bundle2
when(filter2Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn("");
em.add(filter2, filter2Reference);
- TestCase.assertEquals(2, em.getMappings().size());
- TestCase.assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id2).getMappings().size());
- TestCase.assertEquals(2, this.httpService.getFilters().size());
- TestCase.assertSame(filter2, this.httpService.getFilters().get(SERVLET_2_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, filter2.getHttpContext().getClass());
+ assertEquals(2, em.getMappings().size());
+ assertSame(filter2, ((FilterMapping) em.getMappings().get(filter2Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id2).getMappings().size());
+ assertEquals(2, this.httpService.getFilters().size());
+ assertSame(filter2, this.httpService.getFilters().get(SERVLET_2_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, filter2.getHttpContext().getClass());
// different HttpContext instances per servlet/per bundle
- TestCase.assertNotSame(filter1.getHttpContext(), filter2.getHttpContext());
+ assertNotSame(filter1.getHttpContext(), filter2.getHttpContext());
// register servlet 1_1 from bundle 1
em.add(filter1_1, filter1_1Reference);
- TestCase.assertEquals(3, em.getMappings().size());
- TestCase.assertSame(filter1_1, ((FilterMapping) em.getMappings().get(filter1_1Reference)).getFilter());
- TestCase.assertEquals(2, em.getHttpContexts().get(id1).getMappings().size());
- TestCase.assertEquals(3, this.httpService.getFilters().size());
- TestCase.assertSame(filter1_1, this.httpService.getFilters().get(SERVLET_1_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(DefaultHttpContext.class, filter1_1.getHttpContext().getClass());
+ assertEquals(3, em.getMappings().size());
+ assertSame(filter1_1, ((FilterMapping) em.getMappings().get(filter1_1Reference)).getFilter());
+ assertEquals(2, em.getHttpContexts().get(id1).getMappings().size());
+ assertEquals(3, this.httpService.getFilters().size());
+ assertSame(filter1_1, this.httpService.getFilters().get(SERVLET_1_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(DefaultHttpContext.class, filter1_1.getHttpContext().getClass());
// same HttpContext instances per servlet in same bundle
- TestCase.assertSame(filter1.getHttpContext(), filter1_1.getHttpContext());
+ assertSame(filter1.getHttpContext(), filter1_1.getHttpContext());
}
@Test
- public void test_filter_before_context_per_bundle()
+ public void test_filter_before_context_per_bundle() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id = HttpContextManagerTest.createId(bundle1, SAMPLE_CONTEXT_ID);
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// register filter1 from bundle1
when(filter1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(filter1, filter1Reference);
// servlet not registered with HttpService yet
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(filter1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(filter1Reference)));
// set up a context with context ID and not shared
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// servlet registered with HttpService
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, filter1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, filter1.getHttpContext());
// unregister context
em.remove(sampleContext);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(filter1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(filter1Reference)));
// unregister filter1
em.remove(filter1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
@Test
- public void test_filter_before_context_shared()
+ public void test_filter_before_context_shared() throws Exception
{
ExtenderManager em = new ExtenderManager();
final String id = HttpContextManagerTest.createId(SAMPLE_CONTEXT_ID);
// prepare with http service
em.setHttpService(this.httpService);
- TestCase.assertTrue(this.httpService.getFilters().isEmpty());
+ assertTrue(this.httpService.getFilters().isEmpty());
// register filter1 from bundle1
when(filter1Reference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
em.add(filter1, filter1Reference);
// servlet not registered with HttpService yet
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(filter1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(filter1Reference)));
// set up a context with context ID and not shared
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_ID)).thenReturn(SAMPLE_CONTEXT_ID);
when(httpContextReference.getProperty(HttpWhiteboardConstants.CONTEXT_SHARED)).thenReturn(true);
em.add(sampleContext, httpContextReference);
- TestCase.assertEquals(1, em.getHttpContexts().size());
+ assertEquals(1, em.getHttpContexts().size());
// servlet registered with HttpService
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
- TestCase.assertEquals(1, this.httpService.getFilters().size());
- TestCase.assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
- TestCase.assertSame(sampleContext, filter1.getHttpContext());
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(1, em.getHttpContexts().get(id).getMappings().size());
+ assertEquals(1, this.httpService.getFilters().size());
+ assertSame(filter1, this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertTrue(em.getOrphanMappings().isEmpty());
+ assertSame(sampleContext, filter1.getHttpContext());
// unregister context
em.remove(sampleContext);
- TestCase.assertEquals(1, em.getMappings().size());
- TestCase.assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
- TestCase.assertEquals(0, em.getHttpContexts().size());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
- TestCase.assertEquals(1, em.getOrphanMappings().size());
- TestCase.assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
- TestCase.assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID)
- .contains(em.getMappings().get(filter1Reference)));
+ assertEquals(1, em.getMappings().size());
+ assertSame(filter1, ((FilterMapping) em.getMappings().get(filter1Reference)).getFilter());
+ assertEquals(0, em.getHttpContexts().size());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertNull(this.httpService.getFilters().get(SERVLET_1_ALIAS));
+ assertEquals(1, em.getOrphanMappings().size());
+ assertEquals(1, em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).size());
+ assertTrue(em.getOrphanMappings().get(SAMPLE_CONTEXT_ID).contains(em.getMappings().get(filter1Reference)));
// unregister filter1
em.remove(filter1Reference);
- TestCase.assertTrue(em.getMappings().isEmpty());
- TestCase.assertTrue(em.getHttpContexts().isEmpty());
- TestCase.assertEquals(0, this.httpService.getFilters().size());
- TestCase.assertTrue(em.getOrphanMappings().isEmpty());
+ assertTrue(em.getMappings().isEmpty());
+ assertTrue(em.getHttpContexts().isEmpty());
+ assertEquals(0, this.httpService.getFilters().size());
+ assertTrue(em.getOrphanMappings().isEmpty());
}
static interface ExtFilter extends Filter
@@ -805,7 +785,6 @@ public class ExtenderManagerTest
static final class MockExtHttpService implements ExtHttpService
{
-
private final BidiMap /* <String, Servlet> */servlets = new DualHashBidiMap();
private final BidiMap /* <String, Filter> */filters = new DualHashBidiMap();
@@ -825,12 +804,10 @@ public class ExtenderManagerTest
return filters;
}
- public void registerServlet(String alias, Servlet servlet, @SuppressWarnings("rawtypes") Dictionary initparams,
- HttpContext context)
-
+ public void registerServlet(String alias, Servlet servlet, @SuppressWarnings("rawtypes") Dictionary initparams, HttpContext context)
{
// always expect a non-null HttpContext here !!
- TestCase.assertNotNull(context);
+ assertNotNull(context);
this.servlets.put(alias, servlet);
@@ -843,6 +820,26 @@ public class ExtenderManagerTest
// not used here
}
+ public void registerFilter(Filter filter, FilterInfo filterInfo) throws ServletException
+ {
+ for (String pattern : filterInfo.patterns)
+ {
+ this.filters.put(pattern, filter);
+ }
+ // make HttpContext available
+ when(((ExtFilter) filter).getHttpContext()).thenReturn(filterInfo.context);
+ }
+
+ public void registerServlet(Servlet servlet, ServletInfo servletInfo) throws ServletException, NamespaceException
+ {
+ for (String pattern : servletInfo.patterns)
+ {
+ this.servlets.put(pattern, servlet);
+ }
+ // make HttpContext available
+ when(((ExtServlet) servlet).getHttpContext()).thenReturn(servletInfo.context);
+ }
+
public void unregister(String alias)
{
Object servlet = this.servlets.remove(alias);
@@ -858,11 +855,10 @@ public class ExtenderManagerTest
return null;
}
- public void registerFilter(Filter filter, String pattern, @SuppressWarnings("rawtypes") Dictionary initParams,
- int ranking, HttpContext context)
+ public void registerFilter(Filter filter, String pattern, @SuppressWarnings("rawtypes") Dictionary initParams, int ranking, HttpContext context)
{
// always expect a non-null HttpContext here !!
- TestCase.assertNotNull(context);
+ assertNotNull(context);
this.filters.put(pattern, filter);
@@ -902,7 +898,8 @@ public class ExtenderManagerTest
// TODO
}
- public RequestInfoDTO calculateRequestInfoDTO(String path) {
+ public RequestInfoDTO calculateRequestInfoDTO(String path)
+ {
// TODO
return null;
}
Modified: felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/FilterMappingTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/FilterMappingTest.java?rev=1605310&r1=1605309&r2=1605310&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/FilterMappingTest.java (original)
+++ felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/FilterMappingTest.java Wed Jun 25 09:52:05 2014
@@ -18,7 +18,6 @@
*/
package org.apache.felix.http.whiteboard.internal.manager;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -27,6 +26,7 @@ import static org.junit.Assert.assertSam
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
+import org.apache.felix.http.api.FilterInfo;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,60 +35,45 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.runtime.dto.FilterDTO;
@RunWith(MockitoJUnitRunner.class)
public class FilterMappingTest
{
-
- private static final String SAMPLE_CONTEXT_ID = "some.context.id";
-
private static final long BUNDLE_ID = 1L;
-
- private static final String[] FILTER_PATTERNS = new String[]{ "/sample/*" };
-
+ private static final String[] FILTER_PATTERNS = new String[] { "/sample/*" };
private static final int FILTER_RANKING = 1234;
@Mock
private HttpContext sampleContext;
-
@Mock
private Bundle bundle;
-
@Mock
private ExtenderManagerTest.ExtFilter filter;
-
private ExtenderManagerTest.MockExtHttpService httpService;
- private ExtenderManagerTest.MockHttpServiceRuntime httpServiceRuntime;
-
@Before
public void setup()
{
when(bundle.getBundleId()).thenReturn(BUNDLE_ID);
this.httpService = new ExtenderManagerTest.MockExtHttpService();
- this.httpServiceRuntime = new ExtenderManagerTest.MockHttpServiceRuntime();
}
@After
public void tearDown()
{
this.httpService = null;
- this.httpServiceRuntime = null;
}
@Test
- public void test_with_context()
+ public void test_with_context() throws Exception
{
- FilterDTO filterDTO = new FilterDTO();
- filterDTO.patterns = FILTER_PATTERNS;
+ FilterInfo filterInfo = new FilterInfo();
+ filterInfo.context = sampleContext;
+ filterInfo.patterns = FILTER_PATTERNS;
+ filterInfo.ranking = FILTER_RANKING;
- FilterMapping fm = new FilterMapping(bundle, filterDTO, filter, FILTER_RANKING);
- assertSame(bundle, fm.getBundle());
- assertSame(filter, fm.getFilter());
- assertArrayEquals(FILTER_PATTERNS, fm.getDto().patterns);
- assertEquals(FILTER_RANKING, fm.getRanking());
+ FilterMapping fm = new FilterMapping(bundle, filter, filterInfo);
assertNull(fm.getContext());
assertNotNull(fm.getInitParams());
@@ -100,14 +85,14 @@ public class FilterMappingTest
assertFalse(fm.isRegistered());
assertTrue(this.httpService.getFilters().isEmpty());
- fm.register(this.httpService, this.httpServiceRuntime);
+ fm.register(this.httpService);
assertSame(sampleContext, fm.getContext());
assertTrue(fm.isRegistered());
assertEquals(1, this.httpService.getFilters().size());
assertSame(filter, this.httpService.getFilters().get(FILTER_PATTERNS[0]));
assertSame(sampleContext, filter.getHttpContext());
- fm.unregister(this.httpService, this.httpServiceRuntime);
+ fm.unregister(this.httpService);
assertSame(sampleContext, fm.getContext());
assertFalse(fm.isRegistered());
assertEquals(0, this.httpService.getFilters().size());
@@ -119,28 +104,26 @@ public class FilterMappingTest
}
@Test
- public void test_context_delayed()
+ public void test_context_delayed() throws Exception
{
- FilterDTO filterDTO = new FilterDTO();
- filterDTO.patterns = FILTER_PATTERNS;
+ FilterInfo filterInfo = new FilterInfo();
+ filterInfo.context = sampleContext;
+ filterInfo.patterns = FILTER_PATTERNS;
+ filterInfo.ranking = FILTER_RANKING;
- FilterMapping fm = new FilterMapping(bundle, filterDTO, filter, FILTER_RANKING);
- assertSame(bundle, fm.getBundle());
- assertSame(filter, fm.getFilter());
- assertArrayEquals(FILTER_PATTERNS, fm.getDto().patterns);
- assertEquals(FILTER_RANKING, fm.getRanking());
+ FilterMapping fm = new FilterMapping(bundle, filter, filterInfo);
assertNull(fm.getContext());
assertNotNull(fm.getInitParams());
assertTrue(fm.getInitParams().isEmpty());
assertFalse(fm.isRegistered());
- fm.register(this.httpService, this.httpServiceRuntime);
+ fm.register(this.httpService);
assertNull(fm.getContext());
assertFalse(fm.isRegistered());
assertTrue(this.httpService.getFilters().isEmpty());
- fm.unregister(httpService, this.httpServiceRuntime);
+ fm.unregister(httpService);
assertNull(fm.getContext());
assertFalse(fm.isRegistered());
assertTrue(this.httpService.getFilters().isEmpty());
@@ -152,16 +135,14 @@ public class FilterMappingTest
}
@Test
- public void test_unset_context()
+ public void test_unset_context() throws Exception
{
- FilterDTO filterDTO = new FilterDTO();
- filterDTO.patterns = FILTER_PATTERNS;
+ FilterInfo filterInfo = new FilterInfo();
+ filterInfo.context = sampleContext;
+ filterInfo.patterns = FILTER_PATTERNS;
+ filterInfo.ranking = FILTER_RANKING;
- FilterMapping fm = new FilterMapping(bundle, filterDTO, filter, FILTER_RANKING);
- assertSame(bundle, fm.getBundle());
- assertSame(filter, fm.getFilter());
- assertArrayEquals(FILTER_PATTERNS, fm.getDto().patterns);
- assertEquals(FILTER_RANKING, fm.getRanking());
+ FilterMapping fm = new FilterMapping(bundle, filter, filterInfo);
assertNull(fm.getContext());
assertNotNull(fm.getInitParams());
@@ -173,7 +154,7 @@ public class FilterMappingTest
assertFalse(fm.isRegistered());
assertTrue(this.httpService.getFilters().isEmpty());
- fm.register(this.httpService, this.httpServiceRuntime);
+ fm.register(this.httpService);
assertSame(sampleContext, fm.getContext());
assertTrue(fm.isRegistered());
assertEquals(1, this.httpService.getFilters().size());
@@ -188,7 +169,7 @@ public class FilterMappingTest
assertSame(filter, this.httpService.getFilters().get(FILTER_PATTERNS[0]));
assertSame(sampleContext, filter.getHttpContext());
- fm.unregister(this.httpService, this.httpServiceRuntime);
+ fm.unregister(this.httpService);
assertNull(fm.getContext());
assertFalse(fm.isRegistered());
assertEquals(0, this.httpService.getFilters().size());
Modified: felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManagerTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManagerTest.java?rev=1605310&r1=1605309&r2=1605310&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManagerTest.java (original)
+++ felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManagerTest.java Wed Jun 25 09:52:05 2014
@@ -27,37 +27,31 @@ import java.util.Set;
import junit.framework.TestCase;
+import org.apache.felix.http.api.ServletInfo;
import org.apache.felix.http.whiteboard.internal.manager.HttpContextManager.HttpContextHolder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.osgi.dto.DTO;
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.runtime.dto.ServletDTO;
@RunWith(MockitoJUnitRunner.class)
public class HttpContextManagerTest
{
-
private static final String SAMPLE_CONTEXT_ID = "some.context.id";
private static final long BUNDLE_1_ID = 1L;
-
private static final String BUNDLE_1_ALIAS = "/bundle1";
private static final long BUNDLE_2_ID = 2L;
-
private static final String BUNDLE_2_ALIAS = "/bundle2";
@Mock
private HttpContext sampleContext;
-
@Mock
private Bundle bundle1;
-
@Mock
private Bundle bundle2;
@@ -77,9 +71,9 @@ public class HttpContextManagerTest
TestCase.assertSame(sampleContext, h1.getContext());
TestCase.assertTrue(h1.getMappings().isEmpty());
- ServletDTO servletDTO = new ServletDTO();
+ ServletInfo servletInfo = new ServletInfo();
- ServletMapping sm = new ServletMapping(bundle1, servletDTO, null);
+ ServletMapping sm = new ServletMapping(bundle1, null, servletInfo);
h1.addMapping(sm);
TestCase.assertSame(sampleContext, sm.getContext());
TestCase.assertEquals(1, h1.getMappings().size());
@@ -96,7 +90,7 @@ public class HttpContextManagerTest
final HttpContextManager hcm = new HttpContextManager();
TestCase.assertTrue(hcm.getHttpContexts().isEmpty());
- Collection<AbstractMapping<? extends DTO>> mappings = hcm.addHttpContext(bundle1, SAMPLE_CONTEXT_ID, sampleContext);
+ Collection<AbstractMapping> mappings = hcm.addHttpContext(bundle1, SAMPLE_CONTEXT_ID, sampleContext);
TestCase.assertNotNull(mappings);
TestCase.assertTrue(mappings.isEmpty());
@@ -106,7 +100,7 @@ public class HttpContextManagerTest
TestCase.assertSame(sampleContext, holders.get(holderId).getContext());
TestCase.assertEquals(mappings, holders.get(holderId).getMappings());
- Collection<AbstractMapping<? extends DTO>> removedMappings = hcm.removeHttpContext(sampleContext);
+ Collection<AbstractMapping> removedMappings = hcm.removeHttpContext(sampleContext);
TestCase.assertNotNull(removedMappings);
TestCase.assertTrue(removedMappings.isEmpty());
TestCase.assertTrue(hcm.getHttpContexts().isEmpty());
@@ -118,7 +112,7 @@ public class HttpContextManagerTest
final HttpContextManager hcm = new HttpContextManager();
TestCase.assertTrue(hcm.getHttpContexts().isEmpty());
- Collection<AbstractMapping<? extends DTO>> mappings = hcm.addHttpContext(null, SAMPLE_CONTEXT_ID, sampleContext);
+ Collection<AbstractMapping> mappings = hcm.addHttpContext(null, SAMPLE_CONTEXT_ID, sampleContext);
TestCase.assertNotNull(mappings);
TestCase.assertTrue(mappings.isEmpty());
@@ -128,7 +122,7 @@ public class HttpContextManagerTest
TestCase.assertSame(sampleContext, holders.get(holderId).getContext());
TestCase.assertEquals(mappings, holders.get(holderId).getMappings());
- Collection<AbstractMapping<? extends DTO>> removedMappings = hcm.removeHttpContext(sampleContext);
+ Collection<AbstractMapping> removedMappings = hcm.removeHttpContext(sampleContext);
TestCase.assertNotNull(removedMappings);
TestCase.assertTrue(removedMappings.isEmpty());
TestCase.assertTrue(hcm.getHttpContexts().isEmpty());
@@ -142,16 +136,16 @@ public class HttpContextManagerTest
hcm.addHttpContext(bundle1, SAMPLE_CONTEXT_ID, sampleContext);
// Servlet 1 gets the context
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ BUNDLE_1_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.patterns = new String[] { BUNDLE_1_ALIAS };
- final ServletMapping bundle1Servlet = new ServletMapping(bundle1, servletDTO, null);
+ final ServletMapping bundle1Servlet = new ServletMapping(bundle1, null, servletInfo);
HttpContext ctx1 = hcm.getHttpContext(bundle1, SAMPLE_CONTEXT_ID, bundle1Servlet);
TestCase.assertNotNull(ctx1);
TestCase.assertSame(ctx1, bundle1Servlet.getContext());
TestCase.assertSame(sampleContext, ctx1);
TestCase.assertTrue(hcm.getHttpContexts().get(id).getMappings().contains(bundle1Servlet));
- Map<String, Set<AbstractMapping<? extends DTO>>> orphans1 = hcm.getOrphanMappings();
+ Map<String, Set<AbstractMapping>> orphans1 = hcm.getOrphanMappings();
TestCase.assertTrue(orphans1.isEmpty());
// unregister servlet again --> all references clear
@@ -184,15 +178,15 @@ public class HttpContextManagerTest
hcm.addHttpContext(bundle1, SAMPLE_CONTEXT_ID, sampleContext);
// Servlet 2 is an orphan
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ BUNDLE_2_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.patterns = new String[] { BUNDLE_2_ALIAS };
- final ServletMapping bundle2Servlet = new ServletMapping(bundle2, servletDTO, null);
+ final ServletMapping bundle2Servlet = new ServletMapping(bundle2, null, servletInfo);
HttpContext ctx2 = hcm.getHttpContext(bundle2, SAMPLE_CONTEXT_ID, bundle2Servlet);
TestCase.assertNull(ctx2);
TestCase.assertNull(bundle2Servlet.getContext());
TestCase.assertTrue(hcm.getHttpContexts().get(id1).getMappings().isEmpty());
- Map<String, Set<AbstractMapping<? extends DTO>>> orphans2 = hcm.getOrphanMappings();
+ Map<String, Set<AbstractMapping>> orphans2 = hcm.getOrphanMappings();
TestCase.assertEquals(1, orphans2.size());
TestCase.assertEquals(1, orphans2.get(SAMPLE_CONTEXT_ID).size());
TestCase.assertTrue(orphans2.get(SAMPLE_CONTEXT_ID).contains(bundle2Servlet));
@@ -227,17 +221,17 @@ public class HttpContextManagerTest
hcm.addHttpContext(null, SAMPLE_CONTEXT_ID, sampleContext);
// Servlet 1 gets the context
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ BUNDLE_1_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.patterns = new String[] { BUNDLE_1_ALIAS };
- final ServletMapping bundle1Servlet = new ServletMapping(bundle1, servletDTO, null);
+ final ServletMapping bundle1Servlet = new ServletMapping(bundle1, null, servletInfo);
HttpContext ctx1 = hcm.getHttpContext(bundle1, SAMPLE_CONTEXT_ID, bundle1Servlet);
TestCase.assertNotNull(ctx1);
TestCase.assertSame(ctx1, bundle1Servlet.getContext());
TestCase.assertSame(sampleContext, ctx1);
TestCase.assertEquals(1, hcm.getHttpContexts().get(id).getMappings().size());
TestCase.assertTrue(hcm.getHttpContexts().get(id).getMappings().contains(bundle1Servlet));
- Map<String, Set<AbstractMapping<? extends DTO>>> orphans1 = hcm.getOrphanMappings();
+ Map<String, Set<AbstractMapping>> orphans1 = hcm.getOrphanMappings();
TestCase.assertTrue(orphans1.isEmpty());
// unregister serlvet 1 --> all references clear
@@ -247,10 +241,10 @@ public class HttpContextManagerTest
TestCase.assertTrue(hcm.getOrphanMappings().isEmpty());
// Servlet 2 gets the context
- servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ BUNDLE_2_ALIAS };
+ servletInfo = new ServletInfo();
+ servletInfo.patterns = new String[] { BUNDLE_2_ALIAS };
- final ServletMapping bundle2Servlet = new ServletMapping(bundle2, servletDTO, null);
+ final ServletMapping bundle2Servlet = new ServletMapping(bundle2, null, servletInfo);
HttpContext ctx2 = hcm.getHttpContext(bundle2, SAMPLE_CONTEXT_ID, bundle2Servlet);
TestCase.assertNotNull(ctx2);
TestCase.assertSame(ctx2, bundle2Servlet.getContext());
Modified: felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ServletMappingTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ServletMappingTest.java?rev=1605310&r1=1605309&r2=1605310&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ServletMappingTest.java (original)
+++ felix/sandbox/http-rfc189/whiteboard/src/test/java/org/apache/felix/http/whiteboard/internal/manager/ServletMappingTest.java Wed Jun 25 09:52:05 2014
@@ -21,6 +21,7 @@ package org.apache.felix.http.whiteboard
import static org.mockito.Mockito.when;
import junit.framework.TestCase;
+import org.apache.felix.http.api.ServletInfo;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,57 +30,45 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.runtime.dto.ServletDTO;
@RunWith(MockitoJUnitRunner.class)
public class ServletMappingTest
{
-
- private static final String SAMPLE_CONTEXT_ID = "some.context.id";
-
private static final long BUNDLE_ID = 1L;
-
private static final String SERVLET_ALIAS = "/bundle";
@Mock
private HttpContext sampleContext;
-
@Mock
private Bundle bundle;
-
@Mock
private ExtenderManagerTest.ExtServlet servlet;
-
private ExtenderManagerTest.MockExtHttpService httpService;
- private ExtenderManagerTest.MockHttpServiceRuntime httpServiceRuntime;
-
@Before
public void setup()
{
when(bundle.getBundleId()).thenReturn(BUNDLE_ID);
this.httpService = new ExtenderManagerTest.MockExtHttpService();
- this.httpServiceRuntime = new ExtenderManagerTest.MockHttpServiceRuntime();
}
@After
public void tearDown()
{
this.httpService = null;
- this.httpServiceRuntime = null;
}
@Test
- public void test_with_context()
+ public void test_with_context() throws Exception
{
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ SERVLET_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.context = sampleContext;
+ servletInfo.patterns = new String[] { SERVLET_ALIAS };
- ServletMapping sm = new ServletMapping(bundle, servletDTO, servlet);
+ ServletMapping sm = new ServletMapping(bundle, servlet, servletInfo);
TestCase.assertSame(bundle, sm.getBundle());
TestCase.assertSame(servlet, sm.getServlet());
- TestCase.assertEquals(SERVLET_ALIAS, sm.getDto().patterns[0]);
TestCase.assertNull(sm.getContext());
TestCase.assertNotNull(sm.getInitParams());
@@ -91,14 +80,14 @@ public class ServletMappingTest
TestCase.assertFalse(sm.isRegistered());
TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- sm.register(this.httpService, this.httpServiceRuntime);
+ sm.register(this.httpService);
TestCase.assertSame(sampleContext, sm.getContext());
TestCase.assertTrue(sm.isRegistered());
TestCase.assertEquals(1, this.httpService.getServlets().size());
TestCase.assertSame(servlet, this.httpService.getServlets().get(SERVLET_ALIAS));
TestCase.assertSame(sampleContext, servlet.getHttpContext());
- sm.unregister(this.httpService, this.httpServiceRuntime);
+ sm.unregister(this.httpService);
TestCase.assertSame(sampleContext, sm.getContext());
TestCase.assertFalse(sm.isRegistered());
TestCase.assertEquals(0, this.httpService.getServlets().size());
@@ -110,27 +99,25 @@ public class ServletMappingTest
}
@Test
- public void test_context_delayed()
+ public void test_context_delayed() throws Exception
{
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ SERVLET_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.context = sampleContext;
+ servletInfo.patterns = new String[] { SERVLET_ALIAS };
- ServletMapping sm = new ServletMapping(bundle, servletDTO, servlet);
- TestCase.assertSame(bundle, sm.getBundle());
- TestCase.assertSame(servlet, sm.getServlet());
- TestCase.assertEquals(SERVLET_ALIAS, sm.getDto().patterns[0]);
+ ServletMapping sm = new ServletMapping(bundle, servlet, servletInfo);
TestCase.assertNull(sm.getContext());
TestCase.assertNotNull(sm.getInitParams());
TestCase.assertTrue(sm.getInitParams().isEmpty());
TestCase.assertFalse(sm.isRegistered());
- sm.register(this.httpService, this.httpServiceRuntime);
+ sm.register(this.httpService);
TestCase.assertNull(sm.getContext());
TestCase.assertFalse(sm.isRegistered());
TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- sm.unregister(httpService, this.httpServiceRuntime);
+ sm.unregister(httpService);
TestCase.assertNull(sm.getContext());
TestCase.assertFalse(sm.isRegistered());
TestCase.assertTrue(this.httpService.getServlets().isEmpty());
@@ -142,15 +129,13 @@ public class ServletMappingTest
}
@Test
- public void test_unset_context()
+ public void test_unset_context() throws Exception
{
- ServletDTO servletDTO = new ServletDTO();
- servletDTO.patterns = new String[]{ SERVLET_ALIAS };
+ ServletInfo servletInfo = new ServletInfo();
+ servletInfo.context = sampleContext;
+ servletInfo.patterns = new String[] { SERVLET_ALIAS };
- ServletMapping sm = new ServletMapping(bundle, servletDTO, servlet);
- TestCase.assertSame(bundle, sm.getBundle());
- TestCase.assertSame(servlet, sm.getServlet());
- TestCase.assertEquals(SERVLET_ALIAS, sm.getDto().patterns[0]);
+ ServletMapping sm = new ServletMapping(bundle, servlet, servletInfo);
TestCase.assertNull(sm.getContext());
TestCase.assertNotNull(sm.getInitParams());
@@ -162,7 +147,7 @@ public class ServletMappingTest
TestCase.assertFalse(sm.isRegistered());
TestCase.assertTrue(this.httpService.getServlets().isEmpty());
- sm.register(this.httpService, this.httpServiceRuntime);
+ sm.register(this.httpService);
TestCase.assertSame(sampleContext, sm.getContext());
TestCase.assertTrue(sm.isRegistered());
TestCase.assertEquals(1, this.httpService.getServlets().size());
@@ -177,7 +162,7 @@ public class ServletMappingTest
TestCase.assertSame(servlet, this.httpService.getServlets().get(SERVLET_ALIAS));
TestCase.assertSame(sampleContext, servlet.getHttpContext());
- sm.unregister(this.httpService, this.httpServiceRuntime);
+ sm.unregister(this.httpService);
TestCase.assertNull(sm.getContext());
TestCase.assertFalse(sm.isRegistered());
TestCase.assertEquals(0, this.httpService.getServlets().size());