Replace LaTeX::TikZ::Set::Path::Elements by LaTeX::TikZ::Set::Op

[perl/modules/LaTeX-TikZ.git] / t / 10-set.t

diff --git a/t/10-set.t b/t/10-set.t
index 69008aed5d948e3ed2cb011a2e6202bdf7a22c98..4ddac3c9d670ff68b9dc81a3dde2daaea4411531 100644 (file)
--- a/t/10-set.t
+++ b/t/10-set.t
@@ -6,15 +6,16 @@ use warnings;
 use Test::More tests => 12 + 2 * 7;
 
 use LaTeX::TikZ;
-use LaTeX::TikZ::Formatter;
 
-my $tikz = LaTeX::TikZ::Formatter->new(
+my $tikz = 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);
  };
@@ -105,12 +106,10 @@ sub failed_valid {
  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);
 };
-like $@, failed_valid('Maybe[ArrayRef[LaTeX::TikZ::Set::Path::Elements]]'),
+like $@, failed_valid('Maybe[ArrayRef[LaTeX::TikZ::Set::Op]]'),
          'creating a path that contains a sequence croaks';
 
 my $path = eval {
@@ -127,7 +126,7 @@ eval {
 };
 is $@, '', 'adding something to a path set doesn\'t croak';
 
-check [ $path, $path ], 'two identical path sets', <<'RES';
+check Tikz->seq($path, $path), 'two identical path sets', <<'RES';
 \draw foo bar baz foo ;
 \draw foo bar baz foo ;
 RES
@@ -135,5 +134,5 @@ RES
 eval {
  $path->add($seq2);
 };
-like $@, failed_valid('LaTeX::TikZ::Set::Path::Elements'),
+like $@, failed_valid('LaTeX::TikZ::Set::Op'),
          'adding a sequence to a path croaks';