From 0f6380698d118cdce95c40d70974f55561bc88bb Mon Sep 17 00:00:00 2001
From: tmeissner <programming@goodcleanfun.de>
Date: Fri, 21 Aug 2015 19:45:57 +0200
Subject: [PATCH] Add new testcases

New testcases for checking correctness of removing and overwriting
entries in dictionary. Furthermore the hasKey() method is tested and
the clearing of the dictionary with the clear() method
---
 test/DictT.vhd | 62 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/test/DictT.vhd b/test/DictT.vhd
index 51ddf94..0195083 100644
--- a/test/DictT.vhd
+++ b/test/DictT.vhd
@@ -47,6 +47,7 @@ begin
     variable v_input  : std_logic_vector(7 downto 0);
     variable v_output : std_logic_vector(7 downto 0);
     variable v_scoreboard : t_scoreboard(0 to 256);
+    variable v_error      : boolean;
   begin
     v_random.InitSeed(v_random'instance_name);
 
@@ -56,7 +57,7 @@ begin
       severity failure;
 
     -- fill dictionary and check count
-    report "INFO: Test : Fill dictionary";
+    report "INFO: Test 0: Fill dictionary";
     for i in 0 to 255 loop
       v_input := v_random.RandSlv(8);
       sv_dict.set(integer'image(i), v_input);
@@ -68,15 +69,70 @@ begin
     report "INFO: Test successful";
 
     -- read all entries and check for correct data
-    report "INFO: Test : Read dictionary";
+    report "INFO: Test 1: Read dictionary";
     for i in 0 to 255 loop
-      sv_dict.get(integer'image(i), v_output);
+      sv_dict.get(integer'image(i), v_output, v_error);
       assert v_output = v_scoreboard(i)
         report "ERROR: Got 0x" & to_hstring(v_output) & ", expected 0x" & to_hstring(v_scoreboard(i))
         severity failure;
     end loop;
     report "INFO: Test successful";
 
+    -- overwrite a key/value pair
+    report "INFO: Test 2: Overwrite a entry";
+    v_input := v_random.RandSlv(8);
+    sv_dict.set("128", v_input);
+    v_scoreboard(128) := v_input;
+    sv_dict.get("128", v_output, v_error);
+    assert v_output = v_scoreboard(128)
+      report "ERROR: Got 0x" & to_hstring(v_output) & ", expected 0x" & to_hstring(v_scoreboard(128))
+      severity failure;
+    report "INFO: Test successful";
+
+    -- overwrite a key/value pair
+    report "INFO: Test 3: Check hasKey() method";
+    for i in 0 to 255 loop
+      assert sv_dict.hasKey(integer'image(i))
+        report "ERROR: Key" & integer'image(i) & " should exist in dictionary"
+        severity failure;
+    end loop;
+    assert not(sv_dict.hasKey("AFFE"))
+      report "ERROR: Key AFFE shouldn't exist in dictionary"
+      severity failure;
+    report "INFO: Test successful";
+
+    -- Remove key/value pair from head of dictionary
+    report "INFO: Test 4: Removing entry from head of dictionary";
+    sv_dict.del("255", v_error);
+    assert not(sv_dict.hasKey("255"))
+      report "ERROR: Key 255 shouldn't exist in dictionary"
+      severity failure;
+    report "INFO: Test successful";
+
+    -- Remove key/value pair from head of dictionary
+    report "INFO: Test 5: Removing entry from middle of dictionary";
+    sv_dict.del("127", v_error);
+    assert not(sv_dict.hasKey("127"))
+      report "ERROR: Key 127 shouldn't exist in dictionary"
+      severity failure;
+    report "INFO: Test successful";
+
+    -- Remove key/value pair from head of dictionary
+    report "INFO: Test 6: Removing entry from beginning of dictionary";
+    sv_dict.del("0", v_error);
+    assert not(sv_dict.hasKey("0"))
+      report "ERROR: Key 0 shouldn't exist in dictionary"
+      severity failure;
+    report "INFO: Test successful";
+
+    -- Remove key/value pair from head of dictionary
+    report "INFO: Test 7: Clear all entries from dictionary";
+    sv_dict.clear(v_error);
+    assert sv_dict.size = 0
+      report "ERROR: Dict should be empty"
+      severity failure;
+    report "INFO: Test successful";
+
     report "INFO: t_dict test finished successfully";
     wait;
   end process DictTestP;