diff --git a/test/bug.1056.t b/test/bug.1056.t deleted file mode 100755 index df8d11c37..000000000 --- a/test/bug.1056.t +++ /dev/null @@ -1,72 +0,0 @@ -#! /usr/bin/env perl -################################################################################ -## -## Copyright 2006 - 2015, 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 -## in the Software without restriction, including without limitation the rights -## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -## copies of the Software, and to permit persons to whom the Software is -## furnished to do so, subject to the following conditions: -## -## The above copyright notice and this permission notice shall be included -## in all copies or substantial portions of the Software. -## -## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -## SOFTWARE. -## -## http://www.opensource.org/licenses/mit-license.php -## -################################################################################ - -use strict; -use warnings; -use Test::More tests => 7; - -# Ensure environment has no influence. -delete $ENV{'TASKDATA'}; -delete $ENV{'TASKRC'}; - -use File::Basename; -my $ut = basename ($0); -my $rc = $ut . '.rc'; - -# Create the rc file. -if (open my $fh, '>', $rc) -{ - print $fh "data.location=.\n", - "confirmation=off\n", - "color=off\n", - "verbose=nothing\n"; - close $fh; -} - -# Bug 1056: Project indentation in CmdSummary. -qx{../src/task rc:$rc add testing project:existingParent 2>&1 >/dev/null}; -qx{../src/task rc:$rc add testing project:existingParent.child 2>&1 >/dev/null}; -qx{../src/task rc:$rc add testing project:abstractParent.kid 2>&1 >/dev/null}; -qx{../src/task rc:$rc add testing project:.myProject 2>&1 >/dev/null}; -qx{../src/task rc:$rc add testing project:myProject. 2>&1 >/dev/null}; -qx{../src/task rc:$rc add testing project:.myProject. 2>&1 >/dev/null}; - -my $output = qx{../src/task rc:$rc summary 2>&1}; -my @lines = split ('\n',$output); - -like ($lines[0], qr/^\.myProject\s/, "$ut: '.myProject' not indented"); -like ($lines[1], qr/^\.myProject\.\s/, "$ut: '.myProject.' not indented"); -like ($lines[2], qr/^abstractParent\s*$/, "$ut: 'abstractParent' not indented, no data"); -like ($lines[3], qr/^\s\skid\s+\d/, "$ut: ' kid' indented, without parent, with data"); -like ($lines[4], qr/^existingParent\s+\d/, "$ut: 'existingParent' not indented, with data"); -like ($lines[5], qr/^\s\schild\s+\d/, "$ut: ' child' indented, without parent, with data"); -like ($lines[6], qr/^myProject\.\s+\d/, "$ut: 'myProject.' not indented, with data"); - -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; - diff --git a/test/project.t b/test/project.t index d7f4b53fa..9d566d56d 100755 --- a/test/project.t +++ b/test/project.t @@ -96,13 +96,7 @@ class TestProjects(TestCase): self.assertRegexpMatches(err, self.STATUS.format("foo bar", "0%", "1 task")) - def test_project_indentation(self): - """check project/subproject indentation - - Reported in bug 1056 - - See also the tests of helper functions for CmdProjects in util.t.cpp - """ + def add_tasks(self): self.t(("add", "testing", "project:existingParent")) self.t(("add", "testing", "project:existingParent.child")) self.t(("add", "testing", "project:abstractParent.kid")) @@ -110,8 +104,7 @@ class TestProjects(TestCase): self.t(("add", "testing", "project:myProject")) self.t(("add", "testing", "project:.myProject.")) - code, out, err = self.t(("projects",)) - + def validate_indentation(self, out): order = ( ".myProject ", ".myProject. ", @@ -135,6 +128,30 @@ class TestProjects(TestCase): "indentation.{2}".format(proj, pos, out)) ) + def test_project_indentation(self): + """check project/subproject indentation in 'task projects' + + Reported in bug 1056 + + See also the tests of helper functions for CmdProjects in util.t.cpp + """ + self.add_tasks() + + code, out, err = self.t(("projects",)) + + self.validate_indentation(out) + + def test_project_indentation_in_summary(self): + """check project/subproject indentation in 'task summary' + + Reported in bug 1056 + """ + self.add_tasks() + + code, out, err = self.t(("summary",)) + + self.validate_indentation(out) + if __name__ == "__main__": from simpletap import TAPTestRunner