Better Testing (#174)

Fixes  #174
Fixes #168

Author: gordonwatts

.github/workflows/ci.yaml

@@ -58,7 +58,7 @@ jobs:
       run: |
         python -m pytest -m "not atlas_xaod_runner and not cms_aod_runner"
     - name: Report coverage with Codecov
-      if: github.event_name == 'push' && matrix.python-version == 3.7 && matrix.platform == 'ubuntu-latest'
+      if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
       uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

func_adl_xAOD/common/ast_to_cpp_translator.py

@@ -802,6 +802,25 @@ def visit_Num(self, node):
     def visit_Str(self, node):
         crep.set_rep(node, crep.cpp_value('"{0}"'.format(node.s), self._gc.current_scope(), ctyp.terminal("string")))
 
+    def visit_Constant(self, node: ast.Constant):
+        '''Visit Constnat node.
+
+        Note that this has to take the place of `visit_Str` and `visit_Num` as we roll
+        python versions forward. So those methods and this method must be kept in sync.
+
+        Args:
+            node (ast.Constant): The constant to visit
+        '''
+        value = node.value
+        if type(value) is str:
+            crep.set_rep(node, crep.cpp_value(f'"{value}"', self._gc.current_scope(), ctyp.terminal("string")))
+        elif type(value) is int:
+            crep.set_rep(node, crep.cpp_value(value, self._gc.current_scope(), ctyp.terminal("int")))
+        elif type(value) is float:
+            crep.set_rep(node, crep.cpp_value(value, self._gc.current_scope(), ctyp.terminal("double")))
+        else:
+            raise Exception(f"Unsupported constant type: {type(value)}")
+
     def code_fill_ttree(self, e_rep: crep.cpp_rep_base, e_name: crep.cpp_variable,
                         scope_fill: Union[gc_scope, gc_scope_top_level]) -> Union[gc_scope, gc_scope_top_level]:
         '''
@@ -1016,11 +1035,10 @@ def call_Where(self, node: ast.AST, args: List[ast.AST]):
         new_sequence_var = w_val.copy_with_new_scope(self._gc.current_scope())
         crep.set_rep(node, crep.cpp_sequence(new_sequence_var, seq.iterator_value(), self._gc.current_scope()))
 
-    def call_Range(self, node: ast.AST, args: List[ast.AST]):
+    def call_Range(self, node: ast.Call, args: List[ast.AST]):
         'Create a collection of numbers from lower_bound'
 
-        if len(args) != 2:
-            raise Exception('blah blah')
+        assert len(args) == 2, 'Range(lower bound, upper bound) is the only allowed form'
         lower_bound = args[0]
         upper_bound = args[1]
 

tests/atlas/xaod/test_cpp_script_control.py

@@ -32,7 +32,7 @@ async def execute_result_async(self, a: ast.AST) -> Any:
         return ExecutorInfo(f_spec.main_script, f_spec.result_rep.filename)
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def cache_directory():
     'Return a directory that can be deleted when the test is done'
     with tempfile.TemporaryDirectory() as d_temp:

tests/atlas/xaod/test_integrated_query.py

@@ -33,7 +33,7 @@ def test_select_first_of_array():
     assert training_df.iloc[-1]['col1'] == 336
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def event_loop():
     'Get the loop done right on windows'
     if os.name == 'nt':
@@ -148,7 +148,7 @@ def test_1D_array():
                              .Select('lambda e: e.Jets("AntiKt4EMTopoJets").Select(lambda j: j.pt()/1000.0)'))
     print(training_df)
     assert len(training_df[b'col1']) == 10
-    assert len(training_df[b'col1'][0]) == 32
+    assert len(training_df[b'col1'][0]) == 32  # type: ignore
 
 
 def test_2D_array():
@@ -157,8 +157,8 @@ def test_2D_array():
                              .Select('lambda e: e.Jets("AntiKt4EMTopoJets").Select(lambda j: j.Jets("AntiKt4EMTopoJets").Select(lambda j1: j1.pt()/1000.0))'))
     print(training_df)
     assert len(training_df[b'col1']) == 10
-    assert len(training_df[b'col1'][0]) == 32
-    assert len(training_df[b'col1'][0][0]) == 32
+    assert len(training_df[b'col1'][0]) == 32  # type: ignore
+    assert len(training_df[b'col1'][0][0]) == 32  # type: ignore
 
 
 def test_2D_nested_where():
@@ -172,4 +172,4 @@ def test_2D_nested_where():
     print(training_df)
     a = training_df[b'col1']
     assert len(a) == 10
-    assert len(a[0]) == 8
+    assert len(a[0]) == 8  # type: ignore

tests/atlas/xaod/test_query_ast_visitor.py

@@ -1,5 +1,6 @@
 # Some very direct white box testing
 import ast
+import sys
 
 import func_adl_xAOD.common.cpp_representation as crep
 import func_adl_xAOD.common.cpp_types as ctyp
@@ -27,6 +28,19 @@ def test_binary_plus_return_type_2():
     assert r.cpp_type().type == 'double'
 
 
+def test_complex_number_not_understood():
+    if sys.version_info >= (3, 8):
+        import cmath  # NOQA
+        c = complex(1, 2)
+        node = ast.Constant(value=c, kind=None)
+
+        q = atlas_xaod_query_ast_visitor()
+        with pytest.raises(Exception) as e:
+            q.get_rep(node)
+
+        assert 'complex' in str(e)
+
+
 def test_binary_plus_return_type_3():
     q = atlas_xaod_query_ast_visitor()
     r = q.get_rep(ast.parse('1+1').body[0].value)  # type: ignore

tests/atlas/xaod/test_xaod_executor.py

@@ -1,7 +1,9 @@
-from tests.utils.locators import find_line_numbers_with, find_line_with, find_open_blocks
-from tests.utils.general import get_lines_of_code, print_lines
 import pytest
+from func_adl import Range
 from tests.atlas.xaod.utils import atlas_xaod_dataset, exe_from_qastle
+from tests.utils.general import get_lines_of_code, print_lines
+from tests.utils.locators import (find_line_numbers_with, find_line_with,
+                                  find_open_blocks)
 
 # Tests that make sure the xaod executor is working correctly
 
@@ -596,3 +598,20 @@ async def test_electron_and_muon_from_qastle():
     q = "(call ResultTTree (call Select (call Select (call EventDataset (list 'localds:bogus')) (lambda (list e) (list (call (attr e 'Electrons') 'Electrons') (call (attr e 'Muons') 'Muons')))) (lambda (list e) (list (call (attr (subscript e 0) 'Select') (lambda (list ele) (call (attr ele 'E')))) (call (attr (subscript e 0) 'Select') (lambda (list ele) (call (attr ele 'pt')))) (call (attr (subscript e 0) 'Select') (lambda (list ele) (call (attr ele 'phi')))) (call (attr (subscript e 0) 'Select') (lambda (list ele) (call (attr ele 'eta')))) (call (attr (subscript e 1) 'Select') (lambda (list mu) (call (attr mu 'E')))) (call (attr (subscript e 1) 'Select') (lambda (list mu) (call (attr mu 'pt')))) (call (attr (subscript e 1) 'Select') (lambda (list mu) (call (attr mu 'phi')))) (call (attr (subscript e 1) 'Select') (lambda (list mu) (call (attr mu 'eta'))))))) (list 'e_E' 'e_pt' 'e_phi' 'e_eta' 'mu_E' 'mu_pt' 'mu_phi' 'mu_eta') 'forkme' 'dude.root')"
     r = await exe_from_qastle(q)
     print(r)
+
+
+def test_Range_good_call():
+    # The following statement should be a straight sequence, not an array.
+    r = (atlas_xaod_dataset()
+         .SelectMany(lambda e: e.Jets("AntiKt4EMTopoJets"))
+         .Select(lambda j: Range(0, 10)
+                 .Select(lambda index: j.pt() * index))
+         .value()
+         )
+    # Check to see if there mention of push_back anywhere.
+    lines = get_lines_of_code(r)
+    print_lines(lines)
+    for_loops = find_line_numbers_with('for (', lines)
+    assert len(for_loops) == 2
+    find_line_with('(0)', lines)
+    find_line_with('(10)', lines)