From 51e947064f79ed15576c55c9e834bf9d00006ef3 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Thu, 19 Feb 2015 13:38:27 +0000 Subject: [PATCH] Tests - merge args.[2-5].t with enpassant.t and convert to python --- test/args.2.t | 83 -------------------- test/args.3.t | 83 -------------------- test/args.4.t | 83 -------------------- test/args.5.t | 88 ---------------------- test/enpassant.t | 191 +++++++++++++++++++++++++++++++++-------------- 5 files changed, 136 insertions(+), 392 deletions(-) delete mode 100755 test/args.2.t delete mode 100755 test/args.3.t delete mode 100755 test/args.4.t delete mode 100755 test/args.5.t diff --git a/test/args.2.t b/test/args.2.t deleted file mode 100755 index 076bb4daf..000000000 --- a/test/args.2.t +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -############################################################################### -# -# 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 -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - - -class TestDoneEnpassant(TestCase): - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - # No journal log which may contain the words we are looking for - self.t.config("journal.info", "off") - - def test_done(self): - """Test 'done' with en-passant changes""" - self.t(("add", "one")) - self.t(("add", "two")) - self.t(("add", "three")) - self.t(("add", "four")) - self.t(("add", "five")) - - self.t(("1", "done", "oneanno")) - code, out, err = self.t(("1", "info")) - self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno", - msg="done enpassant annotation") - - self.t(("2", "done", "/two/TWO/")) - code, out, err = self.t(("2", "info")) - self.assertRegexpMatches(out, "Description +TWO", - msg="done enpassant modify") - - self.t(("3", "done", "+threetag")) - code, out, err = self.t(("3", "info")) - self.assertRegexpMatches(out, "Tags +threetag", - msg="done enpassant tag") - - self.t(("4", "done", "pri:H")) - code, out, err = self.t(("4", "info")) - self.assertRegexpMatches(out, "Priority +H", - msg="done enpassant priority") - - self.t(("5", "done", "pro:PROJ")) - code, out, err = self.t(("5", "info")) - self.assertRegexpMatches(out, "Project +PROJ", - msg="done enpassant project") - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 diff --git a/test/args.3.t b/test/args.3.t deleted file mode 100755 index 93c4deb83..000000000 --- a/test/args.3.t +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -############################################################################### -# -# 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 -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - - -class TestDeleteEnpassant(TestCase): - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - # No journal log which may contain the words we are looking for - self.t.config("journal.info", "off") - - def test_delete(self): - """Test 'delete' with en-passant changes""" - self.t(("add", "one")) - self.t(("add", "two")) - self.t(("add", "three")) - self.t(("add", "four")) - self.t(("add", "five")) - - self.t(("1", "delete", "oneanno")) - code, out, err = self.t(("1", "info")) - self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno", - msg="delete enpassant annotation") - - self.t(("2", "delete", "/two/TWO/")) - code, out, err = self.t(("2", "info")) - self.assertRegexpMatches(out, "Description +TWO", - msg="delete enpassant modify") - - self.t(("3", "delete", "+threetag")) - code, out, err = self.t(("3", "info")) - self.assertRegexpMatches(out, "Tags +threetag", - msg="delete enpassant tag") - - self.t(("4", "delete", "pri:H")) - code, out, err = self.t(("4", "info")) - self.assertRegexpMatches(out, "Priority +H", - msg="delete enpassant priority") - - self.t(("5", "delete", "pro:PROJ")) - code, out, err = self.t(("5", "info")) - self.assertRegexpMatches(out, "Project +PROJ", - msg="delete enpassant project") - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 diff --git a/test/args.4.t b/test/args.4.t deleted file mode 100755 index 7653fcb10..000000000 --- a/test/args.4.t +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -############################################################################### -# -# 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 -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - - -class TestStartEnpassant(TestCase): - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - # No journal log which may contain the words we are looking for - self.t.config("journal.info", "off") - - def test_start(self): - """Test 'start' with en-passant changes""" - self.t(("add", "one")) - self.t(("add", "two")) - self.t(("add", "three")) - self.t(("add", "four")) - self.t(("add", "five")) - - self.t(("1", "start", "oneanno")) - code, out, err = self.t(("1", "info")) - self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno", - msg="start enpassant annotation") - - self.t(("2", "start", "/two/TWO/")) - code, out, err = self.t(("2", "info")) - self.assertRegexpMatches(out, "Description +TWO", - msg="start enpassant modify") - - self.t(("3", "start", "+threetag")) - code, out, err = self.t(("3", "info")) - self.assertRegexpMatches(out, "Tags +threetag", - msg="start enpassant tag") - - self.t(("4", "start", "pri:H")) - code, out, err = self.t(("4", "info")) - self.assertRegexpMatches(out, "Priority +H", - msg="start enpassant priority") - - self.t(("5", "start", "pro:PROJ")) - code, out, err = self.t(("5", "info")) - self.assertRegexpMatches(out, "Project +PROJ", - msg="start enpassant project") - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 diff --git a/test/args.5.t b/test/args.5.t deleted file mode 100755 index e505a7cc7..000000000 --- a/test/args.5.t +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -############################################################################### -# -# 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 -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - - -class TestStopEnpassant(TestCase): - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - # No journal log which may contain the words we are looking for - self.t.config("journal.info", "off") - - def test_start(self): - """Test 'start' with en-passant changes""" - self.t(("add", "one")) - self.t(("1", "start")) - self.t(("add", "two")) - self.t(("2", "start")) - self.t(("add", "three")) - self.t(("3", "start")) - self.t(("add", "four")) - self.t(("4", "start")) - self.t(("add", "five")) - self.t(("5", "start")) - - self.t(("1", "stop", "oneanno")) - code, out, err = self.t(("1", "info")) - self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno", - msg="stop enpassant annotation") - - self.t(("2", "stop", "/two/TWO/")) - code, out, err = self.t(("2", "info")) - self.assertRegexpMatches(out, "Description +TWO", - msg="stop enpassant modify") - - self.t(("3", "stop", "+threetag")) - code, out, err = self.t(("3", "info")) - self.assertRegexpMatches(out, "Tags +threetag", - msg="stop enpassant tag") - - self.t(("4", "stop", "pri:H")) - code, out, err = self.t(("4", "info")) - self.assertRegexpMatches(out, "Priority +H", - msg="stop enpassant priority") - - self.t(("5", "stop", "pro:PROJ")) - code, out, err = self.t(("5", "info")) - self.assertRegexpMatches(out, "Project +PROJ", - msg="stop enpassant project") - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 diff --git a/test/enpassant.t b/test/enpassant.t index 4d2ad5b52..0ab25741c 100755 --- a/test/enpassant.t +++ b/test/enpassant.t @@ -1,61 +1,142 @@ -#! /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 -## -################################################################################ +#!/usr/bin/env python2.7 +# -*- coding: utf-8 -*- +############################################################################### +# +# 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 => 8; +import sys +import os +import unittest +# Ensure python finds the local simpletap module +sys.path.append(os.path.dirname(os.path.abspath(__file__))) -# Ensure environment has no influence. -delete $ENV{'TASKDATA'}; -delete $ENV{'TASKRC'}; +from basetest import Task, TestCase -# Create the rc file. -if (open my $fh, '>', 'enp.rc') -{ - print $fh "data.location=.\n"; - close $fh; -} -# Test the en passant feature. -qx{../src/task rc:enp.rc add foo 2>&1}; -qx{../src/task rc:enp.rc add foo bar 2>&1}; -qx{../src/task rc:enp.rc 1,2 done /foo/FOO/ pri:H +tag 2>&1}; -my $output = qx{../src/task rc:enp.rc info 1 2>&1}; -like ($output, qr/Status\s+Completed/, 'en passant 1 status change'); -like ($output, qr/Description\s+FOO/, 'en passant 1 description change'); -like ($output, qr/Priority\s+H/, 'en passant 1 description change'); -like ($output, qr/Tags\s+tag/, 'en passant 1 description change'); -$output = qx{../src/task rc:enp.rc info 2 2>&1}; -like ($output, qr/Status\s+Completed/, 'en passant 2 status change'); -like ($output, qr/Description\s+FOO bar/, 'en passant 2 description change'); -like ($output, qr/Priority\s+H/, 'en passant 2 description change'); -like ($output, qr/Tags\s+tag/, 'en passant 2 description change'); +class BaseTestEnpassant(TestCase): + def setUp(self): + """Executed before each test in the class""" + self.t = Task() + # No journal log which may contain the words we are looking for + self.t.config("journal.info", "off") -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data enp.rc); -exit 0; +class TestEnpassantMultiple(BaseTestEnpassant): + def setUp(self): + super(TestEnpassantMultiple, self).setUp() + + self.t(("add", "foo")) + self.t(("add", "foo", "bar")) + self.t(("add", "baz foo baz")) + + def validate_info(self, id, desc): + code, out, err = self.t((id, "info")) + + self.assertRegexpMatches( + out, "Status +Completed", + msg="enpassant {0} status change".format(id), + ) + self.assertRegexpMatches( + out, "Priority +H", + msg="enpassant {0} priority change".format(id), + ) + self.assertRegexpMatches( + out, "Tags +tag", + msg="enpassant {0} tag change".format(id), + ) + self.assertRegexpMatches( + out, "Description +{0}".format(desc), + msg="enpassant {0} description change".format(id), + ) + + def test_multiple(self): + "Test enpassant in multiple tasks and with multiple changes at once" + self.t(("1,2,3", "done", "/foo/FOO/", "pri:H", "+tag"), input="all\n") + + self.validate_info("1", desc="FOO") + self.validate_info("2", desc="FOO bar") + self.validate_info("3", desc="baz FOO baz") + + +class TestEnpassant(BaseTestEnpassant): + def setUp(self): + super(TestEnpassant, self).setUp() + + self.t(("add", "one")) + self.t(("add", "two")) + self.t(("add", "three")) + self.t(("add", "four")) + self.t(("add", "five")) + + def perform_action(self, action): + self.t(("1", action, "oneanno")) + code, out, err = self.t(("1", "info")) + self.assertRegexpMatches(out, "Description +one\n[0-9: -]+ oneanno", + msg="{0} enpassant annotation".format(action)) + + self.t(("2", action, "/two/TWO/")) + code, out, err = self.t(("2", "info")) + self.assertRegexpMatches(out, "Description +TWO", + msg="{0} enpassant modify".format(action)) + + self.t(("3", action, "+threetag")) + code, out, err = self.t(("3", "info")) + self.assertRegexpMatches(out, "Tags +threetag", + msg="{0} enpassant tag".format(action)) + + self.t(("4", action, "pri:H")) + code, out, err = self.t(("4", "info")) + self.assertRegexpMatches(out, "Priority +H", + msg="{0} enpassant priority".format(action)) + + self.t(("5", action, "pro:PROJ")) + code, out, err = self.t(("5", "info")) + self.assertRegexpMatches(out, "Project +PROJ", + msg="{0} enpassant project".format(action)) + + def test_done(self): + """Test 'done' with en-passant changes""" + self.perform_action("done") + + def test_delete(self): + """Test 'delete' with en-passant changes""" + self.perform_action("delete") + + def test_start(self): + """Test 'start' with en-passant changes""" + self.perform_action("start") + + def test_stop(self): + """Test 'stop' with en-passant changes""" + self.t(("1-5", "start"), input="all\n") + + self.perform_action("stop") + + +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4