split test cases for gray tests

example/manual/test_gray_original.py

@@ -0,0 +1,44 @@
+import unittest
+
+from myhdl import Simulation, Signal, delay, intbv, bin
+
+from bin2gray import bin2gray
+
+MAX_WIDTH = 11
+
+def nextLn(Ln):
+    """ Return Gray code Ln+1, given Ln. """
+    Ln0 = ['0' + codeword for codeword in Ln]
+    Ln1 = ['1' + codeword for codeword in Ln]
+    Ln1.reverse()
+    return Ln0 + Ln1
+
+
+class TestOriginalGrayCode(unittest.TestCase):
+
+    def testOriginalGrayCode(self):
+        """Check that the code is an original Gray code."""
+
+        Rn = []
+
+        def stimulus(B, G, n):
+            for i in range(2**n):
+                B.next = intbv(i)
+                yield delay(10)
+                Rn.append(bin(G, width=n))
+
+        Ln = ['0', '1'] # n == 1
+        for w in range(2, MAX_WIDTH):
+            Ln = nextLn(Ln)
+            del Rn[:]
+            B = Signal(intbv(0)[w:])
+            G = Signal(intbv(0)[w:])
+            dut = bin2gray(B, G)
+            stim = stimulus(B, G, w)
+            sim = Simulation(dut, stim)
+            sim.run(quiet=1)
+            self.assertEqual(Ln, Rn)
+
+
+if __name__ == '__main__':
+    unittest.main()

example/manual/test_gray_properties.py

@@ -1,7 +1,4 @@
-from __future__ import generators
-
 import unittest
-from unittest import TestCase
 
 from myhdl import Simulation, Signal, delay, intbv, bin
 
@@ -9,41 +6,7 @@ from bin2gray import bin2gray
 
 MAX_WIDTH = 11
 
-def nextLn(Ln):
+class TestGrayCodeProperties(unittest.TestCase):
-    """ Return Gray code Ln+1, given Ln. """
-    Ln0 = ['0' + codeword for codeword in Ln]
-    Ln1 = ['1' + codeword for codeword in Ln]
-    Ln1.reverse()
-    return Ln0 + Ln1
-
-
-class TestOriginalGrayCode(TestCase):
-
-    def testOriginalGrayCode(self):
-        """Check that the code is an original Gray code."""
-
-        Rn = []
-
-        def stimulus(B, G, n):
-            for i in range(2**n):
-                B.next = intbv(i)
-                yield delay(10)
-                Rn.append(bin(G, width=n))
-
-        Ln = ['0', '1'] # n == 1
-        for w in range(2, MAX_WIDTH):
-            Ln = nextLn(Ln)
-            del Rn[:]
-            B = Signal(intbv(0)[w:])
-            G = Signal(intbv(0)[w:])
-            dut = bin2gray(B, G)
-            stim = stimulus(B, G, w)
-            sim = Simulation(dut, stim)
-            sim.run(quiet=1)
-            self.assertEqual(Ln, Rn)
-
-
-class TestGrayCodeProperties(TestCase):
 
     def testSingleBitChange(self):
         """Check that only one bit changes in successive codewords."""