#21 Add implicit @1 to command 'untag'

- Extend interval assertions
- Add interval assertions to tests for command 'tag'
- Add interval assertions to tests for command 'untag'
This commit is contained in:
Thomas Lauf 2018-05-13 15:28:18 +02:00 committed by lauft
parent c595132a9c
commit 10dfa64cfa
5 changed files with 184 additions and 64 deletions

View file

@ -13,19 +13,62 @@ class BaseTestCase(unittest.TestCase):
class TestCase(BaseTestCase):
def assertInterval(self, interval, expectedStart=None, expectedEnd=None, expectedTags=None, description=None):
self.assertTrue('start' in interval)
self.assertTrue('end' in interval)
def assertOpenInterval(self, interval,
expectedStart=None,
expectedTags=None,
description="interval"):
self.assertTrue("start" in interval, "{} does not contain a start date".format(description))
self.assertFalse("end" in interval, "{} does contain an end date".format(description))
return self.assertInterval(interval,
expectedStart=expectedStart,
expectedEnd=None,
expectedTags=expectedTags,
description=description)
def assertClosedInterval(self, interval,
expectedStart=None,
expectedEnd=None,
expectedTags=None,
description="interval"):
self.assertTrue("start" in interval, "{} does not contain a start date".format(description))
self.assertTrue("end" in interval, "{} does not contain an end date".format(description))
return self.assertInterval(interval,
expectedStart=expectedStart,
expectedEnd=expectedEnd,
expectedTags=expectedTags,
description=description)
def assertInterval(self, interval,
expectedStart=None,
expectedEnd=None,
expectedTags=None,
description="interval"):
if expectedStart:
self.assertEqual(interval['start'], expectedStart, description)
self.assertEqual(
interval["start"],
expectedStart,
"start time of {} does not match (expected: {}, actual: {})".format(description,
expectedStart,
interval["start"]))
if expectedEnd:
self.assertEqual(interval['end'], expectedEnd, description)
self.assertEqual(
interval["end"],
expectedEnd,
"end time of {} does not match (expected: {}, actual: {})".format(description,
expectedEnd,
interval["end"]))
if expectedTags:
self.assertTrue('tags' in interval)
self.assertEqual(interval['tags'], expectedTags, description)
self.assertTrue("tags" in interval)
self.assertEqual(
interval["tags"],
expectedTags,
"tags of {} do not match (expected: {}, actual: {})". format(description,
expectedTags,
interval["tags"]))
# vim: ai sts=4 et sw=4