Skip to content

Commit 0a36c9d

Browse files
dapengzhang0dapengzhang0
authored
all: migrate .proto files from testing-proto to interop-testing
and provide a simple protobuf service for test in testing-proto instead.
1 parent 2f6e2c8 commit 0a36c9d

22 files changed

Lines changed: 1427 additions & 53 deletions

File tree

‎interop-testing/build.gradle‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ apply plugin: 'application'
33
description = "gRPC: Integration Testing"
44
startScripts.enabled = false
55

6+
// Add dependency on the protobuf plugin
7+
buildscript {
8+
repositories {
9+
mavenCentral()
10+
}
11+
dependencies {
12+
classpath libraries.protobuf_plugin
13+
}
14+
}
15+
616
dependencies {
717
compile project(':grpc-auth'),
818
project(':grpc-core'),
@@ -11,13 +21,14 @@ dependencies {
1121
project(':grpc-protobuf'),
1222
project(':grpc-stub'),
1323
project(':grpc-testing'),
14-
project(':grpc-testing-proto'),
1524
libraries.junit,
1625
libraries.mockito,
1726
libraries.netty_tcnative,
1827
libraries.oauth_client
1928
}
2029

30+
configureProtoCompilation()
31+
2132
test {
2233
// For the automated tests, use Jetty ALPN.
2334
jvmArgs "-javaagent:" + configurations.alpnagent.asPath
@@ -78,3 +89,11 @@ applicationDistribution.into("bin") {
7889
from(http2_client)
7990
fileMode = 0755
8091
}
92+
93+
// Let intellij projects refer to generated code
94+
idea {
95+
module {
96+
sourceDirs += file("${projectDir}/src/generated/main/java")
97+
sourceDirs += file("${projectDir}/src/generated/main/grpc")
98+
}
99+
}

testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java renamed to interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java

File renamed without changes.

testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java renamed to interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java

File renamed without changes.

testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java renamed to interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java

File renamed without changes.

testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java renamed to interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java

File renamed without changes.

testing-proto/src/generated/main/java/com/google/protobuf/EmptyProtos.java renamed to interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java

File renamed without changes.

testing-proto/src/generated/main/java/io/grpc/testing/integration/Messages.java renamed to interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java

File renamed without changes.

testing-proto/src/generated/main/java/io/grpc/testing/integration/Metrics.java renamed to interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java

File renamed without changes.

testing-proto/src/generated/main/java/io/grpc/testing/integration/Test.java renamed to interop-testing/src/generated/main/java/io/grpc/testing/integration/Test.java

File renamed without changes.

testing-proto/src/main/proto/io/grpc/testing/integration/empty.proto renamed to interop-testing/src/main/proto/io/grpc/testing/integration/empty.proto

File renamed without changes.

0 commit comments

Comments
 (0)