Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2022-12-02 11:15:03 +01:00
parent f7f73439ab
commit 2d94b43faa
5 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,20 +25,22 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.springframework.http.ContentDisposition.parse;
/**
* Unit tests for {@link ContentDisposition}
* Unit tests for {@link ContentDisposition}.
*
* @author Sebastien Deleuze
* @author Rossen Stoyanchev
*/
class ContentDispositionTests {
private static DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME;
private static final DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME;
@Test
@SuppressWarnings("deprecation")
void parse() {
@Test
void parseFilenameQuoted() {
assertThat(parse("form-data; name=\"foo\"; filename=\"foo.txt\"; size=123"))
.isEqualTo(ContentDisposition.formData()
.name("foo")
@@ -72,7 +74,7 @@ class ContentDispositionTests {
.build());
}
@Test // gh-24112
@Test // gh-24112
void parseEncodedFilenameWithPaddedCharset() {
assertThat(parse("attachment; filename*= UTF-8''some-file.zip"))
.isEqualTo(ContentDisposition.attachment()
@@ -80,13 +82,13 @@ class ContentDispositionTests {
.build());
}
@Test // gh-26463
@Test // gh-26463
void parseBase64EncodedFilename() {
String input = "attachment; filename=\"=?UTF-8?B?5pel5pys6KqeLmNzdg==?=\"";
assertThat(parse(input).getFilename()).isEqualTo("日本語.csv");
}
@Test // gh-26463
@Test // gh-26463
void parseBase64EncodedShiftJISFilename() {
String input = "attachment; filename=\"=?SHIFT_JIS?B?k/qWe4zqLmNzdg==?=\"";
assertThat(parse(input).getFilename()).isEqualTo("日本語.csv");
@@ -116,7 +118,7 @@ class ContentDispositionTests {
.isThrownBy(() -> parse("form-data; name=\"name\"; filename*=UTF-8''%A.txt"));
}
@Test // gh-23077
@Test // gh-23077
@SuppressWarnings("deprecation")
void parseWithEscapedQuote() {
BiConsumer<String, String> tester = (description, filename) ->
@@ -137,8 +139,8 @@ class ContentDispositionTests {
"The Twilight Zone \\\\\\\\");
}
@Test
@SuppressWarnings("deprecation")
@Test
void parseWithExtraSemicolons() {
assertThat(parse("form-data; name=\"foo\";; ; filename=\"foo.txt\"; size=123"))
.isEqualTo(ContentDisposition.formData()
@@ -148,8 +150,8 @@ class ContentDispositionTests {
.build());
}
@Test
@SuppressWarnings("deprecation")
@Test
void parseDates() {
ZonedDateTime creationTime = ZonedDateTime.parse("Mon, 12 Feb 2007 10:15:30 -0500", formatter);
ZonedDateTime modificationTime = ZonedDateTime.parse("Tue, 13 Feb 2007 10:15:30 -0500", formatter);
@@ -167,8 +169,8 @@ class ContentDispositionTests {
.build());
}
@Test
@SuppressWarnings("deprecation")
@Test
void parseIgnoresInvalidDates() {
ZonedDateTime readTime = ZonedDateTime.parse("Wed, 14 Feb 2007 10:15:30 -0500", formatter);
@@ -197,13 +199,8 @@ class ContentDispositionTests {
assertThatIllegalArgumentException().isThrownBy(() -> parse("foo;bar"));
}
private static ContentDisposition parse(String input) {
return ContentDisposition.parse(input);
}
@Test
@SuppressWarnings("deprecation")
@Test
void format() {
assertThat(
ContentDisposition.formData()
@@ -235,14 +232,11 @@ class ContentDispositionTests {
.isEqualTo("form-data; name=\"name\"; filename=\"test.txt\"");
}
@Test // gh-24220
@Test // gh-24220
void formatWithFilenameWithQuotes() {
BiConsumer<String, String> tester = (input, output) -> {
assertThat(ContentDisposition.formData().filename(input).build().toString())
.isEqualTo("form-data; filename=\"" + output + "\"");
assertThat(ContentDisposition.formData().filename(input, StandardCharsets.US_ASCII).build().toString())
.isEqualTo("form-data; filename=\"" + output + "\"");
};