From 08d054bc2ed66c5bd68e55040e91f16ab462110a Mon Sep 17 00:00:00 2001 From: Koptelov Nikita Date: Sun, 5 Apr 2020 18:50:49 +0300 Subject: [PATCH] cleaned up generated tests in /integration --- .gitignore | 64 ++++++++++++++++++- .../binding_with_substruct_in_body/Makefile | 3 + integration/go.mod | 3 +- integration/go.sum | 4 ++ integration/impl_service_sub_dir/Makefile | 1 + integration/impl_service_sub_dir_2/Makefile | 2 + integration/swagger_comments/Makefile | 2 + integration/swagger_default_options/Makefile | 2 + 8 files changed, 79 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 44d0245..d93295b 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,66 @@ _testmain.go # Ignore vendor, needed for better local development -vendor/ \ No newline at end of file +vendor/ +/integration/additional_bindings/strings/to_lower_test.go +/integration/go_package/strings/to_lower_test.go +/integration/go_package/strings/to_upper_test.go +/integration/go_package_alias/strings/to_lower_test.go +/integration/go_package_alias/strings/to_upper_test.go +/integration/go_package_alias_proto_in_root/strings/to_lower_test.go +/integration/go_package_alias_proto_in_root/strings/to_upper_test.go +/integration/go_package_alias_proto_standalone/strings/to_lower_test.go +/integration/go_package_alias_proto_standalone/strings/to_upper_test.go +/integration/go_package_proto_in_root/strings/to_lower_test.go +/integration/go_package_proto_in_root/strings/to_upper_test.go +/integration/go_package_proto_standalone/strings/to_lower_test.go +/integration/go_package_proto_standalone/strings/to_upper_test.go +/integration/go_package_with_alias/strings/to_lower_test.go +/integration/go_package_with_alias/strings/to_upper_test.go +/integration/go_package_with_alias_proto_in_root/strings/to_lower_test.go +/integration/go_package_with_alias_proto_in_root/strings/to_upper_test.go +/integration/go_package_with_alias_proto_standalone/strings/to_lower_test.go +/integration/go_package_with_alias_proto_standalone/strings/to_upper_test.go +/integration/gogo_enums/strings/to_lower_test.go +/integration/google_empty/strings/empty_response_test.go +/integration/google_empty/strings/to_lower_test.go +/integration/google_empty/strings/to_upper_test.go +/integration/google_empty/strings/without_desc_and_option_test.go +/integration/google_empty/strings/without_desc_test.go +/integration/http_headers_passthru/strings/to_lower_test.go +/integration/http_headers_response/strings/to_lower_test.go +/integration/impl_service_sub_dir_2/strings/to_lower_test.go +/integration/impl_service_sub_dir_2/strings/to_upper_test.go +/integration/impl_standalone/strings/to_lower_test.go +/integration/impl_standalone/strings/to_upper_test.go +/integration/impl_standalone_without_swagger/strings/to_lower_test.go +/integration/impl_standalone_without_swagger/strings/to_upper_test.go +/integration/imported_type_in_request/strings/to_lower_test.go +/integration/imported_type_in_request/strings/to_upper_test.go +/integration/imported_type_in_response/strings/to_lower_test.go +/integration/imported_type_in_response/strings/to_upper_test.go +/integration/no_bindings/strings/to_lower_test.go +/integration/no_bindings/strings/to_upper_test.go +/integration/one_location/pb/to_lower_test.go +/integration/one_location/pb/to_upper_test.go +/integration/one_location_with_dot_package/pb/to_lower_test.go +/integration/one_location_with_dot_package/pb/to_upper_test.go +/integration/one_location_with_go_package_alias/pb/to_lower_test.go +/integration/one_location_with_go_package_alias/pb/to_upper_test.go +/integration/one_location_with_package/pb/to_lower_test.go +/integration/one_location_with_package/pb/to_upper_test.go +/integration/partial_bindings/strings/to_lower_test.go +/integration/partial_bindings/strings/to_upper_test.go +/integration/proto_in_root/strings/to_lower_test.go +/integration/proto_in_root/strings/to_upper_test.go +/integration/proto_standalone/strings/to_lower_test.go +/integration/proto_standalone/strings/to_upper_test.go +/integration/proto_two_services/strings/to_lower2_test.go +/integration/proto_two_services/strings/to_lower_test.go +/integration/proto_two_services/strings/to_upper2_test.go +/integration/proto_two_services/strings/to_upper_test.go +/integration/snake_case_message/strings/to_upper_test.go +/integration/snake_case_method/strings/to_upper_test.go +/integration/snake_case_service/strings/to_upper_test.go +/integration/swagger_def_sam_json_case/strings/to_lower_test.go +/integration/swagger_def_sam_json_case/strings/to_upper_test.go diff --git a/integration/binding_with_substruct_in_body/Makefile b/integration/binding_with_substruct_in_body/Makefile index 10a2c2d..18fe185 100644 --- a/integration/binding_with_substruct_in_body/Makefile +++ b/integration/binding_with_substruct_in_body/Makefile @@ -8,6 +8,9 @@ clean: rm -f ./pb/strings.pb.goclay.go rm -f ./strings/strings.go rm -f ./strings/to_lower.go + rm -f ./strings/to_lower_test.go + rm -f ./strings/to_upper.go + rm -f ./strings/to_upper_test.go rm -f main protoc: protoc-build diff --git a/integration/go.mod b/integration/go.mod index 21e207d..4a9eb9b 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -7,12 +7,13 @@ require ( github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.2 - github.com/googleapis/googleapis v0.0.0-20200310083500-365c029b8cdb // indirect + github.com/googleapis/googleapis v0.0.0-20200405015038-5077b1e4674a // indirect github.com/grpc-ecosystem/grpc-gateway v1.14.2 github.com/jmoiron/jsonq v0.0.0-20150511023944-e874b168d07e github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.4.0 github.com/utrack/clay/v2 v2.1.0 + github.com/y0ssar1an/q v1.0.10 // indirect golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c google.golang.org/grpc v1.27.1 diff --git a/integration/go.sum b/integration/go.sum index 6eefa4f..cf1e49e 100644 --- a/integration/go.sum +++ b/integration/go.sum @@ -46,6 +46,8 @@ github.com/googleapis/googleapis v0.0.0-20200215052923-8a1020bf6828 h1:AqnoVTmTB github.com/googleapis/googleapis v0.0.0-20200215052923-8a1020bf6828/go.mod h1:XrPm4xpez/lHHyE+8/G+NqQRcB4lg42HF9zQVTvxtXw= github.com/googleapis/googleapis v0.0.0-20200310083500-365c029b8cdb h1:fwxKpzV/vPKUER/2Fm6mWMMffbmgtkGFgWdIcSyzFkk= github.com/googleapis/googleapis v0.0.0-20200310083500-365c029b8cdb/go.mod h1:XrPm4xpez/lHHyE+8/G+NqQRcB4lg42HF9zQVTvxtXw= +github.com/googleapis/googleapis v0.0.0-20200405015038-5077b1e4674a h1:SJ6mtvn1KFnRuxtBEHybsfXR3OuHfdldkiUuxIb4hrI= +github.com/googleapis/googleapis v0.0.0-20200405015038-5077b1e4674a/go.mod h1:XrPm4xpez/lHHyE+8/G+NqQRcB4lg42HF9zQVTvxtXw= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= github.com/grpc-ecosystem/grpc-gateway v1.12.1 h1:zCy2xE9ablevUOrUZc3Dl72Dt+ya2FNAvC2yLYMHzi4= @@ -91,6 +93,8 @@ github.com/y0ssar1an/q v1.0.7 h1:s3ckTY+wjk6Y0sFce4rIS1Ezf8S6d0UFJrKwe40MyiQ= github.com/y0ssar1an/q v1.0.7/go.mod h1:Q1Rk1StqWjSOfA/CF4zJEW1fLmkl5Cy8EsILdkB+DgE= github.com/y0ssar1an/q v1.0.9 h1:hf3MOepE9F3QoUfEFklh6muQzpA7mgRvvUj9myGQvEk= github.com/y0ssar1an/q v1.0.9/go.mod h1:wtZBfP+3OpE8GqpIlFjSmla+v7HEJQB7vV7Rvd7Pjio= +github.com/y0ssar1an/q v1.0.10 h1:ZDk1A2iVD9ADpAIshUrZC5LXz0IrFi8ynZFpd79r3K0= +github.com/y0ssar1an/q v1.0.10/go.mod h1:WSOB4gz+fGjO4MYSCuxDK6KS7L5XFjFf8KrQi4srPG4= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= diff --git a/integration/impl_service_sub_dir/Makefile b/integration/impl_service_sub_dir/Makefile index 6ce683d..df62d83 100644 --- a/integration/impl_service_sub_dir/Makefile +++ b/integration/impl_service_sub_dir/Makefile @@ -8,6 +8,7 @@ clean: rm -f ./pb/strings.pb.goclay.go rm -f ./strings/strings.go rm -f ./strings/to_upper.go + rm -f ./strings/to_upper_test.go rm -f main protoc: protoc-build diff --git a/integration/impl_service_sub_dir_2/Makefile b/integration/impl_service_sub_dir_2/Makefile index daca6bc..77a0131 100644 --- a/integration/impl_service_sub_dir_2/Makefile +++ b/integration/impl_service_sub_dir_2/Makefile @@ -14,6 +14,8 @@ clean: rm -f ./strings-api/strings_api.go rm -f ./strings-api/to_lower.go rm -f ./strings-api/to_upper.go + rm -f ./strings-api/to_lower_test.go + rm -f ./strings-api/to_upper_test.go rm -f main protoc: protoc-build diff --git a/integration/swagger_comments/Makefile b/integration/swagger_comments/Makefile index d8b3df8..d308e3c 100644 --- a/integration/swagger_comments/Makefile +++ b/integration/swagger_comments/Makefile @@ -9,6 +9,8 @@ clean: rm -f ./strings/strings.go rm -f ./strings/to_lower.go rm -f ./strings/to_upper.go + rm -f ./strings/to_lower_test.go + rm -f ./strings/to_upper_test.go protoc: protoc-build protoc --plugin=protoc-gen-goclay=$(GEN_CLAY_BIN) --plugin=protoc-gen-gofast=$(GEN_GOFAST_BIN) -I/usr/local/include:${GRPC_GATEWAY_PATH}/third_party/googleapis:. --gofast_out=plugins=grpc:. --goclay_out=impl=true,impl_path=../../strings:. pb/strings/strings.proto diff --git a/integration/swagger_default_options/Makefile b/integration/swagger_default_options/Makefile index d8b3df8..d308e3c 100644 --- a/integration/swagger_default_options/Makefile +++ b/integration/swagger_default_options/Makefile @@ -9,6 +9,8 @@ clean: rm -f ./strings/strings.go rm -f ./strings/to_lower.go rm -f ./strings/to_upper.go + rm -f ./strings/to_lower_test.go + rm -f ./strings/to_upper_test.go protoc: protoc-build protoc --plugin=protoc-gen-goclay=$(GEN_CLAY_BIN) --plugin=protoc-gen-gofast=$(GEN_GOFAST_BIN) -I/usr/local/include:${GRPC_GATEWAY_PATH}/third_party/googleapis:. --gofast_out=plugins=grpc:. --goclay_out=impl=true,impl_path=../../strings:. pb/strings/strings.proto