parameterize flatdata-generator tests

Signed-off-by: mohapatr3 <[email protected]>

Author: mohapatr3

.github/workflows/generator.yml

@@ -26,6 +26,6 @@ jobs:
       - name: Run tests
         run: |
           cd flatdata-generator
-          uv run --with pytest pytest
+          uv run --with pytest pytest -v
           pip install .
           flatdata-generator --help

flatdata-generator/tests/generators/test_cpp_generator.py

@@ -21,6 +21,12 @@ def generate_and_compare(test_case):
 
     generate_and_assert_in(test, CppGenerator, *expectations)
 
-def test_against_expectations():
+def get_test_cases():
+    test_cases = []
     for x in schemas_and_expectations(generator='cpp', extension='h'):
-        generate_and_compare(x)
+        test_cases.append(x)
+    return test_cases
+
+@pytest.mark.parametrize("case", get_test_cases())
+def test_against_expectations(case):
+    generate_and_compare(case)

flatdata-generator/tests/generators/test_dot_generator.py

@@ -33,6 +33,12 @@ def generate_and_compare(test_case):
 
     generate_and_assert_in(test, DotGenerator, *expectations)
 
-def test_against_expectations():
+def get_test_cases():
+    test_cases = []
     for x in schemas_and_expectations(generator='dot', extension='dot'):
-        generate_and_compare(x)
+        test_cases.append(x)
+    return test_cases
+
+@pytest.mark.parametrize("case", get_test_cases())
+def test_against_expectations(case):
+    generate_and_compare(case)

flatdata-generator/tests/generators/test_flatdata_generator.py

@@ -18,10 +18,16 @@ def generate_and_compare(test_case):
     contents = FlatdataGenerator().render(tree)
     assert expectation == contents
 
-def test_against_expectations():
-    for i in schemas_and_expectations(generator='flatdata', extension='flatdata'):
-        generate_and_compare((i[1], i[1]))
+def get_test_cases():
+    test_cases = []
+    for x in schemas_and_expectations(generator='flatdata', extension='flatdata'):
+        test_cases.append(x)
+    return test_cases
 
-def test_normalization_is_fixed_point():
-    for i in schemas_and_expectations(generator='flatdata', extension='flatdata'):
-        generate_and_compare((i[1], i[1]))
+@pytest.mark.parametrize("case", get_test_cases())
+def test_against_expectations(case):
+    generate_and_compare(case)
+
+@pytest.mark.parametrize("case", get_test_cases())
+def test_normalization_is_fixed_point(case):
+    generate_and_compare((case[1], case[1]))

flatdata-generator/tests/generators/test_go_generator.py

@@ -25,11 +25,16 @@ def generate_and_compare(test_case):
 def skip(test_case):
     raise pytest.skip("Test %s is skipped" % test_case[0])
 
-
-def test_against_expectations():
+def get_test_cases():
+    test_cases = []
     for x in schemas_and_expectations(generator='go', extension='go'):
-        # Go does not yet support namespaces, enums, ranges, or constants, skip those tests
-        if "enums" not in x[0] and "constants" not in x[0] and "namespaces" not in x[0] and "ranges" not in x[0]:
-            generate_and_compare(x)
-        else:
-            skip(x)
+        test_cases.append(x)
+    return test_cases
+
+@pytest.mark.parametrize("test_case", get_test_cases())
+def test_against_expectations(test_case):
+    # Go does not yet support namespaces, enums, ranges, or constants, skip those tests
+    if "enums" not in test_case[0] and "constants" not in test_case[0] and "namespaces" not in test_case[0] and "ranges" not in test_case[0]:
+        generate_and_compare(test_case)
+    else:
+        skip(test_case)

flatdata-generator/tests/generators/test_python_generator.py

@@ -24,10 +24,16 @@ def generate_and_compare(test_case):
 def skip(test_case):
     raise pytest.skip("Test %s is skipped" % test_case[0])
 
-def test_against_expectations():
+def get_test_cases():
+    test_cases = []
     for x in schemas_and_expectations(generator='py', extension='py'):
-        # Python does not yet support enums or constants, skip those tests
-        if "enums" not in x[0] and "constants" not in x[0]:
-            generate_and_compare(x)
-        else:
-            skip(x)
+        test_cases.append(x)
+    return test_cases
+
+@pytest.mark.parametrize("test_case", get_test_cases())
+def test_against_expectations(test_case):
+    # Python does not yet support enums or constants, skip those tests
+    if "enums" not in test_case[0] and "constants" not in test_case[0]:
+        generate_and_compare(test_case)
+    else:
+        skip(test_case)

flatdata-generator/tests/generators/test_rust_generator.py

@@ -37,6 +37,12 @@ def generate_and_compare(test_case):
 
     generate_and_assert_in(test, RustGenerator, *expectations)
 
-def test_against_expectations():
+def get_test_cases():
+    test_cases = []
     for x in schemas_and_expectations(generator='rust', extension='rs'):
-        generate_and_compare(x)
+        test_cases.append(x)
+    return test_cases
+
+@pytest.mark.parametrize("test_case", get_test_cases())
+def test_against_expectations(test_case):
+    generate_and_compare(test_case)

flatdata-generator/tests/tree/test_node_tree_builder.py

@@ -162,18 +162,8 @@ def test_two_structures_are_parsed_correctly():
     check_struct(tree.find(".foo.Bar"), 2, 1)
     check_struct(tree.find(".foo.Baz"), 17, 3)
 
