Revert "Bug 17494: (QA followup) Fix exception name"

This reverts commit f508096d926d2e09b26f462ad8d5ff9a52af0ec8.

diff --git a/Koha/AudioAlert.pm b/Koha/AudioAlert.pm
index d7f7c20..d86d9a1 100644 (file)
--- a/Koha/AudioAlert.pm
+++ b/Koha/AudioAlert.pm
@@ -43,9 +43,7 @@ sub store {
 
     if ( $self->verification_token ) {
         if ( Koha::Patron::Modifications->search( { verification_token => $self->verification_token } )->count() ) {
-            Koha::Exceptions::Patron::Modification::DuplicateVerificationToken->throw(
-                "Duplicate verification token " . $self->verification_token
-            );
+            Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken->throw;
         }
     }
 

diff --git a/Koha/Exceptions/Patron/Modification.pm b/Koha/Exceptions/Patron/Modification.pm
index 4cf5cfa..1068fbb 100644 (file)
--- a/Koha/Exceptions/Patron/Modification.pm
+++ b/Koha/Exceptions/Patron/Modification.pm
@@ -3,14 +3,10 @@ package Koha::Exceptions::Patron::Modification;
 use Modern::Perl;
 
 use Exception::Class (
-
-    'Koha::Exceptions::Patron::Modification' => {
-        description => 'Something went wrong'
+    'Koha::Exceptions::Koha::Patron::Modification::DuplicateVerificationToken' => {
+        isa => 'Koha::Exceptions::Object',
+        description => "The verification token given already exists",
     },
-    '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 f1bc731..ad16d38 100755 (executable)
--- 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 => 16;
+use Test::More tests => 15;
 use Try::Tiny;
 
 use t::lib::TestBuilder;
@@ -31,9 +31,8 @@ try {
         }
     )->store();
 } catch {
-    ok( $_->isa('Koha::Exceptions::Patron::Modification::DuplicateVerificationToken'),
+    ok( $_->isa('Koha::Exceptions::Koha::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