X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F08multipart-suffix.t;h=fadc8748f52256ddc55c7b0e759c6e4cf27187c6;hb=05f6d2389cf075266ace8b028a946108a25399bc;hp=20ae48312c9e116fd8f6218c8dc02ab1c98d63f1;hpb=08160cca69ee960a312c88410dd5c5b3b376a577;p=catagits%2FHTTP-Body.git diff --git a/t/08multipart-suffix.t b/t/08multipart-suffix.t index 20ae483..fadc874 100644 --- a/t/08multipart-suffix.t +++ b/t/08multipart-suffix.t @@ -21,43 +21,61 @@ my $path = catdir( getcwd(), 't', 'data', 'multipart' ); { my $uploads = uploads_for('001'); - like( - $uploads->{upload2}{tempname}, qr/\.pl$/, - 'tempname preserves .pl suffix' - ); - - unlike( - $uploads->{upload4}{tempname}, qr/\..+$/, - 'tempname for upload4 has no suffix' - ); + { + my ($volume,$directories,$file) = File::Spec->splitpath( $uploads->{upload2}{tempname} ); + like( + $file, qr/\.pl$/, + 'tempname preserves .pl suffix' + ); + } + + { + my ($volume,$directories,$file) = File::Spec->splitpath( $uploads->{upload4}{tempname} ); + unlike( + $file, qr/\..+$/, + 'tempname for upload4 has no suffix' + ); + } + } { my $uploads = uploads_for('006'); - like( - $uploads->{upload2}{tempname}, qr/\.pl$/, - 'tempname preserves .pl suffix with Windows filename' - ); + { + my ($volume,$directories,$file) = File::Spec->splitpath( $uploads->{upload2}{tempname} ); + like( + $file, qr/\.pl$/, + 'tempname preserves .pl suffix with Windows filename' + ); + } + } { my $uploads = uploads_for('014'); - like( - $uploads->{upload}{tempname}, qr/\.foo\.txt$/, - 'tempname preserves .foo.txt suffix' - ); - - like( - $uploads->{upload2}{tempname}, qr/\.txt$/, - 'tempname preserves .txt suffix when dir name has .' - ); + { + my ($volume,$directories,$file) = File::Spec->splitpath( $uploads->{upload}{tempname} ); + like( + $file, qr/\.foo\.txt$/, + 'tempname preserves .foo.txt suffix' + ); + } + + { + my ($volume,$directories,$file) = File::Spec->splitpath( $uploads->{upload2}{tempname} ); + like( + $file, qr/\.txt$/, + 'tempname preserves .txt suffix when dir name has .' + ); + } + + like( + $uploads->{upload2}{tempname}, qr/[\\\/]\w+.txt$/, + 'tempname only gets extension from filename, not from a directory name' + ); - like( - $uploads->{upload2}{tempname}, qr/[\\\/]\w+.txt$/, - 'tempname only gets extension from filename, not from a directory name' - ); } sub uploads_for {