X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FMembers.t;h=f75652c267c8e789a0a29320c4757e043796478b;hb=2b90ea2cb0e5e976de7ddef0151ae83d8ac578e6;hp=e28fbae742224339e0a7bc1731d603d3b66e12e0;hpb=f098258e8cf2d616c6bbc35e44c6a1df47be8517;p=koha_ffzg

diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t
index e28fbae742..f75652c267 100755
--- a/t/db_dependent/Members.t
+++ b/t/db_dependent/Members.t
@@ -1,83 +1,499 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# This is to test C4/Members
-# It requires a working Koha database with the sample data
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
 
-use strict;
-use warnings;
+use Test::More tests => 63;
+use Test::MockModule;
+use Data::Dumper qw/Dumper/;
+use C4::Context;
+use Koha::Database;
+use Koha::Holds;
+use Koha::List::Patron;
+use Koha::Patrons;
 
-use Test::More tests => 15;
+use t::lib::Mocks;
+use t::lib::TestBuilder;
 
 BEGIN {
         use_ok('C4::Members');
 }
 
+my $schema = Koha::Database->schema;
+$schema->storage->txn_begin;
+my $builder = t::lib::TestBuilder->new;
+my $dbh = C4::Context->dbh;
 
-# Make a borrower for testing
-my $data = { cardnumber => 'TESTCARD01',
-    firstname => 'Marie',
-    surname => 'Mcknight',
-    categorycode => 'S',
-    branchcode => 's'
-    };
+# Remove invalid guarantorid's as long as we have no FK
+$dbh->do("UPDATE borrowers b1 LEFT JOIN borrowers b2 ON b2.borrowernumber=b1.guarantorid SET b1.guarantorid=NULL where b1.guarantorid IS NOT NULL AND b2.borrowernumber IS NULL");
 
-my $addmem=AddMember(%$data);
+my $library1 = $builder->build({
+    source => 'Branch',
+});
+my $library2 = $builder->build({
+    source => 'Branch',
+});
+my $patron_category = $builder->build({ source => 'Category' });
+my $CARDNUMBER   = 'TESTCARD01';
+my $FIRSTNAME    = 'Marie';
+my $SURNAME      = 'Mcknight';
+my $BRANCHCODE   = $library1->{branchcode};
 
+my $CHANGED_FIRSTNAME = "Marry Ann";
+my $EMAIL             = "Marie\@email.com";
+my $EMAILPRO          = "Marie\@work.com";
+my $PHONE             = "555-12123";
 
-my $member=GetMemberDetails("","TESTCARD01");
-is ($member->{firstname}, "Marie", "Got member");
+# XXX should be randomised and checked against the database
+my $IMPOSSIBLE_CARDNUMBER = "XYZZZ999";
 
-$member->{firstname}="Claire";
-ModMember(%$member);
-my $changedmember=GetMemberDetails("","TESTCARD01");
-is ($changedmember->{firstname}, "Claire", "Member Changed");
+#my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter)= @_;
+my @USERENV = (
+    1,
+    'test',
+    'MASTERTEST',
+    'Test',
+    'Test',
+    't',
+    'Test',
+    0,
+);
+my $BRANCH_IDX = 5;
 
-$member->{firstname}="Marie";
-ModMember(%$member);
-$changedmember=GetMemberDetails("","TESTCARD01");
-is ($changedmember->{firstname}, "Marie", "Member Returned");
+C4::Context->_new_userenv ('DUMMY_SESSION_ID');
+C4::Context->set_userenv ( @USERENV );
 
-$member->{email}="Marie\@email.com";
-ModMember(%$member);
-$changedmember=GetMemberDetails("","TESTCARD01");
-is ($changedmember->{email}, "Marie\@email.com", "Email Set works");
+my $userenv = C4::Context->userenv
+  or BAIL_OUT("No userenv");
 
-$member->{ethnicity}="German";
-ModMember(%$member);
-$changedmember=GetMemberDetails("","TESTCARD01");
-is ($changedmember->{ethnicity}, "German", "Ethnicity Works");
+# Make a borrower for testing
+my %data = (
+    cardnumber => $CARDNUMBER,
+    firstname =>  $FIRSTNAME . q{ },
+    surname => $SURNAME,
+    categorycode => $patron_category->{categorycode},
+    branchcode => $BRANCHCODE,
+    dateofbirth => '',
+    dateexpiry => '9999-12-31',
+    userid => 'tomasito'
+);
+
+my $addmem=AddMember(%data);
+ok($addmem, "AddMember()");
 
