This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 6b2e952a935f89b96e680c29c7b1763eb0dcd796
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon May 22 14:21:54 2023 -0400
Rename Jakarta test classes
---
...ckHttpServletRequest.java => JakartaMockHttpServletRequest.java} | 6 +++---
...taServletHttpRequest.java => JakartaMockServletHttpRequest.java} | 6 +++---
.../commons/fileupload2/jakarta/JakartaServletFileUploadTest.java | 4 ++--
.../org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockHttpServletRequest.java
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
similarity index 97%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockHttpServletRequest.java
rename to
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
index d68cf08..4f80abe 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockHttpServletRequest.java
+++
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
@@ -46,7 +46,7 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-public class MockHttpServletRequest implements HttpServletRequest {
+public class JakartaMockHttpServletRequest implements HttpServletRequest {
private static class MyServletInputStream extends ServletInputStream {
@@ -107,14 +107,14 @@ public class MockHttpServletRequest implements
HttpServletRequest {
/**
* Creates a new instance with the given request data and content type.
*/
- public MockHttpServletRequest(final byte[] requestData, final String
contentType) {
+ public JakartaMockHttpServletRequest(final byte[] requestData, final
String contentType) {
this(new ByteArrayInputStream(requestData), requestData.length,
contentType, -1);
}
/**
* Creates a new instance with the given request data and content type.
*/
- public MockHttpServletRequest(final InputStream requestInputStream, final
long requestLength, final String contentType, final int readLimit) {
+ public JakartaMockHttpServletRequest(final InputStream requestInputStream,
final long requestLength, final String contentType, final int readLimit) {
this.requestInputStream = requestInputStream;
this.requestLength = requestLength;
this.contentType = contentType;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockJakartaServletHttpRequest.java
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
similarity index 98%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockJakartaServletHttpRequest.java
rename to
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
index 9fa19fa..c87ef5a 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/MockJakartaServletHttpRequest.java
+++
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
@@ -45,7 +45,7 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-public class MockJakartaServletHttpRequest implements HttpServletRequest {
+public class JakartaMockServletHttpRequest implements HttpServletRequest {
private static class MyServletInputStream extends
jakarta.servlet.ServletInputStream {
@@ -103,14 +103,14 @@ public class MockJakartaServletHttpRequest implements
HttpServletRequest {
/**
* Creates a new instance with the given request data and content type.
*/
- public MockJakartaServletHttpRequest(final byte[] requestData, final
String strContentType) {
+ public JakartaMockServletHttpRequest(final byte[] requestData, final
String strContentType) {
this(new ByteArrayInputStream(requestData), requestData.length,
strContentType);
}
/**
* Creates a new instance with the given request data and content type.
*/
- public MockJakartaServletHttpRequest(final InputStream requestData, final
long requestLength, final String strContentType) {
+ public JakartaMockServletHttpRequest(final InputStream requestData, final
long requestLength, final String strContentType) {
mRequestData = requestData;
length = requestLength;
mStrContentType = strContentType;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
index 7ff29af..15c8ca3 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
+++
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
@@ -52,7 +52,7 @@ public class JakartaServletFileUploadTest {
// @formatter:on
final byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
- final HttpServletRequest request = new
MockJakartaServletHttpRequest(bytes, Constants.CONTENT_TYPE);
+ final HttpServletRequest request = new
JakartaMockServletHttpRequest(bytes, Constants.CONTENT_TYPE);
final DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
fileItemFactory.setDefaultCharset("UTF-8");
@@ -89,7 +89,7 @@ public class JakartaServletFileUploadTest {
"-----1234--\r\n";
// @formatter:on
final byte[] bytes = text.getBytes(StandardCharsets.US_ASCII);
- final HttpServletRequest request = new
MockJakartaServletHttpRequest(bytes, Constants.CONTENT_TYPE);
+ final HttpServletRequest request = new
JakartaMockServletHttpRequest(bytes, Constants.CONTENT_TYPE);
final JakartaServletFileUpload upload = new
JakartaServletFileUpload(new DiskFileItemFactory());
final Map<String, List<FileItem>> mappedParameters =
upload.parseParameterMap(request);
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
index 9a27d18..b8d8c74 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
+++
b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
@@ -36,9 +36,9 @@ public class JakartaSizesTest extends
SizesTest<JakartaServletFileUpload, HttpSe
}
@Override
- protected MockHttpServletRequest newMockHttpServletRequest(final String
request, final Integer overrideContenLength, final Integer overrideReadLimit) {
+ protected JakartaMockHttpServletRequest newMockHttpServletRequest(final
String request, final Integer overrideContenLength, final Integer
overrideReadLimit) {
final byte[] requestData = request.getBytes(StandardCharsets.US_ASCII);
- return new MockHttpServletRequest(new
ByteArrayInputStream(requestData), overrideContenLength != null ?
overrideContenLength : requestData.length,
+ return new JakartaMockHttpServletRequest(new
ByteArrayInputStream(requestData), overrideContenLength != null ?
overrideContenLength : requestData.length,
Constants.CONTENT_TYPE, overrideReadLimit != null ?
overrideReadLimit : -1);
}
