Skip to content

Commit 336a5d0

Browse files
committed
Add container for MockMvcServerServerSpec hierarchy
See gh-34428
1 parent e838444 commit 336a5d0

File tree

6 files changed

+381
-434
lines changed

6 files changed

+381
-434
lines changed

spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public interface MockMvcWebTestClient {
8888
* to initialize {@link MockMvc}.
8989
*/
9090
static ControllerSpec bindToController(Object... controllers) {
91-
return new StandaloneMockMvcSpec(controllers);
91+
return new MockMvcWebTestClientSpecs.StandaloneMockMvcSpec(controllers);
9292
}
9393

9494
/**
@@ -100,7 +100,7 @@ static ControllerSpec bindToController(Object... controllers) {
100100
* @since 6.2
101101
*/
102102
static RouterFunctionSpec bindToRouterFunction(RouterFunction<?>... routerFunctions) {
103-
return new RouterFunctionMockMvcSpec(routerFunctions);
103+
return new MockMvcWebTestClientSpecs.RouterFunctionMockMvcSpec(routerFunctions);
104104
}
105105

106106
/**
@@ -112,7 +112,7 @@ static RouterFunctionSpec bindToRouterFunction(RouterFunction<?>... routerFuncti
112112
* to initialize {@code MockMvc}.
113113
*/
114114
static MockMvcServerSpec<?> bindToApplicationContext(WebApplicationContext context) {
115-
return new ApplicationContextMockMvcSpec(context);
115+
return new MockMvcWebTestClientSpecs.ApplicationContextMockMvcSpec(context);
116116
}
117117

118118
/**

0 commit comments

Comments
 (0)