Skip to content

Commit 11325a0

Browse files
committed
normalize the tests and the variable names
1 parent 962c807 commit 11325a0

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

t/porting/merge-delta.t

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ my %pod = do {
1717
my ( undef, @kv ) = split /^# (.*)\n/m, <DATA>;
1818
@kv;
1919
};
20-
$pod{master} = slurp( 'Porting/perldelta_template.pod' );
20+
$pod{master} = slurp('Porting/perldelta_template.pod');
2121

2222
# tree_for:
2323
# just a single test: we're not testing Pod::Simple::SimpleTree
@@ -35,20 +35,25 @@ is(
3535
is( as_pod( tree_for( $pod{$_} ) ), $pod{$_}, "$_ POD round trips" )
3636
for sort keys %pod;
3737

38-
# merge_into: skips NAME section
39-
my $master_tree = tree_for( $pod{master} );
40-
my $master_pod = as_pod( $pod{master} );
41-
merge_into( $master_tree, tree_for( $pod{'NAME section'} ), 'NAME section' );
42-
is( as_pod($master_tree), $master_pod, 'merge_into( master, NAME section )' );
38+
# merge_info
39+
my ( $master, $delta, $title );
40+
41+
# merge_into: skips (e.g. NAME)
42+
$title = 'NAME';
43+
$master = tree_for( $pod{master} );
44+
my $master_pod = as_pod( $pod{master} ); # compute it before munging $master
45+
merge_into( $master, tree_for( $pod{$title} ), $title );
46+
is( as_pod($master), $master_pod, 'merge_into( skip )' );
4347

4448
# merge_into: head2 section (e.g. Security)
45-
$master_tree = tree_for( $pod{master} );
46-
my $security_tree = tree_for( $pod{Security} );
47-
merge_into( $master_tree, $security_tree, 'Security' );
49+
$title = 'Security';
50+
$master = tree_for( $pod{master} );
51+
$delta = tree_for( $pod{$title} );
52+
merge_into( $master, $delta, $title );
4853
is(
49-
head2_slice( $security_tree, 'Security' ),
50-
head2_slice( $master_tree, 'Security' ),
51-
'merge_into Security'
54+
head2_slice( $master, $title ),
55+
head2_slice( $delta, $title ),
56+
'merge_into( head2 )'
5257
);
5358

5459
done_testing;

0 commit comments

Comments
 (0)