GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 09:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Tests - Remove assertTriggered, redundant with assertTriggeredCount

Browse source
This commit is contained in:
Renato Alves 2015-02-15 17:44:47 +00:00
parent 7cd42b5d2f
commit 80c01f3ffb
5 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/basetest/hooks.py
View file

@ -478,13 +478,6 @@ class LoggedHook(Hook):
return newlog return newlog
def assertTriggered(self):
"""Check if current hook file was triggered/used by taskwarrior
"""
log = self._parse_log()
assert log["calls"], "{0} was never called".format(self.hookname)
def assertTriggeredCount(self, count): def assertTriggeredCount(self, count):
"""Check if current hook file was triggered/used by taskwarrior and """Check if current hook file was triggered/used by taskwarrior and
how many times. how many times.

8
test/hooks.on-add.t
View file

@ -50,7 +50,6 @@ class TestHooksOnAdd(TestCase):
code, out, err = self.t(("add", "foo")) code, out, err = self.t(("add", "foo"))
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -65,7 +64,6 @@ class TestHooksOnAdd(TestCase):
code, out, err = self.t.runError(("add", "foo")) code, out, err = self.t.runError(("add", "foo"))
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(1) hook.assertExitcode(1)
@ -80,7 +78,6 @@ class TestHooksOnAdd(TestCase):
code, out, err = self.t.runError(("add", "foo")) code, out, err = self.t.runError(("add", "foo"))
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(1) hook.assertExitcode(1)
@ -96,7 +93,6 @@ class TestHooksOnAdd(TestCase):
self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err) self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -109,7 +105,6 @@ class TestHooksOnAdd(TestCase):
self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err) self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -122,7 +117,6 @@ class TestHooksOnAdd(TestCase):
self.assertIn("Hook Error: JSON must be for the same task:", err) self.assertIn("Hook Error: JSON must be for the same task:", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -138,7 +132,6 @@ class TestHooksOnAdd(TestCase):
self.assertIn("Hook Error: JSON syntax error in: {\"}", err) self.assertIn("Hook Error: JSON syntax error in: {\"}", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
hook.assertInvalidJSONOutput() hook.assertInvalidJSONOutput()
@ -155,7 +148,6 @@ class TestHooksOnAdd(TestCase):
self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err) self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)

4
test/hooks.on-exit.t
View file

@ -51,7 +51,6 @@ class TestHooksOnExit(TestCase):
self.assertIn("Taskwarrior", out) self.assertIn("Taskwarrior", out)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -68,7 +67,6 @@ class TestHooksOnExit(TestCase):
self.assertIn("Taskwarrior", out) self.assertIn("Taskwarrior", out)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(1) hook.assertExitcode(1)
@ -85,7 +83,6 @@ class TestHooksOnExit(TestCase):
self.assertIn("Taskwarrior", out) self.assertIn("Taskwarrior", out)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -102,7 +99,6 @@ class TestHooksOnExit(TestCase):
self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err) self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)

4
test/hooks.on-launch.t
View file

@ -51,7 +51,6 @@ class TestHooksOnLaunch(TestCase):
self.assertIn("Taskwarrior", out) self.assertIn("Taskwarrior", out)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -68,7 +67,6 @@ class TestHooksOnLaunch(TestCase):
self.assertNotIn("Taskwarrior", out) self.assertNotIn("Taskwarrior", out)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(1) hook.assertExitcode(1)
@ -85,7 +83,6 @@ class TestHooksOnLaunch(TestCase):
self.assertNotIn("Could not get Hook exit status!", err) self.assertNotIn("Could not get Hook exit status!", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(137) hook.assertExitcode(137)
@ -102,7 +99,6 @@ class TestHooksOnLaunch(TestCase):
self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err) self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)

7
test/hooks.on-modify.t
View file

@ -51,7 +51,6 @@ class TestHooksOnModify(TestCase):
code, out, err = self.t(("1", "modify", "+tag")) code, out, err = self.t(("1", "modify", "+tag"))
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -67,7 +66,6 @@ class TestHooksOnModify(TestCase):
code, out, err = self.t.runError(("1", "modify", "+tag")) code, out, err = self.t.runError(("1", "modify", "+tag"))
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(1) hook.assertExitcode(1)
@ -84,7 +82,6 @@ class TestHooksOnModify(TestCase):
self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err) self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -101,7 +98,6 @@ class TestHooksOnModify(TestCase):
self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err) self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -118,7 +114,6 @@ class TestHooksOnModify(TestCase):
self.assertIn("Hook Error: JSON must be for the same task:", err) self.assertIn("Hook Error: JSON must be for the same task:", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -135,7 +130,6 @@ class TestHooksOnModify(TestCase):
self.assertIn("Hook Error: JSON syntax error in: {\"}", err) self.assertIn("Hook Error: JSON syntax error in: {\"}", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)
@ -152,7 +146,6 @@ class TestHooksOnModify(TestCase):
self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err) self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err)
hook = self.t.hooks[hookname] hook = self.t.hooks[hookname]
hook.assertTriggered()
hook.assertTriggeredCount(1) hook.assertTriggeredCount(1)
hook.assertExitcode(0) hook.assertExitcode(0)