Simplify @⁠EnumSource usage

spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java

@@ -67,7 +67,7 @@ class H2SequenceMaxValueIncrementerTests {
 	 * Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>.
 	 */
 	@ParameterizedTest
-	@EnumSource(ModeEnum.class)
+	@EnumSource
 	void incrementsSequenceWithExplicitH2CompatibilityMode(ModeEnum mode) {
 		String connectionUrl = String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false;MODE=%s", UUID.randomUUID(), mode);
 		DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", "");

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java

@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 class UriComponentsBuilderTests {
 
 	@ParameterizedTest // see gh-26453
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void examplesInReferenceManual(ParserType parserType) {
 		final String expected = "/hotel%20list/New%20York?q=foo%2Bbar";
 
@@ -156,7 +156,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see gh-9317
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriEncodedQuery(ParserType parserType) {
 		URI uri = URI.create("https://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
 		String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0);
@@ -167,7 +167,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriString(ParserType parserType) {
 		UriComponents result = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc3986.txt", parserType).build();
 		assertThat(result.getScheme()).isEqualTo("https");
@@ -224,7 +224,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-9832
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriStringQueryParamWithReservedCharInValue(ParserType parserType) {
 		String uri = "https://www.google.com/ig/calculator?q=1USD=?EUR";
 		UriComponents result = UriComponentsBuilder.fromUriString(uri, parserType).build();
@@ -234,7 +234,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-14828
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriStringQueryParamEncodedAndContainingPlus(ParserType parserType) {
 		String httpUrl = "http://localhost:8080/test/print?value=%EA%B0%80+%EB%82%98";
 		URI uri = UriComponentsBuilder.fromUriString(httpUrl, parserType).build(true).toUri();
@@ -243,7 +243,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-10539
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriStringIPv6Host(ParserType parserType) {
 		UriComponents result = UriComponentsBuilder
 				.fromUriString("http://[1abc:2abc:3abc::5ABC:6abc]:8080/resource", parserType).build().encode();
@@ -251,14 +251,14 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriStringInvalidIPv6Host(ParserType parserType) {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				UriComponentsBuilder.fromUriString("http://[1abc:2abc:3abc::5ABC:6abc:8080/resource", parserType));
 	}
 
 	@ParameterizedTest // see SPR-11970
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromUriStringNoPathWithReservedCharInQuery(ParserType parserType) {
 		UriComponents result = UriComponentsBuilder.fromUriString("https://example.com?foo=bar@baz", parserType).build();
 		assertThat(result.getUserInfo()).isNull();
@@ -268,7 +268,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-1428
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromHttpUrlQueryParamEncodedAndContainingPlus(ParserType parserType) {
 		String httpUrl = "http://localhost:8080/test/print?value=%EA%B0%80+%EB%82%98";
 		URI uri = UriComponentsBuilder.fromUriString(httpUrl, parserType).build(true).toUri();
@@ -277,7 +277,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-10779
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromHttpUrlCaseInsensitiveScheme(ParserType parserType) {
 		assertThat(UriComponentsBuilder.fromUriString("HTTP://www.google.com", parserType).build().getScheme())
 				.isEqualTo("http");
@@ -286,14 +286,14 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see SPR-10539
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromHttpUrlInvalidIPv6Host(ParserType parserType) {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				UriComponentsBuilder.fromUriString("http://[1abc:2abc:3abc::5ABC:6abc:8080/resource", parserType));
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromHttpUrlWithoutFragment(ParserType parserType) {
 		String httpUrl = "http://localhost:8080/test/print";
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString(httpUrl, parserType).build();
@@ -333,7 +333,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // see gh-25300
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void fromHttpUrlWithFragment(ParserType parserType) {
 		String httpUrl = "https://example.com/#baz";
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString(httpUrl, parserType).build();
@@ -449,7 +449,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void replacePath(ParserType parserType) {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc2396.txt", parserType);
 		builder.replacePath("/rfc/rfc3986.txt");
@@ -465,7 +465,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void replaceQuery(ParserType parserType) {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar&baz=qux", parserType);
 		builder.replaceQuery("baz=42");
@@ -605,7 +605,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void parseBuildAndExpandHierarchical(ParserType parserType) {
 		URI uri = UriComponentsBuilder
 				.fromUriString("{scheme}://{host}:{port}/{segment}?{query}#{fragment}", parserType)
@@ -617,7 +617,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void buildAndExpandOpaque(ParserType parserType) {
 		UriComponents result = UriComponentsBuilder.fromUriString("mailto:{user}@{domain}", parserType)
 				.buildAndExpand("foo", "example.com");
@@ -631,7 +631,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // gh-33699
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void schemeVariableMixedCase(ParserType parserType) {
 
 		BiConsumer<String, String> tester = (scheme, value) -> {
@@ -647,7 +647,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void queryParamWithValueWithEquals(ParserType parserType) {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=baz", parserType).build();
 		assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar=baz");
@@ -655,7 +655,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void queryParamWithoutValueWithEquals(ParserType parserType) {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=", parserType).build();
 		assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar=");
@@ -663,7 +663,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void queryParamWithoutValueWithoutEquals(ParserType parserType) {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar", parserType).build();
 		assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar");
@@ -688,7 +688,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void relativeUrls(ParserType parserType) {
 		String baseUrl = "https://example.com";
 		assertThat(UriComponentsBuilder.fromUriString(baseUrl + "/foo/../bar", parserType).build().toString())
@@ -706,7 +706,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void emptySegments(ParserType parserType) {
 		String baseUrl = "https://example.com/abc/";
 		assertThat(UriComponentsBuilder.fromUriString(baseUrl, parserType).path("/x/y/z").build().toString())
@@ -720,7 +720,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void parsesEmptyFragment(ParserType parserType) {
 		UriComponents components = UriComponentsBuilder.fromUriString("/example#", parserType).build();
 		assertThat(components.getFragment()).isNull();
@@ -728,7 +728,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // SPR-13257
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void parsesEmptyUri(ParserType parserType) {
 		UriComponents components = UriComponentsBuilder.fromUriString("", parserType).build();
 		assertThat(components.toString()).isEmpty();
@@ -791,7 +791,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // gh-26466
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void encodeTemplateWithInvalidPlaceholderSyntax(ParserType parserType) {
 
 		BiConsumer<String, String> tester = (in, out) ->
@@ -821,7 +821,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // SPR-16364
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void uriComponentsNotEqualAfterNormalization(ParserType parserType) {
 		UriComponents uri1 = UriComponentsBuilder.fromUriString("http://test.com", parserType).build().normalize();
 		UriComponents uri2 = UriComponentsBuilder.fromUriString("http://test.com/", parserType).build();
@@ -832,7 +832,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // SPR-17256
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void uriComponentsWithMergedQueryParams(ParserType parserType) {
 		String uri = UriComponentsBuilder.fromUriString("http://localhost:8081", parserType)
 				.uriComponents(UriComponentsBuilder.fromUriString("/{path}?sort={sort}", parserType).build())
@@ -842,7 +842,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // SPR-17630
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriStringWithCurlyBraces(ParserType parserType) {
 		assertThat(UriComponentsBuilder.fromUriString("/path?q={asa}asa", parserType).toUriString())
 				.isEqualTo("/path?q=%7Basa%7Dasa");
@@ -855,7 +855,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void validPort(ParserType parserType) {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://localhost:52567/path", parserType).build();
 		assertThat(uriComponents.getPort()).isEqualTo(52567);
@@ -871,7 +871,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void verifyInvalidPort(ParserType parserType) {
 		String url = "http://localhost:XXX/path";
 		assertThatIllegalArgumentException()
@@ -881,7 +881,7 @@ class UriComponentsBuilderTests {
 	}
 
 	@ParameterizedTest // gh-27039
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void expandPortAndPathWithoutSeparator(ParserType parserType) {
 		URI uri = UriComponentsBuilder
 				.fromUriString("ws://localhost:{port}/{path}", parserType)

spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java

@@ -79,28 +79,28 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriEncoded(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich", parserType).build();
 		assertThat(uri.encode().toUri()).isEqualTo(URI.create("https://example.com/hotel%20list/Z%C3%BCrich"));
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriNotEncoded(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich", parserType).build();
 		assertThat(uri.toUri()).isEqualTo(URI.create("https://example.com/hotel%20list/Z\u00fcrich"));
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriAlreadyEncoded(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("https://example.com/hotel%20list/Z%C3%BCrich", parserType).build(true);
 		assertThat(uri.encode().toUri()).isEqualTo(URI.create("https://example.com/hotel%20list/Z%C3%BCrich"));
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriWithIpv6HostAlreadyEncoded(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString(
 				"http://[1abc:2abc:3abc::5ABC:6abc]:8080/hotel%20list/Z%C3%BCrich", parserType).build(true);
@@ -110,14 +110,14 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void toUriStringWithPortVariable(ParserType parserType) {
 		String url = "http://localhost:{port}/first";
 		assertThat(UriComponentsBuilder.fromUriString(url, parserType).build().toUriString()).isEqualTo(url);
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void expand(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("https://example.com", parserType).path("/{foo} {bar}").build();
 		uri = uri.expand("1 2", "3 4");
@@ -127,7 +127,7 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest // SPR-13311
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void expandWithRegexVar(ParserType parserType) {
 		String template = "/myurl/{name:[a-z]{1,5}}/show";
 		UriComponents uri = UriComponentsBuilder.fromUriString(template, parserType).build();
@@ -137,14 +137,14 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest // SPR-17630
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void uirTemplateExpandWithMismatchedCurlyBraces(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("/myurl/?q={{{{", parserType).encode().build();
 		assertThat(uri.toUriString()).isEqualTo("/myurl/?q=%7B%7B%7B%7B");
 	}
 
 	@ParameterizedTest // gh-22447
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void expandWithFragmentOrder(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder
 				.fromUriString("https://{host}/{path}#{fragment}", parserType).build()
@@ -154,7 +154,7 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest // SPR-12123
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void port(ParserType parserType) {
 		UriComponents uri1 = fromUriString("https://example.com:8080/bar", parserType).build();
 		UriComponents uri2 = fromUriString("https://example.com/bar", parserType).port(8080).build();
@@ -172,7 +172,7 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest // gh-28521
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void invalidPort(ParserType parserType) {
 		assertThatExceptionOfType(InvalidUrlException.class)
 				.isThrownBy(() -> fromUriString("https://example.com:XXX/bar", parserType));
@@ -207,14 +207,14 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void normalize(ParserType parserType) {
 		UriComponents uri = UriComponentsBuilder.fromUriString("https://example.com/foo/../bar", parserType).build();
 		assertThat(uri.normalize().toString()).isEqualTo("https://example.com/bar");
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void serializable(ParserType parserType) throws Exception {
 		UriComponents uri = UriComponentsBuilder.fromUriString(
 				"https://example.com", parserType).path("/{foo}").query("bar={baz}").build();
@@ -240,7 +240,7 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void equalsHierarchicalUriComponents(ParserType parserType) {
 		String url = "https://example.com";
 		UriComponents uric1 = UriComponentsBuilder.fromUriString(url, parserType).path("/{foo}").query("bar={baz}").build();
@@ -254,7 +254,7 @@ class UriComponentsTests {
 	}
 
 	@ParameterizedTest
-	@EnumSource(value = ParserType.class)
+	@EnumSource
 	void equalsOpaqueUriComponents(ParserType parserType) {
 		String baseUrl = "http:example.com";
 		UriComponents uric1 = UriComponentsBuilder.fromUriString(baseUrl + "/foo/bar", parserType).build();