From 34e8317d01b641b92cfae3426307c06c6847be37 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 9 Aug 2018 21:11:38 +0200 Subject: [PATCH] Improve stop.t - use interval asserts - use utc time - use configure_exclusions --- test/stop.t | 133 ++++++++++++++++++++++------------------------------ 1 file changed, 56 insertions(+), 77 deletions(-) diff --git a/test/stop.t b/test/stop.t index 504ae766..91d30050 100755 --- a/test/stop.t +++ b/test/stop.t @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ############################################################################### # -# Copyright 2006 - 2018, Paul Beckingham, Federico Hernandez. +# Copyright 2006 - 2018, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -30,6 +30,8 @@ import os import sys import unittest +from datetime import datetime, timedelta, time + # Ensure python finds the local simpletap module sys.path.append(os.path.dirname(os.path.abspath(__file__))) @@ -43,171 +45,148 @@ class TestStop(TestCase): def test_timed_stop(self): """Test timed stop""" - self.t("start 20160516T090100") - self.t("stop 20160516T100200") + now_utc = datetime.now().utcnow() + one_hour_before_utc = now_utc - timedelta(hours=1) + + self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc)) + self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc)) + j = self.t.export() + self.assertEqual(len(j), 1) - self.assertIn('0100Z', j[0]['start']) - self.assertIn('0200Z', j[0]['end']) + self.assertClosedInterval(j[0], + expectedStart=one_hour_before_utc, + expectedEnd=now_utc) def test_invalid_stop(self): """Verify stop date after start date is an error""" - self.t("start 20160516T100200") - code, out, err = self.t.runError("stop 20160516T090100") + now_utc = datetime.now().utcnow() + one_hour_before_utc = now_utc - timedelta(hours=1) + + self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc)) + + code, out, err = self.t.runError("stop {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc)) + self.assertIn("The end of a date range must be after the start.", err) def test_stop_all(self): """Start three tags, stop""" self.t("start 5mins ago one two three") + code, out, err = self.t("stop") + self.assertIn("Recorded one three two", out) j = self.t.export() + self.assertEqual(len(j), 1) - self.assertItemsEqual(['one', 'two', 'three'], j[0]['tags']) + self.assertClosedInterval(j[0], expectedTags=["one", "two", "three"]) def test_stop_three(self): """Start three tags, stop three""" self.t("start 5mins ago one two three") + code, out, err = self.t("stop one two three") + self.assertIn("Recorded one three two", out) j = self.t.export() + self.assertEqual(len(j), 1) - self.assertItemsEqual(['one', 'two', 'three'], j[0]['tags']) + self.assertClosedInterval(j[0], expectedTags=["one", "two", "three"]) def test_stop_two(self): """Start three tags, stop two""" self.t("start 5mins ago one two three") - code, out, err = self.t("stop one three") + + code, out, err = self.t("stop one three") + self.assertIn("Tracking two", out) j = self.t.export() + self.assertEqual(len(j), 2) - self.assertItemsEqual(['one', 'two', 'three'], j[0]['tags']) - self.assertItemsEqual(['two'], j[1]['tags']) + self.assertClosedInterval(j[0], expectedTags=["one", "two", "three"]) + self.assertOpenInterval(j[1], expectedTags=["two"]) def test_stop_fourth(self): """Start three tags, stop fourth""" self.t("start 5mins ago one two three") + code, out, err = self.t.runError("stop four") + self.assertIn("The current interval does not have the 'four' tag.", err) def test_single_interval_enclosing_exclusion(self): """Add one interval that encloseѕ an exclusion, and is therefore flattened""" - self.t.config("exclusions.monday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.tuesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.wednesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.thursday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.friday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.saturday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.sunday", "<9:11:50 12:22:44-13:32:23 >18:05:11") + self.t.configure_exclusions([(time(18, 5, 11), time(9, 11, 50)), + (time(12, 22, 44), time(13, 32, 23))]) self.t("start 20160101T100000 foo") self.t("stop 20160101T150000") j = self.t.export() + self.assertEqual(len(j), 2) - - self.assertTrue('start' in j[0]) - self.assertTrue('end' in j[0]) - self.assertTrue('tags' in j[0]) - self.assertEqual(j[0]['tags'][0], 'foo') - - self.assertTrue('start' in j[1]) - self.assertTrue('end' in j[1]) - self.assertTrue('tags' in j[1]) - self.assertEqual(j[1]['tags'][0], 'foo') + self.assertClosedInterval(j[0], expectedTags=["foo"]) + self.assertClosedInterval(j[1], expectedTags=["foo"]) def test_single_interval_starting_within_an_exclusion_and_enclosing_an_exclusion(self): """Add one interval that starts within an exclusion and encloses an exclusion""" - self.t.config("exclusions.monday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.tuesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.wednesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.thursday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.friday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.saturday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.sunday", "<9:11:50 12:22:44-13:32:23 >18:05:11") + self.t.configure_exclusions([(time(18, 5, 11), time(9, 11, 50)), + (time(12, 22, 44), time(13, 32, 23))]) self.t("start 20160101T082255 foo") self.t("stop 20160101T144422") # stop, so foo gets closed and flattened j = self.t.export() + self.assertEqual(len(j), 2) - - self.assertTrue('start' in j[0]) + self.assertClosedInterval(j[0], expectedTags=["foo"]) self.assertIn('2255Z', j[0]['start']) - self.assertTrue('end' in j[0]) self.assertIn('2244Z', j[0]['end']) - self.assertTrue('tags' in j[0]) - self.assertEqual(j[0]['tags'][0], 'foo') - self.assertTrue('start' in j[1]) + self.assertClosedInterval(j[1], expectedTags=["foo"]) self.assertIn('3223Z', j[1]['start']) - self.assertTrue('end' in j[1]) self.assertIn('4422Z', j[1]['end']) - self.assertTrue('tags' in j[1]) - self.assertEqual(j[1]['tags'][0], 'foo') def test_single_interval_ending_within_an_exclusion_and_enclosing_an_exclusion(self): """Add one interval that ends within an exclusion and encloses an exclusion""" - self.t.config("exclusions.monday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.tuesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.wednesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.thursday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.friday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.saturday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.sunday", "<9:11:50 12:22:44-13:32:23 >18:05:11") + self.t.configure_exclusions([(time(18, 5, 11), time(9, 11, 50)), + (time(12, 22, 44), time(13, 32, 23))]) self.t("start 20160101T102255 foo") self.t("stop 20160101T194422") # stop, so foo gets closed and flattened j = self.t.export() + self.assertEqual(len(j), 2) - - self.assertTrue('start' in j[0]) + self.assertClosedInterval(j[0], expectedTags=["foo"]) self.assertIn('2255Z', j[0]['start']) - self.assertTrue('end' in j[0]) self.assertIn('2244Z', j[0]['end']) - self.assertTrue('tags' in j[0]) - self.assertEqual(j[0]['tags'][0], 'foo') - self.assertTrue('start' in j[1]) + self.assertClosedInterval(j[0], expectedTags=["foo"]) self.assertIn('3223Z', j[1]['start']) - self.assertTrue('end' in j[1]) self.assertIn('4422Z', j[1]['end']) - self.assertTrue('tags' in j[1]) - self.assertEqual(j[1]['tags'][0], 'foo') def test_single_interval_and_enclosing_an_exclusion_with_day_change(self): """Add one interval that encloses an exclusion with day change""" - self.t.config("exclusions.monday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.tuesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.wednesday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.thursday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.friday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.saturday", "<9:11:50 12:22:44-13:32:23 >18:05:11") - self.t.config("exclusions.sunday", "<9:11:50 12:22:44-13:32:23 >18:05:11") + self.t.configure_exclusions([(time(18, 5, 11), time(9, 11, 50)), + (time(12, 22, 44), time(13, 32, 23))]) self.t("start 20160101T172255 foo") self.t("stop 20160102T104422") # stop, so foo gets closed and flattened j = self.t.export() + self.assertEqual(len(j), 2) - - self.assertTrue('start' in j[0]) + self.assertClosedInterval(j[0], expectedTags=["foo"]) self.assertIn('2255Z', j[0]['start']) - self.assertTrue('end' in j[0]) self.assertIn('0511Z', j[0]['end']) - self.assertTrue('tags' in j[0]) - self.assertEqual(j[0]['tags'][0], 'foo') - self.assertTrue('start' in j[1]) + self.assertClosedInterval(j[0], expectedTags=["foo"]) self.assertIn('1150Z', j[1]['start']) - self.assertTrue('end' in j[1]) self.assertIn('4422Z', j[1]['end']) - self.assertTrue('tags' in j[1]) - self.assertEqual(j[1]['tags'][0], 'foo') if __name__ == "__main__":