diff --git a/test/color.active.t b/test/color.active.t index 501ada6dc..da1d0951e 100755 --- a/test/color.active.t +++ b/test/color.active.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -40,7 +40,6 @@ if (open my $fh, '>', 'color.rc') "color.active=red\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -54,11 +53,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m /x, 'color.active'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.blocked.t b/test/color.blocked.t index 94e88c5ed..95447d0ec 100755 --- a/test/color.blocked.t +++ b/test/color.blocked.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -41,7 +41,6 @@ if (open my $fh, '>', 'color.rc') "color.alternate=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -55,11 +54,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m /x, 'color.blocked'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.disable.t b/test/color.disable.t index b1b45334b..efa8a1441 100755 --- a/test/color.disable.t +++ b/test/color.disable.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 3; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -40,7 +40,6 @@ if (open my $fh, '>', 'color.rc') "color.pri.H=red\n", "fontunderline=no\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -53,11 +52,5 @@ unlike ($output, qr/\033\[0m/, 'color.disable - no color reset'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.keyword.t b/test/color.keyword.t index 1431b04e7..c4d2403e6 100755 --- a/test/color.keyword.t +++ b/test/color.keyword.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 6; +use Test::More tests => 4; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -45,7 +45,6 @@ if (open my $fh, '>', 'color.rc') "color.keyword.yellow=yellow\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -63,11 +62,5 @@ like ($output, qr/ \033\[33m .* annotation .* \033\[0m /x, 'color.ke # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.overdue.t b/test/color.overdue.t index 6152a9c89..362bff0c2 100755 --- a/test/color.overdue.t +++ b/test/color.overdue.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -41,7 +41,6 @@ if (open my $fh, '>', 'color.rc') "_forcecolor=1\n", "dateformat=m/d/Y\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -54,11 +53,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m/x, 'color.overdue'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.pri.t b/test/color.pri.t index 91d65da9b..4cd67346c 100755 --- a/test/color.pri.t +++ b/test/color.pri.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 6; +use Test::More tests => 4; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -44,7 +44,6 @@ if (open my $fh, '>', 'color.rc') "color.alternate=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -61,11 +60,5 @@ like ($output, qr/ \033\[33m .* yellow .* \033\[0m /x, 'color.pri.none'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.project.t b/test/color.project.t index 576e6af55..fc81629eb 100755 --- a/test/color.project.t +++ b/test/color.project.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -42,7 +42,6 @@ if (open my $fh, '>', 'color.rc') "color.alternate=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -55,11 +54,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m /x, 'color.project.re # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.recurring.t b/test/color.recurring.t index 092ebdfa9..6baa586d9 100755 --- a/test/color.recurring.t +++ b/test/color.recurring.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -41,7 +41,6 @@ if (open my $fh, '>', 'color.rc') "color.due=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -54,11 +53,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m /x, 'color.recur # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.tag.t b/test/color.tag.t index d83620539..15b96e89c 100755 --- a/test/color.tag.t +++ b/test/color.tag.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 3; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -44,7 +44,6 @@ if (open my $fh, '>', 'color.rc') "color.tag.green=green\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -59,11 +58,5 @@ like ($output, qr/ \033\[32m .* green .* \033\[0m /x, 'color.tag.green' # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.tagged.t b/test/color.tagged.t index ecd48b6ad..d96c4b59a 100755 --- a/test/color.tagged.t +++ b/test/color.tagged.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 5; +use Test::More tests => 3; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -44,7 +44,6 @@ if (open my $fh, '>', 'color.rc') "color.alternate=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } # Test the add command. @@ -57,11 +56,5 @@ like ($output, qr/ \033\[31m .* red .* \033\[0m /x, 'color.tagged'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0; diff --git a/test/color.uda.t b/test/color.uda.t index 6ecd676dc..75faa6299 100755 --- a/test/color.uda.t +++ b/test/color.uda.t @@ -27,7 +27,7 @@ use strict; use warnings; -use Test::More tests => 4; +use Test::More tests => 2; # Ensure environment has no influence. delete $ENV{'TASKDATA'}; @@ -43,7 +43,6 @@ if (open my $fh, '>', 'color.rc') "color.alternate=\n", "_forcecolor=1\n"; close $fh; - ok (-r 'color.rc', 'Created color.rc'); } qx{../src/task rc:color.rc add one 2>&1}; @@ -55,11 +54,5 @@ like ($output, qr/ \033\[31m .* two .* \033\[0m /x, 'Found color.uda'); # Cleanup. unlink qw(pending.data completed.data undo.data backlog.data color.rc); -ok (! -r 'pending.data' && - ! -r 'completed.data' && - ! -r 'undo.data' && - ! -r 'backlog.data' && - ! -r 'color.rc', 'Cleanup'); - exit 0;