Bug 17600: Standardize our EXPORT_OK

[srvgit] / t / db_dependent / Record / Record.t

diff --git a/t/db_dependent/Record/Record.t b/t/db_dependent/Record/Record.t
index e2532a3..495f8e0 100755 (executable)
--- a/t/db_dependent/Record/Record.t
+++ b/t/db_dependent/Record/Record.t
@@ -5,18 +5,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 #
 use strict;
@@ -27,7 +27,7 @@ use constant WHEREAMI => 't/db_dependent/Record/testrecords';
 # specify the number of tests
 use Test::More tests => 21; #FIXME Commented out two failing tests
 #use C4::Context;
-use C4::Record;
+use C4::Record qw( marc2marc marc2marcxml marc2dcxml changeEncoding );
 
 =head1 NAME
 
@@ -45,48 +45,48 @@ $ ./Record_test.pl
 ok (1, 'module compiled');
 
 # open some files for testing
-open MARC21MARC8,WHEREAMI."/marc21_marc8.dat" or die $!;
+open my $MARC21MARC8, '<', WHEREAMI."/marc21_marc8.dat" or die $!;
 my $marc21_marc8; # = scalar (MARC21MARC8);
-foreach my $line (<MARC21MARC8>) {
+foreach my $line (<$MARC21MARC8>) {
     $marc21_marc8 .= $line;
 }
 $marc21_marc8 =~ s/\n$//;
-close MARC21MARC8;
+close $MARC21MARC8;
 
-open (MARC21UTF8,"<:utf8",WHEREAMI."/marc21_utf8.dat") or die $!;
+open (my $MARC21UTF8, '<:encoding(UTF-8)', WHEREAMI."/marc21_utf8.dat") or die $!;
 my $marc21_utf8;
-foreach my $line (<MARC21UTF8>) {
+foreach my $line (<$MARC21UTF8>) {
        $marc21_utf8 .= $line;
 }
 $marc21_utf8 =~ s/\n$//;
-close MARC21UTF8;
+close $MARC21UTF8;
 
-open MARC21MARC8COMBCHARS,WHEREAMI."/marc21_marc8_combining_chars.dat" or die $!;
+open(my $MARC21MARC8COMBCHARS, '<', WHEREAMI."/marc21_marc8_combining_chars.dat") or die $!;
 my $marc21_marc8_combining_chars;
-foreach my $line(<MARC21MARC8COMBCHARS>) {
+foreach my $line(<$MARC21MARC8COMBCHARS>) {
        $marc21_marc8_combining_chars.=$line;
 }
 $marc21_marc8_combining_chars =~ s/\n$//; #FIXME: why is a newline ending up here?
-close MARC21MARC8COMBCHARS;
+close $MARC21MARC8COMBCHARS;
 
-open (MARC21UTF8COMBCHARS,"<:utf8",WHEREAMI."/marc21_utf8_combining_chars.dat") or die $!;
+open (my $MARC21UTF8COMBCHARS, '<:encoding(UTF-8)', WHEREAMI."/marc21_utf8_combining_chars.dat") or die $!;
 my $marc21_utf8_combining_chars;
-foreach my $line(<MARC21UTF8COMBCHARS>) {
+foreach my $line(<$MARC21UTF8COMBCHARS>) {
        $marc21_utf8_combining_chars.=$line;
 }
-close MARC21UTF8COMBCHARS;
+close $MARC21UTF8COMBCHARS;
 
-open (MARCXMLUTF8,"<:utf8",WHEREAMI."/marcxml_utf8.xml") or die $!;
+open (my $MARCXMLUTF8, '<:encoding(UTF-8)', WHEREAMI."/marcxml_utf8.xml") or die $!;
 my $marcxml_utf8;
-foreach my $line (<MARCXMLUTF8>) {
+foreach my $line (<$MARCXMLUTF8>) {
        $marcxml_utf8 .= $line;
 }
-close MARCXMLUTF8;
+close $MARCXMLUTF8;
 
 $marcxml_utf8 =~ s/\n//g;
 
 ## The Tests:
-my $error; my $marc; my $marcxml; my $dcxml; # some scalars to store values
+my $error; my $marc; my $marcxml; # some scalars to store values
 ## MARC to MARCXML
 print "\n1. Checking conversion of simple ISO-2709 (MARC21) records to MARCXML\n";
 ok (($error,$marcxml) = marc2marcxml($marc21_marc8,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 (MARC21)');
@@ -113,8 +113,9 @@ ok (!$error, 'no errors in conversion');
 ok (($error,$marcxml) = marc2marcxml($marc21_utf8_combining_chars,'UTF-8','MARC21'), 'marc2marcxml - from UTF-8 to UTF-8 with combining characters (MARC21)');
 ok (!$error, 'no errors in conversion');
 
-ok (($error,$dcxml) = marc2dcxml($marc21_utf8), 'marc2dcxml - from ISO-2709 to Dublin Core');
-ok (!$error, 'no errors in conversion');
+ok (eval{marc2dcxml($marc21_utf8, undef, undef, 'oaidc')}, 'marc2dcxml - from ISO-2709 to Dublin Core');
+$error = $@;
+ok (!$error, 'no errors in conversion to DublinCore');
 
 print "\n3. checking ability to alter encoding\n";
 ok (($error,$marc) = changeEncoding($marc21_marc8,'MARC','MARC21','UTF-8'), 'changeEncoding - MARC21 from MARC-8 to UTF-8');