PNG re-work: change note for the previous + some TODO

[imager.git] / t / t16matrix.t

diff --git a/t/t16matrix.t b/t/t16matrix.t
index 07ecc858c09ec19e592aa017657d19da6c82f6ee..460460291339d72c4867b5f8115b78182e9afe33 100644 (file)
--- a/t/t16matrix.t
+++ b/t/t16matrix.t
@@ -1,6 +1,6 @@
 #!perl -w
 use strict;
-use Test::More tests => 8;
+use Test::More tests => 23;
 use Imager;
 
 BEGIN { use_ok('Imager::Matrix2d', ':handy') }
@@ -14,6 +14,14 @@ my $trans = Imager::Matrix2d->translate('x'=>10, 'y'=>-11);
 ok(almost_equal($trans, [ 1, 0, 10,
                           0, 1, -11,
                           0, 0, 1 ]), "translate matrix");
+my $trans_x = Imager::Matrix2d->translate(x => 10);
+ok(almost_equal($trans_x, [ 1, 0, 10,
+                          0, 1, 0,
+                          0, 0, 1 ]), "translate just x");
+my $trans_y = Imager::Matrix2d->translate('y' => 11);
+ok(almost_equal($trans_y, [ 1, 0, 0,
+                          0, 1, 11,
+                          0, 0, 1 ]), "translate just y");
 
 my $rotate = Imager::Matrix2d->rotate(degrees=>90);
 ok(almost_equal($rotate, [ 0, -1, 0,
@@ -30,6 +38,11 @@ ok(almost_equal($scale, [ 1.2, 0,   0,
                           0,   0.8, 0,
                           0,   0,   1 ]), "scale matrix");
 
+my $custom = Imager::Matrix2d->matrix(1, 0, 0, 0, 1, 0, 0, 0, 1);
+ok(almost_equal($custom, [ 1, 0, 0,
+                       0, 1, 0,
+                       0, 0, 1 ]), "custom matrix");
+
 my $trans_called;
 $rotate = Imager::Matrix2d::Test->rotate(degrees=>90, x=>50);
 ok($trans_called, "translate called on rotate with just x");
@@ -38,6 +51,64 @@ $trans_called = 0;
 $rotate = Imager::Matrix2d::Test->rotate(degrees=>90, 'y'=>50);
 ok($trans_called, "translate called on rotate with just y");
 
+ok(!Imager::Matrix2d->matrix(), "bad custom matrix");
+is(Imager->errstr, "9 co-efficients required", "check error");
+
+{
+  my @half = ( 0.5, 0, 0,
+              0, 0.5, 0,
+              0, 0, 1 );
+  my @quart = ( 0, 0.25, 0,
+               1, 0, 0,
+               0, 0, 1 );
+  my $half_matrix = Imager::Matrix2d->matrix(@half);
+  my $quart_matrix = Imager::Matrix2d->matrix(@quart);
+  my $result = $half_matrix * $quart_matrix;
+  is_deeply($half_matrix * \@quart, $result, "mult by unblessed matrix");
+  is_deeply(\@half * $quart_matrix, $result, "mult with unblessed matrix");
+
+  my $half_three = Imager::Matrix2d->matrix(1.5, 0, 0, 0, 1.5, 0, 0, 0, 3);
+  is_deeply($half_matrix * 3, $half_three, "mult by three");
+  is_deeply(3 * $half_matrix, $half_three, "mult with three");
+
+  {
+    # check error handling - bad ref type
+    my $died = 
+      !eval {
+      my $foo = $half_matrix * +{};
+      1;
+    };
+    ok($died, "mult by hash ref died");
+    like($@, qr/multiply by array ref or number/, "check message");
+  }
+
+  {
+    # check error handling - bad array
+    $@ = '';
+    my $died = 
+      !eval {
+      my $foo = $half_matrix * [ 1 .. 8 ];
+      1;
+    };
+    ok($died, "mult by short array ref died");
+    like($@, qr/9 elements required in array ref/, "check message");
+  }
+
+  {
+    # check error handling - bad value
+    $@ = '';
+    my $died = 
+      !eval {
+      my $foo = $half_matrix * "abc";
+      1;
+    };
+    ok($died, "mult by bad scalar died");
+    like($@, qr/multiply by array ref or number/, "check message");
+  }
+  
+}
+
+
 sub almost_equal {
   my ($m1, $m2) = @_;
 
@@ -58,3 +129,4 @@ sub translate {
   ++$trans_called;
   return $class->SUPER::translate(%opts);
 }
+