From f508096d926d2e09b26f462ad8d5ff9a52af0ec8 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 4 Nov 2016 12:18:57 -0300 Subject: [PATCH] Bug 17494: (QA followup) Fix exception name This patch changes the exception name to match the package name. And also adds a test for the thrown exception message. Also creates a general Koha::Exception::Patron::Modification exception to make the new one inherit from it, following the common use in the codebase. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James (cherry picked from commit 9a301836714924581b806cd7c728695625ddf3cc) Signed-off-by: Julian Maurice --- Koha/AudioAlert.pm | 4 +++- Koha/Exceptions/Patron/Modification.pm | 10 +++++++--- t/db_dependent/Koha_borrower_modifications.t | 5 +++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Koha/AudioAlert.pm b/Koha/AudioAlert.pm index d86d9a17f0..d7f7c206fe 100644 --- a/Koha/AudioAlert.pm +++ b/Koha/AudioAlert.pm @@ -43,7 +43,9 @@ sub store { if ( $self->verification_token ) { if ( Koha::Patron::Modifications->search( { verification_token => $self->verification_token } )->count() ) { - Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken->throw; + Koha::Exceptions::Patron::Modification::DuplicateVerificationToken->throw( + "Duplicate verification token " . $self->verification_token + ); } } diff --git a/Koha/Exceptions/Patron/Modification.pm b/Koha/Exceptions/Patron/Modification.pm index 1068fbb549..4cf5cfafb1 100644 --- a/Koha/Exceptions/Patron/Modification.pm +++ b/Koha/Exceptions/Patron/Modification.pm @@ -3,10 +3,14 @@ package Koha::Exceptions::Patron::Modification; use Modern::Perl; use Exception::Class ( - 'Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken' => { - isa => 'Koha::Exceptions::Object', - description => "The verification token given already exists", + + 'Koha::Exceptions::Patron::Modification' => { + description => 'Something went wrong' }, + 'Koha::Exceptions::Patron::Modification::DuplicateVerificationToken' => { + isa => 'Koha::Exceptions::Patron::Modification', + description => "The verification token given already exists" + } ); 1; diff --git a/t/db_dependent/Koha_borrower_modifications.t b/t/db_dependent/Koha_borrower_modifications.t index ad16d387c0..f1bc731892 100755 --- a/t/db_dependent/Koha_borrower_modifications.t +++ b/t/db_dependent/Koha_borrower_modifications.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use Modern::Perl; -use Test::More tests => 15; +use Test::More tests => 16; use Try::Tiny; use t::lib::TestBuilder; @@ -31,8 +31,9 @@ try { } )->store(); } catch { - ok( $_->isa('Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken'), + ok( $_->isa('Koha::Exceptions::Patron::Modification::DuplicateVerificationToken'), 'Attempting to add a duplicate verification token to the database should raise a Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken exception' ); + is( $_->message, "Duplicate verification token 1234567890", 'Exception carries the right message' ); }; ## Get the new pending modification -- 2.39.5