GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Throw error message if start date is earlier than open interval

Browse source 
Closes #240

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2019-08-02 17:54:08 +02:00
parent a62ebf0196
commit 57f9982fd1
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/commands/CmdStart.cpp
View file

@ -35,7 +35,6 @@ int CmdStart (
Database& database,
Journal& journal)
{
// Add a new open interval, which may have a defined start time.
auto filter = getFilter (cli);
auto now = Datetime ();
@ -63,9 +62,18 @@ int CmdStart (
// Stop it, at the given start time, if applicable.
Interval modified {latest};
if (filter.start.toEpoch () != 0)
{
if (modified.start >= filter.start)
{
throw std::string ("The end of a date range must be after the start.");
}
modified.end = filter.start;
}
else
{
modified.end = Datetime ();
}
// Update database.
database.deleteInterval (latest);

16
test/start.t
View file

@ -96,6 +96,22 @@ class TestStart(TestCase):
self.assertIn("Tracking bar", out)
self.assertIn("Ended 01:00:00", out)
def test_start_with_start_date_earlier_than_open_interval(self):
"""Test start with start date earlier than open interval"""
self.t("start FOO")
code, out, err = self.t.runError("start BAR 1h ago")
self.assertIn("The end of a date range must be after the start.", err)
def test_start_with_start_date_earlier_than_closed_interval(self):
"""Test start with start date earlier than closed interval"""
self.t("track FOO 1h before now")
code, out, err = self.t.runError("start BAR 2h ago")
self.assertIn("You cannot overlap intervals. Correct the start/end time, or specify the :adjust hint.", err)
def test_start_with_more_tags_than_current_tracking(self):
"""Test 'start' with more tags than current tracking should start new tracking"""
self.t("start 1h ago foo")