Browse Source

Bug 23425: (QA follow-up) Keep it generic

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Tomás Cohen Arazi 5 years ago
committed by Martin Renvoize
parent
commit
2ae6e95a40
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      Koha/Biblio/Metadata.pm
  2. 6
      Koha/Exceptions/Metadata.pm
  3. 6
      t/Koha/Exceptions.t

2
Koha/Biblio/Metadata.pm

@ -75,7 +75,7 @@ sub record {
id => $self->id,
format => $self->format,
schema => $self->schema,
marcxml_error => $marcxml_error,
decoding_error => $marcxml_error,
);
}
}

6
Koha/Exceptions/Metadata.pm

@ -25,7 +25,7 @@ use Exception::Class (
'Koha::Exceptions::Metadata::Invalid' => {
isa => 'Koha::Exceptions::Metadata',
description => 'Invalid data',
fields => ['id','format','schema', 'marcxml_error']
fields => ['id','format','schema', 'decoding_error']
}
);
@ -36,8 +36,8 @@ sub full_message {
unless ($msg) {
if ( $self->isa('Koha::Exceptions::Metadata::Invalid') ) {
$msg = sprintf( "Invalid data, cannot decode object (id=%s, format=%s, schema=%s, MARCXML error='%s')",
$self->id, $self->format, $self->schema, $self->marcxml_error );
$msg = sprintf( "Invalid data, cannot decode object (id=%s, format=%s, schema=%s, decoding_error='%s')",
$self->id, $self->format, $self->schema, $self->decoding_error );
}
}

6
t/Koha/Exceptions.t

@ -115,12 +115,14 @@ subtest 'Koha::Exceptions::Metadata tests' => sub {
$object->mock( 'schema', 'a_schema' );
throws_ok
{ Koha::Exceptions::Metadata::Invalid->throw( id => 'an_id', format => 'a_format', schema => 'a_schema' ); }
{ Koha::Exceptions::Metadata::Invalid->throw(
id => 'an_id', format => 'a_format',
schema => 'a_schema', decoding_error => 'a_nasty_error' ); }
'Koha::Exceptions::Metadata::Invalid',
'Exception is thrown :-D';
# stringify the exception
is( "$@", 'Invalid data, cannot decode object (id=an_id, format=a_format, schema=a_schema)', 'Exception stringified correctly' );
is( "$@", 'Invalid data, cannot decode object (id=an_id, format=a_format, schema=a_schema, decoding_error=\'a_nasty_error\')', 'Exception stringified correctly' );
throws_ok
{ Koha::Exceptions::Metadata::Invalid->throw( "Manual message exception" ) }

Loading…
Cancel
Save