Unittest - properly implement Hook.assert* functions

test/basetest/hooks.py

@@ -460,35 +460,36 @@ class LoggedHook(Hook):
 
         return newlog
 
-    def assert_triggered(self):
+    def assertTriggered(self):
         """Check if current hook file was triggered/used by taskwarrior
         """
         log = self._parse_log()
 
-        if log["calls"]:
+        assert log["calls"], "{0} was never called".format(self.hookname)
-            return True
-        else:
-            return False
 
-    def assert_triggered_count(self, count):
+    def assertTriggeredCount(self, count):
         """Check if current hook file was triggered/used by taskwarrior and
         how many times.
         """
         log = self._parse_log()
 
-        if len(log["calls"]) == count:
+        assert len(log["calls"]) == count, ("{0} calls expected for {1} but "
-            return True
+                                            "found {2}".format(
-        else:
+                                                count,
-            return False
+                                                self.hookname,
+                                                log["calls"]
+                                            ))
 
-    def assert_exitcode(self, exitcode):
+    def assertExitcode(self, exitcode):
         """Check if current hook finished with the expected exit code
         """
         log = self._parse_log()
 
-        if log["exitcode"] == exitcode:
+        assert log["exitcode"] == exitcode, ("Expected exit code {0} for {1} "
-            return True
+                                             "but found {2}".format(
-        else:
+                                                 exitcode,
-            return False
+                                                 self.hookname,
+                                                 log["exitcode"]
+                                             ))
 
 # vim: ai sts=4 et sw=4