[utilities COMMIT] in /spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring: resource/FileBackedHTTPResour...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 17 09:32:31 2015
New Revision: 814

URL: http://svn.shibboleth.net/view/utilities?rev=814&view=rev
Log:
IDP-542 Teardown application contexts after tests

https://issues.shibboleth.net/jira/browse/IDP-542

Good for hygiene, but can also impact other tests.  Some contexts found languishing in Spring-Extensions

Modified:
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/SVNResourceTest.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java?rev=814&r1=813&r2=814&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java	(original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java	Mon Aug 17 09:32:31 2015
@@ -25,7 +25,6 @@
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
 import org.apache.http.client.HttpClient;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.MutablePropertySources;
@@ -44,10 +43,14 @@
  */
 public class FileBackedHTTPResourceTest {
 
-    private final String existsURL = "http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/resources/data/document.xml?view=co";
-    private final String nonExistsURL = "http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/resources/data/documxent.xml?view=co";
+    private final String existsURL =
+            "http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/resources/data/document.xml?view=co";
+
+    private final String nonExistsURL =
+            "http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/resources/data/documxent.xml?view=co";
+
     private String existsFile;
-   
+
     private HttpClient client;
 
     @BeforeClass public void setupClient() throws Exception {
@@ -55,38 +58,39 @@
         File file = File.createTempFile("FileBackedHTTPResourceTest1", ".xml");
         existsFile = file.getAbsolutePath();
     }
-    
+
     @AfterClass public void deleteFile() {
         File f = new File(existsFile);
         if (f.exists()) {
             f.delete();
         }
     }
-    
-    @SuppressWarnings("deprecation")
-    @Test public void existsTest() throws IOException {
-       final Resource existsResource = new FileBackedHTTPResource(existsFile, client, existsURL);
-       final Resource notExistsResource = new FileBackedHTTPResource(client, nonExistsURL,  new FileSystemResource(existsFile+"ZZZ"));
-        
+
+    @SuppressWarnings("deprecation") @Test public void existsTest() throws IOException {
+        final Resource existsResource = new FileBackedHTTPResource(existsFile, client, existsURL);
+        final Resource notExistsResource =
+                new FileBackedHTTPResource(client, nonExistsURL, new FileSystemResource(existsFile + "ZZZ"));
+
         Assert.assertTrue(existsResource.exists());
         Assert.assertFalse(notExistsResource.exists());
     }
-    
-    @SuppressWarnings("deprecation")
-    @Test public void testCompare() throws IOException {
-        
-        Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(client, existsURL, new FileSystemResource(existsFile)), new ClassPathResource("data/document.xml")));
+
+    @SuppressWarnings("deprecation") @Test public void testCompare() throws IOException {
+
+        Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(client, existsURL,
+                new FileSystemResource(existsFile)), new ClassPathResource("data/document.xml")));
         // With that done compare via the backup
-        Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(existsFile, client, nonExistsURL), new ClassPathResource("data/document.xml")));
+        Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(existsFile, client, nonExistsURL),
+                new ClassPathResource("data/document.xml")));
     }
-    
+
     public GenericApplicationContext getContext(String location) {
-        
+
         MockPropertySource mockEnvVars = new MockPropertySource();
         mockEnvVars.setProperty("file.name", existsFile);
         mockEnvVars.setProperty("the.url", existsURL);
 

[... 306 lines stripped ...]