X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FMembers.t;h=650eed6510813bca33889087a8380c8e317aa91f;hb=ef410fd62f279a10687636a4f26babb2c91ecadc;hp=f405a46a69bde5e8dcc2e80e8a1de53c36bd4441;hpb=ae927390ffabdc26d66b254a17abbe81e6683279;p=koha.git

diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t
index f405a46a69..650eed6510 100755
--- a/t/db_dependent/Members.t
+++ b/t/db_dependent/Members.t
@@ -94,8 +94,8 @@ my %data = (
     userid => 'tomasito'
 );
 
-my $addmem=AddMember(%data);
-ok($addmem, "AddMember()");
+my $addmem=Koha::Patron->new(\%data)->store->borrowernumber;
+ok($addmem, "Koha::Patron->store()");
 
 my $member = Koha::Patrons->find( { cardnumber => $CARDNUMBER } )
   or BAIL_OUT("Cannot read member with card $CARDNUMBER");
@@ -151,12 +151,12 @@ is ($checkcardnum, "2", "Card number is too long");
     dateexpiry   => '',
     dateenrolled => '',
 );
-my $borrowernumber = AddMember( %data );
+my $borrowernumber = Koha::Patron->new( \%data )->store->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');
+is( $borrower->{dateofbirth}, undef, 'Koha::Patron->store should undef dateofbirth if empty string is given');
+is( $borrower->{debarred}, undef, 'Koha::Patron->store should undef debarred if empty string is given');
+isnt( $borrower->{dateexpiry}, '0000-00-00', 'Koha::Patron->store should not set dateexpiry to 0000-00-00 if empty string is given');
+isnt( $borrower->{dateenrolled}, '0000-00-00', 'Koha::Patron->store 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;
@@ -177,7 +177,7 @@ subtest 'ModMember should not update userid if not true' => sub {
 
     $data{ cardnumber } = "234567890";
     $data{userid} = 'a_user_id';
-    $borrowernumber = AddMember( %data );
+    $borrowernumber = Koha::Patron->new( \%data )->store->borrowernumber;
     $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
 
     ModMember( borrowernumber => $borrowernumber, firstname => 'Tomas', userid => '' );
@@ -266,7 +266,7 @@ $builder->build({
 # IndependentBranches is off.
 t::lib::Mocks::mock_preference('IndependentBranches', 0);
 
-my $owner = AddMember (categorycode => 'STAFFER', branchcode => $library2->{branchcode} );
+my $owner = Koha::Patron->new({ categorycode => 'STAFFER', branchcode => $library2->{branchcode} })->store->borrowernumber;
 my $list1 = AddPatronList( { name => 'Test List 1', owner => $owner } );
 my @listpatrons = ($bor1inlist, $bor2inlist);
 AddPatronsToList(  { list => $list1, borrowernumbers => \@listpatrons });
@@ -341,11 +341,11 @@ isnt( Koha::Patrons->find( $patron2->{borrowernumber} )->lastseen, undef, 'Lasts
 ## 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} );
+$borrowernumber = Koha::Patron->new({ categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} })->store->borrowernumber;
 $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' );
+$borrowernumber = Koha::Patron->new({ categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} })->store->borrowernumber;
+ok( $borrowernumber > 0, 'Koha::Patron->store 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' );
 
@@ -399,7 +399,7 @@ subtest 'Trivial test for AddMember_Auto' => sub {
 
 $schema->storage->txn_rollback;
 
-subtest 'AddMember (invalid categorycode) tests' => sub {
+subtest 'Koha::Patron->store (invalid categorycode) tests' => sub {
     plan tests => 1;
 
     $schema->storage->txn_begin;
@@ -414,7 +414,7 @@ subtest 'AddMember (invalid categorycode) tests' => sub {
     };
 
     throws_ok
-        { AddMember( %{ $patron_data } ); }
+        { Koha::Patron->new( $patron_data )->store; }
         'Koha::Exceptions::Object::FKConstraint',
         'AddMember raises an exception on invalid categorycode';