From 99559b1665f27950e33ddd3eb7dd9bc9c61e12db Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 25 Apr 2009 09:51:44 +0200 Subject: passes critic, but changes for "attach_nodes" are wrong --- lib/Tree/Template/Declare.pm | 8 +++++--- t/02-xslt.t | 14 ++++++++------ t/perlcriticrc | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/Tree/Template/Declare.pm b/lib/Tree/Template/Declare.pm index 356c2fd..38f933c 100644 --- a/lib/Tree/Template/Declare.pm +++ b/lib/Tree/Template/Declare.pm @@ -64,15 +64,17 @@ sub _build_group { local $current_node[0]=$node; $_[0]->(caller_args(1)); } - if ($current_node[0] && !defined(wantarray)) { + if ($current_node[0] && !defined wantarray) { $builder->add_child_node($current_node[0],$node); } return $node; }, attach_nodes => sub { if ($current_node[0]) { - $builder->add_child_node($current_node[0],$_) - for @_; + for my $newnode (@_) { + $builder->add_child_node($current_node[0], + $newnode); + } } }, name => sub ($) { diff --git a/t/02-xslt.t b/t/02-xslt.t index 58206e8..ac6bf42 100644 --- a/t/02-xslt.t +++ b/t/02-xslt.t @@ -2,10 +2,10 @@ package main; use Test::Most 'die'; BEGIN { -eval 'use Tree::DAG_Node::XPath; require Tree::Transform::XSLTish'; -plan skip_all => 'Tree::DAG_Node::XPath and Tree::Transform::XSLTish needed for this test' if $@; +eval 'use Tree::DAG_Node::XPath 0.10; require Tree::Transform::XSLTish'; +plan skip_all => 'Tree::DAG_Node::XPath 0.10 and Tree::Transform::XSLTish needed for this test' if $@; } -plan tests => 1; +plan tests => 3; package Copy;{ use Tree::Transform::XSLTish; @@ -16,12 +16,14 @@ use warnings; tree_rule match => '/', action => sub { tree { + main::diag 'root'; $_[0]->apply_rules; }; }; tree_rule match => '*', priority => 0, action => sub { node { + main::diag 'node '.$_[0]->it->name; name $_[0]->it->name; attribs %{$_[0]->it->attributes}; $_[0]->apply_rules; @@ -36,9 +38,6 @@ use warnings; use Tree::Template::Declare builder => Tree::Template::Declare::DAG_Node->new('Tree::DAG_Node::XPath'); use Data::Dumper; -sub Tree::DAG_Node::XPath::Root::xpath_get_root_node { return $_[0] } -sub Tree::DAG_Node::XPath::Root::xpath_get_parent_node { return } - my $tree=tree { node { name 'root'; @@ -60,6 +59,9 @@ diag "transforming"; my $trans=Copy->new(); my ($tree2)=$trans->transform($tree); +ok(defined $tree,'built'); +ok(defined $tree2,'transformed'); + diag "comparing"; is($tree->tree_to_lol_notation(), $tree2->tree_to_lol_notation(), diff --git a/t/perlcriticrc b/t/perlcriticrc index 3593672..a118666 100644 --- a/t/perlcriticrc +++ b/t/perlcriticrc @@ -7,3 +7,4 @@ color = 1 [-Variables::ProhibitLocalVars] [-ValuesAndExpressions::ProhibitEmptyQuotes] [-Subroutines::RequireArgUnpacking] +[-CodeLayout::RequireTidyCode] -- cgit v1.2.3