From 1f53ff61fffb4cc9b42ddf7e331e225c1b48b4ff Mon Sep 17 00:00:00 2001
From: Damien George
Date: Wed, 7 Feb 2018 15:55:52 +1100
Subject: tests/basics: Rename remaining tests that are for built-in functions.

For consistency with all of the other tests that are named builtin_XXX.py.
---
 tests/basics/builtin_enumerate.py | 16 ++++++++++++++++
 tests/basics/builtin_filter.py    |  8 ++++++++
 tests/basics/builtin_getattr.py   | 18 ++++++++++++++++++
 tests/basics/builtin_hasattr.py   | 39 +++++++++++++++++++++++++++++++++++++++
 tests/basics/builtin_map.py       |  4 ++++
 tests/basics/builtin_print.py     | 20 ++++++++++++++++++++
 tests/basics/builtin_setattr.py   | 25 +++++++++++++++++++++++++
 tests/basics/builtin_zip.py       |  9 +++++++++
 tests/basics/enumerate.py         | 16 ----------------
 tests/basics/filter.py            |  8 --------
 tests/basics/getattr1.py          | 18 ------------------
 tests/basics/hasattr1.py          | 39 ---------------------------------------
 tests/basics/map.py               |  4 ----
 tests/basics/print.py             | 20 --------------------
 tests/basics/setattr1.py          | 25 -------------------------
 tests/basics/zip.py               |  9 ---------
 16 files changed, 139 insertions(+), 139 deletions(-)
 create mode 100644 tests/basics/builtin_enumerate.py
 create mode 100644 tests/basics/builtin_filter.py
 create mode 100644 tests/basics/builtin_getattr.py
 create mode 100644 tests/basics/builtin_hasattr.py
 create mode 100644 tests/basics/builtin_map.py
 create mode 100644 tests/basics/builtin_print.py
 create mode 100644 tests/basics/builtin_setattr.py
 create mode 100644 tests/basics/builtin_zip.py
 delete mode 100644 tests/basics/enumerate.py
 delete mode 100644 tests/basics/filter.py
 delete mode 100644 tests/basics/getattr1.py
 delete mode 100644 tests/basics/hasattr1.py
 delete mode 100644 tests/basics/map.py
 delete mode 100644 tests/basics/print.py
 delete mode 100644 tests/basics/setattr1.py
 delete mode 100644 tests/basics/zip.py

(limited to 'tests/basics')

diff --git a/tests/basics/builtin_enumerate.py b/tests/basics/builtin_enumerate.py
new file mode 100644
index 000000000..4f8239bf7
--- /dev/null
+++ b/tests/basics/builtin_enumerate.py
@@ -0,0 +1,16 @@
+try:
+    enumerate
+except:
+    print("SKIP")
+    raise SystemExit
+
+print(list(enumerate([])))
+print(list(enumerate([1, 2, 3])))
+print(list(enumerate([1, 2, 3], 5)))
+print(list(enumerate([1, 2, 3], -5)))
+print(list(enumerate(range(100))))
+
+# specifying args with keywords
+print(list(enumerate([1, 2, 3], start=1)))
+print(list(enumerate(iterable=[1, 2, 3])))
+print(list(enumerate(iterable=[1, 2, 3], start=1)))
diff --git a/tests/basics/builtin_filter.py b/tests/basics/builtin_filter.py
new file mode 100644
index 000000000..c6d97cf9b
--- /dev/null
+++ b/tests/basics/builtin_filter.py
@@ -0,0 +1,8 @@
+try:
+    filter
+except:
+    print("SKIP")
+    raise SystemExit
+
+print(list(filter(lambda x: x & 1, range(-3, 4))))
+print(list(filter(None, range(-3, 4))))
diff --git a/tests/basics/builtin_getattr.py b/tests/basics/builtin_getattr.py
new file mode 100644
index 000000000..59cb7e7f7
--- /dev/null
+++ b/tests/basics/builtin_getattr.py
@@ -0,0 +1,18 @@
+class A:
+
+    var = 132
+
+    def __init__(self):
+        self.var2 = 34
+
+    def meth(self, i):
+        return 42 + i
+
+
+a = A()
+print(getattr(a, "var"))
+print(getattr(a, "var2"))
+print(getattr(a, "meth")(5))
+print(getattr(a, "_none_such", 123))
+print(getattr(list, "foo", 456))
+print(getattr(a, "va" + "r2"))
diff --git a/tests/basics/builtin_hasattr.py b/tests/basics/builtin_hasattr.py
new file mode 100644
index 000000000..118a19e57
--- /dev/null
+++ b/tests/basics/builtin_hasattr.py
@@ -0,0 +1,39 @@
+class A:
+
+    var = 132
+
+    def __init__(self):
+        self.var2 = 34
+
+    def meth(self, i):
+        return 42 + i
+
+
+a = A()
+print(hasattr(a, "var"))
+print(hasattr(a, "var2"))
+print(hasattr(a, "meth"))
+print(hasattr(a, "_none_such"))
+print(hasattr(list, "foo"))
+
+class C:
+
+    def __getattr__(self, attr):
+        if attr == "exists":
+            return attr
+        raise AttributeError
+
+c = C()
+print(hasattr(c, "exists"))
+# TODO
+#print(hasattr(c, "doesnt_exist"))
+
+try:
+    hasattr(1, b'123')
+except TypeError:
+    print('TypeError')
+
+try:
+    hasattr(1, 123)
+except TypeError:
+    print('TypeError')
diff --git a/tests/basics/builtin_map.py b/tests/basics/builtin_map.py
new file mode 100644
index 000000000..8fce352c2
--- /dev/null
+++ b/tests/basics/builtin_map.py
@@ -0,0 +1,4 @@
+print(list(map(lambda x: x & 1, range(-3, 4))))
+print(list(map(abs, range(-3, 4))))
+print(list(map(tuple, [[i] for i in range(-3, 4)])))
+print(list(map(pow, range(4), range(4))))
diff --git a/tests/basics/builtin_print.py b/tests/basics/builtin_print.py
new file mode 100644
index 000000000..880aaf44f
--- /dev/null
+++ b/tests/basics/builtin_print.py
@@ -0,0 +1,20 @@
+# test builtin print function
+
+print()
+print(None)
+print('')
+print(1)
+print(1, 2)
+
+print(sep='')
+print(sep='x')
+print(end='')
+print(end='x\n')
+print(1, sep='')
+print(1, end='')
+print(1, sep='', end='')
+print(1, 2, sep='')
+print(1, 2, end='')
+print(1, 2, sep='', end='')
+
+print([{1:2}])
diff --git a/tests/basics/builtin_setattr.py b/tests/basics/builtin_setattr.py
new file mode 100644
index 000000000..e4acb14ca
--- /dev/null
+++ b/tests/basics/builtin_setattr.py
@@ -0,0 +1,25 @@
+class A:
+
+    var = 132
+
+    def __init__(self):
+        self.var2 = 34
+
+
+a = A()
+setattr(a, "var", 123)
+setattr(a, "var2", 56)
+print(a.var)
+print(a.var2)
+
+try:
+    setattr(a, b'var3', 1)
+except TypeError:
+    print('TypeError')
+
+# try setattr on a built-in function
+try:
+    setattr(int, 'to_bytes', 1)
+except (AttributeError, TypeError):
+    # uPy raises AttributeError, CPython raises TypeError
+    print('AttributeError/TypeError')
diff --git a/tests/basics/builtin_zip.py b/tests/basics/builtin_zip.py
new file mode 100644
index 000000000..66f2544e5
--- /dev/null
+++ b/tests/basics/builtin_zip.py
@@ -0,0 +1,9 @@
+try:
+    zip
+    set
+except NameError:
+    print("SKIP")
+    raise SystemExit
+
+print(list(zip()))
+print(list(zip([1], set([2, 3]))))
diff --git a/tests/basics/enumerate.py b/tests/basics/enumerate.py
deleted file mode 100644
index 4f8239bf7..000000000
--- a/tests/basics/enumerate.py
+++ /dev/null
@@ -1,16 +0,0 @@
-try:
-    enumerate
-except:
-    print("SKIP")
-    raise SystemExit
-
-print(list(enumerate([])))
-print(list(enumerate([1, 2, 3])))
-print(list(enumerate([1, 2, 3], 5)))
-print(list(enumerate([1, 2, 3], -5)))
-print(list(enumerate(range(100))))
-
-# specifying args with keywords
-print(list(enumerate([1, 2, 3], start=1)))
-print(list(enumerate(iterable=[1, 2, 3])))
-print(list(enumerate(iterable=[1, 2, 3], start=1)))
diff --git a/tests/basics/filter.py b/tests/basics/filter.py
deleted file mode 100644
index c6d97cf9b..000000000
--- a/tests/basics/filter.py
+++ /dev/null
@@ -1,8 +0,0 @@
-try:
-    filter
-except:
-    print("SKIP")
-    raise SystemExit
-
-print(list(filter(lambda x: x & 1, range(-3, 4))))
-print(list(filter(None, range(-3, 4))))
diff --git a/tests/basics/getattr1.py b/tests/basics/getattr1.py
deleted file mode 100644
index 59cb7e7f7..000000000
--- a/tests/basics/getattr1.py
+++ /dev/null
@@ -1,18 +0,0 @@
-class A:
-
-    var = 132
-
-    def __init__(self):
-        self.var2 = 34
-
-    def meth(self, i):
-        return 42 + i
-
-
-a = A()
-print(getattr(a, "var"))
-print(getattr(a, "var2"))
-print(getattr(a, "meth")(5))
-print(getattr(a, "_none_such", 123))
-print(getattr(list, "foo", 456))
-print(getattr(a, "va" + "r2"))
diff --git a/tests/basics/hasattr1.py b/tests/basics/hasattr1.py
deleted file mode 100644
index 118a19e57..000000000
--- a/tests/basics/hasattr1.py
+++ /dev/null
@@ -1,39 +0,0 @@
-class A:
-
-    var = 132
-
-    def __init__(self):
-        self.var2 = 34
-
-    def meth(self, i):
-        return 42 + i
-
-
-a = A()
-print(hasattr(a, "var"))
-print(hasattr(a, "var2"))
-print(hasattr(a, "meth"))
-print(hasattr(a, "_none_such"))
-print(hasattr(list, "foo"))
-
-class C:
-
-    def __getattr__(self, attr):
-        if attr == "exists":
-            return attr
-        raise AttributeError
-
-c = C()
-print(hasattr(c, "exists"))
-# TODO
-#print(hasattr(c, "doesnt_exist"))
-
-try:
-    hasattr(1, b'123')
-except TypeError:
-    print('TypeError')
-
-try:
-    hasattr(1, 123)
-except TypeError:
-    print('TypeError')
diff --git a/tests/basics/map.py b/tests/basics/map.py
deleted file mode 100644
index 8fce352c2..000000000
--- a/tests/basics/map.py
+++ /dev/null
@@ -1,4 +0,0 @@
-print(list(map(lambda x: x & 1, range(-3, 4))))
-print(list(map(abs, range(-3, 4))))
-print(list(map(tuple, [[i] for i in range(-3, 4)])))
-print(list(map(pow, range(4), range(4))))
diff --git a/tests/basics/print.py b/tests/basics/print.py
deleted file mode 100644
index 880aaf44f..000000000
--- a/tests/basics/print.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# test builtin print function
-
-print()
-print(None)
-print('')
-print(1)
-print(1, 2)
-
-print(sep='')
-print(sep='x')
-print(end='')
-print(end='x\n')
-print(1, sep='')
-print(1, end='')
-print(1, sep='', end='')
-print(1, 2, sep='')
-print(1, 2, end='')
-print(1, 2, sep='', end='')
-
-print([{1:2}])
diff --git a/tests/basics/setattr1.py b/tests/basics/setattr1.py
deleted file mode 100644
index e4acb14ca..000000000
--- a/tests/basics/setattr1.py
+++ /dev/null
@@ -1,25 +0,0 @@
-class A:
-
-    var = 132
-
-    def __init__(self):
-        self.var2 = 34
-
-
-a = A()
-setattr(a, "var", 123)
-setattr(a, "var2", 56)
-print(a.var)
-print(a.var2)
-
-try:
-    setattr(a, b'var3', 1)
-except TypeError:
-    print('TypeError')
-
-# try setattr on a built-in function
-try:
-    setattr(int, 'to_bytes', 1)
-except (AttributeError, TypeError):
-    # uPy raises AttributeError, CPython raises TypeError
-    print('AttributeError/TypeError')
diff --git a/tests/basics/zip.py b/tests/basics/zip.py
deleted file mode 100644
index 66f2544e5..000000000
--- a/tests/basics/zip.py
+++ /dev/null
@@ -1,9 +0,0 @@
-try:
-    zip
-    set
-except NameError:
-    print("SKIP")
-    raise SystemExit
-
-print(list(zip()))
-print(list(zip([1], set([2, 3]))))
-- 
cgit v1.2.3