X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F61findnot.t;h=e7f4249a8e7cc8843accfa42fb45c53575601396;hb=b7743dab;hp=ee7b582ea6274ed0383cc9d6201b6a7256776f17;hpb=57dc206ebd7065abc265ef81c729f16b97e6ab5a;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/61findnot.t b/t/61findnot.t
index ee7b582..e7f4249 100644
--- a/t/61findnot.t
+++ b/t/61findnot.t
@@ -1,14 +1,14 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
+use Test::Warn;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 17;
-
 my $art = $schema->resultset("Artist")->find(4);
 ok(!defined($art), 'Find on primary id: artist not found');
 my @cd = $schema->resultset("CD")->find(6);
@@ -44,3 +44,29 @@ $cd = $schema->resultset("CD")->search({title => 'Call of the West'});
 @cd = $cd->single;
 cmp_ok(@cd, '==', 1, 'Return something even in array context');
 ok(@cd && !defined($cd[0]), 'Array contains an undef as only element');
+
+$cd = $schema->resultset("CD")->first;
+my $artist_rs = $schema->resultset("Artist")->search({ artistid => $cd->artist->artistid });
+$art = $artist_rs->find({ name => 'some other name' }, { key => 'primary' });
+ok($art, 'Artist found by key in the resultset');
+
+# collapsing and non-collapsing are separate codepaths, thus the separate tests
+
+$artist_rs = $schema->resultset("Artist");
+warnings_exist {
+  $artist_rs->find({})
+} qr/\QDBIx::Class::ResultSet::find(): Query returned more than one row.  SQL that returns multiple rows is DEPRECATED for ->find and ->single/
+    =>  "Non-unique find generated a cursor inexhaustion warning";
+throws_ok {
+  $artist_rs->find({}, { key => 'primary' })
+} qr/Unable to satisfy constraint 'primary'/;
+
+$artist_rs = $schema->resultset("Artist")->search({}, { prefetch => 'cds' });
+warnings_exist {
+  $artist_rs->find({})
+} qr/\QDBIx::Class::ResultSet::find(): Query returned more than one row/, "Non-unique find generated a cursor inexhaustion warning";
+throws_ok {
+  $artist_rs->find({}, { key => 'primary' })
+} qr/Unable to satisfy constraint 'primary'/;
+
+done_testing;