X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F12-fail.t;h=9d7a38bcd6f664b900cd6a503a1fd94bb8d8d0dd;hb=996eba3b3befca997254ee92da04762e851d7e75;hp=ae58908f2a29a42c6825a2f78c2b9f9809f7b900;hpb=a83ae797757bad0608b572dad6621f44436ecaa2;p=catagits%2FTest-EOL.git

diff --git a/t/12-fail.t b/t/12-fail.t
index ae58908..9d7a38b 100644
--- a/t/12-fail.t
+++ b/t/12-fail.t
@@ -5,7 +5,7 @@ use Test::More qw(no_plan);
 use File::Temp qw( tempdir tempfile );
 
 my $perl  = $^X || 'perl';
-my $inc = join(' -I ', @INC) || '';
+my $inc = join(' -I ', map { qq{"$_"} } @INC) || '';
 $inc = "-I $inc" if $inc;
 
 {
@@ -15,11 +15,9 @@ $inc = "-I $inc" if $inc;
     local $/ = undef;
     open my $fh, '<', $outfile or die $!;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No tabs in '[^']*' on line 4/m, 'windows EOL found in tmp file 1' );
-    #unlink $outfile;
-    #system("rm -rf $dir");
+    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line 4/m, 'windows EOL found in tmp file 1' );
+    unlink $outfile;
 }
-
 {
     my $dir = make_bad_file_2();
     my (undef, $outfile) = tempfile();
@@ -27,11 +25,9 @@ $inc = "-I $inc" if $inc;
     open my $fh, '<', $outfile or die $!;
     local $/ = undef;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No tabs in '[^']*' on line 12/m, 'windows EOL found in tmp file2 ' );
+    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file2 ' );
     unlink $outfile;
-    system("rm -rf $dir");
 }
-
 {
     my ($dir, $file) = make_bad_file_3();
     my (undef, $outfile) = tempfile();
@@ -39,13 +35,23 @@ $inc = "-I $inc" if $inc;
     open my $fh, '<', $outfile or die $!;
     local $/ = undef;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No tabs in '[^']*' on line 6/m, 'windows EOL found in tmp file 3' );
+    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file 3' );
+    unlink $outfile;
+}
+
+{
+    my $dir = make_bad_file_4();
+    my (undef, $outfile) = tempfile();
+    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok({trailing_whitespace => 1}, '$dir' )" 2>&1 > $outfile` );
+    open my $fh, '<', $outfile or die $!;
+    local $/ = undef;
+    my $content = <$fh>;
+    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file 4' );
     unlink $outfile;
-    system("rm -rf $dir");
 }
 
 sub make_bad_file_1 {
-  my $tmpdir = tempdir();
+  my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
   print $fh <<"DUMMY";
 #!perl
@@ -58,7 +64,7 @@ DUMMY
 }
 
 sub make_bad_file_2 {
-  my $tmpdir = tempdir();
+  my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
   print $fh <<"DUMMY";
 #!perl
@@ -68,7 +74,7 @@ sub make_bad_file_2 {
 =head1 NAME
 
 test.pL -	A test script
-
+







 =cut
 
 sub main {
@@ -79,7 +85,7 @@ DUMMY
 }
 
 sub make_bad_file_3 {
-  my $tmpdir = tempdir();
+  my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pm' );
   print $fh <<"DUMMY";
 use strict;
@@ -90,7 +96,8 @@ sub new {
     my (\$class) = @_;
     my \$self = bless { }, \$class;
     return \$self;
-}
+}



+
 
 1;
 DUMMY
@@ -98,3 +105,26 @@ DUMMY
   return ($tmpdir, $filename);
 }
 
+sub make_bad_file_4 {
+  my $tmpdir = tempdir( CLEANUP => 1 );
+  my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
+  print $fh <<"DUMMY";
+#!perl
+
+=pod
+
+=head1 NAME
+
+test.pL -	A test script
+
+=cut
+
+sub main {
+DUMMY
+
+print $fh qq{    print "Hello!\n";   \n}; # <-- whitespace
+print $fh '}';
+
+  return $tmpdir;
+}
+