aichaos#94 Add unit test for sorting trigger with weights tag. Minor update on comment

hungtu · hungtu · commit 1e2213e1dc0c · 2017-05-31T16:25:31.000+02:00
diff --git a/rivescript/sorting.py b/rivescript/sorting.py
@@ -32,6 +32,7 @@ class TriggerObj(object):
             pound: Number of numeric wildcards (``#``)
             under: Number of alphabetical wildcards (``_``)
             option: Number of optional tags ("[man]" in "hey [man]"), assume that the template is properly formatted
+            is_empty: Boolean variable indicating whether the trigger has non-zero wordcount
         """
 
     def __init__(self, pattern, index, weight, inherit = sys.maxsize):
@@ -109,9 +110,10 @@ def sort_trigger_set(triggers, exclude_previous=True, say=None):
 
         trigger_object_list.append(TriggerObj(pattern, index, weight, inherit))
 
-    # Priority order of sorting criteria: weight, inherit, star, pound, under, option, wordcount, len, alphabet
+    # Priority order of sorting criteria:
+    # weight, inherit, is_empty, star, pound, under, option, wordcount, len, alphabet
     sorted_list = sorted(trigger_object_list,
-                         key=attrgetter('weight', 'inherit', "is_empty", 'star', 'pound',
+                         key=attrgetter('weight', 'inherit', 'is_empty', 'star', 'pound',
                                         'under', 'option', 'wordcount', 'len', 'alphabet'))
     return [triggers[item.index] for item in sorted_list]
 
diff --git a/tests/test_sorting.py b/tests/test_sorting.py
@@ -61,6 +61,12 @@ def test_sorting_triggers(self):
 
             + _ _
             - 17
+
+            + ho _{weight=100}
+            - 18
+
+            + ho _
+            - 19
         """)
         
         sorted_triggers =  {trig[0]:position for position, trig in enumerate(self.rs._brain.master._sorted["topics"]['random'])}
@@ -81,10 +87,11 @@ def test_sorting_triggers(self):
         # 5) Sorted by number of wildcard triggers 
         self.assertLess(sorted_triggers['hi *'], sorted_triggers['* you *'])
 
-        # 6) The `super catch all` (only single star `*` or `[*]`) should be last
-        self.assertGreaterEqual(sorted_triggers['*'], max(sorted_triggers.values())-1)
+        # 6) The `super catch all` (only single star `*` or `[*]`) should be the last two
+        third_last_position = max(sorted_triggers.values())-2
+        self.assertLess(third_last_position, sorted_triggers['*'])
         self.assertLess(sorted_triggers['hi [*]'], sorted_triggers['*'])
-        self.assertGreaterEqual(sorted_triggers['[*]'], max(sorted_triggers.values())-1)
+        self.assertLess(third_last_position, sorted_triggers['[*]'])
         self.assertLess(sorted_triggers['[*] hi [*]'], sorted_triggers['[*]'])
         self.assertLess(sorted_triggers['[*] hi *'], sorted_triggers['*'])
         self.assertLess(sorted_triggers['hi [*]'], sorted_triggers['[*]'])
@@ -102,3 +109,11 @@ def test_sorting_triggers(self):
         # 9) Among the triggers with text, the order of wildcard priority still holds
         self.assertLess(sorted_triggers['hi _'], sorted_triggers['hi *'])
         self.assertLess(sorted_triggers['hi _'], sorted_triggers['hi [*]'])
+
+        # 10) Among the triggers with text, the order of wildcard priority still holds
+        self.assertLess(sorted_triggers['hi _'], sorted_triggers['hi *'])
+        self.assertLess(sorted_triggers['hi _'], sorted_triggers['hi [*]'])
+
+        # 11) Making sure that the weight tag is taken into account
+        self.assertLess(sorted_triggers['ho _{weight=100}'], sorted_triggers['hi _'])
+        self.assertLess(sorted_triggers['hi _'], sorted_triggers['ho _'])
