tests/extmod/ubinascii: Add tests for bytes.hex etc.

Also make the sep test not micropython-specific.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

5 files changed, 44 insertions, 25 deletions

diff --git a/tests/basics/builtin_str_hex.py b/tests/basics/builtin_str_hex.py
new file mode 100644
index 0000000000..7390c8eaee
--- /dev/null
+++ b/tests/basics/builtin_str_hex.py
@@ -0,0 +1,24 @@
+if not hasattr(bytes, "fromhex"):
+    print("SKIP")
+    raise SystemExit
+
+for x in (
+    b"\x00\x01\x02\x03\x04\x05\x06\x07",
+    b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+    b"\x7f\x80\xff",
+    b"1234ABCDabcd",
+):
+    print(x.hex())
+    print(bytearray(x).hex())
+    print(memoryview(x).hex())
+    print(x.hex(":"))
+    print(bytearray(x).hex(":"))
+    print(memoryview(x).hex(":"))
+
+for x in (
+    "0001020304050607",
+    "08090a0b0c0d0e0f",
+    "7f80ff",
+    "313233344142434461626364",
+):
+    print(bytes.fromhex(x))
diff --git a/tests/extmod/ubinascii_hexlify.py b/tests/extmod/ubinascii_hexlify.py
index 2329f53edd..3c266fb6cc 100644
--- a/tests/extmod/ubinascii_hexlify.py
+++ b/tests/extmod/ubinascii_hexlify.py
@@ -7,7 +7,16 @@ except ImportError:
     print("SKIP")
     raise SystemExit
 
-print(binascii.hexlify(b"\x00\x01\x02\x03\x04\x05\x06\x07"))
-print(binascii.hexlify(b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"))
-print(binascii.hexlify(b"\x7f\x80\xff"))
-print(binascii.hexlify(b"1234ABCDabcd"))
+for x in (
+    b"\x00\x01\x02\x03\x04\x05\x06\x07",
+    b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+    b"\x7f\x80\xff",
+    b"1234ABCDabcd",
+):
+    print(binascii.hexlify(x))
+
+# Two-argument version (now supported in CPython)
+print(binascii.hexlify(b"123", ":"))
+
+# zero length buffer
+print(binascii.hexlify(b"", b":"))
diff --git a/tests/extmod/ubinascii_micropython.py b/tests/extmod/ubinascii_micropython.py
deleted file mode 100644
index 94e8daa557..0000000000
--- a/tests/extmod/ubinascii_micropython.py
+++ /dev/null
@@ -1,15 +0,0 @@
-try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-# two arguments supported in uPy but not CPython
-a = binascii.hexlify(b"123", ":")
-print(a)
-
-# zero length buffer
-print(binascii.hexlify(b"", b":"))
diff --git a/tests/extmod/ubinascii_micropython.py.exp b/tests/extmod/ubinascii_micropython.py.exp
deleted file mode 100644
index a195d2602c..0000000000
--- a/tests/extmod/ubinascii_micropython.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-b'31:32:33'
-b''
diff --git a/tests/extmod/ubinascii_unhexlify.py b/tests/extmod/ubinascii_unhexlify.py
index 413eaf1b6f..2c3598ab98 100644
--- a/tests/extmod/ubinascii_unhexlify.py
+++ b/tests/extmod/ubinascii_unhexlify.py
@@ -7,10 +7,13 @@ except ImportError:
     print("SKIP")
     raise SystemExit
 
-print(binascii.unhexlify(b"0001020304050607"))
-print(binascii.unhexlify(b"08090a0b0c0d0e0f"))
-print(binascii.unhexlify(b"7f80ff"))
-print(binascii.unhexlify(b"313233344142434461626364"))
+for x in (
+    b"0001020304050607",
+    b"08090a0b0c0d0e0f",
+    b"7f80ff",
+    b"313233344142434461626364",
+):
+    print(binascii.unhexlify(x))
 
 try:
     a = binascii.unhexlify(b"0")  # odd buffer length