Skip to content

Commit

Permalink
critic cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
petdance committed Mar 27, 2008
1 parent b7f97c1 commit 28b4ab4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
2 changes: 2 additions & 0 deletions t/ack-ignore-dir.t
View file
Expand Up @@ -43,6 +43,8 @@ sub set_up_assertion_that_these_options_will_ignore_those_directories {
# ignore everything in .svn directories
my $svn_regex = quotemeta File::Spec->catfile( '', '.svn', '' ); # the respective filesystem equivalent of '/.svn/'
@results = grep { ! m/$svn_regex/ } @results;

return;
}

FILES_HAVE_BEEN_SET_UP_AS_EXPECTED: {
Expand Down
3 changes: 1 addition & 2 deletions t/ack-match.t
View file
Expand Up @@ -21,8 +21,7 @@ my @tests = (
# 3 tests for each call to test_match()
plan tests => @tests * 3;

test_match( @$_ ) for @tests;

test_match( @{$_} ) for @tests;

# call ack normally and compare output to calling with --match regex
#
Expand Down
2 changes: 1 addition & 1 deletion t/illegal-regex.t
View file
Expand Up @@ -20,7 +20,7 @@ my @tests = (
plan tests => @tests * 4;

for ( @tests ) {
test_ack_with( @$_ );
test_ack_with( @{$_} );
}

sub test_ack_with {
Expand Down
26 changes: 13 additions & 13 deletions t/module.t
View file
Expand Up @@ -46,7 +46,7 @@ STARTING_POINTS: {
lists_match( $what, ["t${dir_sep}etc"], 'get_starting_points' );

my $iter = App::Ack::get_iterator( $what, \%opt );
isa_ok( $iter, 'CODE', 'get_iterator returs CODE' );
isa_ok( $iter, 'CODE', 'get_iterator returns CODE' );
}

our @result;
Expand Down Expand Up @@ -77,7 +77,7 @@ my $iter1;
lists_match( $what, ["t${dir_sep}text"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
$iter1 = $iter;
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -114,7 +114,7 @@ my $iter1;
lists_match( $what, ["t${dir_sep}text", "t${dir_sep}etc"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
isnt( $iter, $iter1, 'different iterators' );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -173,7 +173,7 @@ my $iter1;
[
'print',
"Somehow no matter what the world keeps turning\n"
]
],
);

my @e = map {$_->[0]} @expected;
Expand Down Expand Up @@ -214,7 +214,7 @@ my $iter1;
my $what = App::Ack::get_starting_points( [$dir], \%opts );
lists_match( $what, ["t${dir_sep}text"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is ref $iter, 'CODE' ;
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -271,7 +271,7 @@ my $iter1;
my $what = App::Ack::get_starting_points( [$dir, 't/etc'], \%opts );
lists_match( $what, ["t${dir_sep}text", "t${dir_sep}etc"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is ref $iter, 'CODE';
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -390,7 +390,7 @@ my $iter1;
my $what = App::Ack::get_starting_points( [$dir], \%opts );
lists_match( $what, ["t${dir_sep}text"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -457,7 +457,7 @@ my $iter1;
my $what = App::Ack::get_starting_points( [$dir], \%opts );
lists_match( $what, ["t${dir_sep}text"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -502,7 +502,7 @@ my $iter1;
32,
"\n",
1
]
],
);
my @e = sort by_2nd @expected;
my @r = sort by_2nd @result;
Expand All @@ -524,7 +524,7 @@ my $iter1;
fill_type_wanted();
lists_match( $what, ["t${dir_sep}swamp"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand All @@ -551,7 +551,7 @@ my $iter1;
fill_type_wanted();
lists_match( $what, ["t${dir_sep}swamp"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -579,7 +579,7 @@ my $iter1;
$App::Ack::type_wanted{js} = 1;
lists_match( $what, ["t${dir_sep}swamp"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down Expand Up @@ -607,7 +607,7 @@ my $iter1;
$App::Ack::type_wanted{cc} = 1;
lists_match( $what, ["t${dir_sep}swamp"], 'get_starting_points' );
my $iter = App::Ack::get_iterator( $what, \%opts );
is( ref $iter, 'CODE' );
isa_ok( $iter, 'CODE' );
App::Ack::filetype_setup();
App::Ack::print_files_with_matches( $iter, \%opts );
my @expected = (
Expand Down
1 change: 1 addition & 0 deletions tags
View file
Expand Up @@ -173,6 +173,7 @@ filetype_setup Ack.pm /^sub filetype_setup {$/;" s
filetypes Ack.pm /^sub filetypes {$/;" s
filetypes_supported Ack.pm /^sub filetypes_supported {$/;" s
filetypes_supported_set Ack.pm /^sub filetypes_supported_set {$/;" s
fill_type_wanted t/module.t /^sub fill_type_wanted {$/;" s
get_command_line_options Ack.pm /^sub get_command_line_options {$/;" s
get_copyright Ack.pm /^sub get_copyright {$/;" s
get_iterator Ack.pm /^sub get_iterator {$/;" s
Expand Down

0 comments on commit 28b4ab4

Please sign in to comment.