FELIX-4060 : Fix test case when bundle is stopped
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1661136 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java b/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
index 1869ae3..1d8bbaf 100644
--- a/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
+++ b/http/itest/src/test/java/org/apache/felix/http/itest/HttpJettyTest.java
@@ -23,6 +23,7 @@
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.servlet.http.HttpServletResponse.SC_PAYMENT_REQUIRED;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -95,7 +96,8 @@
bundle.stop();
- assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
+ // destroy should not be called as the bundle stopped
+ assertFalse(destroyLatch.await(5, TimeUnit.SECONDS));
try
{
@@ -122,16 +124,19 @@
HttpContext context = new HttpContext()
{
+ @Override
public String getMimeType(String name)
{
return null;
}
+ @Override
public URL getResource(String name)
{
return null;
}
+ @Override
public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException
{
try
@@ -264,16 +269,19 @@
HttpContext context = new HttpContext()
{
+ @Override
public String getMimeType(String name)
{
return null;
}
+ @Override
public URL getResource(String name)
{
return null;
}
+ @Override
public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException
{
if (request.getParameter("setStatus") != null)
@@ -442,11 +450,13 @@
HttpContext context = new HttpContext()
{
+ @Override
public String getMimeType(String name)
{
return null;
}
+ @Override
public URL getResource(String name)
{
try
@@ -464,6 +474,7 @@
return null;
}
+ @Override
public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException
{
return true;