You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/09/20 06:18:50 UTC
svn commit: r1761525 -
/felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
Author: cziegeler
Date: Tue Sep 20 06:18:50 2016
New Revision: 1761525
URL: http://svn.apache.org/viewvc?rev=1761525&view=rev
Log:
Adjust tests to latest implementation
Modified:
felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
Modified: felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java?rev=1761525&r1=1761524&r2=1761525&view=diff
==============================================================================
--- felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java (original)
+++ felix/sandbox/http-itest-r7/src/test/java/org/apache/felix/http/itest/HttpServiceRuntimeTest.java Tue Sep 20 06:18:50 2016
@@ -614,9 +614,11 @@ public class HttpServiceRuntimeTest exte
ServletContextDTO defaultContextDTO = runtimeDTO.servletContextDTOs[2];
long contextServiceId = defaultContextDTO.serviceId;
- assertEquals(Arrays.toString(defaultContextDTO.servletDTOs), 1, defaultContextDTO.servletDTOs.length);
+ assertEquals(Arrays.toString(defaultContextDTO.servletDTOs), 2, defaultContextDTO.servletDTOs.length);
assertEquals("default servlet", defaultContextDTO.servletDTOs[0].name);
assertEquals(contextServiceId, defaultContextDTO.servletDTOs[0].servletContextId);
+ assertEquals("default error page", defaultContextDTO.servletDTOs[1].name);
+ assertEquals(contextServiceId, defaultContextDTO.servletDTOs[1].servletContextId);
assertEquals(1, defaultContextDTO.filterDTOs.length);
assertEquals("default filter", defaultContextDTO.filterDTOs[0].name);
assertEquals(contextServiceId, defaultContextDTO.filterDTOs[0].servletContextId);
@@ -630,9 +632,11 @@ public class HttpServiceRuntimeTest exte
ServletContextDTO testContextDTO = runtimeDTO.servletContextDTOs[1];
contextServiceId = testContextDTO.serviceId;
- assertEquals(1, testContextDTO.servletDTOs.length);
+ assertEquals(2, testContextDTO.servletDTOs.length);
assertEquals("context servlet", testContextDTO.servletDTOs[0].name);
assertEquals(contextServiceId, testContextDTO.servletDTOs[0].servletContextId);
+ assertEquals("context error page", testContextDTO.servletDTOs[1].name);
+ assertEquals(contextServiceId, testContextDTO.servletDTOs[1].servletContextId);
assertEquals(1, testContextDTO.filterDTOs.length);
assertEquals("context filter", testContextDTO.filterDTOs[0].name);
assertEquals(contextServiceId, testContextDTO.filterDTOs[0].servletContextId);