Update assert functions to remove duplicated code via assert_op in test_helper.py

diff --git a/TLB/test/test_cam.py b/TLB/test/test_cam.py
index 4bd1cfe9a394d358c4d6ed27cdee7e89bedaf2b0..de2bdcf48f90d4693ffcb35b0dfe92217d760fbe 100644 (file)
--- a/TLB/test/test_cam.py
+++ b/TLB/test/test_cam.py
@@ -6,7 +6,7 @@ from nmigen.compat.sim import run_simulation
 
 from Cam import Cam
 
-from test_helper import assert_eq, assert_ne
+from test_helper import assert_eq, assert_ne, assert_op
 
 def set_cam(dut, e, we, a, d):
     yield dut.enable.eq(e)
@@ -17,24 +17,15 @@ def set_cam(dut, e, we, a, d):
     
 def check_multiple_match(dut, mm, op):
     out_mm = yield dut.multiple_match
-    if op == 0:
-        assert_eq("Multiple Match", out_mm, mm)
-    else:
-        assert_ne("Multiple Match", out_mm, mm)
+    assert_op("Multiple Match", out_mm, mm, op)
 
 def check_single_match(dut, sm, op):
     out_sm = yield dut.single_match
-    if op == 0:
-        assert_eq("Single Match", out_sm, sm)
-    else:
-        assert_ne("Single Match", out_sm, sm)
+    assert_op("Single Match", out_sm, sm, op)
 
 def check_match_address(dut, ma, op):
     out_ma = yield dut.match_address
-    if op == 0:
-        assert_eq("Match Address", out_ma, ma)
-    else:
-        assert_ne("Match Address", out_ma, ma)
+    assert_op("Match Address", out_ma, ma, op)
 
 def check_all(dut, multiple_match, single_match, match_address, mm_op, sm_op, ma_op):
     yield from check_multiple_match(dut, multiple_match, mm_op)

diff --git a/TLB/test/test_cam_entry.py b/TLB/test/test_cam_entry.py
index 1ed48f50a8368cc7126fb4e30da5f1ee3ba1f2f0..68a34c73b7931efa3bf4d965b50c434b507fda55 100644 (file)
--- a/TLB/test/test_cam_entry.py
+++ b/TLB/test/test_cam_entry.py
@@ -4,7 +4,7 @@ sys.path.append("../../TestUtil")
 
 from nmigen.compat.sim import run_simulation
 
-from test_helper import assert_eq, assert_ne
+from test_helper import assert_eq, assert_ne, assert_op
 from CamEntry import CamEntry
 
 # This function allows for the easy setting of values to the Cam Entry
@@ -30,10 +30,7 @@ def set_cam_entry(dut, c, d):
 #   op (Operation): (0 => ==), (1 => !=)
 def check_data(dut, d, op):
     out_d = yield dut.data
-    if op == 0:
-        assert_eq("Data", out_d, d)
-    else:
-        assert_ne("Data", out_d, d)
+    assert_op("Data", out_d, d, op)
 
 # Checks the match state of the CAM entry
 # Arguments:
@@ -42,10 +39,7 @@ def check_data(dut, d, op):
 #   op (Operation): (0 => ==), (1 => !=)
 def check_match(dut, m, op):
     out_m = yield dut.match
-    if op == 0:
-        assert_eq("Match", out_m, m)
-    else:
-        assert_ne("Match", out_m, m)
+    assert_op("Match", out_m, m, op)
 
 # Checks the state of the CAM entry
 # Arguments:

diff --git a/TestUtil/test_helper.py b/TestUtil/test_helper.py
index 5e60ab98d9d1564e57dc49363d8453c2307b862b..d22124b838b494f7e30213a7e76d23da535ab0d4 100644 (file)
--- a/TestUtil/test_helper.py
+++ b/TestUtil/test_helper.py
@@ -1,9 +1,20 @@
-# Verifies the given values are equal
+# Verifies the given values given the particular operand
 # Arguments:
 #   p (Prefix): Appended to the front of the assert statement
 #   e (Expected): The expected value
 #   o (Output): The output result
 #   op (Operation): (0 => ==), (1 => !=)
+def assert_op(pre, o, e, op):
+    if op == 0:
+        assert_eq(pre, o, e)
+    else:
+        assert_ne(pre, o, e)    
+
+# Verifies the given values are equal
+# Arguments:
+#   p (Prefix): Appended to the front of the assert statement
+#   e (Expected): The expected value
+#   o (Output): The output result
 def assert_eq(p, o, e):
     assert o == e, p + " Output " + str(o) + " Expected " + str(e)