more files

Signed-off-by: Thijs Baaijen <[email protected]>

Author: Thijss

tests/unit/model/arrays/test_filters_filter.py

@@ -17,39 +17,38 @@ def test_filter_by_id_kwarg(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(id=1)
     assert isinstance(array, FancyTestArray)
     assert array.size == 1
-    assert array.id == 1
+    assert array["id"] == 1
 
 
 def test_filter_by_id_arg(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(1)
     assert array.size == 1
-    assert array.id == 1
+    assert array["id"] == 1
 
 
 def test_filter_keeps_original_order():
     original_array = FancyTestArray.zeros(9)
-    original_array.id = [1, 3, 2, 4, 5, 6, 7, 8, 16]
+    original_array["id"] = [1, 3, 2, 4, 5, 6, 7, 8, 16]
     array = original_array.filter(id=[2, 4, 5, 16, 3])
-    np.testing.assert_array_equal([3, 2, 4, 5, 16], array.id)
+    np.testing.assert_array_equal([3, 2, 4, 5, 16], array["id"])
 
 
 def test_filter_by_int(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(test_int=4)
     assert array.size == 1
-    assert array.test_int == 4
+    assert array["test_int"] == 4
 
 
 def test_filter_by_float(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(test_float=1.0)
     assert array.size == 1
-    record = array.record
-    assert math.isclose(record.test_float, 1.0)
+    assert math.isclose(array["test_float"].item(), 1.0)
 
 
 def test_filter_by_str(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(test_str="c")
     assert array.size == 1
-    assert array.test_str == "c"
+    assert array["test_str"] == "c"
 
 
 def test_filter_no_match(fancy_test_array: FancyTestArray):
@@ -60,7 +59,7 @@ def test_filter_no_match(fancy_test_array: FancyTestArray):
 def test_filter_multiple_matches(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(test_float=4.0)
     assert array.size == 2
-    assert_array_equal(array.test_float, [4.0, 4.0])
+    assert_array_equal(array["test_float"], [4.0, 4.0])
 
 
 def test_filter_no_input(fancy_test_array: FancyTestArray):
@@ -76,7 +75,7 @@ def test_filter_empty_list_input(fancy_test_array: FancyTestArray):
 def test_filter_mode_or(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(test_float=1.0, test_str="a", mode_="OR")
     assert 2 == array.size
-    assert_array_equal(array.id, [1, 3])
+    assert_array_equal(array["id"], [1, 3])
 
 
 def test_filter_mask_by_id_kwarg(fancy_test_array: FancyTestArray):
@@ -134,11 +133,11 @@ def test_filter_kwarg_by_set_input(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter(id={1})
     assert isinstance(array, FancyTestArray)
     assert array.size == 1
-    assert array.id == 1
+    assert array["id"] == 1
 
 
 def test_filter_arg_by_set_input(fancy_test_array: FancyTestArray):
     array = fancy_test_array.filter({1, 2})
     assert isinstance(array, FancyTestArray)
     assert array.size == 2
-    assert_array_equal(array.id, [1, 2])
+    assert_array_equal(array["id"], [1, 2])

tests/unit/model/arrays/test_filters_get.py

@@ -15,28 +15,28 @@
 def test_get_by_id_kwarg(fancy_test_array: FancyTestArray):
     array = fancy_test_array.get(id=1)
     assert isinstance(array, FancyTestArray)
-    assert array.id == 1
+    assert array["id"] == 1
 
 
 def test_get_by_id_arg(fancy_test_array: FancyTestArray):
     array = fancy_test_array.get(1)
     assert isinstance(array, FancyTestArray)
-    assert array.id == 1
+    assert array["id"] == 1
 
 
 def test_get_by_int(fancy_test_array: FancyTestArray):
     array = fancy_test_array.get(test_int=4)
-    assert array.test_int == 4
+    assert array["test_int"] == 4
 
 
 def test_get_by_float(fancy_test_array: FancyTestArray):
-    record = fancy_test_array.get(test_float=1.0).record
-    assert math.isclose(record.test_float, 1.0)
+    array = fancy_test_array.get(test_float=1.0)
+    assert math.isclose(array["test_float"].item(), 1.0)
 
 
 def test_get_by_str(fancy_test_array: FancyTestArray):
     array = fancy_test_array.get(test_str="c")
-    assert array.test_str == "c"
+    assert array["test_str"] == "c"
 
 
 def test_get_no_match(fancy_test_array: FancyTestArray):
@@ -58,4 +58,4 @@ def test_get_kwarg_set_input(fancy_test_array: FancyTestArray):
     array = fancy_test_array.get(id={1})
     assert isinstance(array, FancyTestArray)
     assert array.size == 1
-    assert array.id == 1
+    assert array["id"] == 1