Merge pull request #69 from boukeversteegh/pr/bugreports

Bugreports

Author: boukeversteegh

betterproto/tests/README.md

@@ -87,4 +87,4 @@ betterproto/tests/test_inputs.py ..x...x..x...x.X........xx........x.....x......
 - `x` — XFAIL: expected failure
 - `X` — XPASS: expected failure, but still passed
 
-Test cases marked for expected failure are declared in [inputs/xfail.py](inputs.xfail.py)
+Test cases marked for expected failure are declared in [inputs/config.py](inputs/config.py)

betterproto/tests/generate.py

@@ -2,6 +2,7 @@
 import glob
 import os
 import shutil
+import subprocess
 import sys
 from typing import Set
 
@@ -33,6 +34,8 @@ def generate(whitelist: Set[str]):
 
     test_case_names = set(get_directories(inputs_path))
 
+    failed_test_cases = []
+
     for test_case_name in sorted(test_case_names):
         test_case_input_path = os.path.realpath(
             os.path.join(inputs_path, test_case_name)
@@ -45,22 +48,39 @@ def generate(whitelist: Set[str]):
         ):
             continue
 
-        test_case_output_path_reference = os.path.join(
-            output_path_reference, test_case_name
-        )
-        test_case_output_path_betterproto = os.path.join(
-            output_path_betterproto, test_case_name
+        print(f"Generating output for {test_case_name}")
+        try:
+            generate_test_case_output(test_case_name, test_case_input_path)
+        except subprocess.CalledProcessError as e:
+            failed_test_cases.append(test_case_name)
+
+    if failed_test_cases:
+        sys.stderr.write("\nFailed to generate the following test cases:\n")
+        for failed_test_case in failed_test_cases:
+            sys.stderr.write(f"- {failed_test_case}\n")
+
+
+def generate_test_case_output(test_case_name, test_case_input_path=None):
+    if not test_case_input_path:
+        test_case_input_path = os.path.realpath(
+            os.path.join(inputs_path, test_case_name)
         )
 
-        print(f"Generating output for {test_case_name}")
-        os.makedirs(test_case_output_path_reference, exist_ok=True)
-        os.makedirs(test_case_output_path_betterproto, exist_ok=True)
+    test_case_output_path_reference = os.path.join(
+        output_path_reference, test_case_name
+    )
+    test_case_output_path_betterproto = os.path.join(
+        output_path_betterproto, test_case_name
+    )
+
+    os.makedirs(test_case_output_path_reference, exist_ok=True)
+    os.makedirs(test_case_output_path_betterproto, exist_ok=True)
 
-        clear_directory(test_case_output_path_reference)
-        clear_directory(test_case_output_path_betterproto)
+    clear_directory(test_case_output_path_reference)
+    clear_directory(test_case_output_path_betterproto)
 
-        protoc_reference(test_case_input_path, test_case_output_path_reference)
-        protoc_plugin(test_case_input_path, test_case_output_path_betterproto)
+    protoc_reference(test_case_input_path, test_case_output_path_reference)
+    protoc_plugin(test_case_input_path, test_case_output_path_betterproto)
 
 
 HELP = "\n".join(

betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.json

@@ -0,0 +1,5 @@
+{
+  "UPPERCASE": 10,
+  "UPPERCASE_V2": 10,
+  "UPPER_CAMEL_CASE": 10
+}

betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+message Test {
+  int32 UPPERCASE = 1;
+  int32 UPPERCASE_V2 = 2;
+  int32 UPPER_CAMEL_CASE = 3;
+}

betterproto/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py

@@ -0,0 +1,16 @@
+from betterproto.tests.output_betterproto.casing_message_field_uppercase.casing_message_field_uppercase import (
+    Test,
+)
+
+
+def test_message_casing():
+    message = Test()
+    assert hasattr(
+        message, "uppercase"
+    ), "UPPERCASE attribute is converted to 'uppercase' in python"
+    assert hasattr(
+        message, "uppercase_v2"
+    ), "UPPERCASE_V2 attribute is converted to 'uppercase_v2' in python"
+    assert hasattr(
+        message, "upper_camel_case"
+    ), "UPPER_CAMEL_CASE attribute is converted to upper_camel_case in python"

betterproto/tests/inputs/config.py

@@ -0,0 +1,23 @@
+# Test cases that are expected to fail, e.g. unimplemented features or bug-fixes.
+# Remove from list when fixed.
+tests = {
+    "import_root_sibling",  # 61
+    "import_child_package_from_package",  # 58
+    "import_root_package_from_child",  # 60
+    "import_parent_package_from_child",  # 59
+    "import_circular_dependency",  # failing because of other bugs now
+    "import_packages_same_name",  # 25
+    "oneof_enum",  # 63
+    "googletypes_service_returns_empty",  # 9
+    "casing_message_field_uppercase",  # 11
+    "namespace_keywords",  # 70
+    "namespace_builtin_types"  # 53
+}
+
+services = {
+    "googletypes_response",
+    "googletypes_response_embedded",
+    "service",
+    "import_service_input_message",
+    "googletypes_service_returns_empty",
+}

betterproto/tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "google/protobuf/empty.proto";
+
+service Test {
+    rpc Send (RequestMessage) returns (google.protobuf.Empty) {
+    }
+}
+
+message RequestMessage {
+}

betterproto/tests/inputs/import_packages_same_name/import_packages_same_name.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+import "users_v1.proto";
+import "posts_v1.proto";
+
+// Tests generated message can correctly reference two packages with the same leaf-name
+
+message Test {
+  users.v1.User user = 1;
+  posts.v1.Post post = 2;
+}

betterproto/tests/inputs/import_packages_same_name/posts_v1.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package posts.v1;
+
+message Post {
+
+}

betterproto/tests/inputs/import_packages_same_name/users_v1.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package users.v1;
+
+message User {
+
+}