summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2015-08-30 00:30:28 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2015-08-30 00:38:00 +0300
commit58d9b10d70a584ee1a958c4f85708277404cf45a (patch)
treef9db1140e05e4f2355bd20967bbc702ffa73de93
parent0a8b5d160bf9297dcb39af5657f61141038a0855 (diff)
downloadmicropython-58d9b10d70a584ee1a958c4f85708277404cf45a.tar.gz
micropython-58d9b10d70a584ee1a958c4f85708277404cf45a.zip
tests: Split byteorder-dependent tests to *_endian.py's.
-rw-r--r--tests/basics/array_construct.py2
-rw-r--r--tests/basics/array_construct_endian.py6
-rw-r--r--tests/basics/bytearray_construct.py3
-rw-r--r--tests/basics/bytearray_construct_endian.py7
-rw-r--r--tests/basics/bytes_add.py4
-rw-r--r--tests/basics/bytes_add_endian.py5
-rw-r--r--tests/basics/bytes_construct.py3
-rw-r--r--tests/basics/bytes_construct_endian.py7
8 files changed, 31 insertions, 6 deletions
diff --git a/tests/basics/array_construct.py b/tests/basics/array_construct.py
index 8c0b4b5973..0625111c9e 100644
--- a/tests/basics/array_construct.py
+++ b/tests/basics/array_construct.py
@@ -7,7 +7,7 @@ print(array('b', (1, 2)))
print(array('h', [1, 2]))
# raw copy from bytes, bytearray
-print(array('h', b'12'))
+print(array('h', b'22')) # should be byteorder-neutral
print(array('h', bytearray(2)))
print(array('i', bytearray(4)))
diff --git a/tests/basics/array_construct_endian.py b/tests/basics/array_construct_endian.py
new file mode 100644
index 0000000000..1ea8230532
--- /dev/null
+++ b/tests/basics/array_construct_endian.py
@@ -0,0 +1,6 @@
+# test construction of array.array from different objects
+
+from array import array
+
+# raw copy from bytes, bytearray
+print(array('h', b'12'))
diff --git a/tests/basics/bytearray_construct.py b/tests/basics/bytearray_construct.py
index def78c0d21..1c45f6fcf5 100644
--- a/tests/basics/bytearray_construct.py
+++ b/tests/basics/bytearray_construct.py
@@ -9,5 +9,4 @@ print(bytearray([1, 2]))
# arrays
print(bytearray(array('b', [1, 2])))
-print(bytearray(array('h', [1, 2])))
-print(bytearray(array('I', [1, 2])))
+print(bytearray(array('h', [0x101, 0x202])))
diff --git a/tests/basics/bytearray_construct_endian.py b/tests/basics/bytearray_construct_endian.py
new file mode 100644
index 0000000000..dbd635c0c9
--- /dev/null
+++ b/tests/basics/bytearray_construct_endian.py
@@ -0,0 +1,7 @@
+# test construction of bytearray from different objects
+
+from array import array
+
+# arrays
+print(bytearray(array('h', [1, 2])))
+print(bytearray(array('I', [1, 2])))
diff --git a/tests/basics/bytes_add.py b/tests/basics/bytes_add.py
index 1288d5ac33..7a887db231 100644
--- a/tests/basics/bytes_add.py
+++ b/tests/basics/bytes_add.py
@@ -5,5 +5,7 @@ print(b"123" + bytearray(2))
import array
-print(b"123" + array.array('i', [1]))
+# should be byteorder-neutral
+print(b"123" + array.array('h', [0x1515]))
+
print(b"\x01\x02" + array.array('b', [1, 2]))
diff --git a/tests/basics/bytes_add_endian.py b/tests/basics/bytes_add_endian.py
new file mode 100644
index 0000000000..5471280d93
--- /dev/null
+++ b/tests/basics/bytes_add_endian.py
@@ -0,0 +1,5 @@
+# test bytes + other
+
+import array
+
+print(b"123" + array.array('i', [1]))
diff --git a/tests/basics/bytes_construct.py b/tests/basics/bytes_construct.py
index 0cf0540c7a..e43c8179fc 100644
--- a/tests/basics/bytes_construct.py
+++ b/tests/basics/bytes_construct.py
@@ -9,8 +9,7 @@ print(bytes(bytearray(4)))
# arrays
print(bytes(array('b', [1, 2])))
-print(bytes(array('h', [1, 2])))
-print(bytes(array('I', [1, 2])))
+print(bytes(array('h', [0x101, 0x202])))
# long ints
print(ord(bytes([14953042807679334000 & 0xff])))
diff --git a/tests/basics/bytes_construct_endian.py b/tests/basics/bytes_construct_endian.py
new file mode 100644
index 0000000000..1912f63a4d
--- /dev/null
+++ b/tests/basics/bytes_construct_endian.py
@@ -0,0 +1,7 @@
+# test construction of bytes from different objects
+
+from array import array
+
+# arrays
+print(bytes(array('h', [1, 2])))
+print(bytes(array('I', [1, 2])))