-my @searchstring=("Mcknight");
-my ($results) = Search(\@searchstring,undef,undef,undef,["surname"]);
-is ($results->[0]->{surname}, "Mcknight", "Surname Search works");
+my $member = Koha::Patrons->find( { cardnumber => $CARDNUMBER } )
+  or BAIL_OUT("Cannot read member with card $CARDNUMBER");
+$member = $member->unblessed;
 
-$member->{phone}="555-12123";
+ok ( $member->{firstname}    eq $FIRSTNAME    &&
+     $member->{surname}      eq $SURNAME      &&
+     $member->{categorycode} eq $patron_category->{categorycode} &&
+     $member->{branchcode}   eq $BRANCHCODE
+     , "Got member")
+  or diag("Mismatching member details: ".Dumper(\%data, $member));
+
+is($member->{dateofbirth}, undef, "Empty dates handled correctly");
+
+$member->{firstname} = $CHANGED_FIRSTNAME . q{ };
+$member->{email}     = $EMAIL;
+$member->{phone}     = $PHONE;
+$member->{emailpro}  = $EMAILPRO;
 ModMember(%$member);
+my $changedmember = Koha::Patrons->find( { cardnumber => $CARDNUMBER } )->unblessed;
+ok ( $changedmember->{firstname} eq $CHANGED_FIRSTNAME &&
+     $changedmember->{email}     eq $EMAIL             &&
+     $changedmember->{phone}     eq $PHONE             &&
+     $changedmember->{emailpro}  eq $EMAILPRO
+     , "Member Changed")
+  or diag("Mismatching member details: ".Dumper($member, $changedmember));
 
-@searchstring=("555-12123");
-($results) = Search(\@searchstring,undef,undef,undef,["phone"]);
-is ($results->[0]->{phone}, "555-12123", "phone Search works");
+t::lib::Mocks::mock_preference( 'CardnumberLength', '' );
+C4::Context->clear_syspref_cache();
 
-my $checkcardnum=C4::Members::checkcardnumber("TESTCARD01", "");
+my $checkcardnum=C4::Members::checkcardnumber($CARDNUMBER, "");
 is ($checkcardnum, "1", "Card No. in use");
 
-$checkcardnum=C4::Members::checkcardnumber("67", "");
+$checkcardnum=C4::Members::checkcardnumber($IMPOSSIBLE_CARDNUMBER, "");
 is ($checkcardnum, "0", "Card No. not used");
 
