Skip to content

Commit 24e6417

Browse files
committed
Adapt to latest changes in Spring for GraphQL snapshots
See gh-30463
1 parent 93817c7 commit 24e6417

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQueryByExampleAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.data.repository.query.QueryByExampleExecutor;
3131
import org.springframework.graphql.ExecutionGraphQlService;
3232
import org.springframework.graphql.data.GraphQlRepository;
33-
import org.springframework.graphql.test.tester.GraphQlServiceTester;
33+
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3434

3535
import static org.mockito.ArgumentMatchers.any;
3636
import static org.mockito.BDDMockito.given;
@@ -55,7 +55,7 @@ class GraphQlQueryByExampleAutoConfigurationTests {
5555
void shouldRegisterDataFetcherForQueryByExampleRepositories() {
5656
this.contextRunner.run((context) -> {
5757
ExecutionGraphQlService graphQlService = context.getBean(ExecutionGraphQlService.class);
58-
GraphQlServiceTester graphQlTester = GraphQlServiceTester.create(graphQlService);
58+
ExecutionGraphQlServiceTester graphQlTester = ExecutionGraphQlServiceTester.create(graphQlService);
5959
graphQlTester.document("{ bookById(id: 1) {name}}").execute().path("bookById.name").entity(String.class)
6060
.isEqualTo("Test title");
6161
});

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.data.repository.CrudRepository;
3131
import org.springframework.graphql.ExecutionGraphQlService;
3232
import org.springframework.graphql.data.GraphQlRepository;
33-
import org.springframework.graphql.test.tester.GraphQlServiceTester;
33+
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3434
import org.springframework.graphql.test.tester.GraphQlTester;
3535

3636
import static org.mockito.ArgumentMatchers.any;
@@ -56,7 +56,7 @@ class GraphQlQuerydslAutoConfigurationTests {
5656
void shouldRegisterDataFetcherForQueryDslRepositories() {
5757
this.contextRunner.run((context) -> {
5858
ExecutionGraphQlService graphQlService = context.getBean(ExecutionGraphQlService.class);
59-
GraphQlTester graphQlTester = GraphQlServiceTester.create(graphQlService);
59+
GraphQlTester graphQlTester = ExecutionGraphQlServiceTester.create(graphQlService);
6060
graphQlTester.document("{ bookById(id: 1) {name}}").execute().path("bookById.name").entity(String.class)
6161
.isEqualTo("Test title");
6262
});

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQueryByExampleAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
3030
import org.springframework.graphql.ExecutionGraphQlService;
3131
import org.springframework.graphql.data.GraphQlRepository;
32-
import org.springframework.graphql.test.tester.GraphQlServiceTester;
32+
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3333
import org.springframework.graphql.test.tester.GraphQlTester;
3434

3535
import static org.mockito.ArgumentMatchers.any;
@@ -55,7 +55,7 @@ class GraphQlReactiveQueryByExampleAutoConfigurationTests {
5555
void shouldRegisterDataFetcherForQueryByExampleRepositories() {
5656
this.contextRunner.run((context) -> {
5757
ExecutionGraphQlService graphQlService = context.getBean(ExecutionGraphQlService.class);
58-
GraphQlTester graphQlTester = GraphQlServiceTester.create(graphQlService);
58+
GraphQlTester graphQlTester = ExecutionGraphQlServiceTester.create(graphQlService);
5959
graphQlTester.document("{ bookById(id: 1) {name}}").execute().path("bookById.name").entity(String.class)
6060
.isEqualTo("Test title");
6161
});

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQuerydslAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
3030
import org.springframework.graphql.ExecutionGraphQlService;
3131
import org.springframework.graphql.data.GraphQlRepository;
32-
import org.springframework.graphql.test.tester.GraphQlServiceTester;
32+
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3333
import org.springframework.graphql.test.tester.GraphQlTester;
3434

3535
import static org.mockito.ArgumentMatchers.any;
@@ -55,7 +55,7 @@ class GraphQlReactiveQuerydslAutoConfigurationTests {
5555
void shouldRegisterDataFetcherForQueryDslRepositories() {
5656
this.contextRunner.run((context) -> {
5757
ExecutionGraphQlService graphQlService = context.getBean(ExecutionGraphQlService.class);
58-
GraphQlTester graphQlTester = GraphQlServiceTester.create(graphQlService);
58+
GraphQlTester graphQlTester = ExecutionGraphQlServiceTester.create(graphQlService);
5959
graphQlTester.document("{ bookById(id: 1) {name}}").execute().path("bookById.name").entity(String.class)
6060
.isEqualTo("Test title");
6161
});

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ This testing module ships the {spring-graphql-docs}/#testing-graphqltester[Graph
439439
The tester is heavily used in test, so be sure to become familiar with using it.
440440
There are `GraphQlTester` variants and Spring Boot will auto-configure them depending on the type of tests:
441441

442-
* the `GraphQlServiceTester` performs tests on the server side, without a client nor a transport
442+
* the `ExecutionGraphQlServiceTester` performs tests on the server side, without a client nor a transport
443443
* the `HttpGraphQlTester` performs tests with a client that connects to a server, with or without a live server
444444

445445
Spring Boot helps you to test your {spring-graphql-docs}#controllers[Spring GraphQL Controllers] with the `@GraphQlTest` annotation.

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/graphql/tester/GraphQlTesterAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.graphql.ExecutionGraphQlService;
28-
import org.springframework.graphql.test.tester.GraphQlServiceTester;
28+
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
2929
import org.springframework.graphql.test.tester.GraphQlTester;
3030

3131
/**
@@ -41,8 +41,8 @@ public class GraphQlTesterAutoConfiguration {
4141
@Bean
4242
@ConditionalOnBean(ExecutionGraphQlService.class)
4343
@ConditionalOnMissingBean
44-
public GraphQlServiceTester graphQlTester(ExecutionGraphQlService graphQlService) {
45-
return GraphQlServiceTester.create(graphQlService);
44+
public ExecutionGraphQlServiceTester graphQlTester(ExecutionGraphQlService graphQlService) {
45+
return ExecutionGraphQlServiceTester.create(graphQlService);
4646
}
4747

4848
}

0 commit comments

Comments
 (0)