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

Reject empty strings in DurationFormatterUtils

Browse Source 
See gh-33669
This commit is contained in:
Seungrae
2024-10-09 00:56:59 +09:00
committed by Stéphane Nicoll
parent 7f7f65cfcb
commit 02c990ca82
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-context/src/test/java/org/springframework/format/datetime/standard/DurationFormatterUtilsTests.java
View File

@@ -23,7 +23,10 @@ import java.util.Arrays;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.springframework.format.annotation.DurationFormat;
import org.springframework.format.annotation.DurationFormat.Unit;
import static org.assertj.core.api.Assertions.assertThat;
@@ -188,6 +191,22 @@ class DurationFormatterUtilsTests {
.havingCause().withMessage("Does not match composite duration pattern");
}
@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void parseEmptyStringThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.parse("", style))
.withMessage("Value must not be empty");
}
@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void parseNullStringThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.parse(null, style))
.withMessage("Value must not be empty");
}
@Test
void printSimple() {
assertThat(DurationFormatterUtils.print(Duration.ofNanos(12345), SIMPLE, Unit.NANOS))
@@ -240,6 +259,14 @@ class DurationFormatterUtilsTests {
.isEqualTo("-1d2h34m57s28ms3us2ns");
}
@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void printNullDurationThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.print(null, style))
.withMessage("Value must not be null");
}
@Test
void detectAndParse() {
assertThat(DurationFormatterUtils.detectAndParse("PT1.234S", Unit.NANOS))