From befebb8a5c7757cddd0fbb0c639ca8f909d931c9 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Tue, 13 Mar 2012 18:07:54 +0100 Subject: [PATCH] bug 7661: Moving C4::tests to unit tests --- C4/tests/Record_test.pl => t/db_dependent/Record/Record.t | 4 ++-- .../db_dependent/Record}/testrecords/marc21_marc8.dat | 0 .../Record}/testrecords/marc21_marc8_combining_chars.dat | 0 .../db_dependent/Record}/testrecords/marc21_marc8_errors.dat | 0 .../db_dependent/Record}/testrecords/marc21_utf8.dat | 0 .../Record}/testrecords/marc21_utf8_combining_chars.dat | 0 .../db_dependent/Record}/testrecords/marcxml_utf8.xml | 0 .../Record}/testrecords/marcxml_utf8_entityencoded.xml | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename C4/tests/Record_test.pl => t/db_dependent/Record/Record.t (98%) rename {C4/tests => t/db_dependent/Record}/testrecords/marc21_marc8.dat (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marc21_marc8_combining_chars.dat (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marc21_marc8_errors.dat (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marc21_utf8.dat (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marc21_utf8_combining_chars.dat (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marcxml_utf8.xml (100%) rename {C4/tests => t/db_dependent/Record}/testrecords/marcxml_utf8_entityencoded.xml (100%) diff --git a/C4/tests/Record_test.pl b/t/db_dependent/Record/Record.t similarity index 98% rename from C4/tests/Record_test.pl rename to t/db_dependent/Record/Record.t index f7a65ab0f9..d3f43374a7 100755 --- a/C4/tests/Record_test.pl +++ b/t/db_dependent/Record/Record.t @@ -87,9 +87,9 @@ $marcxml_utf8 =~ s/\n//g; my $error; my $marc; my $marcxml; my $dcxml; # 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)'); +ok (($error,$marcxml) = marc2marcxml($marc21_marc8,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 (MARC21)'); ok (!$error, 'no errors in conversion'); - $marcxml =~ s/\n//g; + $marcxml =~ s/\n//g; $marcxml =~ s/v\/ s/v\/s/g; # FIXME: bug in new_from_xml_record!! is ($marcxml,$marcxml_utf8, 'record matches antitype'); diff --git a/C4/tests/testrecords/marc21_marc8.dat b/t/db_dependent/Record/testrecords/marc21_marc8.dat similarity index 100% rename from C4/tests/testrecords/marc21_marc8.dat rename to t/db_dependent/Record/testrecords/marc21_marc8.dat diff --git a/C4/tests/testrecords/marc21_marc8_combining_chars.dat b/t/db_dependent/Record/testrecords/marc21_marc8_combining_chars.dat similarity index 100% rename from C4/tests/testrecords/marc21_marc8_combining_chars.dat rename to t/db_dependent/Record/testrecords/marc21_marc8_combining_chars.dat diff --git a/C4/tests/testrecords/marc21_marc8_errors.dat b/t/db_dependent/Record/testrecords/marc21_marc8_errors.dat similarity index 100% rename from C4/tests/testrecords/marc21_marc8_errors.dat rename to t/db_dependent/Record/testrecords/marc21_marc8_errors.dat diff --git a/C4/tests/testrecords/marc21_utf8.dat b/t/db_dependent/Record/testrecords/marc21_utf8.dat similarity index 100% rename from C4/tests/testrecords/marc21_utf8.dat rename to t/db_dependent/Record/testrecords/marc21_utf8.dat diff --git a/C4/tests/testrecords/marc21_utf8_combining_chars.dat b/t/db_dependent/Record/testrecords/marc21_utf8_combining_chars.dat similarity index 100% rename from C4/tests/testrecords/marc21_utf8_combining_chars.dat rename to t/db_dependent/Record/testrecords/marc21_utf8_combining_chars.dat diff --git a/C4/tests/testrecords/marcxml_utf8.xml b/t/db_dependent/Record/testrecords/marcxml_utf8.xml similarity index 100% rename from C4/tests/testrecords/marcxml_utf8.xml rename to t/db_dependent/Record/testrecords/marcxml_utf8.xml diff --git a/C4/tests/testrecords/marcxml_utf8_entityencoded.xml b/t/db_dependent/Record/testrecords/marcxml_utf8_entityencoded.xml similarity index 100% rename from C4/tests/testrecords/marcxml_utf8_entityencoded.xml rename to t/db_dependent/Record/testrecords/marcxml_utf8_entityencoded.xml -- 2.39.5