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 2015/05/20 11:32:26 UTC
svn commit: r1680501 - in /felix/trunk/http/itest: pom.xml
src/test/java/org/apache/felix/http/itest/ResourceTest.java
Author: cziegeler
Date: Wed May 20 09:32:26 2015
New Revision: 1680501
URL: http://svn.apache.org/r1680501
Log:
Correct test case - resource at / is serving all requests
Modified:
felix/trunk/http/itest/pom.xml
felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/ResourceTest.java
Modified: felix/trunk/http/itest/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/itest/pom.xml?rev=1680501&r1=1680500&r2=1680501&view=diff
==============================================================================
--- felix/trunk/http/itest/pom.xml (original)
+++ felix/trunk/http/itest/pom.xml Wed May 20 09:32:26 2015
@@ -58,7 +58,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/ResourceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/ResourceTest.java?rev=1680501&r1=1680500&r2=1680501&view=diff
==============================================================================
--- felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/ResourceTest.java (original)
+++ felix/trunk/http/itest/src/test/java/org/apache/felix/http/itest/ResourceTest.java Wed May 20 09:32:26 2015
@@ -53,11 +53,13 @@ public class ResourceTest extends BaseIn
HttpContext context = new HttpContext()
{
+ @Override
public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException
{
return true;
}
+ @Override
public URL getResource(String name)
{
try
@@ -75,6 +77,7 @@ public class ResourceTest extends BaseIn
return null;
}
+ @Override
public String getMimeType(String name)
{
return null;
@@ -99,10 +102,11 @@ public class ResourceTest extends BaseIn
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
assertResponseCode(SC_OK, testHtmlURL);
- assertResponseCode(SC_NOT_FOUND, testURL);
+ assertResponseCode(SC_OK, testURL);
unregister("/");
assertResponseCode(SC_NOT_FOUND, testHtmlURL);
+ assertResponseCode(SC_NOT_FOUND, testURL);
}
}