-my $age=GetAge("1992-08-14", "2011-01-19");
-is ($age, "18", "Age correct");
+t::lib::Mocks::mock_preference( 'CardnumberLength', '4' );
+C4::Context->clear_syspref_cache();
+
+$checkcardnum=C4::Members::checkcardnumber($IMPOSSIBLE_CARDNUMBER, "");
+is ($checkcardnum, "2", "Card number is too long");
+
+
+
+t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' );
+C4::Context->clear_syspref_cache();
+
+my $notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
+is ($notice_email, $EMAIL, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is off");
+
+t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'emailpro' );
+C4::Context->clear_syspref_cache();
+
+$notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
+is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is emailpro");
+
+# Check_Userid tests
+%data = (
+    cardnumber   => "123456789",
+    firstname    => "Tomasito",
+    surname      => "None",
+    categorycode => $patron_category->{categorycode},
+    branchcode   => $library2->{branchcode},
+    dateofbirth  => '',
+    debarred     => '',
+    dateexpiry   => '',
+    dateenrolled => '',
+);
+# Add a new borrower
+my $borrowernumber = AddMember( %data );
+is( Check_Userid( 'tomasito.non', $borrowernumber ), 1,
+    'recently created userid -> unique (borrowernumber passed)' );
+is( Check_Userid( 'tomasitoxxx', $borrowernumber ), 1,
+    'non-existent userid -> unique (borrowernumber passed)' );
+is( Check_Userid( 'tomasito.none', '' ), 0,
+    'userid exists (blank borrowernumber)' );
+is( Check_Userid( 'tomasitoxxx', '' ), 1,
+    'non-existent userid -> unique (blank borrowernumber)' );
+
+my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+is( $borrower->{dateofbirth}, undef, 'AddMember should undef dateofbirth if empty string is given');
+is( $borrower->{debarred}, undef, 'AddMember should undef debarred if empty string is given');
+isnt( $borrower->{dateexpiry}, '0000-00-00', 'AddMember should not set dateexpiry to 0000-00-00 if empty string is given');
+isnt( $borrower->{dateenrolled}, '0000-00-00', 'AddMember should not set dateenrolled to 0000-00-00 if empty string is given');
+
+ModMember( borrowernumber => $borrowernumber, dateofbirth => '', debarred => '', dateexpiry => '', dateenrolled => '' );
+$borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+is( $borrower->{dateofbirth}, undef, 'ModMember should undef dateofbirth if empty string is given');
+is( $borrower->{debarred}, undef, 'ModMember should undef debarred if empty string is given');
+isnt( $borrower->{dateexpiry}, '0000-00-00', 'ModMember should not set dateexpiry to 0000-00-00 if empty string is given');
+isnt( $borrower->{dateenrolled}, '0000-00-00', 'ModMember should not set dateenrolled to 0000-00-00 if empty string is given');
+
+ModMember( borrowernumber => $borrowernumber, dateofbirth => '1970-01-01', debarred => '2042-01-01', dateexpiry => '9999-12-31', dateenrolled => '2015-09-06' );
+$borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+is( $borrower->{dateofbirth}, '1970-01-01', 'ModMember should correctly set dateofbirth if a valid date is given');
+is( $borrower->{debarred}, '2042-01-01', 'ModMember should correctly set debarred if a valid date is given');
+is( $borrower->{dateexpiry}, '9999-12-31', 'ModMember should correctly set dateexpiry if a valid date is given');
+is( $borrower->{dateenrolled}, '2015-09-06', 'ModMember should correctly set dateenrolled if a valid date is given');
+
+# Add a new borrower with the same userid but different cardnumber
+$data{ cardnumber } = "987654321";
+my $new_borrowernumber = AddMember( %data );
+is( Check_Userid( 'tomasito.none', '' ), 0,
+    'userid not unique (blank borrowernumber)' );
+is( Check_Userid( 'tomasito.none', $new_borrowernumber ), 0,
+    'userid not unique (second borrowernumber passed)' );
+$borrower = Koha::Patrons->find( $new_borrowernumber )->unblessed;
+ok( $borrower->{userid} ne 'tomasito', "Borrower with duplicate userid has new userid generated" );
+
+$data{ cardnumber } = "234567890";
+$data{userid} = 'a_user_id';
+$borrowernumber = AddMember( %data );
+$borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+is( $borrower->{userid}, $data{userid}, 'AddMember should insert the given userid' );
+
+subtest 'ModMember should not update userid if not true' => sub {
+    plan tests => 3;
+    ModMember( borrowernumber => $borrowernumber, firstname => 'Tomas', userid => '' );
+    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+    is ( $borrower->{userid}, $data{userid}, 'ModMember should not update the userid with an empty string' );
+    ModMember( borrowernumber => $borrowernumber, firstname => 'Tomas', userid => 0 );
+    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+    is ( $borrower->{userid}, $data{userid}, 'ModMember should not update the userid with an 0');
+    ModMember( borrowernumber => $borrowernumber, firstname => 'Tomas', userid => undef );
+    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+    is ( $borrower->{userid}, $data{userid}, 'ModMember should not update the userid with an undefined value');
+};
+
+#Regression tests for bug 10612
+my $library3 = $builder->build({
+    source => 'Branch',
+});
+$builder->build({
+        source => 'Category',
+        value => {
+            categorycode         => 'STAFFER',
+            description          => 'Staff dont batch del',
+            category_type        => 'S',
+        },
+});
 
-$age=GetAge("2011-01-19", "1992-01-19");
-is ($age, "-19", "Birthday In the Future");
+$builder->build({
+        source => 'Category',
+        value => {
+            categorycode         => 'CIVILIAN',
+            description          => 'Civilian batch del',
+            category_type        => 'A',
+        },
+});
 
