This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 523de2495d Replace inappropriate usages of FileUpload
523de2495d is described below
commit 523de2495d0b2f16eff8164a1713cbde365223be
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 15 10:47:37 2023 +0100
Replace inappropriate usages of FileUpload
---
test/org/apache/catalina/ha/session/TestDeltaRequest.java | 2 +-
test/org/apache/catalina/loader/TestVirtualContext.java | 8 ++++----
test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java | 7 +++----
test/org/apache/catalina/session/FileStoreTest.java | 7 +++----
test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java | 2 +-
5 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/test/org/apache/catalina/ha/session/TestDeltaRequest.java
b/test/org/apache/catalina/ha/session/TestDeltaRequest.java
index ba4e874e6f..bc795af10d 100644
--- a/test/org/apache/catalina/ha/session/TestDeltaRequest.java
+++ b/test/org/apache/catalina/ha/session/TestDeltaRequest.java
@@ -17,6 +17,7 @@
package org.apache.catalina.ha.session;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -26,7 +27,6 @@ import org.junit.Test;
import org.apache.catalina.Manager;
import org.apache.catalina.session.StandardManager;
import org.apache.tomcat.unittest.TesterContext;
-import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
public class TestDeltaRequest {
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java
b/test/org/apache/catalina/loader/TestVirtualContext.java
index fc26aecd7a..720817be6b 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -29,12 +29,12 @@ import org.junit.Test;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.core.JreMemoryLeakPreventionListener;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.IOTools;
import org.apache.catalina.webresources.StandardRoot;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.tomcat.util.scan.StandardJarScanner;
public class TestVirtualContext extends TomcatBaseTest {
@@ -266,7 +266,7 @@ public class TestVirtualContext extends TomcatBaseTest {
FileOutputStream annotatedServletClassOutputStream = new
FileOutputStream(new File(
targetPackageForAnnotatedClass,
MyAnnotatedServlet.class.getSimpleName()
+ ".class"))) {
- IOUtils.copy(annotatedServletClassInputStream,
annotatedServletClassOutputStream);
+ IOTools.flow(annotatedServletClassInputStream,
annotatedServletClassOutputStream);
}
ctx.setResources(new StandardRoot(ctx));
@@ -302,7 +302,7 @@ public class TestVirtualContext extends TomcatBaseTest {
tomcat.start();
assertPageContains("/test/annotatedServlet",
MyAnnotatedServlet.MESSAGE);
tomcat.stop();
- FileUtils.deleteDirectory(additionWebInfClasses);
+ ExpandWar.delete(additionWebInfClasses);
Assert.assertTrue("Failed to clean up [" + tempFile + "]",
tempFile.delete());
}
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
index 141f690ea5..1912264a50 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
@@ -32,9 +32,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
public class TestWebappClassLoaderWeaving extends TomcatBaseTest {
@@ -60,11 +60,10 @@ public class TestWebappClassLoaderWeaving extends
TomcatBaseTest {
@AfterClass
public static void tearDownClass() throws Exception {
-
- FileUtils.deleteDirectory(new File(WEBAPP_DOC_BASE));
-
+ ExpandWar.delete(new File(WEBAPP_DOC_BASE));
}
+
private Tomcat tomcat;
private Context context;
private WebappClassLoaderBase loader;
diff --git a/test/org/apache/catalina/session/FileStoreTest.java
b/test/org/apache/catalina/session/FileStoreTest.java
index c827562bcb..4b80b389ac 100644
--- a/test/org/apache/catalina/session/FileStoreTest.java
+++ b/test/org/apache/catalina/session/FileStoreTest.java
@@ -26,9 +26,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.catalina.Manager;
+import org.apache.catalina.startup.ExpandWar;
import org.apache.tomcat.unittest.TesterContext;
import org.apache.tomcat.unittest.TesterServletContext;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
public class FileStoreTest {
@@ -51,9 +51,8 @@ public class FileStoreTest {
@AfterClass
- public static void cleanup() throws IOException {
- FileUtils.cleanDirectory(dir);
- FileUtils.deleteDirectory(dir);
+ public static void cleanup() {
+ ExpandWar.delete(dir);
}
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
index cfadc80757..5434971b68 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.util.net;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.ObjectOutputStream;
@@ -24,7 +25,6 @@ import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
import org.apache.tomcat.websocket.server.WsContextListener;
public class TestSSLHostConfigIntegration extends TomcatBaseTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
