Bug 15632 [QA Followup] - Change method type to _type for bug 15446

[koha.git] / t / db_dependent / Borrower.t

diff --git a/t/db_dependent/Borrower.t b/t/db_dependent/Borrower.t
index 620b6ff..c619754 100755 (executable)
--- a/t/db_dependent/Borrower.t
+++ b/t/db_dependent/Borrower.t
@@ -17,7 +17,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 12;
+use Test::More tests => 13;
 use Test::Warn;
 
 use C4::Context;
@@ -28,13 +28,11 @@ BEGIN {
     use_ok('Koha::Borrower');
 }
 
-# Start transaction
-my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
+my $schema = Koha::Database->new->schema;
+$schema->storage->txn_begin;
 
-my $categorycode = Koha::Database->new()->schema()->resultset('Category')->first()->categorycode();
-my $branchcode = Koha::Database->new()->schema()->resultset('Branch')->first()->branchcode();
+my $categorycode = $schema->resultset('Category')->first()->categorycode();
+my $branchcode = $schema->resultset('Branch')->first()->branchcode();
 
 my $object = Koha::Borrower->new();
 
@@ -45,12 +43,16 @@ $object->branchcode( $branchcode );
 $object->surname("Test Surname");
 $object->store();
 
-my $borrower = Koha::Database->new()->schema()->resultset('Borrower')->find( $object->borrowernumber() );
-is( $borrower->surname(), "Test Surname", "Object found in database" );
-
 is( $object->in_storage, 1, "Object is now stored" );
 
+my $borrowernumber = $object->borrowernumber;
+
+my $borrower = $schema->resultset('Borrower')->find( $borrowernumber );
+is( $borrower->surname(), "Test Surname", "Object found in database" );
+
 is( $object->is_changed(), 0, "Object is unchanged" );
+$object->surname("Test Surname");
+is( $object->is_changed(), 0, "Object is still unchanged" );
 $object->surname("Test Surname 2");
 is( $object->is_changed(), 1, "Object is changed" );
 
@@ -63,7 +65,7 @@ $object->store();
 is( $object->is_changed(), 0, "Object no longer marked as changed after being stored" );
 
 $object->delete();
-$borrower = Koha::Database->new()->schema()->resultset('Borrower')->find( $object->borrowernumber() );
+$borrower = $schema->resultset('Borrower')->find( $borrowernumber );
 ok( ! $borrower, "Object no longer found in database" );
 is( $object->in_storage, 0, "Object is not in storage" );