Author: markt
Date: Fri Oct 13 12:01:23 2017
New Revision: 1812119
URL: http://svn.apache.org/viewvc?rev=1812119&view=rev
Log:
Fix some FindBugs warnings in the test cases
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
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=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
Fri Oct 13 12:01:23 2017
@@ -81,7 +81,7 @@ public class TestPersistentProviderRegis
validateSimple(end);
if (f.exists()) {
- f.delete();
+ Assert.assertTrue("Failed to clean up [" + f + "]", f.delete());
}
}
}
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Fri Oct
13 12:01:23 2017
@@ -88,7 +88,7 @@ public class TestSendFile extends Tomcat
}
} finally {
for (File f : files) {
- f.delete();
+ Assert.assertTrue("Failed to clean up [" + f + "]",
f.delete());
}
}
}
@@ -205,7 +205,9 @@ public class TestSendFile extends Tomcat
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
file.getAbsolutePath());
req.setAttribute(Globals.SENDFILE_FILE_START_ATTR,
Long.valueOf(0));
req.setAttribute(Globals.SENDFILE_FILE_END_ATTR,
Long.valueOf(file.length()));
- file.delete();
+ if (!file.delete()) {
+ throw new ServletException("Failed to delete [" + file +
"]");
+ }
} else {
byte[] c = new byte[1024];
Random rd = new Random();
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Fri
Oct 13 12:01:23 2017
@@ -2032,7 +2032,7 @@ public class TestAsyncContextImpl extend
private static final long serialVersionUID = 1L;
- private AsyncContext asyncContext;
+ private transient AsyncContext asyncContext;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Fri
Oct 13 12:01:23 2017
@@ -308,7 +308,7 @@ public class TestVirtualContext extends
assertPageContains("/test/annotatedServlet",
MyAnnotatedServlet.MESSAGE);
tomcat.stop();
FileUtils.deleteDirectory(additionWebInfClasses);
- tempFile.delete();
+ Assert.assertTrue("Failed to clean up [" + tempFile + "]",
tempFile.delete());
}
private void assertPageContains(String pageUrl, String expectedBody)
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
Fri Oct 13 12:01:23 2017
@@ -83,7 +83,7 @@ public class TestWebappClassLoaderExecut
long n = 1000L;
int tpSize = 10;
- public volatile ThreadPoolExecutor tpe;
+ public transient volatile ThreadPoolExecutor tpe;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Fri Oct 13 12:01:23 2017
@@ -32,6 +32,7 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -54,7 +55,7 @@ public class TestWebappClassLoaderWeavin
File webappDocBaseFile = new File(webappDocBase);
WEBAPP_DOC_BASE = webappDocBaseFile.getCanonicalPath();
File classes = new File(webappDocBaseFile, "/WEB-INF/classes/" +
PACKAGE_PREFIX);
- classes.mkdirs();
+ Assert.assertTrue("Failed to create [" + classes + "]",
classes.mkdirs());
copyResource(PACKAGE_PREFIX + "/TesterNeverWeavedClass.class",
new File(classes, "TesterNeverWeavedClass.class"));
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Fri Oct 13 12:01:23 2017
@@ -1123,32 +1123,32 @@ public class TestHostConfigAutomaticDepl
if (xml == null) {
Assert.fail();
} else {
- xml.setLastModified(System.currentTimeMillis() -
- 10 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" +
xml + "]", xml.setLastModified(
+ System.currentTimeMillis() - 10 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
}
break;
case EXT:
if (ext == null) {
Assert.fail();
} else {
- ext.setLastModified(System.currentTimeMillis() -
- 10 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" +
ext + "]", ext.setLastModified(
+ System.currentTimeMillis() - 10 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
}
break;
case WAR:
if (war == null) {
Assert.fail();
} else {
- war.setLastModified(System.currentTimeMillis() -
- 10 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" +
war + "]", war.setLastModified(
+ System.currentTimeMillis() - 10 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
}
break;
case DIR:
if (dir == null) {
Assert.fail();
} else {
- dir.setLastModified(System.currentTimeMillis() -
- 10 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" +
dir + "]", dir.setLastModified(
+ System.currentTimeMillis() - 10 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
}
break;
default:
@@ -1697,8 +1697,8 @@ public class TestHostConfigAutomaticDepl
}
Files.copy(src.toPath(), dest.toPath());
// Make sure that HostConfig thinks the WAR has been modified.
- dest.setLastModified(
- System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" + dest + "]",
dest.setLastModified(
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
return dest;
}
@@ -1710,8 +1710,8 @@ public class TestHostConfigAutomaticDepl
}
Files.copy(XML_SOURCE.toPath(), xml.toPath());
// Make sure that HostConfig thinks the xml has been modified.
- xml.setLastModified(
- System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" + xml + "]",
xml.setLastModified(
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
return xml;
}
@@ -1746,8 +1746,8 @@ public class TestHostConfigAutomaticDepl
fos.write(context.toString().getBytes(StandardCharsets.ISO_8859_1));
}
// Make sure that HostConfig thinks the xml has been modified.
- xml.setLastModified(
- System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" + xml + "]",
xml.setLastModified(
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
return xml;
}
@@ -1945,7 +1945,8 @@ public class TestHostConfigAutomaticDepl
File war = createWar(srcWar, true);
// Make the WAR appear to have been created earlier
- war.setLastModified(war.lastModified() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" + war + "]",
war.setLastModified(
+ war.lastModified() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
tomcat.addWebapp(APP_NAME.getPath(), war.getAbsolutePath());
tomcat.start();
@@ -1954,10 +1955,12 @@ public class TestHostConfigAutomaticDepl
File dir = new File(host.getAppBase(), APP_NAME.getBaseName());
// Make the DIR appear to have been created earlier
long lastModified = war.lastModified() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS;
- dir.setLastModified(lastModified);
+ Assert.assertTrue("Failed to set last modified for [" + dir + "]",
+ dir.setLastModified(lastModified));
host.stop();
- war.setLastModified(System.currentTimeMillis());
+ Assert.assertTrue("Failed to set last modified for [" + war + "]",
+ war.setLastModified(System.currentTimeMillis()));
host.start();
if (autoDeploy) {
host.backgroundProcess();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Fri Oct
13 12:01:23 2017
@@ -848,8 +848,9 @@ public abstract class TomcatBaseTest ext
Files.copy(file, destPath);
// Make sure that HostConfig thinks all newly copied files have
// been modified.
- destPath.toFile().setLastModified(
- System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ Assert.assertTrue("Failed to set last modified for [" +
destPath + "]",
+ destPath.toFile().setLastModified(
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS));
return FileVisitResult.CONTINUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
