ace-commits mailing list archives

Author: marrs
Date: Fri Feb 15 10:37:58 2013
New Revision: 1446501

URL: http://svn.apache.org/r1446501
Log:
ACE-335 Small code cleanups in an integration test.

Modified:
    ace/trunk/org.apache.ace.http.itest/bnd.bnd
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java

Modified: ace/trunk/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/bnd.bnd?rev=1446501&r1=1446500&r2=1446501&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http.itest/bnd.bnd Fri Feb 15 10:37:58 2013
@@ -13,8 +13,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.server.log.store.api;version=latest,\
 	javax.servlet
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: \
-	osgi.cmpn,\
+-runbundles: osgi.cmpn,\
 	org.apache.felix.eventadmin,\
 	org.apache.felix.http.jetty,\
 	org.apache.felix.dependencymanager.shell,\

Modified: ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java?rev=1446501&r1=1446500&r2=1446501&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java (original)
+++ ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java Fri
Feb 15 10:37:58 2013
@@ -33,13 +33,10 @@ public class MockHttpService implements 
     private boolean m_unregisterCalled = false;
 
     public HttpContext createDefaultHttpContext() {
-        // TODO Auto-generated method stub
         return null;
     }
 
     public void registerResources(String arg0, String arg1, HttpContext arg2) throws NamespaceException
{
-        // TODO Auto-generated method stub
-
     }
 
     @SuppressWarnings("unchecked")

Modified: ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java?rev=1446501&r1=1446500&r2=1446501&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
(original)
+++ ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
Fri Feb 15 10:37:58 2013
@@ -64,10 +64,11 @@ public class ServletConfiguratorIntegrat
         assertTrue("TestValue not echo'd back", waitForEchoServlet(true));
         assertTrue("Servlet not registered with the mock service", m_mockHttp.isRegisterCalled());
 
-
         m_dependencyManager.remove(m_echoServletService);
         assertFalse("The servlet should not be available anymore", waitForEchoServlet(false));
         assertTrue("Servlet not unregistered with the mock service", m_mockHttp.isUnregisterCalled());
+
+        m_dependencyManager.remove(m_mockHttpService);
     }
 
     @Override
@@ -121,16 +122,19 @@ public class ServletConfiguratorIntegrat
                     Thread.sleep(100);
                 }
             }
-        }catch (MalformedURLException e) {
+        }
+        catch (MalformedURLException e) {
             e.printStackTrace();
             fail("No MalformedURLException expected");
         }
         catch (InterruptedException e) {
             e.printStackTrace();
             fail("No interruptedException expected");
-        } catch (Throwable t) {
+        }
+        catch (Throwable t) {
             t.printStackTrace();
-        } finally {
+        }
+        finally {
             if (bufReader != null) {
                 try {
                     bufReader.close();