-my $sortdet=C4::Members::GetSortDetails("lost", "3");
-is ($sortdet, "Lost and Paid For", "lost and paid works");
+$builder->build({
+        source => 'Category',
+        value => {
+            categorycode         => 'KIDclamp',
+            description          => 'Kid to be guaranteed',
+            category_type        => 'C',
+        },
+});
+
+my $borrower1 = $builder->build({
+        source => 'Borrower',
+        value  => {
+            categorycode=>'STAFFER',
+            branchcode => $library3->{branchcode},
+            dateexpiry => '2015-01-01',
+            guarantorid=> undef,
+        },
+});
+my $bor1inlist = $borrower1->{borrowernumber};
+my $borrower2 = $builder->build({
+        source => 'Borrower',
+        value  => {
+            categorycode=>'STAFFER',
+            branchcode => $library3->{branchcode},
+            dateexpiry => '2015-01-01',
+            guarantorid=> undef,
+        },
+});
+
+my $guarantee = $builder->build({
+        source => 'Borrower',
+        value  => {
+            categorycode=>'KIDclamp',
+            branchcode => $library3->{branchcode},
+            dateexpiry => '2015-01-01',
+            guarantorid=> undef, # will be filled later
+        },
+});
+
+my $bor2inlist = $borrower2->{borrowernumber};
+
+$builder->build({
+        source => 'OldIssue',
+        value  => {
+            borrowernumber => $bor2inlist,
+            timestamp => '2016-01-01',
+        },
+});
+
+my $owner = AddMember (categorycode => 'STAFFER', branchcode => $library2->{branchcode} );
+my $list1 = AddPatronList( { name => 'Test List 1', owner => $owner } );
+my @listpatrons = ($bor1inlist, $bor2inlist);
+AddPatronsToList(  { list => $list1, borrowernumbers => \@listpatrons });
+my $patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),0,'No staff deleted from list of all staff');
+ModMember( borrowernumber => $bor2inlist, categorycode => 'CIVILIAN' );
+$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
+ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted from list');
+$patstodel = GetBorrowersToExpunge( {branchcode => $library3->{branchcode},patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by branchcode and list');
+$patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02', patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by expirationdate and list');
+$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');
+
+ModMember( borrowernumber => $bor1inlist, categorycode => 'CIVILIAN' );
+ModMember( borrowernumber => $guarantee->{borrowernumber} ,guarantorid=>$bor1inlist );
+
+$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
+ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');
+$patstodel = GetBorrowersToExpunge( {branchcode => $library3->{branchcode},patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by branchcode and list');
+$patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02', patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');
+$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
+ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');
+ModMember( borrowernumber => $guarantee->{borrowernumber}, guarantorid=>'' );
+
+$builder->build({
+        source => 'Issue',
+        value  => {
+            borrowernumber => $bor2inlist,
+        },
+});
+$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
+is( scalar(@$patstodel),1,'Borrower with issue not deleted from list');
+$patstodel = GetBorrowersToExpunge( {branchcode => $library3->{branchcode},patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),1,'Borrower with issue not deleted by branchcode and list');
+$patstodel = GetBorrowersToExpunge( {category_code => 'CIVILIAN',patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),1,'Borrower with issue not deleted by category_code and list');
+$patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02',patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),1,'Borrower with issue not deleted by expiration_date and list');
+$builder->schema->resultset( 'Issue' )->delete_all;
+$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
+ok( scalar(@$patstodel)== 2,'Borrowers without issue deleted from list');
+$patstodel = GetBorrowersToExpunge( {category_code => 'CIVILIAN',patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),2,'Borrowers without issues deleted by category_code and list');
+$patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02',patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),2,'Borrowers without issues deleted by expiration_date and list');
+$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
+is( scalar(@$patstodel),2,'Borrowers without issues deleted by last issue date');
+
+# Test GetBorrowersToExpunge and TrackLastPatronActivity
+$dbh->do(q|UPDATE borrowers SET lastseen=NULL|);
+$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN', guarantorid => undef } } );
+$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN', guarantorid => undef } } );
+$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN', guarantorid => undef } } );
+$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });
+is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );
+$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });
+is( scalar @$patstodel, 2, 'TrackLastPatronActivity - 2 patrons must be deleted' );
+$patstodel = GetBorrowersToExpunge( { last_seen => '2016-04-04' });
+is( scalar @$patstodel, 3, 'TrackLastPatronActivity - 3 patrons must be deleted' );
+my $patron2 = $builder->build({ source => 'Borrower', value => { lastseen => undef } });
+t::lib::Mocks::mock_preference( 'TrackLastPatronActivity', '0' );
+Koha::Patrons->find( $patron2->{borrowernumber} )->track_login;
+is( Koha::Patrons->find( $patron2->{borrowernumber} )->lastseen, undef, 'Lastseen should not be changed' );
+Koha::Patrons->find( $patron2->{borrowernumber} )->track_login({ force => 1 });
+isnt( Koha::Patrons->find( $patron2->{borrowernumber} )->lastseen, undef, 'Lastseen should be changed now' );
+
+# Regression tests for BZ13502
+## Remove all entries with userid='' (should be only 1 max)
+$dbh->do(q|DELETE FROM borrowers WHERE userid = ''|);
+## And create a patron with a userid=''
+$borrowernumber = AddMember( categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} );
+$dbh->do(q|UPDATE borrowers SET userid = '' WHERE borrowernumber = ?|, undef, $borrowernumber);
+# Create another patron and verify the userid has been generated
+$borrowernumber = AddMember( categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} );
+ok( $borrowernumber > 0, 'AddMember should have inserted the patron even if no userid is given' );
+$borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+ok( $borrower->{userid},  'A userid should have been generated correctly' );
+
+# Regression tests for BZ12226
+is( Check_Userid( C4::Context->config('user'), '' ), 0,
+    'Check_Userid should return 0 for the DB user (Bug 12226)');
+
+subtest 'GetMemberAccountRecords' => sub {
+
+    plan tests => 2;
+
+    my $borrowernumber = $builder->build({ source => 'Borrower' })->{ borrowernumber };
+    my $accountline_1  = $builder->build({
+        source => 'Accountline',
+        value  => {
+            borrowernumber    => $borrowernumber,
+            amountoutstanding => 64.60
+        }
+    });
+
+    my ($total,undef,undef) = GetMemberAccountRecords( $borrowernumber );
+    is( $total , 64.60, "Rounding works correctly in total calculation (single value)" );
+
+    my $accountline_2 = $builder->build({
+        source => 'Accountline',
+        value  => {
+            borrowernumber    => $borrowernumber,
+            amountoutstanding => 10.65
+        }
+    });
+
+    ($total,undef,undef) = GetMemberAccountRecords( $borrowernumber );
+    is( $total , 75.25, "Rounding works correctly in total calculation (multiple values)" );
+
+};
+
+subtest 'GetMemberAccountBalance' => sub {
+
+    plan tests => 6;
+
+    my $members_mock = new Test::MockModule('C4::Members');
+    $members_mock->mock( 'GetMemberAccountRecords', sub {
+        my ($borrowernumber) = @_;
+        if ($borrowernumber) {
+            my @accountlines = (
+            { amountoutstanding => '7', accounttype => 'Rent' },
+            { amountoutstanding => '5', accounttype => 'Res' },
+            { amountoutstanding => '3', accounttype => 'Pay' } );
+            return ( 15, \@accountlines );
+        }
+        else {
+            my @accountlines;
+            return ( 0, \@accountlines );
+        }
+    });
+
+    # do not count holds charges
+    t::lib::Mocks::mock_preference( 'HoldsInNoissuesCharge', '1' );
+    t::lib::Mocks::mock_preference( 'ManInvInNoissuesCharge', '0' );
+    my ($total, $total_minus_charges,
+        $other_charges) = C4::Members::GetMemberAccountBalance(123);
+    is( $total, 15 , "Total calculated correctly");
+    is( $total_minus_charges, 15, "Holds charges are not count if HoldsInNoissuesCharge=1");
+    is( $other_charges, 0, "Holds charges are not considered if HoldsInNoissuesCharge=1");
+
+    t::lib::Mocks::mock_preference( 'HoldsInNoissuesCharge', '0' );
+    ($total, $total_minus_charges,
+        $other_charges) = C4::Members::GetMemberAccountBalance(123);
+    is( $total, 15 , "Total calculated correctly");
+    is( $total_minus_charges, 10, "Holds charges are count if HoldsInNoissuesCharge=0");
+    is( $other_charges, 5, "Holds charges are considered if HoldsInNoissuesCharge=1");
+};
+
+subtest 'purgeSelfRegistration' => sub {
+    plan tests => 2;
+
+    #purge unverified
+    my $d=360;
+    C4::Members::DeleteUnverifiedOpacRegistrations($d);
+    foreach(1..3) {
+        $dbh->do("INSERT INTO borrower_modifications (timestamp, borrowernumber, verification_token) VALUES ('2014-01-01 01:02:03',0,?)", undef, (scalar localtime)."_$_");
+    }
+    is( C4::Members::DeleteUnverifiedOpacRegistrations($d), 3, 'Test for DeleteUnverifiedOpacRegistrations' );
+
+    #purge members in temporary category
+    my $c= 'XYZ';
+    $dbh->do("INSERT IGNORE INTO categories (categorycode) VALUES ('$c')");
+    t::lib::Mocks::mock_preference('PatronSelfRegistrationDefaultCategory', $c );
+    t::lib::Mocks::mock_preference('PatronSelfRegistrationExpireTemporaryAccountsDelay', 360);
+    C4::Members::DeleteExpiredOpacRegistrations();
+    $dbh->do("INSERT INTO borrowers (surname, address, city, branchcode, categorycode, dateenrolled) VALUES ('Testaabbcc', 'Street 1', 'CITY', ?, '$c', '2014-01-01 01:02:03')", undef, $library1->{branchcode});
+    is( C4::Members::DeleteExpiredOpacRegistrations(), 1, 'Test for DeleteExpiredOpacRegistrations');
+};
+
+sub _find_member {
+    my ($resultset) = @_;
+    my $found = $resultset && grep( { $_->{cardnumber} && $_->{cardnumber} eq $CARDNUMBER } @$resultset );
+    return $found;
+}
 
