[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTT...

[noreply at shibboleth.net]

Author: putmanb
Date: Sun Apr  3 13:35:51 2016
New Revision: 4446

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4446&view=rev
Log:
Attempt to fix new FileBackedHTTPMetadataResolver unit test failures on Windows.

Per Rod, File#delete(...) fails on Windows if the file is open in some way.  Be sure to close the file stream on copy.
Also use NIO to delete file in @After teardown.  This throws if file can't be deleted, should indicate reason.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java?rev=4446&r1=4445&r2=4446&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java	(original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java	Sun Apr  3 13:35:51 2016
@@ -19,7 +19,11 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
@@ -93,9 +97,9 @@
     }
 
     @AfterMethod
-    protected void tearDown() {
-        File backupFile = new File(backupFilePath);
-        backupFile.delete();
+    protected void tearDown() throws IOException {
+        Path nioBackupFilePath = Paths.get(backupFilePath);
+        Files.deleteIfExists(nioBackupFilePath);
     }
     
     /**
@@ -216,7 +220,9 @@
     @Test
     public void testInitFromBackupFile() throws Exception {
         File backupFile = new File(backupFilePath);
-        Resources.copy(Resources.getResource(relativeMDResource), new FileOutputStream(backupFile));
+        try (FileOutputStream backupFileOutputStream = new FileOutputStream(backupFile)) {
+            Resources.copy(Resources.getResource(relativeMDResource), backupFileOutputStream);
+        }
         
         Assert.assertTrue(backupFile.exists(), "Backup file was not created");
         Assert.assertTrue(backupFile.length() > 0, "Backup file contains no data");
@@ -253,7 +259,9 @@
     @Test
     public void testNoBackupFileLoadWhenMetadataCached() throws Exception {
         File backupFile = new File(backupFilePath);
-        Resources.copy(Resources.getResource(relativeMDResource), new FileOutputStream(backupFile));
+        try (FileOutputStream backupFileOutputStream = new FileOutputStream(backupFile)) {
+            Resources.copy(Resources.getResource(relativeMDResource), backupFileOutputStream);
+        }
         
         Assert.assertTrue(backupFile.exists(), "Backup file was not created");
         Assert.assertTrue(backupFile.length() > 0, "Backup file contains no data");