From 9d09d35c59c7110f0c326867b6674b9fcbe9cfba Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Fri, 24 Jul 2015 15:33:26 +0100
Subject: [PATCH] Test: Convert bug.calc.t to Python

---
 test/bug.calc.t | 43 -------------------------------------------
 test/calc.t     | 11 +++++++++++
 2 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100755 test/bug.calc.t

diff --git a/test/bug.calc.t b/test/bug.calc.t
deleted file mode 100755
index f7361ffa4..000000000
--- a/test/bug.calc.t
+++ /dev/null
@@ -1,43 +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 => 5;
-
-my $ut = 'bug.calc.t';
-
-# '15min' is seen as '15', 'min', not '15min' duration.
-my $output = qx{../src/calc --debug 15min};
-unlike ($output, qr/token infix '15' Date/,           "$ut: Misinterpretation: 15min -> 15");
-unlike ($output, qr/token infix 'min' Identifier/,    "$ut: Misinterpretation: 15min -> m");
-unlike ($output, qr/Error: Unexpected stack size: 2/, "$ut: Unexpected stack size");
-like   ($output, qr/Eval literal duration ↑'PT15M'/,    "$ut: 15min -> push PT15M");
-like   ($output, qr/^PT15M$/ms,                         "$ut: 15min -> PT15M");
-
-exit 0;
-
diff --git a/test/calc.t b/test/calc.t
index 175eefb5a..b79c2ac91 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -93,6 +93,17 @@ class TestCalc(TestCase):
         self.assertIn("Copyright", out)
         self.assertGreaterEqual(code, 1)
 
+    def test_duration(self):
+        """'15min' is seen as '15', 'min', not '15min' duration"""
+        code, out, err = run_cmd_wait((CALC, "--debug", "15min"))
+
+        self.assertNotIn("token infix '15' Date", out)
+        self.assertNotIn("token infix 'min' Identifier", out)
+        self.assertNotIn("Error: Unexpected stack size: 2", out)
+        self.assertNotIn("Error: Unexpected stack size: 2", err)
+        self.assertIn("Eval literal duration ↑'PT15M'", out)
+        self.assertRegexpMatches(out, re.compile("^PT15M$", re.MULTILINE))
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner