Add more base64 array_ok tests

marthacryan · marthacryan · commit e500e385e045 · 2024-08-07T15:09:20.000-07:00
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_color_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_color_validator.py
@@ -1,6 +1,7 @@
 import pytest
 from _plotly_utils.basevalidators import ColorValidator
 import numpy as np
+from plotly.tests.b64 import b64
 
 
 # Fixtures
@@ -131,6 +132,18 @@ def test_acceptance_aok(val, validator_aok):
         assert coerce_val == val
 
 
+# Test that it doesn't use a base64 array
+# Numpy v2 has a StrDType but we don't want to convert it yet.
+# Change this test if you add support for it.
+def test_acceptance_aok_base64_array(validator_aok):
+    val = b64(np.array(['aliceblue', 'antiquewhite', 'aqua', 'aquamarine', 'azure']))
+    coerce_val = validator_aok.validate_coerce(val)
+    assert coerce_val[0] == 'aliceblue'
+    assert coerce_val[1] == 'antiquewhite'
+    assert coerce_val[2] == 'aqua'
+    assert coerce_val[3] == 'aquamarine'
+    assert coerce_val[4] == 'azure'
+
 @pytest.mark.parametrize(
     "val",
     [
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_colorlist_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_colorlist_validator.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from _plotly_utils.basevalidators import ColorlistValidator
-
+from plotly.tests.b64 import b64
 
 # Fixtures
 # --------
@@ -48,3 +48,12 @@ def test_acceptance_aok(val, validator):
     coerce_val = validator.validate_coerce(val)
     assert isinstance(coerce_val, list)
     assert validator.present(coerce_val) == tuple(val)
+
+# Test that it doesn't use a base64 array
+# Numpy v2 has a StrDType but we don't want to convert it yet.
+# Change this test if you add support for it.
+def test_acceptance_b64_aok(validator):
+    val = b64(np.array(["red", "rgb(255, 0, 0)"]))
+    coerce_val = validator.validate_coerce(val)
+    assert coerce_val[0] == "red"
+    assert coerce_val[1] == "rgb(255, 0, 0)"
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_compoundarray_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_compoundarray_validator.py
@@ -1,7 +1,8 @@
 import pytest
 from _plotly_utils.basevalidators import CompoundArrayValidator
 from plotly.graph_objs.layout import Image
-
+import numpy as np
+from plotly.tests.b64 import b64
 
 # Fixtures
 # --------
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_enumerated_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_enumerated_validator.py
@@ -2,6 +2,7 @@
 import numpy as np
 import pandas as pd
 from _plotly_utils.basevalidators import EnumeratedValidator
+from plotly.tests.b64 import b64
 
 
 # Fixtures
@@ -93,6 +94,12 @@ def test_acceptance_aok(val, validator_aok):
     else:
         assert coerce_val == val
 
+# Test base64 array
+def test_aok_base64_array(validator_aok):
+    val = b64(np.array([1, 2, 3], dtype="int64"))
+    coerce_val = validator_aok.validate_coerce(val)
+    assert coerce_val["bdata"] == "AQID"
+    assert coerce_val["dtype"] == "i1"
 
 # ### Rejection by value ###
 @pytest.mark.parametrize("val", [True, 0, 1, 23, np.inf, set()])
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_flaglist_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_flaglist_validator.py
@@ -2,7 +2,7 @@
 import pytest
 from _plotly_utils.basevalidators import FlaglistValidator
 import numpy as np
-
+from plotly.tests.b64 import b64
 
 EXTRAS = ["none", "all", True, False, 3]
 FLAGS = ["lines", "markers", "text"]
@@ -130,6 +130,14 @@ def test_acceptance_aok_scalar_extra(extra, validator_extra_aok):
     assert validator_extra_aok.validate_coerce(extra) == extra
 
 
+# Test base64 array
+def test_acceptance_aok_scalar_base64(validator_extra_aok):
+    val = b64(np.array([1, 2, 3], dtype="int64"))
+    coerce_val = validator_extra_aok.validate_coerce(val)
+    assert coerce_val["bdata"] == "AQID"
+    assert coerce_val["dtype"] == "i1"
+
+
 # ### Acceptance (lists) ###
 def test_acceptance_aok_scalarlist_flaglist(flaglist, validator_extra_aok):
     assert np.array_equal(
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_number_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_number_validator.py
@@ -4,6 +4,7 @@
 from _plotly_utils.basevalidators import NumberValidator
 import numpy as np
 import pandas as pd
+from plotly.tests.b64 import b64
 
 # Fixtures
 # --------
@@ -108,6 +109,14 @@ def test_acceptance_aok_list(val, validator_aok):
     )
 
 
+# Test base64 array
+def test_acceptance_aok_base64(validator_aok):
+    val = b64(np.array([1, 2, 3], dtype="int64"))
+    coerce_val = validator_aok.validate_coerce(val)
+    assert coerce_val["bdata"] == "AQID"
+    assert coerce_val["dtype"] == "i1"
+
+
 # ### Coerce ###
 #     Coerced to general consistent numeric type
 @pytest.mark.parametrize(
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_string_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_string_validator.py
@@ -3,6 +3,8 @@
 from _plotly_utils.basevalidators import StringValidator
 import numpy as np
 
+from plotly.tests.b64 import b64
+
 
 # Fixtures
 # --------
@@ -145,6 +147,17 @@ def test_acceptance_aok_list(val, validator_aok):
         assert coerce_val == val
 
 
+# Test that it doesn't use a base64 array
+# Numpy v2 has a StrDType but we don't want to convert it yet.
+# Change this test if you add support for it.
+def test_aok_base64_array(validator_aok):
+    val = b64(np.array(['a', 'b', 'c'], dtype=np.dtypes.StrDType))
+    coerce_val = validator_aok.validate_coerce(val)
+    assert coerce_val[0] == 'a'
+    assert coerce_val[1] == 'b'
+    assert coerce_val[2] == 'c'
+
+
 # ### Rejection by type ###
 @pytest.mark.parametrize("val", [["foo", ()], ["foo", 3, 4], [3, 2, 1]])
 def test_rejection_aok(val, validator_aok_strict):
