From c342159369de8e700e2e077c536e8abe3dffa354 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 26 May 2014 13:22:51 -0400
Subject: [PATCH] Unit Tests

- calc.t was not up to date regarding the form of the diagnostic output.
---
 test/calc.t | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/test/calc.t b/test/calc.t
index cb892b8ad..85758b277 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -27,36 +27,35 @@
 
 use strict;
 use warnings;
-use Test::More tests => 22;
+use Test::More tests => 21;
 
 # '15min' is seen as '15', 'min', not '15min' duration.
 my $output = qx{../src/calc --debug --noambiguous '12 * 3600 + 34 * 60 + 56'};
-like ($output, qr/token infix '12' Number/,   'Number 12');
-like ($output, qr/token infix '3600' Number/, 'Number 3600');
-like ($output, qr/token infix '34' Number/,   'Number 60');
-like ($output, qr/token infix '60' Number/,   'Number 60');
-like ($output, qr/token infix '56' Number/,   'Number 56');
-like ($output, qr/no errors/ms,               'No syntax errors');
-like ($output, qr/^45296$/ms,                 'Result 45296');
-unlike ($output, qr/Error/,                   'No errors');
+like ($output, qr/eval push '12' Number/,   'Number 12');
+like ($output, qr/eval push '3600' Number/, 'Number 3600');
+like ($output, qr/eval push '34' Number/,   'Number 60');
+like ($output, qr/eval push '60' Number/,   'Number 60');
+like ($output, qr/eval push '56' Number/,   'Number 56');
+like ($output, qr/no errors/ms,             'No syntax errors');
+like ($output, qr/^45296$/ms,               'Result 45296');
+unlike ($output, qr/Error/,                 'No errors');
 
 $output = qx{../src/calc --debug --noambiguous --postfix '12 3600 * 34 60 * 56 + +'};
-like ($output, qr/token postfix '12' Number/,   'Number 12');
-like ($output, qr/token postfix '3600' Number/, 'Number 3600');
-like ($output, qr/token postfix '34' Number/,   'Number 60');
-like ($output, qr/token postfix '60' Number/,   'Number 60');
-like ($output, qr/token postfix '56' Number/,   'Number 56');
-like ($output, qr/^45296$/ms,                 'Result 45296');
-unlike ($output, qr/Error/,                   'No errors');
+like ($output, qr/eval push '12' Number/,   'Number 12');
+like ($output, qr/eval push '3600' Number/, 'Number 3600');
+like ($output, qr/eval push '34' Number/,   'Number 60');
+like ($output, qr/eval push '60' Number/,   'Number 60');
+like ($output, qr/eval push '56' Number/,   'Number 56');
+like ($output, qr/^45296$/ms,               'Result 45296');
+unlike ($output, qr/Error/,                 'No errors');
 
 $output = qx{../src/calc --debug --noambiguous '2--3'};
-like ($output, qr/token infix '2' Number/ms,       'Number 2');
-like ($output, qr/token infix '-' Operator/ms,     'Operator -');
-like ($output, qr/token infix '_neg_' Operator/ms, 'operator _neg_');
-like ($output, qr/token infix '3' Number/ms,       'Number 3');
-like ($output, qr/no errors/ms,                    'No syntax errors');
-like ($output, qr/^5$/ms,                          'Result 5');
-unlike ($output, qr/Error/,                        'No errors');
+like ($output, qr/eval push '2' Number/ms,  'Number 2');
+like ($output, qr/eval operator '-'/ms,     'Operator -');
+like ($output, qr/eval push '3' Number/ms,  'Number 3');
+like ($output, qr/no errors/ms,             'No syntax errors');
+like ($output, qr/^5$/ms,                   'Result 5');
+unlike ($output, qr/Error/,                 'No errors');
 
 exit 0;