move t1lib font support to a separate module

[imager.git] / t / t56postfix.t

diff --git a/t/t56postfix.t b/t/t56postfix.t
index 4ef18a336d82bad9e732c84a393d68ce569b6103..6366e8b2b4fda673e0249524ffe17ad399ab9be6 100644 (file)
--- a/t/t56postfix.t
+++ b/t/t56postfix.t
@@ -1,28 +1,25 @@
-BEGIN { $| = 1; print "1..6\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use Imager::Expr;
+#!perl -w
+use strict;
+use Test::More tests => 6;
+BEGIN { use_ok('Imager::Expr') }
 
-$loaded = 1;
-print "ok 1\n";
-
-#$Imager::DEBUG=1;
-
-my $expr = Imager::Expr->new({rpnexpr=>'x two * y one + getp1', variables=>[ qw(x y) ], constants=>{one=>1, two=>2}});
-if ($expr) {
-  print "ok 2\n";
+SKIP:
+{
+  my $expr = Imager::Expr->new({rpnexpr=><<EXPR, variables=>[ qw(x y) ], constants=>{one=>1, two=>2}});
+x two * # see if comments work
+y one + 
+getp1
+EXPR
+  ok($expr, "compile postfix")
+    or print "# ", Imager::Expr->error, "\n";
+  $expr
+    or skip("Could not compile", 4);
 
   # perform some basic validation on the code
   my $code = $expr->dumpcode();
   my @code = split /\n/, $code;
-  print $code[-1] =~ /:\s+ret/ ? "ok 3\n" : "not ok 3\n";
-  print grep(/:\s+mult.*x/, @code) ? "ok 4\n" : "not ok 4\n";
-  print grep(/:\s+add.*y/, @code) ? "ok 5\n" : "not ok 5\n";
-  print grep(/:\s+getp1/, @code) ? "ok 6\n" : "not ok 6\n";
-}
-else {
-  print "not ok 2 ",Imager::Expr::error(),"\n";
-  print "not ok 3 # skip\n";
-  print "not ok 4 # skip\n";
-  print "not ok 5 # skip\n";
-  print "not ok 6 # skip\n";
+  ok($code[-1] =~ /:\s+ret/, "ret at the end");
+  ok(grep(/:\s+mult.*x/, @code), "found mult");
+  ok(grep(/:\s+add.*y/, @code), "found add");
+  ok(grep(/:\s+getp1/, @code), "found getp1");
 }