-
-def test_implicit_field_widths_are_set_correctly():
-    def __test(typename, width):
-        tree = _build_node_tree("""namespace n{
-            struct s {
-                f : %s;
-            }
-            }
-            """ % typename)
-        _compute_structure_sizes(tree)
-        check_field(tree.find('.n.s.f'), typename, width, 0)
-
+def get_test_cases_implicit_field_widths_are_set_correctly():
+    test_cases = []
     for typename, width in [
         ('bool', 1),
         ('u8', 8),
@@ -185,10 +175,37 @@ def __test(typename, width):
         ('u64', 64),
         ('i64', 64)
     ]:
-        __test(typename, width)
+        test_cases.append((typename, width))
+    return test_cases
 
+@pytest.mark.parametrize("test_case", get_test_cases_implicit_field_widths_are_set_correctly())
+def test_implicit_field_widths_are_set_correctly(test_case):
+    def __test(typename, width):
+        tree = _build_node_tree("""namespace n{
+            struct s {
+                f : %s;
+            }
+            }
+            """ % typename)
+        _compute_structure_sizes(tree)
+        check_field(tree.find('.n.s.f'), typename, width, 0)
+
+    __test(test_case[0], test_case[1])
 
-def test_archives_resources_references_are_populated():
+
+def get_test_cases_archives_resources_references_are_populated():
+    test_cases = []
+    for values in [
+        ("T", {".foo.A.resourceA.@T"}),
+        ("vector< bar.T >", {".foo.A.resourceA.@bar@T"}),
+        ("multivector< 33, T, foo.T, bar.baz.Boo >",
+         {".foo.A.resourceA.@T", ".foo.A.resourceA.@foo@T", ".foo.A.resourceA.@bar@baz@Boo"})
+    ]:
+        test_cases.append(values)
+    return test_cases
+
+@pytest.mark.parametrize("test_case", get_test_cases_archives_resources_references_are_populated())
+def test_archives_resources_references_are_populated(test_case):
     def __test(schema, references):
         tree = _build_node_tree("""namespace foo{
             archive A {
@@ -201,13 +218,7 @@ def __test(schema, references):
         for r in references:
             assert isinstance(tree.find(r), refs.TypeReference)
 
-    for values in [
-        ("T", {".foo.A.resourceA.@T"}),
-        ("vector< bar.T >", {".foo.A.resourceA.@bar@T"}),
-        ("multivector< 33, T, foo.T, bar.baz.Boo >",
-         {".foo.A.resourceA.@T", ".foo.A.resourceA.@foo@T", ".foo.A.resourceA.@bar@baz@Boo"})
-    ]:
-        __test(values[0], values[1])
+    __test(test_case[0], test_case[1])
 
 
 def test_archives_archive_resources_references_are_populated():

flatdata-generator/tests/tree/test_syntax_tree_builder.py

@@ -20,14 +20,20 @@
     FieldReference, ArchiveReference, BuiltinStructureReference, ConstantValueReference, \
     EnumerationReference, InvalidValueReference
 
-def test_validating_archive_with_no_structure_defined_raises_missing_symbol_error():
+def get_test_cases():
+    test_cases = []
+    for t in ["T", "vector< T >", "multivector< 33, V>"]:
+        test_cases.append(t)
+    return test_cases
+
+@pytest.mark.parametrize("test_case", get_test_cases())
+def test_validating_archive_with_no_structure_defined_raises_missing_symbol_error(test_case):
     def __test(resource_type):
         with pytest.raises(MissingSymbol):
             build_ast(
                 """namespace foo{ archive A { resourceA : %s; } }""" % resource_type)
 
-    for t in ["T", "vector< T >", "multivector< 33, V>"]:
-        __test(t)
+    __test(test_case)
 
 def test_const_ref_with_mismatched_type():
     with pytest.raises(InvalidConstReference):
@@ -433,8 +439,21 @@ def test_tree_with_all_features_schema_results_in_the_same_normalized_tree():
         '.ns._builtin.multivector.IndexType14.value': Field,
     } == generated_tree.symbols(include_types=True)
 
+def get_test_cases_resource_types_are_populated_from_structure_references():
+    test_cases = []
+    for values in [
+        ("T", res.Instance, {"referenced_structures": [".n.A.r.@@n@T"]}),
+        ("vector< T >", res.Vector, {"referenced_structures": [".n.A.r.@@n@T"]}),
+        ("multivector< 33, T>", res.Multivector, {
+            "referenced_structures": ['.n.A.r.@@n@_builtin@multivector@IndexType33',
+                                      '.n.A.r.@@n@T']}),
+        ("raw_data", res.RawData, {"referenced_structures": []})
+    ]:
+        test_cases.append(values)
+    return test_cases
 
-def test_resource_types_are_populated_from_structure_references():
+@pytest.mark.parametrize("test_case", get_test_cases_resource_types_are_populated_from_structure_references())
+def test_resource_types_are_populated_from_structure_references(test_case):
     def __test(schema, resource_type, properties):
         tree = build_ast("""namespace n{
             struct T {
@@ -455,15 +474,7 @@ def __test(schema, resource_type, properties):
             assert hasattr(r, k)
             assert [tree.find(v) for v in values] == getattr(r, k)
 
-    for values in [
-        ("T", res.Instance, {"referenced_structures": [".n.A.r.@@n@T"]}),
-        ("vector< T >", res.Vector, {"referenced_structures": [".n.A.r.@@n@T"]}),
-        ("multivector< 33, T>", res.Multivector, {
-            "referenced_structures": ['.n.A.r.@@n@_builtin@multivector@IndexType33',
-                                      '.n.A.r.@@n@T']}),
-        ("raw_data", res.RawData, {"referenced_structures": []})
-    ]:
-        __test(values[0], values[1], values[2])
+    __test(test_case[0], test_case[1], test_case[2])
 
 
 def test_constants_are_referred_from_every_archive():