Update tests reflecting changes to fixed/ragged dimensions

Author: oliverholworthy

tests/unit/dtypes/test_shape.py

@@ -28,56 +28,53 @@ def test_empty_dimension():
 
 
 def test_min_max_val_dimension():
-    dim = Dimension(2, 3)
+    dim = Dimension((2, 3))
     assert dim.min == 2
     assert dim.max == 3
 
 
 def test_fixed_min_with_unbounded_max():
     dim = Dimension(2)
     assert dim.min == 2
-    assert dim.max is None
+    assert dim.max == 2
 
-    dim = Dimension(2, None)
+    dim = Dimension((2, None))
     assert dim.min == 2
     assert dim.max is None
 
 
 def test_min_is_none_raises_error():
     with pytest.raises(ValueError):
-        Dimension(None)
-
-    with pytest.raises(ValueError):
-        Dimension(None, 1)
+        Dimension((None, 1))
 
 
 def test_bounds_must_be_non_negative():
     with pytest.raises(ValueError):
-        Dimension(-1, 2)
+        Dimension((-1, 2))
 
     with pytest.raises(ValueError):
-        Dimension(2, -1)
+        Dimension((2, -1))
 
 
 def test_max_less_than_min():
     with pytest.raises(ValueError):
-        Dimension(2, 1)
+        Dimension((2, 1))
 
 
 def test_is_bounded():
     dim = Dimension()
     assert dim.is_bounded is False
 
     dim = Dimension(2)
-    assert dim.is_bounded is False
+    assert dim.is_bounded is True
 
-    dim = Dimension(2, 2)
+    dim = Dimension((2, 2))
     assert dim.is_bounded is True
 
-    dim = Dimension(2, 4)
+    dim = Dimension((2, 4))
     assert dim.is_bounded is True
 
-    dim = Dimension(2, None)
+    dim = Dimension((2, None))
     assert dim.is_bounded is False
 
 
@@ -86,15 +83,15 @@ def test_is_fixed():
     assert dim.is_fixed is False
 
     dim = Dimension(2)
-    assert dim.is_fixed is False
+    assert dim.is_fixed is True
 
-    dim = Dimension(2, 2)
+    dim = Dimension((2, 2))
     assert dim.is_fixed is True
 
-    dim = Dimension(2, 4)
+    dim = Dimension((2, 4))
     assert dim.is_fixed is False
 
-    dim = Dimension(2, None)
+    dim = Dimension((2, None))
     assert dim.is_fixed is False
 
 
@@ -103,15 +100,15 @@ def test_is_variable():
     assert dim.is_variable is True
 
     dim = Dimension(2)
-    assert dim.is_variable is True
+    assert dim.is_variable is False
 
-    dim = Dimension(2, 2)
+    dim = Dimension((2, 2))
     assert dim.is_variable is False
 
-    dim = Dimension(2, 4)
+    dim = Dimension((2, 4))
     assert dim.is_variable is True
 
-    dim = Dimension(2, None)
+    dim = Dimension((2, None))
     assert dim.is_variable is True
 
 

tests/unit/schema/test_column_schemas.py

@@ -192,11 +192,9 @@ def test_list_column_attributes():
     assert col3_schema.is_list
     assert col3_schema.is_ragged
 
-    # TODO: Re-enable this test case once we've addressed cases
-    #       like this in downstream libraries
-
-    # with pytest.raises(ValueError):
-    #     ColumnSchema("col4", is_list=True, is_ragged=False)
+    col4_schema = ColumnSchema("col4", is_list=True, is_ragged=False)
+    assert col4_schema.is_list
+    assert col4_schema.is_ragged is False
 
     with pytest.raises(ValueError):
         ColumnSchema("col5", is_list=False, is_ragged=True)
@@ -257,18 +255,18 @@ def test_setting_partial_value_count(value_count):
     )
     assert col_schema.is_list
     assert not col_schema.is_ragged
-    assert col_schema.shape == Shape((None, 10))
+    assert col_schema.shape == Shape((-1, 10))
     assert col_schema.properties["value_count"] == {"min": 10, "max": 10}
 
 
 def test_setting_value_counts_updates_shape_and_flags():
-    col_schema = ColumnSchema("col", dims=(None,))
+    col_schema = ColumnSchema("col", dims=(-1,))
 
     counts = {"min": 4, "max": 5}
     updated_schema = col_schema.with_properties({"value_count": counts})
 
     assert updated_schema.properties["value_count"] == counts
-    assert updated_schema.shape == Shape((None, (4, 5)))
+    assert updated_schema.shape == Shape((-1, (4, 5)))
     assert updated_schema.is_list
     assert updated_schema.is_ragged
 
@@ -287,7 +285,7 @@ def test_setting_flags_updates_shape_and_value_counts():
     col_schema = ColumnSchema("col")
     updated_schema = col_schema.with_dtype(md.int64, is_list=True, is_ragged=True)
 
-    assert updated_schema.shape == Shape((None, None))
+    assert updated_schema.shape == Shape((-1, None))
     assert updated_schema.properties["value_count"] == {"min": 0, "max": None}
     assert updated_schema.is_list
     assert updated_schema.is_ragged