From: Peter Rabbitson Date: Tue, 26 Jan 2010 08:33:42 +0000 (+0000) Subject: Switch to Test::Exception X-Git-Tag: v0.08116~34 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd7d4b437321e95655a7b9b4de14a7b357e95807;p=dbsrgits%2FDBIx-Class.git Switch to Test::Exception --- diff --git a/t/81transactions.t b/t/81transactions.t index c1300de..0e3719e 100644 --- a/t/81transactions.t +++ b/t/81transactions.t @@ -22,14 +22,13 @@ my $code = sub { # Test checking of parameters { - eval { + throws_ok (sub { (ref $schema)->txn_do(sub{}); - }; - like($@, qr/storage/, "can't call txn_do without storage"); - eval { + }, qr/storage/, "can't call txn_do without storage"); + + throws_ok ( sub { $schema->txn_do(''); - }; - like($@, qr/must be a CODE reference/, '$coderef parameter check ok'); + }, qr/must be a CODE reference/, '$coderef parameter check ok'); } # Test successful txn_do() - scalar context @@ -81,13 +80,10 @@ my $code = sub { my $artist = $schema->resultset('Artist')->find(2); my $count_before = $artist->cds->count; - eval { + lives_ok (sub { $schema->txn_do($nested_code, $schema, $artist, $code); - }; - - my $error = $@; + }, 'nested txn_do succeeded'); - ok(!$error, 'nested txn_do succeeded'); is($artist->cds({ title => 'nested txn_do test CD '.$_, })->first->year, 2006, qq{nested txn_do CD$_ year ok}) for (1..10); @@ -112,13 +108,10 @@ my $fail_code = sub { my $artist = $schema->resultset('Artist')->find(3); - eval { + throws_ok (sub { $schema->txn_do($fail_code, $artist); - }; - - my $error = $@; + }, qr/the sky is falling/, 'failed txn_do threw an exception'); - like($error, qr/the sky is falling/, 'failed txn_do threw an exception'); my $cd = $artist->cds({ title => 'this should not exist', year => 2005, @@ -134,13 +127,10 @@ my $fail_code = sub { my $artist = $schema->resultset('Artist')->find(3); - eval { + throws_ok (sub { $schema->txn_do($fail_code, $artist); - }; - - my $error = $@; + }, qr/the sky is falling/, 'failed txn_do threw an exception'); - like($error, qr/the sky is falling/, 'failed txn_do threw an exception'); my $cd = $artist->cds({ title => 'this should not exist', year => 2005, @@ -167,16 +157,13 @@ my $fail_code = sub { die 'FAILED'; }; - eval { - $schema->txn_do($fail_code, $artist); - }; - - my $error = $@; - - like($error, qr/Rollback failed/, 'failed txn_do with a failed '. - 'txn_rollback threw a rollback exception'); - like($error, qr/the sky is falling/, 'failed txn_do with a failed '. - 'txn_rollback included the original exception'); + throws_ok ( + sub { + $schema->txn_do($fail_code, $artist); + }, + qr/the sky is falling.+Rollback failed/s, + 'txn_rollback threw a rollback exception (and included the original exception' + ); my $cd = $artist->cds({ title => 'this should not exist', @@ -208,13 +195,10 @@ my $fail_code = sub { my $artist = $schema->resultset('Artist')->find(3); - eval { + throws_ok ( sub { $schema->txn_do($nested_fail_code, $schema, $artist, $code, $fail_code); - }; - - my $error = $@; + }, qr/the sky is falling/, 'nested failed txn_do threw exception'); - like($error, qr/the sky is falling/, 'nested failed txn_do threw exception'); ok(!defined($artist->cds({ title => 'nested txn_do test CD '.$_, year => 2006, @@ -229,12 +213,10 @@ my $fail_code = sub { # Grab a new schema to test txn before connect { my $schema2 = DBICTest->init_schema(no_deploy => 1); - eval { + lives_ok (sub { $schema2->txn_begin(); $schema2->txn_begin(); - }; - my $err = $@; - ok(! $err, 'Pre-connection nested transactions.'); + }, 'Pre-connection nested transactions.'); # although not connected DBI would still warn about rolling back at disconnect $schema2->txn_rollback; @@ -263,11 +245,10 @@ $schema->storage->disconnect; ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created"); - my $inner_exception; # set in inner() below - eval { + my $inner_exception = ''; # set in inner() below + throws_ok (sub { outer($schema, 1); - }; - is($@, $inner_exception, "Nested exceptions propogated"); + }, qr/$inner_exception/, "Nested exceptions propogated"); ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");