Make LT::Set::Path the base role, remove ::Op, and rename the old ::Path to ::Union

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

diff --git a/t/10-set.t b/t/10-set.t
index 6ff94ef58cb2b1f62ce2ddfe65b76c5243da88c5..9d20422f25d0da150350051c5b6cd0ab7e9787ce 100644 (file)
--- a/t/10-set.t
+++ b/t/10-set.t
@@ -7,29 +7,13 @@ use Test::More tests => 19 + 2 * 14;
 
 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');
 };
@@ -173,15 +157,15 @@ sub failed_valid {
 }
 
 eval {
- Tikz->path($foo, $seq2);
+ Tikz->union($foo, $seq2);
 };
-like $@, failed_valid('Maybe[ArrayRef[LaTeX::TikZ::Set::Op]]'),
-         '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);
+ 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';
 \draw foo bar baz ;
@@ -200,5 +184,5 @@ RES
 eval {
  $path->add($seq2);
 };
-like $@, failed_valid('LaTeX::TikZ::Set::Op'),
+like $@, failed_valid('LaTeX::TikZ::Set::Path'),
          'adding a sequence to a path croaks';