Merge branch '5.3.x'

spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledOnMac.java

@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * Demo <em>composed annotation</em> for {@link DisabledIf @DisabledIf} that
  * disables a test class or test method if the current operating system is
- * Mac OS.
+ * macOS.
  *
  * @author Sam Brannen
  * @since 5.0

spring-test/src/test/java/org/springframework/test/context/junit/jupiter/EnabledOnMac.java

@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * Demo <em>composed annotation</em> for {@link EnabledIf @EnabledIf} that
  * enables a test class or test method if the current operating system is
- * Mac OS.
+ * macOS.
  *
  * @author Sam Brannen
  * @since 5.0

spring-test/src/test/java/org/springframework/test/context/junit/jupiter/event/PublishedEvents.java

@@ -58,7 +58,7 @@ public interface PublishedEvents {
 		/**
 		 * Further constrain the event type for downstream assertions.
 		 *
-		 * @param subType the sub type
+		 * @param subType the subtype
 		 * @return will never be {@literal null}
 		 */
 		<S extends T> TypedPublishedEvents<S> ofSubType(Class<S> subType);

spring-test/src/test/java/org/springframework/test/context/junit4/EmbeddedPersonDatabaseTestsConfig.java

@@ -25,7 +25,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
- * Shared configuration for tests that need an embedded database pre-loaded
+ * Shared configuration for tests that need an embedded database preloaded
  * with the schema for the 'person' table.
  *
  * @author Sam Brannen

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

@@ -291,7 +291,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt
 		MergedContextConfiguration parent = mergedConfig.getParent();
 		assertThat(parent).as("parent config").isNotNull();
 		// The following does not work -- at least not in Eclipse.
-		// asssertThat(parent.getClasses())...
+		// assertThat(parent.getClasses())...
 		// So we use AssertionsForClassTypes directly.
 		AssertionsForClassTypes.assertThat(parent.getClasses()).containsExactly(FooConfig.class);
 

spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java

@@ -152,7 +152,7 @@ public class MockServerTests {
 				.expectStatus().isOk()
 				.returnResult(String.class);
 
-		// Get the raw content without consuming the response body flux..
+		// Get the raw content without consuming the response body flux.
 		byte[] bytes = result.getResponseBodyContent();
 
 		assertThat(bytes).isNotNull();