Also define a default functor rule for the new Polyline

[perl/modules/LaTeX-TikZ.git] / t / 30-functor.t

diff --git a/t/30-functor.t b/t/30-functor.t
index bdade4b6c6257b1686636a263258de9d3e00582f..74ff18d727f489e771a7181ebdf784e03eb34204 100644 (file)
--- a/t/30-functor.t
+++ b/t/30-functor.t
@@ -3,33 +3,17 @@
 use strict;
 use warnings;
 
-use Test::More tests => 10 + 2 * 7;
+use Test::More tests => 11 + 2 * 8;
 
 use LaTeX::TikZ;
 
-my $tikz = Tikz->formatter(
+use lib 't/lib';
+use LaTeX::TikZ::TestHelper;
+
+using Tikz->formatter(
  format => '%d',
 );
 
-sub check {
- my ($set, $desc, $exp) = @_;
-
- local $Test::Builder::Level = $Test::Builder::Level + 1;
-
- my ($head, $decl, $body) = eval {
-  $tikz->render(ref $set eq 'ARRAY' ? @$set : $set);
- };
- is $@, '', "$desc: no error";
-
- unless (ref $exp eq 'ARRAY') {
-  $exp = [ split /\n/, $exp ];
- }
- unshift @$exp, '\begin{tikzpicture}';
- push    @$exp, '\end{tikzpicture}';
-
- is_deeply $body, $exp, $desc;
-}
-
 my $translate = eval {
  Tikz->functor(
   'LaTeX::TikZ::Set::Point' => sub {
@@ -53,7 +37,11 @@ my $seq = Tikz->seq(
                  Tikz->raw('foo'),
                  Tikz->point(2),
                  Tikz->line(-1 => 3)
-                     ->clip(Tikz->circle(1, 1))
+                     ->clip(Tikz->circle(1, 1)),
+                 Tikz->union(
+                  Tikz->chain(4 => '--' => [ -3, 2 ]),
+                  Tikz->join('-|' => [ -1, 0 ], [ 0, 1 ]),
+                 ),
                 )
               ->clip(Tikz->rectangle([0, -1] => [2, 3]));
 
@@ -72,6 +60,7 @@ check $seq, 'the original sequence', <<'RES';
 \clip (1cm,0cm) circle (1cm) ;
 \draw (-1cm,0cm) -- (3cm,0cm) ;
 \end{scope}
+\draw (4cm,0cm) -- (-3cm,2cm) (-1cm,0cm) -| (0cm,1cm) ;
 \end{scope}
 RES
 
@@ -85,9 +74,23 @@ check $seq2, 'the translated sequence', <<'RES';
 \clip (0cm,1cm) circle (1cm) ;
 \draw (-2cm,1cm) -- (2cm,1cm) ;
 \end{scope}
+\draw (3cm,1cm) -- (-4cm,3cm) (-2cm,1cm) -| (-1cm,2cm) ;
 \end{scope}
 RES
 
+my $poly = Tikz->closed_polyline(
+ [ 0, 0 ], [ 1, 0 ], [ 1, 1 ], [ 0, 1 ]
+);
+
+my $poly2 = eval {
+ $poly->$translate(Tikz->point(-1, 1));
+};
+is $@, '', 'translating a polyline doesn\'t croak';
+
+check $poly2, 'the translated polyline', <<'RES';
+\draw (-1cm,1cm) -- (0cm,1cm) -- (0cm,2cm) -- (-1cm,2cm) -- cycle ;
+RES
+
 my $strip = eval {
  Tikz->functor(
   '+LaTeX::TikZ::Mod' => sub { return },
@@ -112,6 +115,7 @@ check $seq2, 'the original sequence', <<'RES';
 \clip (0cm,1cm) circle (1cm) ;
 \draw (-2cm,1cm) -- (2cm,1cm) ;
 \end{scope}
+\draw (3cm,1cm) -- (-4cm,3cm) (-2cm,1cm) -| (-1cm,2cm) ;
 \end{scope}
 RES
 
@@ -120,6 +124,7 @@ check $seq3, 'the stripped sequence', <<'RES';
 \draw foo ;
 \draw (1cm,1cm) ;
 \draw (-2cm,1cm) -- (2cm,1cm) ;
+\draw (3cm,1cm) -- (-4cm,3cm) (-2cm,1cm) -| (-1cm,2cm) ;
 RES
 
 my $special = eval {
@@ -138,7 +143,7 @@ $special = eval {
   '+LaTeX::TikZ::Mod'       => sub { die "mod\n" },
   '+LaTeX::TikZ::Set'       => sub { die "set\n" },
   'LaTeX::TikZ::Set::Point' => sub { Tikz->point(7) },
-  'LaTeX::TikZ::Set::Op'    => sub { Tikz->raw('moo') },
+  'LaTeX::TikZ::Set::Path'  => sub { Tikz->raw('moo') },
  );
 };
 is $@, '', 'creating a special functor with + and normal rules doesn\'t croak';
@@ -158,7 +163,7 @@ check $res, 'the result of the special functor', <<'RES';
 \draw moo ;
 RES
 
-$tikz = eval {
+using eval {
  Tikz->formatter(
   origin => [ -1, 1 ],
  );
@@ -175,5 +180,6 @@ check $seq, 'a sequence translated by an origin', <<'RES';
 \clip (0cm,1cm) circle (1cm) ;
 \draw (-2cm,1cm) -- (2cm,1cm) ;
 \end{scope}
+\draw (3cm,1cm) -- (-4cm,3cm) (-2cm,1cm) -| (-1cm,2cm) ;
 \end{scope}
 RES