diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java index c0b390a17fd..f19c7298376 100644 --- a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java +++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java @@ -26,10 +26,10 @@ import org.springframework.test.context.jdbc.SqlConfig.TransactionMode; import org.springframework.util.Assert; /** - * {@code MergedSqlConfig} encapsulates the merged SQL script configuration - * declared via {@link SqlConfig @SqlConfig} on a test method and its enclosing - * test class. - *
Explicit method-level configuration overrides class-level configuration. + * {@code MergedSqlConfig} encapsulates the merged {@link SqlConfig @SqlConfig} + * attributes declared locally via {@link Sql#config} and globally as a + * class-level annotation. + *
Explicit local configuration attributes override global configuration attributes. * * @author Sam Brannen * @since 4.1