Fix tests

Author: MassimoCimmino

tests/borefield_test.py

@@ -34,25 +34,30 @@ def test_borefield_init(field, request):
 
 
 # Test Borefield.__add__ and Borefield.__radd__
-@pytest.mark.parametrize("field, other_field, field_list, other_field_list", [
-        # Using Borefield and Borehole objects
-        ('single_borehole', 'two_boreholes_inclined', False, False),
-        ('ten_boreholes_rectangular', 'single_borehole_short', False, False),
-        ('ten_boreholes_rectangular', 'two_boreholes_inclined', False, False),
+@pytest.mark.parametrize("field, other_field, field_list, other_field_list, field_borehole, other_field_borehole", [
+        # Using Borefield objects
+        ('ten_boreholes_rectangular', 'two_boreholes_inclined', False, False, False, False),
+        # Using Borefield objects
+        ('single_borehole', 'two_boreholes_inclined', False, False, True, False),
+        ('ten_boreholes_rectangular', 'single_borehole_short', False, False, False, True),
         # Using Borefield as lists
-        ('ten_boreholes_rectangular', 'two_boreholes_inclined', False, True),
-        ('ten_boreholes_rectangular', 'two_boreholes_inclined', True, False),
+        ('ten_boreholes_rectangular', 'two_boreholes_inclined', False, True, False, False),
+        ('ten_boreholes_rectangular', 'two_boreholes_inclined', True, False, False, False),
     ])
-def test_borefield_add(field, other_field, field_list, other_field_list, request):
-    field = request.field
-    other_field = request.other_field
+def test_borefield_add(field, other_field, field_list, other_field_list, field_borehole, other_field_borehole, request):
+    field = request.getfixturevalue(field)
+    other_field = request.getfixturevalue(other_field)
     reference_field = gt.borefield.Borefield.from_boreholes(
         field.to_boreholes() + other_field.to_boreholes()
         )
     if field_list:
         field = field.to_boreholes()
     if other_field_list:
         other_field = other_field.to_boreholes()
+    if field_borehole:
+        field = field[0]
+    if other_field_borehole:
+        other_field = other_field[0]
     assert field + other_field_list == reference_field
 
 

tests/boreholes_test.py

@@ -40,8 +40,8 @@ def test_borehole_init():
         ('single_borehole', 'single_borehole_short', False, True),
     ])
 def test_borehole_add(borehole, other_borehole, borehole_list, other_borehole_list, request):
-    borehole = request.borehole
-    other_borehole = request.other_borehole
+    borehole = request.getfixturevalue(borehole)[0]
+    other_borehole = request.getfixturevalue(other_borehole)[0]
     field = gt.borefield.Borefield.from_boreholes(
         [borehole, other_borehole])
     if borehole_list: