Simplified testing packages

diff --git a/test/src/testing/__init__.py b/test/src/testing/__init__.py
index 859b4fe9ec163fe780731ebcab7b175e2ba0a27d..4f23d52d2fc20ba83ec609e86ca7830b5cb92be4 100644 (file)
--- a/test/src/testing/__init__.py
+++ b/test/src/testing/__init__.py
@@ -91,12 +91,12 @@ def test_prepare(casetype):
 
 def main():
     """
-    moduleNames = ["testing.implementation.all.digitalio",]
+    moduleNames = ["testing.implementation.universal.digitalio",]
     if agnostic.implementation == "micropython":
         moduleNames.extend([ "testing.implementation.micropython.digitalio",])
 
     """
-    moduleNames = ["testing.implementation.all.bitbangio"]
+    moduleNames = ["testing.implementation.universal.bitbangio"]
 
     unittest.raiseException = True # terminates with stack information on userspace Exception
     unittest.raiseBaseException = True # terminates with stack information on system Exception

diff --git a/test/src/testing/adafruit_blinka.py b/test/src/testing/adafruit_blinka.py
index 91a2c84c9415bcf9c32f5d66968a19648bbb7c3d..f27abb51c3716489e966150ed73f63d768d4d7fb 100644 (file)
--- a/test/src/testing/adafruit_blinka.py
+++ b/test/src/testing/adafruit_blinka.py
@@ -36,4 +36,17 @@ class TestEnum(unittest.TestCase):
 
     def test_str(self):
         """A str() call on an Enum performs the same as repr()"""
-        self.assertEqual(str(self.Cls.one), repr(self.Cls.one))
\ No newline at end of file
+        self.assertEqual(str(self.Cls.one), repr(self.Cls.one))
+
+class TestDigitalInOut(unittest.TestCase):
+
+
+    def test_context_manager(self):
+        import digitalio
+        from testing.board import default_pin
+        """Deinitialisation is triggered by __exit__() and should dispose machine.pin reference"""
+        dio = digitalio.DigitalInOut(default_pin)
+        self.assertIsNotNone(dio._pin)
+        with dio:
+            pass
+        self.assertIsNone(dio._pin)

diff --git a/test/src/testing/implementation/all/__init__.py b/test/src/testing/implementation/all/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/test/src/testing/implementation/circuitpython/__init__.py b/test/src/testing/implementation/circuitpython/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/test/src/testing/implementation/circuitpython/digitalio.py b/test/src/testing/implementation/circuitpython/digitalio.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/test/src/testing/implementation/micropython/__init__.py b/test/src/testing/implementation/micropython/__init__.py
deleted file mode 100644 (file)
index dbc1e6c..0000000
--- a/test/src/testing/implementation/micropython/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def create_pin():
-    from microcontroller import Pin
-    name, pin = next(Pin.iteritems())  # grab first pin
-    return pin
-
-def create_dio():
-    import digitalio
-    return digitalio.DigitalInOut(create_pin())
\ No newline at end of file

diff --git a/test/src/testing/implementation/micropython/digitalio.py b/test/src/testing/implementation/micropython/digitalio.py
deleted file mode 100644 (file)
index 05f7e42..0000000
--- a/test/src/testing/implementation/micropython/digitalio.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-    Tests which require an embedded platform (with actual hardware bindings)
-    but which are not architecture-specific.
-"""
-import unittest
-import digitalio
-from testing.board import default_pin
-
-class TestDigitalInOut(unittest.TestCase):
-
-
-    def test_context_manager(self):
-        """Deinitialisation is triggered by __exit__() and should dispose machine.pin reference"""
-        dio = digitalio.DigitalInOut(default_pin)
-        self.assertIsNotNone(dio._pin)
-        with dio:
-            pass
-        self.assertIsNone(dio._pin)
-
-def main():
-    unittest.main()

diff --git a/test/src/testing/profiling/__init__.py b/test/src/testing/profiling/__init__.py
deleted file mode 100644 (file)
index fce14a4..0000000
--- a/test/src/testing/profiling/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-def time_function(f):
-    import utime
-    """From http://docs.micropython.org/en/latest/esp8266/reference/speed_python.html"""
-    myname = str(f).split(' ')[1]
-    def new_func(*args, **kwargs):
-        t = utime.ticks_us()
-        result = f(*args, **kwargs)
-        delta = utime.ticks_diff(utime.ticks_us(), t)
-        print('Function {} Time = {:6.3f}ms'.format(myname, delta/1000))
-        return result
-    return new_func

diff --git a/test/src/testing/implementation/__init__.py b/test/src/testing/universal/__init__.py
similarity index 100%
rename from test/src/testing/implementation/__init__.py
rename to test/src/testing/universal/__init__.py

diff --git a/test/src/testing/implementation/all/digitalio.py b/test/src/testing/universal/digitalio.py
similarity index 100%
rename from test/src/testing/implementation/all/digitalio.py
rename to test/src/testing/universal/digitalio.py

diff --git a/test/src/testing/implementation/all/i2c.py b/test/src/testing/universal/i2c.py
similarity index 100%
rename from test/src/testing/implementation/all/i2c.py
rename to test/src/testing/universal/i2c.py

diff --git a/test/src/testing/implementation/all/microcontroller.py b/test/src/testing/universal/microcontroller.py
similarity index 100%
rename from test/src/testing/implementation/all/microcontroller.py
rename to test/src/testing/universal/microcontroller.py

diff --git a/test/src/testing/implementation/all/uart.py b/test/src/testing/universal/uart.py
similarity index 100%
rename from test/src/testing/implementation/all/uart.py
rename to test/src/testing/universal/uart.py