Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[mfinanz.git] / t / db_helper / with_transaction.t

diff --git a/t/db_helper/with_transaction.t b/t/db_helper/with_transaction.t
index 6d49a209b4fe8f5b7d6e13f3438b7d2a3f2b9deb..cc3fc0ece58b16a56b880ad9e3e5db082995c9bc 100644 (file)
--- a/t/db_helper/with_transaction.t
+++ b/t/db_helper/with_transaction.t
@@ -10,7 +10,7 @@ use Carp;
 use Data::Dumper;
 use Support::TestSetup;
 use SL::DB::Part;
-use SL::Dev::Part;
+use SL::Dev::Part qw(new_part);
 
 Support::TestSetup::login();
 
@@ -21,7 +21,7 @@ local $SIG{__WARN__} = sub {};
 
 # test simple transaction
 
-my $part = create_part();
+my $part = new_part();
 SL::DB->client->with_transaction(sub {
   $part->save;
   ok 1, 'part saved';
@@ -31,7 +31,7 @@ SL::DB->client->with_transaction(sub {
 };
 
 # test failing transaction
-my $part2 = create_part(partnumber => $part->partnumber); # woops, duplicate partnumber
+my $part2 = new_part(partnumber => $part->partnumber); # woops, duplicate partnumber
 SL::DB->client->with_transaction(sub {
   $part2->save;
   ok 0, 'part saved';
@@ -55,13 +55,13 @@ dies_ok {
 # TODO - not possible to test without locally adding hooks in run time
 
 # test if error gets correctly stored in db->error
-$part2 = create_part(partnumber => $part->partnumber); # woops, duplicate partnumber
+$part2 = new_part(partnumber => $part->partnumber); # woops, duplicate partnumber
 SL::DB->client->with_transaction(sub {
   $part2->save;
   ok 0, 'part saved';
   1;
 }) or do {
-  like(SL::DB->client->error, qr/duplicate key value violates unique constraint/, 'error is in db->error');
+  like(SL::DB->client->error, qr/unique.constraint/i, 'error is in db->error');
 };
 
 # test stacked transactions
@@ -127,7 +127,7 @@ SL::DB->client->with_transaction(sub {
   1;
 }) or do {
   ok 1, 'sql error in nested transaction rolls back';
-  like(SL::DB->client->error, qr/duplicate key value violates unique constraint/, 'error from nested transaction is in db->error');
+  like(SL::DB->client->error, qr/unique.constraint/i, 'error from nested transaction is in db->error');
 };
 
 $part->load;
@@ -242,4 +242,3 @@ eval {
 
 $part->load;
 is $part->sellprice, "3.00000", 'saved part is not affected';
-