-my $sortdet2=C4::Members::GetSortDetails("loc", "child");
-is ($sortdet2, "Children's Area", "Child area works");
+# Regression tests for BZ15343
+my $password="";
+( $borrowernumber, $password ) = AddMember_Opac(surname=>"Dick",firstname=>'Philip',branchcode => $library2->{branchcode});
+is( $password =~ /^[a-zA-Z]{10}$/ , 1, 'Test for autogenerated password if none submitted');
+( $borrowernumber, $password ) = AddMember_Opac(surname=>"Deckard",firstname=>"Rick",password=>"Nexus-6",branchcode => $library2->{branchcode});
+is( $password eq "Nexus-6", 1, 'Test password used if submitted');
+$borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+my $hashed_up =  Koha::AuthUtils::hash_password("Nexus-6", $borrower->{password});
+is( $borrower->{password} eq $hashed_up, 1, 'Check password hash equals hash of submitted password' );
 
-my $sortdet3=C4::Members::GetSortDetails("withdrawn", "1");
-is ($sortdet3, "Withdrawn", "Withdrawn works");
+subtest 'Trivial test for AddMember_Auto' => sub {
+    plan tests => 3;
+    my $members_mock = Test::MockModule->new( 'C4::Members' );
+    $members_mock->mock( 'fixup_cardnumber', sub { 12345; } );
+    my $library = $builder->build({ source => 'Branch' });
+    my $category = $builder->build({ source => 'Category' });
+    my %borr = AddMember_Auto( surname=> 'Dick3', firstname => 'Philip', branchcode => $library->{branchcode}, categorycode => $category->{categorycode}, password => '34567890' );
+    ok( $borr{borrowernumber}, 'Borrower hash contains borrowernumber' );
+    is( $borr{cardnumber}, 12345, 'Borrower hash contains cardnumber' );
+    my $patron = Koha::Patrons->find( $borr{borrowernumber} );
+    isnt( $patron, undef, 'Patron found' );
+};
 
-# clean up 
-DelMember($member->{borrowernumber});
+$schema->storage->txn_rollback;