From 7c8d47de6d9434114d827566e2bc3347ee10e87f Mon Sep 17 00:00:00 2001 From: boukeversteegh Date: Mon, 8 Jun 2020 17:28:58 +0200 Subject: [PATCH] Add test cases for cousin imports that break due to aliases starting with two underscores --- betterproto/tests/inputs/config.py | 3 +++ .../tests/inputs/import_cousin_package/cousin.proto | 6 ++++++ .../tests/inputs/import_cousin_package/test.proto | 11 +++++++++++ .../import_cousin_package_same_name/cousin.proto | 6 ++++++ .../inputs/import_cousin_package_same_name/test.proto | 11 +++++++++++ 5 files changed, 37 insertions(+) create mode 100644 betterproto/tests/inputs/import_cousin_package/cousin.proto create mode 100644 betterproto/tests/inputs/import_cousin_package/test.proto create mode 100644 betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto create mode 100644 betterproto/tests/inputs/import_cousin_package_same_name/test.proto diff --git a/betterproto/tests/inputs/config.py b/betterproto/tests/inputs/config.py index 48e4b09..7b52cd5 100644 --- a/betterproto/tests/inputs/config.py +++ b/betterproto/tests/inputs/config.py @@ -16,6 +16,9 @@ tests = { packages = { "import_root_package_from_child": ".child", "import_parent_package_from_child": ".parent.child", + "import_root_package_from_nested_child": ".nested.child", + "import_cousin_package": ".test.subpackage", + "import_cousin_package_same_name": ".test.subpackage", "repeatedmessage": ".repeatedmessage", "service": ".service", } diff --git a/betterproto/tests/inputs/import_cousin_package/cousin.proto b/betterproto/tests/inputs/import_cousin_package/cousin.proto new file mode 100644 index 0000000..4361545 --- /dev/null +++ b/betterproto/tests/inputs/import_cousin_package/cousin.proto @@ -0,0 +1,6 @@ +syntax = "proto3"; + +package cousin.cousin_subpackage; + +message CousinMessage { +} diff --git a/betterproto/tests/inputs/import_cousin_package/test.proto b/betterproto/tests/inputs/import_cousin_package/test.proto new file mode 100644 index 0000000..53f3b7f --- /dev/null +++ b/betterproto/tests/inputs/import_cousin_package/test.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package test.subpackage; + +import "cousin.proto"; + +// Verify that we can import message unrelated to us + +message Test { + cousin.cousin_subpackage.CousinMessage message = 1; +} diff --git a/betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto b/betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto new file mode 100644 index 0000000..9253b95 --- /dev/null +++ b/betterproto/tests/inputs/import_cousin_package_same_name/cousin.proto @@ -0,0 +1,6 @@ +syntax = "proto3"; + +package cousin.subpackage; + +message CousinMessage { +} diff --git a/betterproto/tests/inputs/import_cousin_package_same_name/test.proto b/betterproto/tests/inputs/import_cousin_package_same_name/test.proto new file mode 100644 index 0000000..fe31b5f --- /dev/null +++ b/betterproto/tests/inputs/import_cousin_package_same_name/test.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package test.subpackage; + +import "cousin.proto"; + +// Verify that we can import a message unrelated to us, in a subpackage with the same name as us. + +message Test { + cousin.subpackage.CousinMessage message = 1; +}