Codegen: remove unneeded has|getNumberOf in instance tests

Author: redsun82

misc/codegen/generators/qlgen.py

@@ -361,10 +361,6 @@ def _get_all_properties_to_be_tested(
                 type=p.type if not p.is_predicate else None,
                 is_indexed=p.is_indexed,
             )
-            if p.is_repeated and not p.is_optional:
-                yield ql.PropertyForTest(f"getNumberOf{p.plural}", type="int")
-            elif p.is_optional and not p.is_repeated:
-                yield ql.PropertyForTest(f"has{p.singular}")
 
 
 def _partition_iter(x, pred):

misc/codegen/test/test_qlgen.py

@@ -1038,16 +1038,13 @@ def test_test_partial_properties(opts, generate_tests):
             class_name="B",
             properties=[
                 ql.PropertyForTest(getter="getX", is_total=False, type="string"),
-                ql.PropertyForTest(getter="hasX"),
                 ql.PropertyForTest(
                     getter="getY", is_total=False, is_indexed=True, type="bool"
                 ),
-                ql.PropertyForTest(getter="getNumberOfYs", type="int"),
                 ql.PropertyForTest(
                     getter="getZ", is_total=False, is_indexed=True, type="int"
                 ),
                 ql.PropertyForTest(getter="getAW", is_total=False, type="string"),
-                ql.PropertyForTest(getter="getNumberOfWs", type="int"),
             ],
         ),
     }
@@ -1077,7 +1074,6 @@ def test_test_properties_deduplicated(opts, generate_tests):
                 ql.PropertyForTest(
                     getter="getY", is_total=False, is_indexed=True, type="bool"
                 ),
-                ql.PropertyForTest(getter="getNumberOfYs", type="int"),
             ],
         ),
     }

rust/ql/.generated.list

@@ -1,4 +1,4 @@
 instances
-| gen_abi.rs:7:5:7:14 | Abi | hasAbiString: | yes |
+| gen_abi.rs:7:5:7:14 | Abi |
 getAbiString
 | gen_abi.rs:7:5:7:14 | Abi | "C" |

rust/ql/test/extractor-tests/generated/Abi/Abi.expected

@@ -1,5 +1,5 @@
 instances
-| gen_arg_list.rs:7:8:7:16 | ArgList | getNumberOfArgs: | 3 |
+| gen_arg_list.rs:7:8:7:16 | ArgList |
 getArg
 | gen_arg_list.rs:7:8:7:16 | ArgList | 0 | gen_arg_list.rs:7:9:7:9 | 1 |
 | gen_arg_list.rs:7:8:7:16 | ArgList | 1 | gen_arg_list.rs:7:12:7:12 | 2 |

rust/ql/test/extractor-tests/generated/Abi/Abi.ql

@@ -1,5 +1,5 @@
 instances
-| gen_array_list_expr.rs:5:5:5:13 | [...] | getNumberOfExprs: | 3 | getNumberOfAttrs: | 0 |
+| gen_array_list_expr.rs:5:5:5:13 | [...] |
 getExpr
 | gen_array_list_expr.rs:5:5:5:13 | [...] | 0 | gen_array_list_expr.rs:5:6:5:6 | 1 |
 | gen_array_list_expr.rs:5:5:5:13 | [...] | 1 | gen_array_list_expr.rs:5:9:5:9 | 2 |

rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected

@@ -1,5 +1,5 @@
 instances
-| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | getNumberOfExprs: | 2 | getNumberOfAttrs: | 0 | getRepeatOperand: | gen_array_repeat_expr.rs:5:6:5:6 | 1 | getRepeatLength: | gen_array_repeat_expr.rs:5:9:5:10 | 10 |
+| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | getRepeatOperand: | gen_array_repeat_expr.rs:5:6:5:6 | 1 | getRepeatLength: | gen_array_repeat_expr.rs:5:9:5:10 | 10 |
 getExpr
 | gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 0 | gen_array_repeat_expr.rs:5:6:5:6 | 1 |
 | gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 1 | gen_array_repeat_expr.rs:5:9:5:10 | 10 |