Bug 15774: (follow-up) Address QA issues

[koha.git] / t / Koha_MetadataRecord.t

diff --git a/t/Koha_MetadataRecord.t b/t/Koha_MetadataRecord.t
index a924843..0c2c53e 100755 (executable)
--- a/t/Koha_MetadataRecord.t
+++ b/t/Koha_MetadataRecord.t
@@ -39,55 +39,43 @@ is(ref($record), 'Koha::MetadataRecord', 'Created valid Koha::MetadataRecord obj
 
 my $samplehash = [
     {
-        'field' => [
-            {
-                'value' => '1234',
-                'tag'   => '001',
-            }
-        ]
+        'value' => '1234',
+        'tag'   => '001',
     },
     {
-        'field' => [
+        'subfield' => [
             {
-                'subfield' => [
-                    {
-                        'value'  => 'Cooking',
-                        'subtag' => 'a'
-                    }
-                ],
-                'indicator2' => ' ',
-                'tag'        => 150,
-                'indicator1' => ' ',
+                'value'  => 'Cooking',
+                'subtag' => 'a'
             }
-        ]
+        ],
+        'indicator2' => ' ',
+        'tag'        => 150,
+        'indicator1' => ' ',
     },
     {
-        'field' => [
+        'subfield' => [
             {
-                'subfield' => [
-                    {
-                        'value'  => 'Cookery',
-                        'subtag' => 'a'
-                    },
-                    {
-                        'value' => 'Instructional manuals',
-                        'subtag' => 'z'
-                    }
-                ],
-                'indicator2' => ' ',
-                'tag'        => 450,
-                'indicator1' => ' ',
+                'value'  => 'Cookery',
+                'subtag' => 'a'
+            },
+            {
+                'value'  => 'Instructional manuals',
+                'subtag' => 'z'
             }
-        ]
+        ],
+        'indicator2' => ' ',
+        'tag'        => 450,
+        'indicator1' => ' ',
     }
 ];
 
 my $hash = $record->createMergeHash();
 my %fieldkeys;
 foreach my $field (@$hash) {
-    $fieldkeys{delete $field->{'field'}->[0]->{'key'}}++;
-    if (defined $field->{'field'}->[0]->{'subfield'}) {
-        foreach my $subfield (@{$field->{'field'}->[0]->{'subfield'}}) {
+    $fieldkeys{delete $field->{'key'}}++;
+    if (defined $field->{'subfield'}) {
+        foreach my $subfield (@{$field->{'subfield'}}) {
             $fieldkeys{delete $subfield->{'subkey'}}++;
         }
     }
@@ -100,17 +88,26 @@ is($dupkeys, 0, 'No duplicate keys');
 
 subtest "new() tests" => sub {
 
-    plan tests => 12;
+    plan tests => 14;
 
     # Test default values with a MARC::Record record
     my $record = MARC::Record->new();
-    my $metadata_record = new Koha::MetadataRecord({
-        record => $record
+    my $metadata_record;
+
+    warning_is { $metadata_record = new Koha::MetadataRecord({
+                        record => $record }) }
+               { carped => 'No schema passed' },
+        "Metadata schema is mandatory, raise a carped warning if omitted";
+    is( $metadata_record, undef, "Metadata schema is mandatory, return undef if omitted");
+
+    $metadata_record = new Koha::MetadataRecord({
+        record => $record,
+        schema => 'marc21'
     });
 
     is( ref($metadata_record), 'Koha::MetadataRecord', 'Type correct');
     is( ref($metadata_record->record), 'MARC::Record', 'Record type preserved');
-    is( $metadata_record->schema, 'marc21', 'Metadata schema defaults to marc21');
+    is( $metadata_record->schema, 'marc21', 'Metadata schema is set to marc21');
     is( $metadata_record->format, 'MARC', 'Serializacion format defaults to marc');
     is( $metadata_record->id, undef, 'id is optional, undef if unspecifid');
 
@@ -144,4 +141,3 @@ subtest "new() tests" => sub {
     is( $metadata_record, undef, 'record object mandatory')
 };
 
-1;