From e03d5c0210da28c02907f7bc5e647cbdc77d3831 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 20 May 2015 13:23:11 -0700 Subject: [PATCH] Rename integration-testing to interop-testing "Interoperability" is a more appropriate name for the tests, since they are used for testing across different implementations. They will do a bit of integration testing, like for auth, but this is a smaller scale. It seems the other languages (Go, C++, Node, PHP, Python, Ruby) are using "interop" to describe the tests, and the test case specifications document is named with "interop". After this change, C# will be the only language calling them "integration" tests. This change just renames the folder and artifact. We can change the internal package names later. However, once we do a release, old artifact names will live forever in Maven Central. --- README.md | 2 +- benchmarks/build.gradle | 2 +- .../build.gradle | 0 .../main/com/google/protobuf/EmptyProtos.java | 0 .../main/io/grpc/testing/integration/Messages.java | 0 .../main/io/grpc/testing/integration/Test.java | 0 .../grpc/testing/integration/TestServiceGrpc.java | 0 .../testing/integration/AbstractTransportTest.java | 0 .../grpc/testing/integration/TestServiceClient.java | 0 .../grpc/testing/integration/TestServiceImpl.java | 0 .../grpc/testing/integration/TestServiceServer.java | 0 .../main/java/io/grpc/testing/integration/Util.java | 0 .../proto/io/grpc/testing/integration/empty.proto | 0 .../io/grpc/testing/integration/messages.proto | 0 .../proto/io/grpc/testing/integration/test.proto | 0 .../src/main/resources/certs/README | 0 .../src/main/resources/certs/badclient.key | 0 .../src/main/resources/certs/badclient.pem | 0 .../src/main/resources/certs/badserver.key | 0 .../src/main/resources/certs/badserver.pem | 0 .../src/main/resources/certs/ca-openssl.cnf | 0 .../src/main/resources/certs/ca.key | 0 .../src/main/resources/certs/ca.pem | 0 .../src/main/resources/certs/client.key | 0 .../src/main/resources/certs/client.pem | 0 .../src/main/resources/certs/server0.key | 0 .../src/main/resources/certs/server0.pem | 0 .../src/main/resources/certs/server1-openssl.cnf | 0 .../src/main/resources/certs/server1.key | 0 .../src/main/resources/certs/server1.pem | 0 .../testing/integration/testdata/uncompressable.bin | Bin .../src/test/java/io/grpc/stub/StubConfigTest.java | 0 .../integration/Http2NettyLocalChannelTest.java | 0 .../io/grpc/testing/integration/Http2NettyTest.java | 0 .../grpc/testing/integration/Http2OkHttpTest.java | 0 run-test-client.sh | 4 ++-- run-test-server.sh | 4 ++-- settings.gradle | 4 ++-- 38 files changed, 8 insertions(+), 8 deletions(-) rename {integration-testing => interop-testing}/build.gradle (100%) rename {integration-testing => interop-testing}/src/generated/main/com/google/protobuf/EmptyProtos.java (100%) rename {integration-testing => interop-testing}/src/generated/main/io/grpc/testing/integration/Messages.java (100%) rename {integration-testing => interop-testing}/src/generated/main/io/grpc/testing/integration/Test.java (100%) rename {integration-testing => interop-testing}/src/generated/main/io/grpc/testing/integration/TestServiceGrpc.java (100%) rename {integration-testing => interop-testing}/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java (100%) rename {integration-testing => interop-testing}/src/main/java/io/grpc/testing/integration/TestServiceClient.java (100%) rename {integration-testing => interop-testing}/src/main/java/io/grpc/testing/integration/TestServiceImpl.java (100%) rename {integration-testing => interop-testing}/src/main/java/io/grpc/testing/integration/TestServiceServer.java (100%) rename {integration-testing => interop-testing}/src/main/java/io/grpc/testing/integration/Util.java (100%) rename {integration-testing => interop-testing}/src/main/proto/io/grpc/testing/integration/empty.proto (100%) rename {integration-testing => interop-testing}/src/main/proto/io/grpc/testing/integration/messages.proto (100%) rename {integration-testing => interop-testing}/src/main/proto/io/grpc/testing/integration/test.proto (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/README (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/badclient.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/badclient.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/badserver.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/badserver.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/ca-openssl.cnf (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/ca.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/ca.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/client.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/client.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/server0.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/server0.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/server1-openssl.cnf (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/server1.key (100%) rename {integration-testing => interop-testing}/src/main/resources/certs/server1.pem (100%) rename {integration-testing => interop-testing}/src/main/resources/io/grpc/testing/integration/testdata/uncompressable.bin (100%) rename {integration-testing => interop-testing}/src/test/java/io/grpc/stub/StubConfigTest.java (100%) rename {integration-testing => interop-testing}/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java (100%) rename {integration-testing => interop-testing}/src/test/java/io/grpc/testing/integration/Http2NettyTest.java (100%) rename {integration-testing => interop-testing}/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java (100%) diff --git a/README.md b/README.md index a3687999aa4..b1dfc948186 100644 --- a/README.md +++ b/README.md @@ -177,4 +177,4 @@ The 'transport' layer does the heavy lifting of putting & taking bytes off the w ### Examples -Tests showing how these layers are composed to execute calls using protobuf messages can be found here https://github.com/google/grpc-java/tree/master/integration-testing/src/main/java/io/grpc/testing/integration +Tests showing how these layers are composed to execute calls using protobuf messages can be found here https://github.com/google/grpc-java/tree/master/interop-testing/src/main/java/io/grpc/testing/integration diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 478750b0753..67f1024865d 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -36,7 +36,7 @@ dependencies { project(':grpc-netty'), project(':grpc-okhttp'), project(':grpc-stub'), - project(':grpc-integration-testing'), + project(':grpc-interop-testing'), libraries.junit, libraries.mockito, libraries.hdrhistogram] diff --git a/integration-testing/build.gradle b/interop-testing/build.gradle similarity index 100% rename from integration-testing/build.gradle rename to interop-testing/build.gradle diff --git a/integration-testing/src/generated/main/com/google/protobuf/EmptyProtos.java b/interop-testing/src/generated/main/com/google/protobuf/EmptyProtos.java similarity index 100% rename from integration-testing/src/generated/main/com/google/protobuf/EmptyProtos.java rename to interop-testing/src/generated/main/com/google/protobuf/EmptyProtos.java diff --git a/integration-testing/src/generated/main/io/grpc/testing/integration/Messages.java b/interop-testing/src/generated/main/io/grpc/testing/integration/Messages.java similarity index 100% rename from integration-testing/src/generated/main/io/grpc/testing/integration/Messages.java rename to interop-testing/src/generated/main/io/grpc/testing/integration/Messages.java diff --git a/integration-testing/src/generated/main/io/grpc/testing/integration/Test.java b/interop-testing/src/generated/main/io/grpc/testing/integration/Test.java similarity index 100% rename from integration-testing/src/generated/main/io/grpc/testing/integration/Test.java rename to interop-testing/src/generated/main/io/grpc/testing/integration/Test.java diff --git a/integration-testing/src/generated/main/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/io/grpc/testing/integration/TestServiceGrpc.java similarity index 100% rename from integration-testing/src/generated/main/io/grpc/testing/integration/TestServiceGrpc.java rename to interop-testing/src/generated/main/io/grpc/testing/integration/TestServiceGrpc.java diff --git a/integration-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java similarity index 100% rename from integration-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java rename to interop-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java diff --git a/integration-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java similarity index 100% rename from integration-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java rename to interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java diff --git a/integration-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java similarity index 100% rename from integration-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java rename to interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java diff --git a/integration-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java similarity index 100% rename from integration-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java rename to interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java diff --git a/integration-testing/src/main/java/io/grpc/testing/integration/Util.java b/interop-testing/src/main/java/io/grpc/testing/integration/Util.java similarity index 100% rename from integration-testing/src/main/java/io/grpc/testing/integration/Util.java rename to interop-testing/src/main/java/io/grpc/testing/integration/Util.java diff --git a/integration-testing/src/main/proto/io/grpc/testing/integration/empty.proto b/interop-testing/src/main/proto/io/grpc/testing/integration/empty.proto similarity index 100% rename from integration-testing/src/main/proto/io/grpc/testing/integration/empty.proto rename to interop-testing/src/main/proto/io/grpc/testing/integration/empty.proto diff --git a/integration-testing/src/main/proto/io/grpc/testing/integration/messages.proto b/interop-testing/src/main/proto/io/grpc/testing/integration/messages.proto similarity index 100% rename from integration-testing/src/main/proto/io/grpc/testing/integration/messages.proto rename to interop-testing/src/main/proto/io/grpc/testing/integration/messages.proto diff --git a/integration-testing/src/main/proto/io/grpc/testing/integration/test.proto b/interop-testing/src/main/proto/io/grpc/testing/integration/test.proto similarity index 100% rename from integration-testing/src/main/proto/io/grpc/testing/integration/test.proto rename to interop-testing/src/main/proto/io/grpc/testing/integration/test.proto diff --git a/integration-testing/src/main/resources/certs/README b/interop-testing/src/main/resources/certs/README similarity index 100% rename from integration-testing/src/main/resources/certs/README rename to interop-testing/src/main/resources/certs/README diff --git a/integration-testing/src/main/resources/certs/badclient.key b/interop-testing/src/main/resources/certs/badclient.key similarity index 100% rename from integration-testing/src/main/resources/certs/badclient.key rename to interop-testing/src/main/resources/certs/badclient.key diff --git a/integration-testing/src/main/resources/certs/badclient.pem b/interop-testing/src/main/resources/certs/badclient.pem similarity index 100% rename from integration-testing/src/main/resources/certs/badclient.pem rename to interop-testing/src/main/resources/certs/badclient.pem diff --git a/integration-testing/src/main/resources/certs/badserver.key b/interop-testing/src/main/resources/certs/badserver.key similarity index 100% rename from integration-testing/src/main/resources/certs/badserver.key rename to interop-testing/src/main/resources/certs/badserver.key diff --git a/integration-testing/src/main/resources/certs/badserver.pem b/interop-testing/src/main/resources/certs/badserver.pem similarity index 100% rename from integration-testing/src/main/resources/certs/badserver.pem rename to interop-testing/src/main/resources/certs/badserver.pem diff --git a/integration-testing/src/main/resources/certs/ca-openssl.cnf b/interop-testing/src/main/resources/certs/ca-openssl.cnf similarity index 100% rename from integration-testing/src/main/resources/certs/ca-openssl.cnf rename to interop-testing/src/main/resources/certs/ca-openssl.cnf diff --git a/integration-testing/src/main/resources/certs/ca.key b/interop-testing/src/main/resources/certs/ca.key similarity index 100% rename from integration-testing/src/main/resources/certs/ca.key rename to interop-testing/src/main/resources/certs/ca.key diff --git a/integration-testing/src/main/resources/certs/ca.pem b/interop-testing/src/main/resources/certs/ca.pem similarity index 100% rename from integration-testing/src/main/resources/certs/ca.pem rename to interop-testing/src/main/resources/certs/ca.pem diff --git a/integration-testing/src/main/resources/certs/client.key b/interop-testing/src/main/resources/certs/client.key similarity index 100% rename from integration-testing/src/main/resources/certs/client.key rename to interop-testing/src/main/resources/certs/client.key diff --git a/integration-testing/src/main/resources/certs/client.pem b/interop-testing/src/main/resources/certs/client.pem similarity index 100% rename from integration-testing/src/main/resources/certs/client.pem rename to interop-testing/src/main/resources/certs/client.pem diff --git a/integration-testing/src/main/resources/certs/server0.key b/interop-testing/src/main/resources/certs/server0.key similarity index 100% rename from integration-testing/src/main/resources/certs/server0.key rename to interop-testing/src/main/resources/certs/server0.key diff --git a/integration-testing/src/main/resources/certs/server0.pem b/interop-testing/src/main/resources/certs/server0.pem similarity index 100% rename from integration-testing/src/main/resources/certs/server0.pem rename to interop-testing/src/main/resources/certs/server0.pem diff --git a/integration-testing/src/main/resources/certs/server1-openssl.cnf b/interop-testing/src/main/resources/certs/server1-openssl.cnf similarity index 100% rename from integration-testing/src/main/resources/certs/server1-openssl.cnf rename to interop-testing/src/main/resources/certs/server1-openssl.cnf diff --git a/integration-testing/src/main/resources/certs/server1.key b/interop-testing/src/main/resources/certs/server1.key similarity index 100% rename from integration-testing/src/main/resources/certs/server1.key rename to interop-testing/src/main/resources/certs/server1.key diff --git a/integration-testing/src/main/resources/certs/server1.pem b/interop-testing/src/main/resources/certs/server1.pem similarity index 100% rename from integration-testing/src/main/resources/certs/server1.pem rename to interop-testing/src/main/resources/certs/server1.pem diff --git a/integration-testing/src/main/resources/io/grpc/testing/integration/testdata/uncompressable.bin b/interop-testing/src/main/resources/io/grpc/testing/integration/testdata/uncompressable.bin similarity index 100% rename from integration-testing/src/main/resources/io/grpc/testing/integration/testdata/uncompressable.bin rename to interop-testing/src/main/resources/io/grpc/testing/integration/testdata/uncompressable.bin diff --git a/integration-testing/src/test/java/io/grpc/stub/StubConfigTest.java b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java similarity index 100% rename from integration-testing/src/test/java/io/grpc/stub/StubConfigTest.java rename to interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java diff --git a/integration-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java similarity index 100% rename from integration-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java rename to interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java diff --git a/integration-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java similarity index 100% rename from integration-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java rename to interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java diff --git a/integration-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java similarity index 100% rename from integration-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java rename to interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java diff --git a/run-test-client.sh b/run-test-client.sh index 6a45b8f2a04..02059f8e5ce 100755 --- a/run-test-client.sh +++ b/run-test-client.sh @@ -2,6 +2,6 @@ cd "$(dirname "$0")" cat >&2 <&2 <