merge development

1 files changed, 38 insertions, 1 deletions

diff --git a/python-packages/order_utils/test/test_asset_data_utils.py b/python-packages/order_utils/test/test_asset_data_utils.py
index eeada5873..079368714 100644
--- a/python-packages/order_utils/test/test_asset_data_utils.py
+++ b/python-packages/order_utils/test/test_asset_data_utils.py
@@ -3,9 +3,12 @@
 import pytest
 
 from zero_ex.order_utils.asset_data_utils import (
-    encode_erc20_asset_data,
     decode_erc20_asset_data,
+    decode_erc721_asset_data,
+    encode_erc20_asset_data,
+    encode_erc721_asset_data,
     ERC20_ASSET_DATA_BYTE_LENGTH,
+    ERC721_ASSET_DATA_MINIMUM_BYTE_LENGTH,
 )
 
 
@@ -33,3 +36,37 @@ def test_decode_erc20_asset_data_invalid_proxy_id():
         decode_erc20_asset_data(
             "0xffffffff" + (" " * ERC20_ASSET_DATA_BYTE_LENGTH)
         )
+
+
+def test_encode_erc721_asset_data_type_error_on_token_address():
+    """Test that passing a non-string for token_address raises a TypeError."""
+    with pytest.raises(TypeError):
+        encode_erc721_asset_data(123, 123)
+
+
+def test_encode_erc721_asset_data_type_error_on_token_id():
+    """Test that passing a non-int for token_id raises a TypeError."""
+    with pytest.raises(TypeError):
+        encode_erc721_asset_data("asdf", "asdf")
+
+
+def test_decode_erc721_asset_data_type_error():
+    """Test that passing a non-string for asset_data raises a TypeError."""
+    with pytest.raises(TypeError):
+        decode_erc721_asset_data(123)
+
+
+def test_decode_erc721_asset_data_with_asset_data_too_short():
+    """Test that passing in too short of a string raises a ValueError."""
+    with pytest.raises(ValueError):
+        decode_erc721_asset_data(
+            " " * (ERC721_ASSET_DATA_MINIMUM_BYTE_LENGTH - 1)
+        )
+
+
+def test_decode_erc721_asset_data_invalid_proxy_id():
+    """Test that passing in too short of a string raises a ValueError."""
+    with pytest.raises(ValueError):
+        decode_erc721_asset_data(
+            "0xffffffff" + " " * (ERC721_ASSET_DATA_MINIMUM_BYTE_LENGTH - 1)
+        )