X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F10-set.t;h=e385932d1a3ba6ae5d273b963bb2b504cec8b64f;hb=HEAD;hp=190846c6972956359b799d9f0db65f28fcf7b206;hpb=ee0f9123624eb8e48675f80303ed436b9a94e348;p=perl%2Fmodules%2FLaTeX-TikZ.git

diff --git a/t/10-set.t b/t/10-set.t
index 190846c..e385932 100644
--- a/t/10-set.t
+++ b/t/10-set.t
@@ -3,33 +3,17 @@
 use strict;
 use warnings;
 
-use Test::More tests => 12 + 2 * 7;
+use Test::More tests => 29 + 2 * 21;
 
 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 $foo = eval {
  Tikz->raw('foo');
 };
@@ -101,40 +85,185 @@ check $seq3, 'two different raw sets and an extended sequence', <<'RES';
 \draw foo ;
 RES
 
+my $seq4 = eval {
+ Tikz->seq;
+};
+is $@, '', 'creating an empty sequence doesn\'t croak';
+
+check $seq4, 'an empty sequence', '';
+
+$seq4 = eval {
+ Tikz->seq(Tikz->seq);
+};
+is $@, '', 'creating a sequence that contains an empty sequence doesn\'t croak';
+
+check $seq4, 'a sequence that contains an empty sequence', '';
+
+$seq4 = eval {
+ Tikz->seq($foo, Tikz->seq);
+};
+is $@, '',
+ 'creating a sequence that contains a set and an empty sequence doesn\'t croak';
+
+check $seq4, 'a sequence that contains a set and an empty sequence', <<'RES';
+\draw foo ;
+RES
+
+$seq4 = eval {
+ Tikz->seq(Tikz->seq, $foo);
+};
+is $@, '',
+ 'creating a sequence that contains an empty sequence and a set doesn\'t croak';
+
+check $seq4, 'a sequence that contains an empty sequence and a set', <<'RES';
+\draw foo ;
+RES
+
+$seq4 = eval {
+ Tikz->seq($foo, $bar, Tikz->seq);
+};
+is $@, '',
+'creating a sequence that contains 2 sets and an empty sequence doesn\'t croak';
+
+check $seq4, 'a sequence that contains 2 sets and an empty sequence', <<'RES';
+\draw foo ;
+\draw bar ;
+RES
+
+$seq4 = eval {
+ Tikz->seq($foo, Tikz->seq, $bar);
+};
+is $@, '', 'creating a sequence that contains a set, an empty sequence, a set doesn\'t croak';
+
+check $seq4, 'a sequence that contains a set, an empty sequence, a set',<<'RES';
+\draw foo ;
+\draw bar ;
+RES
+
+$seq4 = eval {
+ Tikz->seq(Tikz->seq, $foo, $bar);
+};
+is $@, '',
+'creating a sequence that contains an empty sequence and 2 sets';
+
+check $seq4, 'a sequence that contains an empty sequence and 2 sets', <<'RES';
+\draw foo ;
+\draw bar ;
+RES
+
 sub failed_valid {
  my ($tc) = @_;
  qr/Validation failed for '\Q$tc\E'/;
 }
 
-my $err_path = qr/does not pass the type constraint because: Validation failed for 'Maybe\[ArrayRef\[LaTeX::TikZ::Set::Path::Elements\]\]/;
-
 eval {
- Tikz->path($foo, $seq2);
+ Tikz->union($foo, $seq2);
 };
-like $@, failed_valid('Maybe[ArrayRef[LaTeX::TikZ::Set::Path::Elements]]'),
-         'creating a path that contains a sequence croaks';
+like $@, failed_valid('Maybe[ArrayRef[LaTeX::TikZ::Set::Path]]'),
+         'creating an union that contains a sequence croaks';
 
-my $path = eval {
- Tikz->path($foo, $bar, $baz);
+my $union = eval {
+ Tikz->union($foo, $bar, $baz);
 };
-is $@, '', 'creating a path set doesn\'t croak';
+is $@, '', 'creating an union set doesn\'t croak';
 
-check $path, 'one path set', <<'RES';
+check $union, 'one union set', <<'RES';
 \draw foo bar baz ;
 RES
 
 eval {
- $path->add($foo);
+ $union->add($foo);
 };
-is $@, '', 'adding something to a path set doesn\'t croak';
+is $@, '', 'adding something to a union set doesn\'t croak';
 
-check Tikz->seq($path, $path), 'two identical path sets', <<'RES';
+check Tikz->seq($union, $union), 'two identical union sets', <<'RES';
 \draw foo bar baz foo ;
 \draw foo bar baz foo ;
 RES
 
 eval {
- $path->add($seq2);
+ $union->add($seq2);
+};
+like $@, failed_valid('LaTeX::TikZ::Set::Path'),
+         'adding a sequence to a union croaks';
+
+my $join = eval {
+ Tikz->join('--' => $foo, $bar, $baz);
+};
+is $@, '', 'creating an chain set joined with a string doesn\'t croak';
+
+check $join, 'one chain set joined with a string', <<'RES';
+\draw foo -- bar -- baz ;
+RES
+
+eval {
+ $join->add($foo);
+};
+is $@, '', 'adding a set to a chain set joined with a string doesn\'t croak';
+
+check $join, 'one appended chain set joined with a string', <<'RES';
+\draw foo -- bar -- baz -- foo ;
+RES
+
+$join = eval {
+ Tikz->join(sub { ' ' } => $foo, $bar, $baz);
+};
+is $@, '', 'creating an chain set joined with a coderef doesn\'t croak';
+
+check $join, 'one chain set joined with a string', <<'RES';
+\draw foo bar baz ;
+RES
+
+eval {
+ $join->add($foo);
+};
+is $@, '', 'adding a set to a chain set joined with a coderef doesn\'t croak';
+
+check $join, 'one appended chain set joined with a coderef', <<'RES';
+\draw foo bar baz foo ;
+RES
+
+$join = eval {
+ Tikz->join([ '', '..', '--' ] => $foo, $bar, $baz);
+};
+is $@, '', 'creating an chain set joined with an arrayref doesn\'t croak';
+
+check $join, 'one chain set joined with a string', <<'RES';
+\draw foo bar .. baz ;
+RES
+
+eval {
+ $join->add($foo);
+};
+is $@, '', 'adding a set to a chain set joined with an arrayref doesn\'t croak';
+
+check $join, 'one appended chain set joined with an arrayref', <<'RES';
+\draw foo bar .. baz -- foo ;
+RES
+
+eval {
+ $join->add($bar);
+};
+is $@, '',
+   'adding too many sets to a chain set joined with an arrayref doesn\'t croak';
+
+eval {
+ using()->render($join);
+};
+like $@, qr/^Invalid connector/,
+         'adding too many sets to a chain set joined with an arrayref croaks';
+
+my $chain = eval {
+ Tikz->chain($foo => '--' => $bar => '->' => $baz);
+};
+is $@, '', 'creating an chain set with chain doesn\'t croak';
+
+check $chain, 'one chain set from chain', <<'RES';
+\draw foo -- bar -> baz ;
+RES
+
+eval {
+ Tikz->chain($foo, '--', $bar, '--');
 };
-like $@, failed_valid('LaTeX::TikZ::Set::Path::Elements'),
-         'adding a sequence to a path croaks';
+like $@, qr/^The 'chain' command expects an odd number of arguments/,
+         'creating an union that contains a sequence croaks';