root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2022-10-08 16:21:30 +02:00
parent afd0443204 b71d95df71
commit 3061a81b0f
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -49,8 +49,10 @@ import org.springframework.test.context.web.ServletTestExecutionListener;
* the appropriate {@link org.springframework.test.context.TestExecutionListener * the appropriate {@link org.springframework.test.context.TestExecutionListener
* TestExecutionListeners} manually.</em> * TestExecutionListeners} manually.</em>
* *
* <p>The following {@link org.springframework.test.context.TestExecutionListener * <p>This class explicitly registers the following {@code TestExecutionListener}
* TestExecutionListeners} are configured by default: * implementations. If you want to switch to using the <em>default</em> set of
* listeners, see the class-level Javadoc for
* {@link TestExecutionListeners @TestExecutionListeners} for details.
* *
* <ul> * <ul>
* <li>{@link org.springframework.test.context.web.ServletTestExecutionListener} * <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}

8
spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -57,8 +57,10 @@ import org.springframework.util.Assert;
* <p>Concrete subclasses must fulfill the same requirements outlined in * <p>Concrete subclasses must fulfill the same requirements outlined in
* {@link AbstractJUnit4SpringContextTests}. * {@link AbstractJUnit4SpringContextTests}.
* *
* <p>The following {@link org.springframework.test.context.TestExecutionListener * <p>This class explicitly registers the following {@code TestExecutionListener}
* TestExecutionListeners} are configured by default: * implementations. If you want to switch to using the <em>default</em> set of
* listeners, see the class-level Javadoc for
* {@link TestExecutionListeners @TestExecutionListeners} for details.
* *
* <ul> * <ul>
* <li>{@link org.springframework.test.context.web.ServletTestExecutionListener} * <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}

8
spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -59,8 +59,10 @@ import org.springframework.test.context.web.ServletTestExecutionListener;
* TestExecutionListeners} manually.</em> Concrete subclasses must also have * TestExecutionListeners} manually.</em> Concrete subclasses must also have
* constructors which either implicitly or explicitly delegate to {@code super();}. * constructors which either implicitly or explicitly delegate to {@code super();}.
* *
* <p>The following {@link org.springframework.test.context.TestExecutionListener * <p>This class explicitly registers the following {@code TestExecutionListener}
* TestExecutionListeners} are configured by default: * implementations. If you want to switch to using the <em>default</em> set of
* listeners, see the class-level Javadoc for
* {@link TestExecutionListeners @TestExecutionListeners} for details.
* *
* <ul> * <ul>
* <li>{@link org.springframework.test.context.web.ServletTestExecutionListener} * <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}

8
spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -56,8 +56,10 @@ import org.springframework.util.Assert;
* <p>Concrete subclasses must fulfill the same requirements outlined in * <p>Concrete subclasses must fulfill the same requirements outlined in
* {@link AbstractTestNGSpringContextTests}. * {@link AbstractTestNGSpringContextTests}.
* *
* <p>The following {@link org.springframework.test.context.TestExecutionListener * <p>This class explicitly registers the following {@code TestExecutionListener}
* TestExecutionListeners} are configured by default: * implementations. If you want to switch to using the <em>default</em> set of
* listeners, see the class-level Javadoc for
* {@link TestExecutionListeners @TestExecutionListeners} for details.
* *
* <ul> * <ul>
* <li>{@link org.springframework.test.context.web.ServletTestExecutionListener} * <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}