Use ExprDeclare in tests instead of expr.include

[dbsrgits/Data-Query.git] / t / perl.t

diff --git a/t/perl.t b/t/perl.t
index d8a4f38..e29b0ae 100644 (file)
--- a/t/perl.t
+++ b/t/perl.t
@@ -4,8 +4,8 @@ use Test::More qw(no_plan);
 use Devel::Dwarn;
 use Data::Query::Renderer::Perl;
 use Data::Query::ExprHelpers qw(perl_scalar_value);
-
-BEGIN { require 't/expr.include' }
+use Data::Query::ExprDeclare;
+use Scalar::Util qw(blessed);
 
 my $rend = Data::Query::Renderer::Perl->new;
 
@@ -13,9 +13,11 @@ sub binding { map perl_scalar_value($_), @_ }
 
 sub expr_perl_is (&;@) {
   my $sub = shift;
-    @_
-      ? is_deeply($rend->render(_run_expr($sub)->{expr}), @_)
-      : ::Dwarn($rend->render(_run_expr($sub)->{expr}));
+  my $e = Data::Query::ExprDeclare::_run_expr($sub);
+  $e = blessed($e) ? $e->{expr} : $e;
+  @_
+    ? is_deeply($rend->render($e), @_)
+    : ::Dwarn($rend->render($e));
 }
 
 expr_perl_is { $_->foo }