svn commit: r1816655 - in /tomcat/trunk/test/org/apache/catalina/authenticator/jaspic: TestAuthConfigFactoryImpl.java TestPersistentProviderRegistrations.java

[markt]

Author: markt
Date: Wed Nov 29 22:06:40 2017
New Revision: 1816655

URL: http://svn.apache.org/viewvc?rev=1816655&view=rev
Log:
Fix some SpotBugs issues in the tests

Modified:
    
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
    
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java?rev=1816655&r1=1816654&r2=1816655&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
 Wed Nov 29 22:06:40 2017
@@ -321,7 +321,9 @@ public class TestAuthConfigFactoryImpl {
         System.setProperty(Globals.CATALINA_BASE_PROP, "test");
 
         if (TEST_CONFIG_FILE.exists()) {
-            TEST_CONFIG_FILE.delete();
+            if (!TEST_CONFIG_FILE.delete()) {
+                Assert.fail("Failed to delete " + TEST_CONFIG_FILE);
+            }
         }
     }
 
@@ -335,7 +337,9 @@ public class TestAuthConfigFactoryImpl {
         }
 
         if (TEST_CONFIG_FILE.exists()) {
-            TEST_CONFIG_FILE.delete();
+            if (!TEST_CONFIG_FILE.delete()) {
+                Assert.fail("Failed to delete " + TEST_CONFIG_FILE);
+            }
         }
     }
 

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java?rev=1816655&r1=1816654&r2=1816655&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
 Wed Nov 29 22:06:40 2017
@@ -126,7 +126,9 @@ public class TestPersistentProviderRegis
             validateNoLayerAndAC(loadedProviders);
         } finally {
             if (f.exists()) {
-                f.delete();
+                if (!f.delete()) {
+                    Assert.fail("Failed to delete " + f);
+                }
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org