TST: Update tests for new helper function values

test/utils/test_axes.py

@@ -180,17 +180,17 @@ def test_basic_indexing_modifies_axes():
     axes = {"ax_time": 0, "ax_coord": 1}
     arr = AxesArray(np.ones(4).reshape((2, 2)), axes)
     slim = arr[1, :, None]
-    with pytest.raises(KeyError):
+    with pytest.raises(AttributeError):
         slim.ax_time
     assert slim.ax_unk == 1
     assert slim.ax_coord == 0
     reverse_slim = arr[None, :, 1]
-    with pytest.raises(KeyError):
+    with pytest.raises(AttributeError):
         reverse_slim.ax_coord
     assert reverse_slim.ax_unk == 0
     assert reverse_slim.ax_time == 1
     almost_new = arr[None, None, 1, :, None, None]
-    with pytest.raises(KeyError):
+    with pytest.raises(AttributeError):
         almost_new.ax_time
     assert almost_new.ax_coord == 2
     assert set(almost_new.ax_unk) == {0, 1, 3, 4}
@@ -232,26 +232,26 @@ def test_adv_indexing_modifies_axes():
 def test_standardize_basic_indexer():
     arr = np.arange(6).reshape(2, 3)
     result_indexer, result_fancy = axes.standardize_indexer(arr, Ellipsis)
-    assert result_indexer == (slice(None), slice(None))
+    assert result_indexer == [slice(None), slice(None)]
     assert result_fancy == ()
 
     result_indexer, result_fancy = axes.standardize_indexer(
         arr, (np.newaxis, 1, 1, Ellipsis)
     )
-    assert result_indexer == (None, 1, 1)
+    assert result_indexer == [None, 1, 1]
     assert result_fancy == ()
 
 
 def test_standardize_fancy_indexer():
     arr = np.arange(6).reshape(2, 3)
     result_indexer, result_fancy = axes.standardize_indexer(arr, [1])
-    assert result_indexer == (np.ones(1), slice(None))
+    assert result_indexer == [np.ones(1), slice(None)]
     assert result_fancy == (0,)
 
     result_indexer, result_fancy = axes.standardize_indexer(
         arr, (np.newaxis, [1], 1, Ellipsis)
     )
-    assert result_indexer == (None, np.ones(1), 1)
+    assert result_indexer == [None, np.ones(1), 1]
     assert result_fancy == (1,)
 
 
@@ -408,18 +408,15 @@ def test_insert_misordered_AxisMapping():
 
 def test_determine_adv_broadcasting():
     indexers = (1, np.ones(1), np.ones((4, 1)), np.ones(3))
-    res_adj, res_nd, res_start = axes._determine_adv_broadcasting(indexers, [1, 2, 3])
-    assert res_adj is True
+    res_nd, res_start = axes._determine_adv_broadcasting(indexers, [1, 2, 3])
     assert res_nd == 2
     assert res_start == 1
 
     indexers = (None, np.ones(1), 2, np.ones(3))
-    res_adj, res_nd, res_start = axes._determine_adv_broadcasting(indexers, [1, 3])
-    assert res_adj is False
+    res_nd, res_start = axes._determine_adv_broadcasting(indexers, [1, 3])
     assert res_nd == 1
     assert res_start == 0
 
-    res_adj, res_nd, res_start = axes._determine_adv_broadcasting(indexers, [])
-    assert res_adj is True
+    res_nd, res_start = axes._determine_adv_broadcasting(indexers, [])
     assert res_nd == 0
     assert res_start is None