Merge branch '6.1.x'

spring-test/src/test/java/org/springframework/test/context/event/DirtiesContextEventPublishingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -49,7 +49,7 @@ import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
  *
  * @author Sam Brannen
  * @since 5.3.17
- * @see https://github.com/spring-projects/spring-framework/issues/27757
+ * @see <a href="https://github.com/spring-projects/spring-framework/issues/27757">gh-27757</a>
  */
 class DirtiesContextEventPublishingTests {
 

spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -50,7 +50,6 @@ import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass
  *
  * @author Sam Brannen
  * @since 5.3.17
- * @see https://github.com/spring-projects/spring-framework/issues/27757
  */
 class EagerTestExecutionEventPublishingTests {
 

spring-test/src/test/java/org/springframework/test/context/jdbc/PrimaryDataSourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -39,7 +39,7 @@ import static org.springframework.test.transaction.TransactionAssert.assertThatT
  *
  * @author Sam Brannen
  * @since 4.3
- * @see org.springframework.test.context.transaction.PrimaryTransactionManagerTests
+ * @see org.springframework.test.context.transaction.manager.PrimaryTransactionManagerTests
  */
 @SpringJUnitConfig
 @DirtiesContext

spring-test/src/test/java/org/springframework/test/context/junit4/rules/AutowiredRuleSpr15927Tests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -30,12 +30,12 @@ import org.springframework.context.annotation.Configuration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for an issue raised in https://jira.spring.io/browse/SPR-15927.
+ * Integration tests for {@code SPR-15927}.
  *
  * @author Sam Brannen
  * @since 5.0
  */
-public class AutowiredRuleTests {
+public class AutowiredRuleSpr15927Tests {
 
 	@ClassRule
 	public static final SpringClassRule springClassRule = new SpringClassRule();

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

@@ -327,10 +327,7 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati
 		assertContextConfigEntriesAreNotUnique(SingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig.class);
 	}
 
-	/**
-	 * Used to reproduce bug reported in https://jira.spring.io/browse/SPR-10997
-	 */
-	@Test
+	@Test // SPR-10997
 	void buildContextHierarchyMapForTestClassHierarchyWithMultiLevelContextHierarchiesAndOverriddenInitializers() {
 		Map<String, List<ContextConfigurationAttributes>> map = buildContextHierarchyMap(TestClass2WithMultiLevelContextHierarchyWithOverriddenInitializers.class);
 
@@ -504,32 +501,24 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati
 	private static class SingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig {
 	}
 
-	/**
-	 * Used to reproduce bug reported in https://jira.spring.io/browse/SPR-10997
-	 */
 	@ContextHierarchy({//
 	//
 		@ContextConfiguration(name = "alpha", locations = "1-A.xml"),//
 		@ContextConfiguration(name = "beta", locations = "1-B.xml") //
-	})
+	}) // SPR-10997
 	private static class TestClass1WithMultiLevelContextHierarchyWithUniqueContextConfig {
 	}
 
-	/**
-	 * Used to reproduce bug reported in https://jira.spring.io/browse/SPR-10997
-	 */
 	@ContextHierarchy({//
 	//
 		@ContextConfiguration(name = "alpha", initializers = DummyApplicationContextInitializer.class),//
 		@ContextConfiguration(name = "beta", initializers = DummyApplicationContextInitializer.class) //
-	})
+	}) // SPR-10997
 	private static class TestClass2WithMultiLevelContextHierarchyWithOverriddenInitializers extends
 			TestClass1WithMultiLevelContextHierarchyWithUniqueContextConfig {
 	}
 
-	/**
-	 * Used to reproduce bug reported in https://jira.spring.io/browse/SPR-10997
-	 */
+	// SPR-10997
 	private static class DummyApplicationContextInitializer implements
 			ApplicationContextInitializer<ConfigurableApplicationContext> {