You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/07/02 20:40:48 UTC
[tomcat] 02/02: Fix some FindBugs warnings in the test cases
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7f5c3844999f7669d438d1e0a52839f70a48e96f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 13 12:01:23 2017 +0000
Fix some FindBugs warnings in the test cases
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1812119 13f79535-47bb-0310-9956-ffa450edef68
---
.../TestPersistentProviderRegistrations.java | 2 +-
.../apache/catalina/connector/TestSendFile.java | 6 ++--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../apache/catalina/loader/TestVirtualContext.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
.../loader/TestWebappClassLoaderWeaving.java | 2 +-
.../startup/TestHostConfigAutomaticDeployment.java | 37 ++++++++++++----------
.../apache/catalina/startup/TomcatBaseTest.java | 5 +--
8 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java b/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
index d198777..a767af2 100644
--- a/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
+++ b/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
@@ -81,7 +81,7 @@ public class TestPersistentProviderRegistrations {
validateSimple(end);
if (f.exists()) {
- f.delete();
+ Assert.assertTrue("Failed to clean up [" + f + "]", f.delete());
}
}
diff --git a/test/org/apache/catalina/connector/TestSendFile.java b/test/org/apache/catalina/connector/TestSendFile.java
index e289941..a8aafbc 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -86,7 +86,7 @@ public class TestSendFile extends TomcatBaseTest {
}
} finally {
for (File f : files) {
- f.delete();
+ Assert.assertTrue("Failed to clean up [" + f + "]", f.delete());
}
}
}
@@ -203,7 +203,9 @@ public class TestSendFile extends TomcatBaseTest {
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();
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index e6fb217..3712c97 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -2028,7 +2028,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
- private AsyncContext asyncContext;
+ private transient AsyncContext asyncContext;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java b/test/org/apache/catalina/loader/TestVirtualContext.java
index 5c21df3..9db23e2 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -304,7 +304,7 @@ public class TestVirtualContext extends TomcatBaseTest {
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)
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
index fe32cee..2fc7b0a 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
@@ -83,7 +83,7 @@ public class TestWebappClassLoaderExecutorMemoryLeak extends TomcatBaseTest {
long n = 1000L;
int tpSize = 10;
- public volatile ThreadPoolExecutor tpe;
+ public transient volatile ThreadPoolExecutor tpe;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
index bb87152..f8bd72d 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
@@ -49,7 +49,7 @@ public class TestWebappClassLoaderWeaving extends TomcatBaseTest {
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"));
diff --git a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
index 2fb86dd..d37b765 100644
--- a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
+++ b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
@@ -1123,32 +1123,32 @@ public class TestHostConfigAutomaticDeployment extends TomcatBaseTest {
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 TestHostConfigAutomaticDeployment extends TomcatBaseTest {
}
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 TestHostConfigAutomaticDeployment extends TomcatBaseTest {
}
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 TestHostConfigAutomaticDeployment extends TomcatBaseTest {
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 TestHostConfigAutomaticDeployment extends TomcatBaseTest {
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 TestHostConfigAutomaticDeployment extends TomcatBaseTest {
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();
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 800a0cc..0fd2286 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -865,8 +865,9 @@ public abstract class TomcatBaseTest extends LoggingBaseTest {
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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org