From 2bbefc95f3898cd09e2836cea1dceed8cf88797f Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 10 Jun 2020 15:50:26 +0100
Subject: [PATCH] add use of classes in L0Cache unit tests

---
 src/soc/experiment/l0_cache.py | 64 ++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/soc/experiment/l0_cache.py b/src/soc/experiment/l0_cache.py
index 1fb24938..3b8ff913 100644
--- a/src/soc/experiment/l0_cache.py
+++ b/src/soc/experiment/l0_cache.py
@@ -567,7 +567,7 @@ def l0_cache_ld(dut, addr, datalen, expected):
     return data
 
 
-def l0_cache_ldst(dut):
+def l0_cache_ldst(arg, dut):
     yield
     addr = 0x2
     data = 0xbeef
@@ -578,8 +578,9 @@ def l0_cache_ldst(dut):
     result = yield from l0_cache_ld(dut, 0x2, 2, data)
     result2 = yield from l0_cache_ld(dut, 0x3, 2, data2)
     yield
-    assert data == result, "data %x != %x" % (result, data)
-    assert data2 == result2, "data2 %x != %x" % (result2, data2)
+    arg.assertEqual(data, result, "data %x != %x" % (result, data))
+    arg.assertEqual(data2, result2, "data2 %x != %x" % (result2, data2))
+
 
 def data_merger_merge(dut):
     print("data_merger")
@@ -603,43 +604,44 @@ def data_merger_merge(dut):
     assert en == 0xff
     yield
 
-def test_l0_cache(arg):
 
-    dut = TstL0CacheBuffer(regwid=64)
-    #vl = rtlil.convert(dut, ports=dut.ports())
-    #with open("test_basic_l0_cache.il", "w") as f:
-    #    f.write(vl)
+class TestL0Cache(unittest.TestCase):
+
+    def test_l0_cache(self):
+
+        dut = TstL0CacheBuffer(regwid=64)
+        #vl = rtlil.convert(dut, ports=dut.ports())
+        #with open("test_basic_l0_cache.il", "w") as f:
+        #    f.write(vl)
+
+        run_simulation(dut, l0_cache_ldst(self, dut),
+                       vcd_name='test_l0_cache_basic.vcd')
 
-    run_simulation(dut, l0_cache_ldst(dut),
-                   vcd_name='test_l0_cache_basic.vcd')
+class TestDataMerger(unittest.TestCase):
 
-def test_data_merger(arg):
+    def test_data_merger(self):
 
-    dut = DataMerger(8)
-    #vl = rtlil.convert(dut, ports=dut.ports())
-    #with open("test_data_merger.il", "w") as f:
-    #    f.write(vl)
+        dut = DataMerger(8)
+        #vl = rtlil.convert(dut, ports=dut.ports())
+        #with open("test_data_merger.il", "w") as f:
+        #    f.write(vl)
 
-    run_simulation(dut, data_merger_merge(dut),
-                   vcd_name='test_data_merger.vcd')
+        run_simulation(dut, data_merger_merge(dut),
+                       vcd_name='test_data_merger.vcd')
 
-def test_dual_port_splitter(arg):
 
-    dut = DualPortSplitter()
-    #vl = rtlil.convert(dut, ports=dut.ports())
-    #with open("test_data_merger.il", "w") as f:
-    #    f.write(vl)
+class TestDualPortSplitter(unittest.TestCase):
 
-    #run_simulation(dut, data_merger_merge(dut),
-    #               vcd_name='test_dual_port_splitter.vcd')
+    def test_dual_port_splitter(self):
+
+        dut = DualPortSplitter()
+        #vl = rtlil.convert(dut, ports=dut.ports())
+        #with open("test_data_merger.il", "w") as f:
+        #    f.write(vl)
+
+        #run_simulation(dut, data_merger_merge(dut),
+        #               vcd_name='test_dual_port_splitter.vcd')
 
 if __name__ == '__main__':
     unittest.main(exit=False)
-    suite = unittest.TestSuite()
-    suite.addTest(test_l0_cache)
-    suite.addTest(test_data_merger)
-    suite.addTest(test_dual_port_splitter)
-
-    runner = unittest.TextTestRunner()
-    runner.run(suite)
 
-- 
2.30.2