gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TW-303: Make "task import" update existing tasks

Browse Source
This commit is contained in:
Wilhelm Schuermann
2015-05-29 19:49:54 +02:00
parent 45088dc9ce
commit 9d6067e2fe
7 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/import.t
View File

@@ -27,7 +27,7 @@
use strict;
use warnings;
use Test::More tests => 9;
use Test::More tests => 8;
# Ensure environment has no influence.
delete $ENV{'TASKDATA'};
@@ -79,10 +79,6 @@ unlike ($output, qr/1.+A.+zero/, 't1 missing');
unlike ($output, qr/2.+B.+one/, 't2 missing');
like ($output, qr/2\/13\/2009.+two/, 't3 present');
# Make sure that a duplicate task cannot be imported.
$output = qx{../src/task rc:import.rc import import.txt 2>&1 >/dev/null};
like ($output, qr/Cannot add task because the uuid .+ is not unique\./, 'error on duplicate uuid');
# Create import file.
if (open my $fh, '>', 'import2.txt')
{

6
test/import.yaml.t
View File

@@ -27,7 +27,7 @@
use strict;
use warnings;
use Test::More tests => 16;
use Test::More tests => 15;
# Ensure environment has no influence.
delete $ENV{'TASKDATA'};
@@ -136,10 +136,6 @@ like ($output, qr/1.+A.+zero.*\n.+ONE/, "$ut: t1 selected by tag, has
like ($output, qr/2.+B.+one.*\n.+TWO.*\n.+THREE/, "$ut: t2 selected by tag, has two annotations");
like ($output, qr/\n2 tasks\n/, "$ut: tag selected two tasks");
# Make sure that a duplicate task cannot be imported.
$output = qx{../src/task rc:$rc import import.json 2>&1 >/dev/null};
like ($output, qr/Cannot add task because the uuid '.{36}' is not unique\./, "$ut: error on duplicate uuid");
# Create import file.
if (open my $fh, '>', 'import.txt')
{

24
test/import_stdin.t → test/import_NEW.t
View File

@@ -35,7 +35,7 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from basetest import Task, TestCase
class TestImportSTDIN(TestCase):
class TestImport(TestCase):
def setUp(self):
self.t = Task()
self.t.config("report.foo.description", "foo")
@@ -55,6 +55,28 @@ class TestImportSTDIN(TestCase):
self.assertRegexpMatches(out, "2\s+one", "second task present")
self.assertRegexpMatches(out, "-\s+two", "third task present")
def test_import_update(self):
"""Update existing tasks"""
json_data = """
{"uuid":"00000000-0000-0000-0000-000000000000","description":"zero","project":"A","status":"pending","entry":"1234567889"}
{"uuid":"11111111-1111-1111-1111-111111111111","description":"one","project":"B","status":"deleted","entry":"1234567889"}
{"uuid":"22222222-2222-2222-2222-222222222222","description":"two","status":"completed","entry":"1234524689","end":"1234524690"}"""
self.t("import", input=json_data)
self.t("next") # Run GC
json_data = """
{"uuid":"00000000-0000-0000-0000-000000000000","description":"zero","project":"C","status":"pending","entry":"1234567889"}
{"uuid":"11111111-1111-1111-1111-111111111111","description":"one","project":"B","status":"pending","entry":"1234567889"}
{"uuid":"22222222-2222-2222-2222-222222222222","description":"two","status":"pending","entry":"1234524689","end":"1234524690"}"""
self.t("import", input=json_data)
zero, one, two = sorted(self.t.export(), key=lambda t: t["uuid"])
self.assertEqual(zero["status"], "pending", "status for 'zero' unchanged")
self.assertEqual(zero["project"], "C", "project for 'zero' changed to 'C'")
self.assertEqual(one["status"], "pending", "status for 'one' changed to pending")
self.assertEqual(two["status"], "pending", "status for 'two' changed to pending")
if __name__ == "__main__":
from simpletap import TAPTestRunner