Skip to content

Commit b240b67

Browse files
committed
Add spring-grpc-test module.
This commit adds the Spring gRPC testing module back into the repo. It is effectively a Spring Boot starter that includes Spring Boot Test Starter, Spring gRPC Test Autoconfigure, and gRPC in-process dependency. Signed-off-by: onobc <[email protected]>
1 parent 5f36e16 commit b240b67

File tree

25 files changed

+61
-106
lines changed

25 files changed

+61
-106
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<module>spring-grpc-server-spring-boot-starter</module>
2929
<module>spring-grpc-server-web-spring-boot-starter</module>
3030
<module>spring-grpc-spring-boot-starter</module>
31+
<module>spring-grpc-test</module>
3132
<module>spring-grpc-test-spring-boot-autoconfigure</module>
3233
</modules>
3334

samples/grpc-client/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ dependencyManagement {
3030
dependencies {
3131
implementation 'org.springframework.grpc:spring-grpc-client-spring-boot-starter'
3232

33-
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
34-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
33+
testImplementation 'org.springframework.grpc:spring-grpc-test'
3534
testImplementation 'org.springframework.boot:spring-boot-web-server'
3635
testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1'
37-
testImplementation 'io.grpc:grpc-inprocess'
3836

3937
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4038
}

samples/grpc-client/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,7 @@
5555

5656
<dependency>
5757
<groupId>org.springframework.grpc</groupId>
58-
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.springframework.boot</groupId>
63-
<artifactId>spring-boot-starter-test</artifactId>
58+
<artifactId>spring-grpc-test</artifactId>
6459
<scope>test</scope>
6560
</dependency>
6661
<dependency>
@@ -74,11 +69,6 @@
7469
<version>0.4.0.0-RC1</version>
7570
<scope>test</scope>
7671
</dependency>
77-
<dependency>
78-
<groupId>io.grpc</groupId>
79-
<artifactId>grpc-inprocess</artifactId>
80-
<scope>test</scope>
81-
</dependency>
8272
</dependencies>
8373

8474
<build>

samples/grpc-oauth2/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ dependencies {
3636
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
3737
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
3838

39-
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
40-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
39+
testImplementation 'org.springframework.grpc:spring-grpc-test'
4140
testImplementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
4241
testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1'
4342

samples/grpc-oauth2/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@
5656

5757
<dependency>
5858
<groupId>org.springframework.grpc</groupId>
59-
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
60-
<scope>test</scope>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.springframework.boot</groupId>
64-
<artifactId>spring-boot-starter-test</artifactId>
59+
<artifactId>spring-grpc-test</artifactId>
6560
<scope>test</scope>
6661
</dependency>
6762
<dependency>

samples/grpc-reactive/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ dependencies {
3535

3636
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
3737

38-
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
39-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
40-
testImplementation 'io.grpc:grpc-inprocess'
38+
testImplementation 'org.springframework.grpc:spring-grpc-test'
4139
testImplementation 'io.projectreactor:reactor-test'
4240

4341
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

samples/grpc-reactive/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,7 @@
7272

7373
<dependency>
7474
<groupId>org.springframework.grpc</groupId>
75-
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.springframework.boot</groupId>
80-
<artifactId>spring-boot-starter-test</artifactId>
81-
<scope>test</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>io.grpc</groupId>
85-
<artifactId>grpc-inprocess</artifactId>
75+
<artifactId>spring-grpc-test</artifactId>
8676
<scope>test</scope>
8777
</dependency>
8878
<dependency>

samples/grpc-secure/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ dependencies {
3232
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
3333
implementation 'org.springframework.boot:spring-boot-starter-security'
3434

35-
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
36-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
35+
testImplementation 'org.springframework.grpc:spring-grpc-test'
3736

3837
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3938
}

samples/grpc-secure/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@
5656

5757
<dependency>
5858
<groupId>org.springframework.grpc</groupId>
59-
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
60-
<scope>test</scope>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.springframework.boot</groupId>
64-
<artifactId>spring-boot-starter-test</artifactId>
59+
<artifactId>spring-grpc-test</artifactId>
6560
<scope>test</scope>
6661
</dependency>
6762
</dependencies>

samples/grpc-server-kotlin/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ dependencies {
3939
implementation "io.grpc:grpc-kotlin-stub:${kotlinStubVersion}"
4040
implementation("io.micrometer:context-propagation")
4141

42-
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
43-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
42+
testImplementation 'org.springframework.grpc:spring-grpc-test'
4443

4544
testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64"
4645
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

0 commit comments

Comments
 (0)