[java-idp-integration-tests COMMIT] in /trunk/src/test/java/net/shibboleth/idp/test: BaseIntegrationTest.java JettySe...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jan 21 20:52:02 2015
New Revision: 51

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=51&view=rev
Log:
Cleanup resources : tear down the Selenium WebDriver and close the HttpClient.

Modified:
    trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java

Modified: trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java Wed Jan 21 20:52:02 2015
@@ -439,6 +439,15 @@
         driver.manage().window().setPosition(new Point(0, 0));
         driver.manage().window().setSize(new Dimension(1024, 768));
     }
+    
+    /**
+     * Quit the web driver.
+     */
+    @AfterMethod public void tearDownDriver() {
+        if (driver != null) {
+            driver.quit();
+        }
+    }
 
     /**
      * Start the flow by accessing the {@link #startFlowURL}.

Modified: trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java Wed Jan 21 20:52:02 2015
@@ -46,7 +46,7 @@
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-//import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
@@ -253,6 +253,9 @@
             if (response instanceof CloseableHttpResponse) {
                 ((CloseableHttpResponse) response).close();
             }
+            if (httpClient instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) httpClient).close();
+            }
         }
 
         return null;