Bug 6874: [QA Follow-up] Adjustments for opac-retrieve

[koha.git] / t / db_dependent / UploadedFiles.t

diff --git a/t/db_dependent/UploadedFiles.t b/t/db_dependent/UploadedFiles.t
index d829dee..908f9f9 100644 (file)
--- a/t/db_dependent/UploadedFiles.t
+++ b/t/db_dependent/UploadedFiles.t
@@ -3,7 +3,8 @@
 use Modern::Perl;
 use File::Temp qw/ tempdir /;
 use Test::CGI::Multipart;
-use Test::More tests => 11;
+use Test::More tests => 18;
+use Test::Warn;
 
 use t::lib::Mocks;
 
@@ -20,7 +21,7 @@ $tcm->upload_file(
 my $cgi = $tcm->create_cgi;
 
 my $tempdir = tempdir(CLEANUP => 1);
-t::lib::Mocks::mock_config('uploadPath', $tempdir);
+t::lib::Mocks::mock_config('upload_path', $tempdir);
 
 my $testfilename = $cgi->param('testfile');
 my $testfile_fh = $cgi->upload('testfile');
@@ -35,8 +36,26 @@ foreach my $key (qw(id filename filepath dir)) {
 
 ok(-e $file->{filepath}, "File $file->{filepath} exists");
 
-ok(C4::UploadedFiles::DelUploadedFile($id), "DelUploadedFile($id) returned true");
+ok(C4::UploadedFiles::DanglingEntry()==-1, "DanglingEntry() returned -1 as expected.");
+ok(C4::UploadedFiles::DanglingEntry($id)==0, "DanglingEntry($id) returned 0 as expected.");
+unlink ($file->{filepath});
+ok(C4::UploadedFiles::DanglingEntry($id)==1, "DanglingEntry($id) returned 1 as expected.");
+
+open my $fh,">",($file->{filepath});
+print $fh "";
+close $fh;
+
+my $DelResult;
+is(C4::UploadedFiles::DelUploadedFile($id),1, "DelUploadedFile($id) returned 1 as expected.");
+warning_like { $DelResult=C4::UploadedFiles::DelUploadedFile($id); } qr/file for id=/, "Expected warning for deleting Dangling Entry.";
+is($DelResult,-1, "DelUploadedFile($id) returned -1 as expected.");
 ok(! -e $file->{filepath}, "File $file->{filepath} does not exist anymore");
 
-is(C4::UploadedFiles::UploadFile($testfilename, '../', $testfile_fh->handle), undef, 'UploadFile with $dir containing ".." return undef');
+my $UploadResult;
+warning_like { $UploadResult=C4::UploadedFiles::UploadFile($testfilename,'../',$testfile_fh->handle); } qr/^Filename or dirname contains '..'. Aborting upload/, "Expected warning for bad file upload.";
+is($UploadResult, undef, "UploadFile with dir containing \"..\" return undef");
 is(C4::UploadedFiles::GetUploadedFile(), undef, 'GetUploadedFile without parameters returns undef');
+
+#trivial test for httpheaders
+my @hdrs = C4::UploadedFiles::httpheaders('does_not_matter_yet');
+is( @hdrs == 4 && $hdrs[1] =~ /application\/octet-stream/, 1, 'Simple test for httpheaders'); #TODO Will be extended on report 14282