Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-03-07 18:05:46 +01:00
parent 17930d6c27 6c87ef09c1
commit ac4c37d8e2
16 changed files with 94 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,19 +64,17 @@ public interface TestContext extends AttributeAccessor, Serializable {
/**
* Get the current {@linkplain Object test instance} for this test context.
* <p>Note: this is a mutable property.
* @return the current test instance (may be {@code null})
* @return the current test instance (never {@code null})
* @see #updateState(Object, Method, Throwable)
*/
@Nullable
Object getTestInstance();
/**
* Get the current {@linkplain Method test method} for this test context.
* <p>Note: this is a mutable property.
* @return the current test method (may be {@code null})
* @return the current test method (never {@code null})
* @see #updateState(Object, Method, Throwable)
*/
@Nullable
Method getTestMethod();
/**
@@ -103,7 +101,7 @@ public interface TestContext extends AttributeAccessor, Serializable {
/**
* Update this test context to reflect the state of the currently executing test.
* <p><strong>WARNING</strong>: this method should only be invoked by the
* <p><strong>WARNING</strong>: This method should only be invoked by the
* {@link TestContextManager}.
* <p>Caution: concurrent invocations of this method might not be thread-safe,
* depending on the underlying implementation.

5
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultMockServerSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.reactive.server;
import org.springframework.util.Assert;
@@ -32,7 +33,7 @@ class DefaultMockServerSpec extends AbstractMockServerSpec<DefaultMockServerSpec
DefaultMockServerSpec(WebHandler webHandler) {
Assert.notNull(webHandler, "'WebHandler' is required");
Assert.notNull(webHandler, "WebHandler is required");
this.webHandler = webHandler;
}

3
spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.reactive.server;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;

3
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClientConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.reactive.server;
import org.springframework.http.client.reactive.ClientHttpConnector;

3
spring-test/src/main/java/org/springframework/test/web/reactive/server/XpathAssertions.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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,7 +30,6 @@ import org.springframework.test.util.XpathExpectationsHelper;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
/**
* XPath assertions for the {@link WebTestClient}.
*