diff --git a/t/2.t b/t/2.t index c8169fd..aeaea46 100644 --- a/t/2.t +++ b/t/2.t @@ -10,25 +10,25 @@ ok(-e "t/"); ok(-d "t/"); foreach my $f qw(1.t 2.t 3.t 4.t) { - $dw = new File::DirWalk(); - $dw->setDepth(1); + $dw = new File::DirWalk(); + $dw->setDepth(1); - $dw->onFile(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - ok(-f $path); - ok(-d $dir); - is($dir, "t"); - is($dw->currentDir(), "t"); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); + $dw->onFile(sub { + my ($path,$dir,$basename) = @_; + ok(-e $path); + ok(-f $path); + ok(-d $dir); + is($dir, "t"); + is($dw->currentDir(), "t"); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); - if (($dw->currentBasename() eq $f) and ($basename eq $f)) { - return 42; - } + if (($dw->currentBasename() eq $f) and ($basename eq $f)) { + return 42; + } - return SUCCESS; - }); + return SUCCESS; + }); - is($dw->walk("t/"), 42); + is($dw->walk("t/"), 42); } diff --git a/t/3.t b/t/3.t index a677c59..6d33ffb 100644 --- a/t/3.t +++ b/t/3.t @@ -11,45 +11,45 @@ my $perl_interpreter = basename($^X); $dw = new File::DirWalk(); $dw->onDirEnter(sub { - my ($path) = @_; - ok(-e $path); - ok(-d $path); + my ($path) = @_; + ok(-e $path); + ok(-d $path); - if ($dw->currentPath() eq $perl_path) { - return 42; - } - - return SUCCESS; + if ($dw->currentPath() eq $perl_path) { + return 42; + } + + return SUCCESS; }); is( $dw->walk($perl_path), 42 ); $dw = new File::DirWalk(); $dw->onDirEnter(sub { - my ($path) = @_; - ok(-e $path); - ok(-d $path); + my ($path) = @_; + ok(-e $path); + ok(-d $path); - if ($dw->currentDir() eq $perl_path) { - return 42; - } - - return SUCCESS; + if ($dw->currentDir() eq $perl_path) { + return 42; + } + + return SUCCESS; }); is( $dw->walk($perl_path), 42 ); $dw = new File::DirWalk(); $dw->onFile(sub { - my ($path) = @_; - ok(-e $path); - ok(-f $path); + my ($path) = @_; + ok(-e $path); + ok(-f $path); - if ($dw->currentBasename() eq $perl_interpreter) { - return 42; - } + if ($dw->currentBasename() eq $perl_interpreter) { + return 42; + } - return SUCCESS; + return SUCCESS; }); is( $dw->walk($perl_path), 42 ); diff --git a/t/4.t b/t/4.t index 7e5ab3d..dc83a10 100644 --- a/t/4.t +++ b/t/4.t @@ -13,91 +13,91 @@ ok( -e "t/tree" ); ok( -d "t/tree" ); foreach my $subdir (qw(dir1 dir2 dir3 dir4 dir5)) { - ok( -e "t/tree/$subdir" ); - ok( -d "t/tree/$subdir" ); + ok( -e "t/tree/$subdir" ); + ok( -d "t/tree/$subdir" ); - $dw = new File::DirWalk(); - $dw->onBeginWalk(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); + $dw = new File::DirWalk(); + $dw->onBeginWalk(sub { + my ($path,$dir,$basename) = @_; + ok(-e $path); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); - if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { - return 42; - } + if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { + return 42; + } - return SUCCESS; - }); - is( $dw->walk("t/tree"), 42 ); + return SUCCESS; + }); + is( $dw->walk("t/tree"), 42 ); - $dw = new File::DirWalk(); - $dw->onDirEnter(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - ok(-d $path); - ok(-d $dir); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); + $dw = new File::DirWalk(); + $dw->onDirEnter(sub { + my ($path,$dir,$basename) = @_; + ok(-e $path); + ok(-d $path); + ok(-d $dir); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); - if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { - is( $dw->count(), 10 ); - is( $dw->currentDepth(), 2 ); - return 42; - } + if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { + is( $dw->count(), 10 ); + is( $dw->currentDepth(), 2 ); + return 42; + } - return SUCCESS; - }); - is( $dw->walk("t/tree"), 42 ); + return SUCCESS; + }); + is( $dw->walk("t/tree"), 42 ); - $dw = new File::DirWalk(); - $dw->onDirLeave(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - ok(-d $path); - ok(-d $dir); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); + $dw = new File::DirWalk(); + $dw->onDirLeave(sub { + my ($path,$dir,$basename) = @_; + ok(-e $path); + ok(-d $path); + ok(-d $dir); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); - if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { - is( $dw->count(), 10 ); - is( $dw->currentDepth(), 2 ); - return 42; - } + if (($dw->currentBasename() eq $subdir) and ($basename eq $subdir)) { + is( $dw->count(), 10 ); + is( $dw->currentDepth(), 2 ); + return 42; + } - return SUCCESS; - }); + return SUCCESS; + }); - is( $dw->walk("t/tree"), 42 ); + is( $dw->walk("t/tree"), 42 ); - $dw = new File::DirWalk(); - $dw->onFile(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - ok(-f $path); - ok(-d $dir); - is($dir, "t/tree/$subdir"); - is($dw->currentDir(), "t/tree/$subdir"); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); - return SUCCESS; - }); + $dw = new File::DirWalk(); + $dw->onFile(sub { + my ($path,$dir,$basename) = @_; + ok(-e $path); + ok(-f $path); + ok(-d $dir); + is($dir, "t/tree/$subdir"); + is($dw->currentDir(), "t/tree/$subdir"); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); + return SUCCESS; + }); - is( $dw->walk("t/tree/$subdir"), SUCCESS ); - is( $dw->count(), 10 ); + is( $dw->walk("t/tree/$subdir"), SUCCESS ); + is( $dw->count(), 10 ); } $files = 0; $dw = new File::DirWalk(); $dw->onFile(sub { - my ($path,$dir,$basename) = @_; - ok(-e $path); - ok(-f $path); - ok(-d $dir); - is($dw->currentDir(), $dir); - is($dw->currentBasename(), $basename); - ++$files; - return SUCCESS; + my ($path,$dir,$basename) = @_; + ok(-e $path); + ok(-f $path); + ok(-d $dir); + is($dw->currentDir(), $dir); + is($dw->currentBasename(), $basename); + ++$files; + return SUCCESS; }); is( $dw->walk("t/tree"), SUCCESS );