Skip to content

Commit

Permalink
remove unneeded temp variables
Browse files Browse the repository at this point in the history
  • Loading branch information
karenetheridge committed Apr 18, 2015
1 parent 61bef6b commit dcc639f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 2 additions & 4 deletions t/load-bad.t
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ my @files = sort grep { /^\w/ } $data_dir->read;

for my $f ( sort @files ) {
my $path = File::Spec->catfile('t','data-fixable',$f);
my $meta = eval { CPAN::Meta->load_file( $path ) };
ok( defined $meta, "load_file('$f')" ) or diag $@;
ok( eval { CPAN::Meta->load_file( $path ) }, "load_file('$f')" ) or diag $@;
my $string = _slurp($path);
my $method = $path =~ /\.json/ ? "load_json_string" : "load_yaml_string";
my $meta2 = eval { CPAN::Meta->$method( $string, { fix_errors => 1 } ) };
ok( defined $meta2, "$method(slurp('$f'))" ) or diag $@;
ok( eval { CPAN::Meta->$method( $string, { fix_errors => 1 } ) }, "$method(slurp('$f'))" ) or diag $@;
}

done_testing;
Expand Down
14 changes: 10 additions & 4 deletions t/merge.t
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,18 @@ my $first_result = $merger->merge(\%base, \%first);
is_deeply($first_result, \%first_expected, 'First result is as expected');

is_deeply($merger->merge(\%base, { abstract => 'This is a test' }), \%base, 'Can merge in identical abstract');
my $failure = eval { $merger->merge(\%base, { abstract => 'And now for something else' }) };
is($failure, undef, 'Trying to merge different author gives an exception');
is(
eval { $merger->merge(\%base, { abstract => 'And now for something else' }) },
undef,
'Trying to merge different author gives an exception',
);
like $@, qr/^Can't merge attribute abstract/, 'Exception looks right';

my $failure2 = eval { $merger->merge(\%base, { provides => { Baz => { file => 'Baz.pm' } } }) };
is($failure2, undef, 'Trying to merge different author gives an exception');
is(
eval { $merger->merge(\%base, { provides => { Baz => { file => 'Baz.pm' } } }) },
undef,
'Trying to merge different author gives an exception',
);
like $@, qr/^Duplication of element provides\.Baz /, 'Exception looks right';

# issue 67
Expand Down
6 changes: 2 additions & 4 deletions t/optional_feature-merge.t
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ my $fragment3 = {
}
};

my $result = eval { $merger->merge($meta1, $fragment3) };
is($result, undef, 'Trying to merge optional_features with same feature name and different descriptions gives an exception');
is( eval { $merger->merge($meta1, $fragment3) }, undef, 'Trying to merge optional_features with same feature name and different descriptions gives an exception');
like $@, qr/^Cannot merge two optional_features named 'FeatureName' with different 'description' values/, 'Exception looks right';

my $fragment4 = {
Expand All @@ -106,8 +105,7 @@ my $fragment4 = {
}
};

$result = eval { $merger->merge($meta1, $fragment4) };
is($result, undef, 'Trying to merge optional_features with same feature name and differences in other keys gives an exception');
is( eval { $merger->merge($meta1, $fragment4) }, undef, 'Trying to merge optional_features with same feature name and differences in other keys gives an exception');
like $@, qr/^Cannot merge two optional_features named 'FeatureName' with different 'x_default' values/, 'Exception looks right';

my $fragment5 = {
Expand Down
4 changes: 1 addition & 3 deletions t/prereqs-finalize.t
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults
sub dies_ok (&@) {
my ($code, $qr, $comment) = @_;

my $lived = eval { $code->(); 1 };

if ($lived) {
if (eval { $code->(); 1 }) {
fail("$comment: did not die");
} else {
like($@, $qr, $comment);
Expand Down

0 comments on commit dcc639f

Please sign in to comment.