From cebf9176a3108317ea7d3f39f40a693dc721ff28 Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Fri, 10 Jul 2020 13:45:52 +0200 Subject: [PATCH] =?UTF-8?q?Move=20betterproto/tests=20=E2=86=92=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- Makefile | 4 ++-- {betterproto/tests => tests}/README.md | 2 +- {betterproto/tests => tests}/__init__.py | 0 conftest.py => tests/conftest.py | 0 {betterproto/tests => tests}/generate.py | 2 +- {betterproto/tests => tests}/grpc/__init__.py | 0 .../tests => tests}/grpc/test_grpclib_client.py | 2 +- .../tests => tests}/grpc/test_stream_stream.py | 0 {betterproto/tests => tests}/grpc/thing_service.py | 2 +- {betterproto/tests => tests}/inputs/bool/bool.json | 0 {betterproto/tests => tests}/inputs/bool/bool.proto | 0 {betterproto/tests => tests}/inputs/bool/test_bool.py | 2 +- {betterproto/tests => tests}/inputs/bytes/bytes.json | 0 {betterproto/tests => tests}/inputs/bytes/bytes.proto | 0 {betterproto/tests => tests}/inputs/casing/casing.json | 0 .../tests => tests}/inputs/casing/casing.proto | 0 .../tests => tests}/inputs/casing/test_casing.py | 4 ++-- .../casing_message_field_uppercase.proto | 0 .../casing_message_field_uppercase.py | 2 +- {betterproto/tests => tests}/inputs/config.py | 0 .../tests => tests}/inputs/double/double-negative.json | 0 {betterproto/tests => tests}/inputs/double/double.json | 0 .../tests => tests}/inputs/double/double.proto | 0 {betterproto/tests => tests}/inputs/enums/enums.json | 0 {betterproto/tests => tests}/inputs/enums/enums.proto | 0 .../tests => tests}/inputs/example/example.proto | 0 {betterproto/tests => tests}/inputs/fixed/fixed.json | 0 {betterproto/tests => tests}/inputs/fixed/fixed.proto | 0 .../inputs/googletypes/googletypes-missing.json | 0 .../inputs/googletypes/googletypes.json | 0 .../inputs/googletypes/googletypes.proto | 0 .../googletypes_response/googletypes_response.proto | 0 .../googletypes_response/test_googletypes_response.py | 4 ++-- .../googletypes_response_embedded.proto | 0 .../test_googletypes_response_embedded.py | 4 ++-- .../googletypes_service_returns_empty.proto | 0 .../googletypes_service_returns_googletype.proto | 0 .../inputs/googletypes_struct/googletypes_struct.json | 0 .../inputs/googletypes_struct/googletypes_struct.proto | 0 .../inputs/googletypes_value/googletypes_value.json | 0 .../inputs/googletypes_value/googletypes_value.proto | 0 .../import_capitalized_package/capitalized.proto | 0 .../inputs/import_capitalized_package/test.proto | 0 .../import_child_package_from_package/child.proto | 0 .../import_child_package_from_package.proto | 0 .../package_message.proto | 0 .../inputs/import_child_package_from_root/child.proto | 0 .../import_child_package_from_root.proto | 0 .../import_circular_dependency.proto | 0 .../inputs/import_circular_dependency/other.proto | 0 .../inputs/import_circular_dependency/root.proto | 0 .../inputs/import_cousin_package/cousin.proto | 0 .../inputs/import_cousin_package/test.proto | 0 .../import_cousin_package_same_name/cousin.proto | 0 .../inputs/import_cousin_package_same_name/test.proto | 0 .../import_packages_same_name.proto | 0 .../inputs/import_packages_same_name/posts_v1.proto | 0 .../inputs/import_packages_same_name/users_v1.proto | 0 .../import_parent_package_from_child.proto | 0 .../parent_package_message.proto | 0 .../inputs/import_root_package_from_child/child.proto | 0 .../inputs/import_root_package_from_child/root.proto | 0 .../import_root_sibling/import_root_sibling.proto | 0 .../inputs/import_root_sibling/sibling.proto | 0 .../child_package_request_message.proto | 0 .../import_service_input_message.proto | 0 .../import_service_input_message/request_message.proto | 0 .../test_import_service_input_message.py | 4 ++-- {betterproto/tests => tests}/inputs/int32/int32.json | 0 {betterproto/tests => tests}/inputs/int32/int32.proto | 0 {betterproto/tests => tests}/inputs/map/map.json | 0 {betterproto/tests => tests}/inputs/map/map.proto | 0 .../tests => tests}/inputs/mapmessage/mapmessage.json | 0 .../tests => tests}/inputs/mapmessage/mapmessage.proto | 0 .../namespace_builtin_types.json | 0 .../namespace_builtin_types.proto | 0 .../inputs/namespace_keywords/namespace_keywords.json | 0 .../inputs/namespace_keywords/namespace_keywords.proto | 0 {betterproto/tests => tests}/inputs/nested/nested.json | 0 .../tests => tests}/inputs/nested/nested.proto | 0 .../tests => tests}/inputs/nested2/nested2.proto | 0 .../tests => tests}/inputs/nested2/package.proto | 0 .../inputs/nestedtwice/nestedtwice.json | 0 .../inputs/nestedtwice/nestedtwice.proto | 0 .../tests => tests}/inputs/oneof/oneof-name.json | 0 {betterproto/tests => tests}/inputs/oneof/oneof.json | 0 {betterproto/tests => tests}/inputs/oneof/oneof.proto | 0 .../tests => tests}/inputs/oneof/test_oneof.py | 4 ++-- .../inputs/oneof_enum/oneof_enum-enum-0.json | 0 .../inputs/oneof_enum/oneof_enum-enum-1.json | 0 .../tests => tests}/inputs/oneof_enum/oneof_enum.json | 0 .../tests => tests}/inputs/oneof_enum/oneof_enum.proto | 0 .../inputs/oneof_enum/test_oneof_enum.py | 4 ++-- {betterproto/tests => tests}/inputs/ref/ref.json | 0 {betterproto/tests => tests}/inputs/ref/ref.proto | 0 .../tests => tests}/inputs/ref/repeatedmessage.proto | 0 .../tests => tests}/inputs/repeated/repeated.json | 0 .../tests => tests}/inputs/repeated/repeated.proto | 0 .../inputs/repeatedmessage/repeatedmessage.json | 0 .../inputs/repeatedmessage/repeatedmessage.proto | 0 .../inputs/repeatedpacked/repeatedpacked.json | 0 .../inputs/repeatedpacked/repeatedpacked.proto | 0 .../tests => tests}/inputs/service/service.proto | 0 {betterproto/tests => tests}/inputs/signed/signed.json | 0 .../tests => tests}/inputs/signed/signed.proto | 0 {betterproto/tests => tests}/mocks.py | 0 {betterproto/tests => tests}/test_casing.py | 0 {betterproto/tests => tests}/test_features.py | 0 {betterproto/tests => tests}/test_get_ref_type.py | 2 +- {betterproto/tests => tests}/test_inputs.py | 10 +++++----- {betterproto/tests => tests}/util.py | 0 112 files changed, 27 insertions(+), 27 deletions(-) rename {betterproto/tests => tests}/README.md (97%) rename {betterproto/tests => tests}/__init__.py (100%) rename conftest.py => tests/conftest.py (100%) rename {betterproto/tests => tests}/generate.py (99%) rename {betterproto/tests => tests}/grpc/__init__.py (100%) rename {betterproto/tests => tests}/grpc/test_grpclib_client.py (98%) rename {betterproto/tests => tests}/grpc/test_stream_stream.py (100%) rename {betterproto/tests => tests}/grpc/thing_service.py (97%) rename {betterproto/tests => tests}/inputs/bool/bool.json (100%) rename {betterproto/tests => tests}/inputs/bool/bool.proto (100%) rename {betterproto/tests => tests}/inputs/bool/test_bool.py (63%) rename {betterproto/tests => tests}/inputs/bytes/bytes.json (100%) rename {betterproto/tests => tests}/inputs/bytes/bytes.proto (100%) rename {betterproto/tests => tests}/inputs/casing/casing.json (100%) rename {betterproto/tests => tests}/inputs/casing/casing.proto (100%) rename {betterproto/tests => tests}/inputs/casing/test_casing.py (83%) rename {betterproto/tests => tests}/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto (100%) rename {betterproto/tests => tests}/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py (83%) rename {betterproto/tests => tests}/inputs/config.py (100%) rename {betterproto/tests => tests}/inputs/double/double-negative.json (100%) rename {betterproto/tests => tests}/inputs/double/double.json (100%) rename {betterproto/tests => tests}/inputs/double/double.proto (100%) rename {betterproto/tests => tests}/inputs/enums/enums.json (100%) rename {betterproto/tests => tests}/inputs/enums/enums.proto (100%) rename {betterproto/tests => tests}/inputs/example/example.proto (100%) rename {betterproto/tests => tests}/inputs/fixed/fixed.json (100%) rename {betterproto/tests => tests}/inputs/fixed/fixed.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes/googletypes-missing.json (100%) rename {betterproto/tests => tests}/inputs/googletypes/googletypes.json (100%) rename {betterproto/tests => tests}/inputs/googletypes/googletypes.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_response/googletypes_response.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_response/test_googletypes_response.py (93%) rename {betterproto/tests => tests}/inputs/googletypes_response_embedded/googletypes_response_embedded.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py (89%) rename {betterproto/tests => tests}/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_struct/googletypes_struct.json (100%) rename {betterproto/tests => tests}/inputs/googletypes_struct/googletypes_struct.proto (100%) rename {betterproto/tests => tests}/inputs/googletypes_value/googletypes_value.json (100%) rename {betterproto/tests => tests}/inputs/googletypes_value/googletypes_value.proto (100%) rename {betterproto/tests => tests}/inputs/import_capitalized_package/capitalized.proto (100%) rename {betterproto/tests => tests}/inputs/import_capitalized_package/test.proto (100%) rename {betterproto/tests => tests}/inputs/import_child_package_from_package/child.proto (100%) rename {betterproto/tests => tests}/inputs/import_child_package_from_package/import_child_package_from_package.proto (100%) rename {betterproto/tests => tests}/inputs/import_child_package_from_package/package_message.proto (100%) rename {betterproto/tests => tests}/inputs/import_child_package_from_root/child.proto (100%) rename {betterproto/tests => tests}/inputs/import_child_package_from_root/import_child_package_from_root.proto (100%) rename {betterproto/tests => tests}/inputs/import_circular_dependency/import_circular_dependency.proto (100%) rename {betterproto/tests => tests}/inputs/import_circular_dependency/other.proto (100%) rename {betterproto/tests => tests}/inputs/import_circular_dependency/root.proto (100%) rename {betterproto/tests => tests}/inputs/import_cousin_package/cousin.proto (100%) rename {betterproto/tests => tests}/inputs/import_cousin_package/test.proto (100%) rename {betterproto/tests => tests}/inputs/import_cousin_package_same_name/cousin.proto (100%) rename {betterproto/tests => tests}/inputs/import_cousin_package_same_name/test.proto (100%) rename {betterproto/tests => tests}/inputs/import_packages_same_name/import_packages_same_name.proto (100%) rename {betterproto/tests => tests}/inputs/import_packages_same_name/posts_v1.proto (100%) rename {betterproto/tests => tests}/inputs/import_packages_same_name/users_v1.proto (100%) rename {betterproto/tests => tests}/inputs/import_parent_package_from_child/import_parent_package_from_child.proto (100%) rename {betterproto/tests => tests}/inputs/import_parent_package_from_child/parent_package_message.proto (100%) rename {betterproto/tests => tests}/inputs/import_root_package_from_child/child.proto (100%) rename {betterproto/tests => tests}/inputs/import_root_package_from_child/root.proto (100%) rename {betterproto/tests => tests}/inputs/import_root_sibling/import_root_sibling.proto (100%) rename {betterproto/tests => tests}/inputs/import_root_sibling/sibling.proto (100%) rename {betterproto/tests => tests}/inputs/import_service_input_message/child_package_request_message.proto (100%) rename {betterproto/tests => tests}/inputs/import_service_input_message/import_service_input_message.proto (100%) rename {betterproto/tests => tests}/inputs/import_service_input_message/request_message.proto (100%) rename {betterproto/tests => tests}/inputs/import_service_input_message/test_import_service_input_message.py (87%) rename {betterproto/tests => tests}/inputs/int32/int32.json (100%) rename {betterproto/tests => tests}/inputs/int32/int32.proto (100%) rename {betterproto/tests => tests}/inputs/map/map.json (100%) rename {betterproto/tests => tests}/inputs/map/map.proto (100%) rename {betterproto/tests => tests}/inputs/mapmessage/mapmessage.json (100%) rename {betterproto/tests => tests}/inputs/mapmessage/mapmessage.proto (100%) rename {betterproto/tests => tests}/inputs/namespace_builtin_types/namespace_builtin_types.json (100%) rename {betterproto/tests => tests}/inputs/namespace_builtin_types/namespace_builtin_types.proto (100%) rename {betterproto/tests => tests}/inputs/namespace_keywords/namespace_keywords.json (100%) rename {betterproto/tests => tests}/inputs/namespace_keywords/namespace_keywords.proto (100%) rename {betterproto/tests => tests}/inputs/nested/nested.json (100%) rename {betterproto/tests => tests}/inputs/nested/nested.proto (100%) rename {betterproto/tests => tests}/inputs/nested2/nested2.proto (100%) rename {betterproto/tests => tests}/inputs/nested2/package.proto (100%) rename {betterproto/tests => tests}/inputs/nestedtwice/nestedtwice.json (100%) rename {betterproto/tests => tests}/inputs/nestedtwice/nestedtwice.proto (100%) rename {betterproto/tests => tests}/inputs/oneof/oneof-name.json (100%) rename {betterproto/tests => tests}/inputs/oneof/oneof.json (100%) rename {betterproto/tests => tests}/inputs/oneof/oneof.proto (100%) rename {betterproto/tests => tests}/inputs/oneof/test_oneof.py (76%) rename {betterproto/tests => tests}/inputs/oneof_enum/oneof_enum-enum-0.json (100%) rename {betterproto/tests => tests}/inputs/oneof_enum/oneof_enum-enum-1.json (100%) rename {betterproto/tests => tests}/inputs/oneof_enum/oneof_enum.json (100%) rename {betterproto/tests => tests}/inputs/oneof_enum/oneof_enum.proto (100%) rename {betterproto/tests => tests}/inputs/oneof_enum/test_oneof_enum.py (91%) rename {betterproto/tests => tests}/inputs/ref/ref.json (100%) rename {betterproto/tests => tests}/inputs/ref/ref.proto (100%) rename {betterproto/tests => tests}/inputs/ref/repeatedmessage.proto (100%) rename {betterproto/tests => tests}/inputs/repeated/repeated.json (100%) rename {betterproto/tests => tests}/inputs/repeated/repeated.proto (100%) rename {betterproto/tests => tests}/inputs/repeatedmessage/repeatedmessage.json (100%) rename {betterproto/tests => tests}/inputs/repeatedmessage/repeatedmessage.proto (100%) rename {betterproto/tests => tests}/inputs/repeatedpacked/repeatedpacked.json (100%) rename {betterproto/tests => tests}/inputs/repeatedpacked/repeatedpacked.proto (100%) rename {betterproto/tests => tests}/inputs/service/service.proto (100%) rename {betterproto/tests => tests}/inputs/signed/signed.json (100%) rename {betterproto/tests => tests}/inputs/signed/signed.proto (100%) rename {betterproto/tests => tests}/mocks.py (100%) rename {betterproto/tests => tests}/test_casing.py (100%) rename {betterproto/tests => tests}/test_features.py (100%) rename {betterproto/tests => tests}/test_get_ref_type.py (99%) rename {betterproto/tests => tests}/test_inputs.py (95%) rename {betterproto/tests => tests}/util.py (100%) diff --git a/.gitignore b/.gitignore index bb48db1..c374260 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ .pytest_cache .python-version build/ -betterproto/tests/output_* +tests/output_* **/__pycache__ dist **/*.egg-info diff --git a/Makefile b/Makefile index 950cc4b..acf80a0 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ help: ## - Show this help. # Dev workflow tasks generate: ## - Generate test cases (do this once before running test) - poetry run ./betterproto/tests/generate.py + poetry run ./tests/generate.py test: ## - Run tests poetry run pytest --cov betterproto @@ -23,7 +23,7 @@ clean: ## - Clean out generated files from the workspace .pytest_cache \ dist \ **/__pycache__ \ - betterproto/tests/output_* + tests/output_* # Manual testing diff --git a/betterproto/tests/README.md b/tests/README.md similarity index 97% rename from betterproto/tests/README.md rename to tests/README.md index 51cd8ec..f1ee609 100644 --- a/betterproto/tests/README.md +++ b/tests/README.md @@ -50,7 +50,7 @@ You can add multiple `.proto` files to the test case, as long as one file matche `test_.py` — *Custom test to validate specific aspects of the generated class* ```python -from betterproto.tests.output_betterproto.bool.bool import Test +from tests.output_betterproto.bool.bool import Test def test_value(): message = Test() diff --git a/betterproto/tests/__init__.py b/tests/__init__.py similarity index 100% rename from betterproto/tests/__init__.py rename to tests/__init__.py diff --git a/conftest.py b/tests/conftest.py similarity index 100% rename from conftest.py rename to tests/conftest.py diff --git a/betterproto/tests/generate.py b/tests/generate.py similarity index 99% rename from betterproto/tests/generate.py rename to tests/generate.py index 3a04d27..e24368e 100755 --- a/betterproto/tests/generate.py +++ b/tests/generate.py @@ -6,7 +6,7 @@ import shutil import sys from typing import Set -from betterproto.tests.util import ( +from tests.util import ( get_directories, inputs_path, output_path_betterproto, diff --git a/betterproto/tests/grpc/__init__.py b/tests/grpc/__init__.py similarity index 100% rename from betterproto/tests/grpc/__init__.py rename to tests/grpc/__init__.py diff --git a/betterproto/tests/grpc/test_grpclib_client.py b/tests/grpc/test_grpclib_client.py similarity index 98% rename from betterproto/tests/grpc/test_grpclib_client.py rename to tests/grpc/test_grpclib_client.py index 67eb085..d1ca47f 100644 --- a/betterproto/tests/grpc/test_grpclib_client.py +++ b/tests/grpc/test_grpclib_client.py @@ -1,5 +1,5 @@ import asyncio -from betterproto.tests.output_betterproto.service.service import ( +from tests.output_betterproto.service.service import ( DoThingResponse, DoThingRequest, GetThingRequest, diff --git a/betterproto/tests/grpc/test_stream_stream.py b/tests/grpc/test_stream_stream.py similarity index 100% rename from betterproto/tests/grpc/test_stream_stream.py rename to tests/grpc/test_stream_stream.py diff --git a/betterproto/tests/grpc/thing_service.py b/tests/grpc/thing_service.py similarity index 97% rename from betterproto/tests/grpc/thing_service.py rename to tests/grpc/thing_service.py index cc863f2..ae05852 100644 --- a/betterproto/tests/grpc/thing_service.py +++ b/tests/grpc/thing_service.py @@ -1,4 +1,4 @@ -from betterproto.tests.output_betterproto.service.service import ( +from tests.output_betterproto.service.service import ( DoThingResponse, DoThingRequest, GetThingRequest, diff --git a/betterproto/tests/inputs/bool/bool.json b/tests/inputs/bool/bool.json similarity index 100% rename from betterproto/tests/inputs/bool/bool.json rename to tests/inputs/bool/bool.json diff --git a/betterproto/tests/inputs/bool/bool.proto b/tests/inputs/bool/bool.proto similarity index 100% rename from betterproto/tests/inputs/bool/bool.proto rename to tests/inputs/bool/bool.proto diff --git a/betterproto/tests/inputs/bool/test_bool.py b/tests/inputs/bool/test_bool.py similarity index 63% rename from betterproto/tests/inputs/bool/test_bool.py rename to tests/inputs/bool/test_bool.py index 3131236..e91bf0a 100644 --- a/betterproto/tests/inputs/bool/test_bool.py +++ b/tests/inputs/bool/test_bool.py @@ -1,4 +1,4 @@ -from betterproto.tests.output_betterproto.bool import Test +from tests.output_betterproto.bool import Test def test_value(): diff --git a/betterproto/tests/inputs/bytes/bytes.json b/tests/inputs/bytes/bytes.json similarity index 100% rename from betterproto/tests/inputs/bytes/bytes.json rename to tests/inputs/bytes/bytes.json diff --git a/betterproto/tests/inputs/bytes/bytes.proto b/tests/inputs/bytes/bytes.proto similarity index 100% rename from betterproto/tests/inputs/bytes/bytes.proto rename to tests/inputs/bytes/bytes.proto diff --git a/betterproto/tests/inputs/casing/casing.json b/tests/inputs/casing/casing.json similarity index 100% rename from betterproto/tests/inputs/casing/casing.json rename to tests/inputs/casing/casing.json diff --git a/betterproto/tests/inputs/casing/casing.proto b/tests/inputs/casing/casing.proto similarity index 100% rename from betterproto/tests/inputs/casing/casing.proto rename to tests/inputs/casing/casing.proto diff --git a/betterproto/tests/inputs/casing/test_casing.py b/tests/inputs/casing/test_casing.py similarity index 83% rename from betterproto/tests/inputs/casing/test_casing.py rename to tests/inputs/casing/test_casing.py index 1c0dc80..9ca4243 100644 --- a/betterproto/tests/inputs/casing/test_casing.py +++ b/tests/inputs/casing/test_casing.py @@ -1,5 +1,5 @@ -import betterproto.tests.output_betterproto.casing as casing -from betterproto.tests.output_betterproto.casing import Test +import tests.output_betterproto.casing as casing +from tests.output_betterproto.casing import Test def test_message_attributes(): diff --git a/betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto similarity index 100% rename from betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto rename to tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto diff --git a/betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py similarity index 83% rename from betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py rename to tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py index e0dee0c..2b32b53 100644 --- a/betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py +++ b/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py @@ -1,4 +1,4 @@ -from betterproto.tests.output_betterproto.casing_message_field_uppercase import Test +from tests.output_betterproto.casing_message_field_uppercase import Test def test_message_casing(): diff --git a/betterproto/tests/inputs/config.py b/tests/inputs/config.py similarity index 100% rename from betterproto/tests/inputs/config.py rename to tests/inputs/config.py diff --git a/betterproto/tests/inputs/double/double-negative.json b/tests/inputs/double/double-negative.json similarity index 100% rename from betterproto/tests/inputs/double/double-negative.json rename to tests/inputs/double/double-negative.json diff --git a/betterproto/tests/inputs/double/double.json b/tests/inputs/double/double.json similarity index 100% rename from betterproto/tests/inputs/double/double.json rename to tests/inputs/double/double.json diff --git a/betterproto/tests/inputs/double/double.proto b/tests/inputs/double/double.proto similarity index 100% rename from betterproto/tests/inputs/double/double.proto rename to tests/inputs/double/double.proto diff --git a/betterproto/tests/inputs/enums/enums.json b/tests/inputs/enums/enums.json similarity index 100% rename from betterproto/tests/inputs/enums/enums.json rename to tests/inputs/enums/enums.json diff --git a/betterproto/tests/inputs/enums/enums.proto b/tests/inputs/enums/enums.proto similarity index 100% rename from betterproto/tests/inputs/enums/enums.proto rename to tests/inputs/enums/enums.proto diff --git a/betterproto/tests/inputs/example/example.proto b/tests/inputs/example/example.proto similarity index 100% rename from betterproto/tests/inputs/example/example.proto rename to tests/inputs/example/example.proto diff --git a/betterproto/tests/inputs/fixed/fixed.json b/tests/inputs/fixed/fixed.json similarity index 100% rename from betterproto/tests/inputs/fixed/fixed.json rename to tests/inputs/fixed/fixed.json diff --git a/betterproto/tests/inputs/fixed/fixed.proto b/tests/inputs/fixed/fixed.proto similarity index 100% rename from betterproto/tests/inputs/fixed/fixed.proto rename to tests/inputs/fixed/fixed.proto diff --git a/betterproto/tests/inputs/googletypes/googletypes-missing.json b/tests/inputs/googletypes/googletypes-missing.json similarity index 100% rename from betterproto/tests/inputs/googletypes/googletypes-missing.json rename to tests/inputs/googletypes/googletypes-missing.json diff --git a/betterproto/tests/inputs/googletypes/googletypes.json b/tests/inputs/googletypes/googletypes.json similarity index 100% rename from betterproto/tests/inputs/googletypes/googletypes.json rename to tests/inputs/googletypes/googletypes.json diff --git a/betterproto/tests/inputs/googletypes/googletypes.proto b/tests/inputs/googletypes/googletypes.proto similarity index 100% rename from betterproto/tests/inputs/googletypes/googletypes.proto rename to tests/inputs/googletypes/googletypes.proto diff --git a/betterproto/tests/inputs/googletypes_response/googletypes_response.proto b/tests/inputs/googletypes_response/googletypes_response.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_response/googletypes_response.proto rename to tests/inputs/googletypes_response/googletypes_response.proto diff --git a/betterproto/tests/inputs/googletypes_response/test_googletypes_response.py b/tests/inputs/googletypes_response/test_googletypes_response.py similarity index 93% rename from betterproto/tests/inputs/googletypes_response/test_googletypes_response.py rename to tests/inputs/googletypes_response/test_googletypes_response.py index a7e4938..2d4d62f 100644 --- a/betterproto/tests/inputs/googletypes_response/test_googletypes_response.py +++ b/tests/inputs/googletypes_response/test_googletypes_response.py @@ -3,8 +3,8 @@ from typing import Any, Callable, Optional import betterproto.lib.google.protobuf as protobuf import pytest -from betterproto.tests.mocks import MockChannel -from betterproto.tests.output_betterproto.googletypes_response import TestStub +from tests.mocks import MockChannel +from tests.output_betterproto.googletypes_response import TestStub test_cases = [ (TestStub.get_double, protobuf.DoubleValue, 2.5), diff --git a/betterproto/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto b/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto rename to tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto diff --git a/betterproto/tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py b/tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py similarity index 89% rename from betterproto/tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py rename to tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py index 4ef8c22..6a1760f 100644 --- a/betterproto/tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py +++ b/tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py @@ -1,7 +1,7 @@ import pytest -from betterproto.tests.mocks import MockChannel -from betterproto.tests.output_betterproto.googletypes_response_embedded import ( +from tests.mocks import MockChannel +from tests.output_betterproto.googletypes_response_embedded import ( Output, TestStub, ) diff --git a/betterproto/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto b/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto rename to tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto diff --git a/betterproto/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto b/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto rename to tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto diff --git a/betterproto/tests/inputs/googletypes_struct/googletypes_struct.json b/tests/inputs/googletypes_struct/googletypes_struct.json similarity index 100% rename from betterproto/tests/inputs/googletypes_struct/googletypes_struct.json rename to tests/inputs/googletypes_struct/googletypes_struct.json diff --git a/betterproto/tests/inputs/googletypes_struct/googletypes_struct.proto b/tests/inputs/googletypes_struct/googletypes_struct.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_struct/googletypes_struct.proto rename to tests/inputs/googletypes_struct/googletypes_struct.proto diff --git a/betterproto/tests/inputs/googletypes_value/googletypes_value.json b/tests/inputs/googletypes_value/googletypes_value.json similarity index 100% rename from betterproto/tests/inputs/googletypes_value/googletypes_value.json rename to tests/inputs/googletypes_value/googletypes_value.json diff --git a/betterproto/tests/inputs/googletypes_value/googletypes_value.proto b/tests/inputs/googletypes_value/googletypes_value.proto similarity index 100% rename from betterproto/tests/inputs/googletypes_value/googletypes_value.proto rename to tests/inputs/googletypes_value/googletypes_value.proto diff --git a/betterproto/tests/inputs/import_capitalized_package/capitalized.proto b/tests/inputs/import_capitalized_package/capitalized.proto similarity index 100% rename from betterproto/tests/inputs/import_capitalized_package/capitalized.proto rename to tests/inputs/import_capitalized_package/capitalized.proto diff --git a/betterproto/tests/inputs/import_capitalized_package/test.proto b/tests/inputs/import_capitalized_package/test.proto similarity index 100% rename from betterproto/tests/inputs/import_capitalized_package/test.proto rename to tests/inputs/import_capitalized_package/test.proto diff --git a/betterproto/tests/inputs/import_child_package_from_package/child.proto b/tests/inputs/import_child_package_from_package/child.proto similarity index 100% rename from betterproto/tests/inputs/import_child_package_from_package/child.proto rename to tests/inputs/import_child_package_from_package/child.proto diff --git a/betterproto/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto b/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto similarity index 100% rename from betterproto/tests/inputs/import_child_package_from_package/import_child_package_from_package.proto rename to tests/inputs/import_child_package_from_package/import_child_package_from_package.proto diff --git a/betterproto/tests/inputs/import_child_package_from_package/package_message.proto b/tests/inputs/import_child_package_from_package/package_message.proto similarity index 100% rename from betterproto/tests/inputs/import_child_package_from_package/package_message.proto rename to tests/inputs/import_child_package_from_package/package_message.proto diff --git a/betterproto/tests/inputs/import_child_package_from_root/child.proto b/tests/inputs/import_child_package_from_root/child.proto similarity index 100% rename from betterproto/tests/inputs/import_child_package_from_root/child.proto rename to tests/inputs/import_child_package_from_root/child.proto diff --git a/betterproto/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto b/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto similarity index 100% rename from betterproto/tests/inputs/import_child_package_from_root/import_child_package_from_root.proto rename to tests/inputs/import_child_package_from_root/import_child_package_from_root.proto diff --git a/betterproto/tests/inputs/import_circular_dependency/import_circular_dependency.proto b/tests/inputs/import_circular_dependency/import_circular_dependency.proto similarity index 100% rename from betterproto/tests/inputs/import_circular_dependency/import_circular_dependency.proto rename to tests/inputs/import_circular_dependency/import_circular_dependency.proto diff --git a/betterproto/tests/inputs/import_circular_dependency/other.proto b/tests/inputs/import_circular_dependency/other.proto similarity index 100% rename from betterproto/tests/inputs/import_circular_dependency/other.proto rename to tests/inputs/import_circular_dependency/other.proto diff --git a/betterproto/tests/inputs/import_circular_dependency/root.proto b/tests/inputs/import_circular_dependency/root.proto similarity index 100% rename from betterproto/tests/inputs/import_circular_dependency/root.proto rename to tests/inputs/import_circular_dependency/root.proto diff --git a/betterproto/tests/inputs/import_cousin_package/cousin.proto b/tests/inputs/import_cousin_package/cousin.proto similarity index 100% rename from betterproto/tests/inputs/import_cousin_package/cousin.proto rename to tests/inputs/import_cousin_package/cousin.proto diff --git a/betterproto/tests/inputs/import_cousin_package/test.proto b/tests/inputs/import_cousin_package/test.proto similarity index 100% rename from betterproto/tests/inputs/import_cousin_package/test.proto rename to tests/inputs/import_cousin_package/test.proto diff --git a/betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto b/tests/inputs/import_cousin_package_same_name/cousin.proto similarity index 100% rename from betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto rename to tests/inputs/import_cousin_package_same_name/cousin.proto diff --git a/betterproto/tests/inputs/import_cousin_package_same_name/test.proto b/tests/inputs/import_cousin_package_same_name/test.proto similarity index 100% rename from betterproto/tests/inputs/import_cousin_package_same_name/test.proto rename to tests/inputs/import_cousin_package_same_name/test.proto diff --git a/betterproto/tests/inputs/import_packages_same_name/import_packages_same_name.proto b/tests/inputs/import_packages_same_name/import_packages_same_name.proto similarity index 100% rename from betterproto/tests/inputs/import_packages_same_name/import_packages_same_name.proto rename to tests/inputs/import_packages_same_name/import_packages_same_name.proto diff --git a/betterproto/tests/inputs/import_packages_same_name/posts_v1.proto b/tests/inputs/import_packages_same_name/posts_v1.proto similarity index 100% rename from betterproto/tests/inputs/import_packages_same_name/posts_v1.proto rename to tests/inputs/import_packages_same_name/posts_v1.proto diff --git a/betterproto/tests/inputs/import_packages_same_name/users_v1.proto b/tests/inputs/import_packages_same_name/users_v1.proto similarity index 100% rename from betterproto/tests/inputs/import_packages_same_name/users_v1.proto rename to tests/inputs/import_packages_same_name/users_v1.proto diff --git a/betterproto/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto b/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto similarity index 100% rename from betterproto/tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto rename to tests/inputs/import_parent_package_from_child/import_parent_package_from_child.proto diff --git a/betterproto/tests/inputs/import_parent_package_from_child/parent_package_message.proto b/tests/inputs/import_parent_package_from_child/parent_package_message.proto similarity index 100% rename from betterproto/tests/inputs/import_parent_package_from_child/parent_package_message.proto rename to tests/inputs/import_parent_package_from_child/parent_package_message.proto diff --git a/betterproto/tests/inputs/import_root_package_from_child/child.proto b/tests/inputs/import_root_package_from_child/child.proto similarity index 100% rename from betterproto/tests/inputs/import_root_package_from_child/child.proto rename to tests/inputs/import_root_package_from_child/child.proto diff --git a/betterproto/tests/inputs/import_root_package_from_child/root.proto b/tests/inputs/import_root_package_from_child/root.proto similarity index 100% rename from betterproto/tests/inputs/import_root_package_from_child/root.proto rename to tests/inputs/import_root_package_from_child/root.proto diff --git a/betterproto/tests/inputs/import_root_sibling/import_root_sibling.proto b/tests/inputs/import_root_sibling/import_root_sibling.proto similarity index 100% rename from betterproto/tests/inputs/import_root_sibling/import_root_sibling.proto rename to tests/inputs/import_root_sibling/import_root_sibling.proto diff --git a/betterproto/tests/inputs/import_root_sibling/sibling.proto b/tests/inputs/import_root_sibling/sibling.proto similarity index 100% rename from betterproto/tests/inputs/import_root_sibling/sibling.proto rename to tests/inputs/import_root_sibling/sibling.proto diff --git a/betterproto/tests/inputs/import_service_input_message/child_package_request_message.proto b/tests/inputs/import_service_input_message/child_package_request_message.proto similarity index 100% rename from betterproto/tests/inputs/import_service_input_message/child_package_request_message.proto rename to tests/inputs/import_service_input_message/child_package_request_message.proto diff --git a/betterproto/tests/inputs/import_service_input_message/import_service_input_message.proto b/tests/inputs/import_service_input_message/import_service_input_message.proto similarity index 100% rename from betterproto/tests/inputs/import_service_input_message/import_service_input_message.proto rename to tests/inputs/import_service_input_message/import_service_input_message.proto diff --git a/betterproto/tests/inputs/import_service_input_message/request_message.proto b/tests/inputs/import_service_input_message/request_message.proto similarity index 100% rename from betterproto/tests/inputs/import_service_input_message/request_message.proto rename to tests/inputs/import_service_input_message/request_message.proto diff --git a/betterproto/tests/inputs/import_service_input_message/test_import_service_input_message.py b/tests/inputs/import_service_input_message/test_import_service_input_message.py similarity index 87% rename from betterproto/tests/inputs/import_service_input_message/test_import_service_input_message.py rename to tests/inputs/import_service_input_message/test_import_service_input_message.py index e53fc48..23d2158 100644 --- a/betterproto/tests/inputs/import_service_input_message/test_import_service_input_message.py +++ b/tests/inputs/import_service_input_message/test_import_service_input_message.py @@ -1,7 +1,7 @@ import pytest -from betterproto.tests.mocks import MockChannel -from betterproto.tests.output_betterproto.import_service_input_message import ( +from tests.mocks import MockChannel +from tests.output_betterproto.import_service_input_message import ( RequestResponse, TestStub, ) diff --git a/betterproto/tests/inputs/int32/int32.json b/tests/inputs/int32/int32.json similarity index 100% rename from betterproto/tests/inputs/int32/int32.json rename to tests/inputs/int32/int32.json diff --git a/betterproto/tests/inputs/int32/int32.proto b/tests/inputs/int32/int32.proto similarity index 100% rename from betterproto/tests/inputs/int32/int32.proto rename to tests/inputs/int32/int32.proto diff --git a/betterproto/tests/inputs/map/map.json b/tests/inputs/map/map.json similarity index 100% rename from betterproto/tests/inputs/map/map.json rename to tests/inputs/map/map.json diff --git a/betterproto/tests/inputs/map/map.proto b/tests/inputs/map/map.proto similarity index 100% rename from betterproto/tests/inputs/map/map.proto rename to tests/inputs/map/map.proto diff --git a/betterproto/tests/inputs/mapmessage/mapmessage.json b/tests/inputs/mapmessage/mapmessage.json similarity index 100% rename from betterproto/tests/inputs/mapmessage/mapmessage.json rename to tests/inputs/mapmessage/mapmessage.json diff --git a/betterproto/tests/inputs/mapmessage/mapmessage.proto b/tests/inputs/mapmessage/mapmessage.proto similarity index 100% rename from betterproto/tests/inputs/mapmessage/mapmessage.proto rename to tests/inputs/mapmessage/mapmessage.proto diff --git a/betterproto/tests/inputs/namespace_builtin_types/namespace_builtin_types.json b/tests/inputs/namespace_builtin_types/namespace_builtin_types.json similarity index 100% rename from betterproto/tests/inputs/namespace_builtin_types/namespace_builtin_types.json rename to tests/inputs/namespace_builtin_types/namespace_builtin_types.json diff --git a/betterproto/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto b/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto similarity index 100% rename from betterproto/tests/inputs/namespace_builtin_types/namespace_builtin_types.proto rename to tests/inputs/namespace_builtin_types/namespace_builtin_types.proto diff --git a/betterproto/tests/inputs/namespace_keywords/namespace_keywords.json b/tests/inputs/namespace_keywords/namespace_keywords.json similarity index 100% rename from betterproto/tests/inputs/namespace_keywords/namespace_keywords.json rename to tests/inputs/namespace_keywords/namespace_keywords.json diff --git a/betterproto/tests/inputs/namespace_keywords/namespace_keywords.proto b/tests/inputs/namespace_keywords/namespace_keywords.proto similarity index 100% rename from betterproto/tests/inputs/namespace_keywords/namespace_keywords.proto rename to tests/inputs/namespace_keywords/namespace_keywords.proto diff --git a/betterproto/tests/inputs/nested/nested.json b/tests/inputs/nested/nested.json similarity index 100% rename from betterproto/tests/inputs/nested/nested.json rename to tests/inputs/nested/nested.json diff --git a/betterproto/tests/inputs/nested/nested.proto b/tests/inputs/nested/nested.proto similarity index 100% rename from betterproto/tests/inputs/nested/nested.proto rename to tests/inputs/nested/nested.proto diff --git a/betterproto/tests/inputs/nested2/nested2.proto b/tests/inputs/nested2/nested2.proto similarity index 100% rename from betterproto/tests/inputs/nested2/nested2.proto rename to tests/inputs/nested2/nested2.proto diff --git a/betterproto/tests/inputs/nested2/package.proto b/tests/inputs/nested2/package.proto similarity index 100% rename from betterproto/tests/inputs/nested2/package.proto rename to tests/inputs/nested2/package.proto diff --git a/betterproto/tests/inputs/nestedtwice/nestedtwice.json b/tests/inputs/nestedtwice/nestedtwice.json similarity index 100% rename from betterproto/tests/inputs/nestedtwice/nestedtwice.json rename to tests/inputs/nestedtwice/nestedtwice.json diff --git a/betterproto/tests/inputs/nestedtwice/nestedtwice.proto b/tests/inputs/nestedtwice/nestedtwice.proto similarity index 100% rename from betterproto/tests/inputs/nestedtwice/nestedtwice.proto rename to tests/inputs/nestedtwice/nestedtwice.proto diff --git a/betterproto/tests/inputs/oneof/oneof-name.json b/tests/inputs/oneof/oneof-name.json similarity index 100% rename from betterproto/tests/inputs/oneof/oneof-name.json rename to tests/inputs/oneof/oneof-name.json diff --git a/betterproto/tests/inputs/oneof/oneof.json b/tests/inputs/oneof/oneof.json similarity index 100% rename from betterproto/tests/inputs/oneof/oneof.json rename to tests/inputs/oneof/oneof.json diff --git a/betterproto/tests/inputs/oneof/oneof.proto b/tests/inputs/oneof/oneof.proto similarity index 100% rename from betterproto/tests/inputs/oneof/oneof.proto rename to tests/inputs/oneof/oneof.proto diff --git a/betterproto/tests/inputs/oneof/test_oneof.py b/tests/inputs/oneof/test_oneof.py similarity index 76% rename from betterproto/tests/inputs/oneof/test_oneof.py rename to tests/inputs/oneof/test_oneof.py index 058563e..c361b53 100644 --- a/betterproto/tests/inputs/oneof/test_oneof.py +++ b/tests/inputs/oneof/test_oneof.py @@ -1,6 +1,6 @@ import betterproto -from betterproto.tests.output_betterproto.oneof import Test -from betterproto.tests.util import get_test_case_json_data +from tests.output_betterproto.oneof import Test +from tests.util import get_test_case_json_data def test_which_count(): diff --git a/betterproto/tests/inputs/oneof_enum/oneof_enum-enum-0.json b/tests/inputs/oneof_enum/oneof_enum-enum-0.json similarity index 100% rename from betterproto/tests/inputs/oneof_enum/oneof_enum-enum-0.json rename to tests/inputs/oneof_enum/oneof_enum-enum-0.json diff --git a/betterproto/tests/inputs/oneof_enum/oneof_enum-enum-1.json b/tests/inputs/oneof_enum/oneof_enum-enum-1.json similarity index 100% rename from betterproto/tests/inputs/oneof_enum/oneof_enum-enum-1.json rename to tests/inputs/oneof_enum/oneof_enum-enum-1.json diff --git a/betterproto/tests/inputs/oneof_enum/oneof_enum.json b/tests/inputs/oneof_enum/oneof_enum.json similarity index 100% rename from betterproto/tests/inputs/oneof_enum/oneof_enum.json rename to tests/inputs/oneof_enum/oneof_enum.json diff --git a/betterproto/tests/inputs/oneof_enum/oneof_enum.proto b/tests/inputs/oneof_enum/oneof_enum.proto similarity index 100% rename from betterproto/tests/inputs/oneof_enum/oneof_enum.proto rename to tests/inputs/oneof_enum/oneof_enum.proto diff --git a/betterproto/tests/inputs/oneof_enum/test_oneof_enum.py b/tests/inputs/oneof_enum/test_oneof_enum.py similarity index 91% rename from betterproto/tests/inputs/oneof_enum/test_oneof_enum.py rename to tests/inputs/oneof_enum/test_oneof_enum.py index ae9d40d..fe21c43 100644 --- a/betterproto/tests/inputs/oneof_enum/test_oneof_enum.py +++ b/tests/inputs/oneof_enum/test_oneof_enum.py @@ -1,12 +1,12 @@ import pytest import betterproto -from betterproto.tests.output_betterproto.oneof_enum import ( +from tests.output_betterproto.oneof_enum import ( Move, Signal, Test, ) -from betterproto.tests.util import get_test_case_json_data +from tests.util import get_test_case_json_data @pytest.mark.xfail diff --git a/betterproto/tests/inputs/ref/ref.json b/tests/inputs/ref/ref.json similarity index 100% rename from betterproto/tests/inputs/ref/ref.json rename to tests/inputs/ref/ref.json diff --git a/betterproto/tests/inputs/ref/ref.proto b/tests/inputs/ref/ref.proto similarity index 100% rename from betterproto/tests/inputs/ref/ref.proto rename to tests/inputs/ref/ref.proto diff --git a/betterproto/tests/inputs/ref/repeatedmessage.proto b/tests/inputs/ref/repeatedmessage.proto similarity index 100% rename from betterproto/tests/inputs/ref/repeatedmessage.proto rename to tests/inputs/ref/repeatedmessage.proto diff --git a/betterproto/tests/inputs/repeated/repeated.json b/tests/inputs/repeated/repeated.json similarity index 100% rename from betterproto/tests/inputs/repeated/repeated.json rename to tests/inputs/repeated/repeated.json diff --git a/betterproto/tests/inputs/repeated/repeated.proto b/tests/inputs/repeated/repeated.proto similarity index 100% rename from betterproto/tests/inputs/repeated/repeated.proto rename to tests/inputs/repeated/repeated.proto diff --git a/betterproto/tests/inputs/repeatedmessage/repeatedmessage.json b/tests/inputs/repeatedmessage/repeatedmessage.json similarity index 100% rename from betterproto/tests/inputs/repeatedmessage/repeatedmessage.json rename to tests/inputs/repeatedmessage/repeatedmessage.json diff --git a/betterproto/tests/inputs/repeatedmessage/repeatedmessage.proto b/tests/inputs/repeatedmessage/repeatedmessage.proto similarity index 100% rename from betterproto/tests/inputs/repeatedmessage/repeatedmessage.proto rename to tests/inputs/repeatedmessage/repeatedmessage.proto diff --git a/betterproto/tests/inputs/repeatedpacked/repeatedpacked.json b/tests/inputs/repeatedpacked/repeatedpacked.json similarity index 100% rename from betterproto/tests/inputs/repeatedpacked/repeatedpacked.json rename to tests/inputs/repeatedpacked/repeatedpacked.json diff --git a/betterproto/tests/inputs/repeatedpacked/repeatedpacked.proto b/tests/inputs/repeatedpacked/repeatedpacked.proto similarity index 100% rename from betterproto/tests/inputs/repeatedpacked/repeatedpacked.proto rename to tests/inputs/repeatedpacked/repeatedpacked.proto diff --git a/betterproto/tests/inputs/service/service.proto b/tests/inputs/service/service.proto similarity index 100% rename from betterproto/tests/inputs/service/service.proto rename to tests/inputs/service/service.proto diff --git a/betterproto/tests/inputs/signed/signed.json b/tests/inputs/signed/signed.json similarity index 100% rename from betterproto/tests/inputs/signed/signed.json rename to tests/inputs/signed/signed.json diff --git a/betterproto/tests/inputs/signed/signed.proto b/tests/inputs/signed/signed.proto similarity index 100% rename from betterproto/tests/inputs/signed/signed.proto rename to tests/inputs/signed/signed.proto diff --git a/betterproto/tests/mocks.py b/tests/mocks.py similarity index 100% rename from betterproto/tests/mocks.py rename to tests/mocks.py diff --git a/betterproto/tests/test_casing.py b/tests/test_casing.py similarity index 100% rename from betterproto/tests/test_casing.py rename to tests/test_casing.py diff --git a/betterproto/tests/test_features.py b/tests/test_features.py similarity index 100% rename from betterproto/tests/test_features.py rename to tests/test_features.py diff --git a/betterproto/tests/test_get_ref_type.py b/tests/test_get_ref_type.py similarity index 99% rename from betterproto/tests/test_get_ref_type.py rename to tests/test_get_ref_type.py index 5a1722b..cbee4ca 100644 --- a/betterproto/tests/test_get_ref_type.py +++ b/tests/test_get_ref_type.py @@ -1,6 +1,6 @@ import pytest -from ..compile.importing import get_type_reference, parse_source_type_name +from betterproto.compile.importing import get_type_reference, parse_source_type_name @pytest.mark.parametrize( diff --git a/betterproto/tests/test_inputs.py b/tests/test_inputs.py similarity index 95% rename from betterproto/tests/test_inputs.py rename to tests/test_inputs.py index 3183957..f09ee79 100644 --- a/betterproto/tests/test_inputs.py +++ b/tests/test_inputs.py @@ -9,9 +9,9 @@ from typing import Set import pytest import betterproto -from betterproto.tests.inputs import config as test_input_config -from betterproto.tests.mocks import MockChannel -from betterproto.tests.util import ( +from tests.inputs import config as test_input_config +from tests.mocks import MockChannel +from tests.util import ( find_module, get_directories, get_test_case_json_data, @@ -59,8 +59,8 @@ test_cases = TestCases( xfail=test_input_config.xfail, ) -plugin_output_package = "betterproto.tests.output_betterproto" -reference_output_package = "betterproto.tests.output_reference" +plugin_output_package = "tests.output_betterproto" +reference_output_package = "tests.output_reference" TestData = namedtuple("TestData", ["plugin_module", "reference_module", "json_data"]) diff --git a/betterproto/tests/util.py b/tests/util.py similarity index 100% rename from betterproto/tests/util.py rename to tests/util.py