diff --git a/test/import.t b/test/import.t index a4370fc16..9360f62b9 100755 --- a/test/import.t +++ b/test/import.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 13; +use Test::More tests => 9; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -39,7 +39,6 @@ if (open my $fh, '>', 'import.rc') print $fh "data.location=.\n", "dateformat=m/d/Y\n"; close $fh; - ok (-r 'import.rc', 'Created import.rc'); } # Create import file. @@ -50,9 +49,7 @@ if (open my $fh, '>', 'import.txt') {"uuid":"11111111-1111-1111-1111-111111111111","description":"one","project":"B","status":"pending","entry":"1234567889"}, {"uuid":"22222222-2222-2222-2222-222222222222","description":"two","status":"completed","entry":"1234524689","end":"1234524690"} EOF - close $fh; - ok (-r 'import.txt', 'Created sample import data'); } my $output = qx{../src/task rc:import.rc import import.txt 2>&1 >/dev/null}; @@ -64,7 +61,7 @@ $output = qx{../src/task rc:import.rc list 2>&1}; # -- ------- --- --- ------ ------- ----------- # 1 A 1.5 yrs zero # 2 B 1.5 yrs one -# +# # 2 tasks like ($output, qr/1.+A.+zero/, 't1 present'); @@ -75,7 +72,7 @@ $output = qx{../src/task rc:import.rc completed 2>&1}; # Complete Project Pri Age Description # --------- ------- --- ------- ----------- # 2/13/2009 1.5 yrs two -# +# # 1 task unlike ($output, qr/1.+A.+zero/, 't1 missing'); @@ -92,9 +89,7 @@ if (open my $fh, '>', 'import2.txt') print $fh <&1 >/dev/null}; @@ -103,13 +98,5 @@ like ($output, qr/Imported 1 tasks\./, 'no errors'); # Cleanup. unlink qw(import.txt import2.txt pending.data completed.data undo.data backlog.data import.rc); -ok (! -r 'import.txt' && - ! -r 'import2.txt' && - ! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'import.rc', 'Cleanup'); - exit 0; diff --git a/test/import.todo.sh.t b/test/import.todo.sh.t index 73ff3f25e..51c51e27c 100755 --- a/test/import.todo.sh.t +++ b/test/import.todo.sh.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 26; +use Test::More tests => 23; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -44,7 +44,6 @@ if (open my $fh, '>', 'import.rc') "dateformat=YYYY-M-D\n", "verbose=off\n"; close $fh; - ok (-r 'import.rc', 'Created import.rc'); } # Create import file. @@ -66,7 +65,6 @@ if (open my $fh, '>', 'import.txt') "x 2011-03-02 2011-03-01 Review Tim's pull request +TodoTxtTouch \@github\n"; # - close $fh; - ok (-r 'import.txt', 'Created sample import data'); } # Convert todo.sh --> task JSON. @@ -127,13 +125,5 @@ like ($output, qr/^Description.+xylophone lesson/ms, '12 '); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data import.rc import.txt import.json); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'import.rc' && - ! -r 'import.txt' && - ! -r 'import.json', 'Cleanup'); - exit 0; diff --git a/test/import.yaml.t b/test/import.yaml.t index ebfdf8c1f..378a3bd5d 100755 --- a/test/import.yaml.t +++ b/test/import.yaml.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 16; +use Test::More tests => 13; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -42,7 +42,6 @@ if (open my $fh, '>', 'import.rc') print $fh "data.location=.\n", "dateformat=m/d/Y\n"; close $fh; - ok (-r 'import.rc', 'Created import.rc'); } # Create import file. @@ -73,7 +72,6 @@ if (open my $fh, '>', 'import.txt') EOF close $fh; - ok (-r 'import.txt', 'Created sample import data'); } # Convert YAML --> task JSON. @@ -88,7 +86,7 @@ $output = qx{../src/task rc:import.rc list 2>&1}; # -- ------- ------- ----------- # 1 A 1.5 yrs zero # 2 B 1.5 yrs one -# +# # 2 tasks like ($output, qr/1.+A.+zero/, 't1 present'); @@ -99,7 +97,7 @@ $output = qx{../src/task rc:import.rc completed 2>&1}; # Complete Age Description # --------- ------- ----------- # 2/13/2009 1.5 yrs two -# +# # 1 task unlike ($output, qr/1.+A.+zero/, 't1 missing'); @@ -148,12 +146,5 @@ like ($output, qr/3.+three/, 't3 present'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data import.rc import.txt import.json); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'import.rc' && - ! -r 'import.txt' && - ! -r 'import.json', 'Cleanup'); exit 0;