Remove validation from TestPropertySourceAttributes

See gh-19930

spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java

@@ -25,7 +25,6 @@
 
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.log.LogMessage;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.Assert;
@@ -54,8 +53,6 @@ class TestPropertySourceAttributes {
 
 	private final Class<?> declaringClass;
 
-	private final MergedAnnotation<?> rootAnnotation;
-
 	private final List<String> locations = new ArrayList<>();
 
 	private final boolean inheritLocations;
@@ -67,48 +64,11 @@ class TestPropertySourceAttributes {
 
 	TestPropertySourceAttributes(MergedAnnotation<TestPropertySource> annotation) {
 		this.declaringClass = declaringClass(annotation);
-		this.rootAnnotation = annotation.getRoot();
 		this.inheritLocations = annotation.getBoolean("inheritLocations");
 		this.inheritProperties = annotation.getBoolean("inheritProperties");
 		mergePropertiesAndLocations(annotation);
 	}
 
-	/**
-	 * Merge this {@code TestPropertySourceAttributes} instance with the
-	 * supplied {@code annotation}, asserting that the two sets of test property
-	 * source attributes have identical values for the
-	 * {@link TestPropertySource#inheritLocations} and
-	 * {@link TestPropertySource#inheritProperties} flags and that the two
-	 * underlying annotations were declared on the same class.
-	 * <p>This method should only be invoked if {@link #canMergeWith(MergedAnnotation)}
-	 * returns {@code true}.
-	 * @since 5.2
-	 * @see #canMergeWith(MergedAnnotation)
-	 */
-	void mergeWith(MergedAnnotation<TestPropertySource> annotation) {
-		Class<?> source = declaringClass(annotation);
-		Assert.state(source == this.declaringClass,
-				() -> "Detected @TestPropertySource declarations within an aggregate index "
-						+ "with different sources: " + this.declaringClass.getName() + " and "
-						+ source.getName());
-		logger.trace(LogMessage.format("Retrieved %s for declaring class [%s].",
-				annotation, this.declaringClass.getName()));
-		assertSameBooleanAttribute(this.inheritLocations, annotation, "inheritLocations");
-		assertSameBooleanAttribute(this.inheritProperties, annotation, "inheritProperties");
-		mergePropertiesAndLocations(annotation);
-	}
-
-	private void assertSameBooleanAttribute(boolean expected, MergedAnnotation<TestPropertySource> annotation,
-			String attribute) {
-
-		Assert.isTrue(expected == annotation.getBoolean(attribute), () -> String.format(
-				"@%s on %s and @%s on %s must declare the same value for '%s' as other " +
-				"directly present or meta-present @TestPropertySource annotations",
-			this.rootAnnotation.getType().getSimpleName(), this.declaringClass.getSimpleName(),
-			annotation.getRoot().getType().getSimpleName(), declaringClass(annotation).getSimpleName(),
-			attribute));
-	}
-
 	private void mergePropertiesAndLocations(MergedAnnotation<TestPropertySource> annotation) {
 		String[] locations = annotation.getStringArray("locations");
 		String[] properties = annotation.getStringArray("properties");

spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java

@@ -276,7 +276,9 @@ public static Map<String, Object> convertInlinedPropertiesToMap(String... inline
 		return map;
 	}
 
-	private static <T extends Annotation> List<MergedAnnotation<T>> findRepeatableAnnotations(Class<?> clazz, Class<T> annotationType) {
+	private static <T extends Annotation> List<MergedAnnotation<T>> findRepeatableAnnotations(
+			Class<?> clazz, Class<T> annotationType) {
+
 		List<List<MergedAnnotation<T>>> listOfLists = new ArrayList<>();
 		findRepeatableAnnotations(clazz, annotationType, listOfLists, new int[] {0});
 		return listOfLists.stream().flatMap(List::stream).collect(Collectors.toList());

spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java

@@ -81,7 +81,7 @@ void extendedEmptyAnnotation() {
 	}
 
 	@Test
-	@Disabled("Validation for repeated @TestPropertySource annotations is currently not working")
+	@Disabled("Validation for repeated @TestPropertySource annotations has been removed")
 	void repeatedTestPropertySourcesWithConflictingInheritLocationsFlags() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> buildMergedTestPropertySources(RepeatedPropertySourcesWithConflictingInheritLocationsFlags.class))
@@ -91,7 +91,7 @@ void repeatedTestPropertySourcesWithConflictingInheritLocationsFlags() {
 	}
 
 	@Test
-	@Disabled("Validation for repeated @TestPropertySource annotations is currently not working")
+	@Disabled("Validation for repeated @TestPropertySource annotations has been removed")
 	void repeatedTestPropertySourcesWithConflictingInheritPropertiesFlags() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> buildMergedTestPropertySources(RepeatedPropertySourcesWithConflictingInheritPropertiesFlags.class))