Merge the relationship resolution rework

[dbsrgits/DBIx-Class.git] / xt / extra / diagnostics / invalid_resolve_relationship_condition_arguments.t

diff --git a/t/relationship/resolve_relationship_condition.t b/xt/extra/diagnostics/invalid_resolve_relationship_condition_arguments.t
similarity index 58%
rename from t/relationship/resolve_relationship_condition.t
rename to xt/extra/diagnostics/invalid_resolve_relationship_condition_arguments.t
index a999dc6..050b5ca 100644 (file)
--- a/t/relationship/resolve_relationship_condition.t
+++ b/xt/extra/diagnostics/invalid_resolve_relationship_condition_arguments.t
@@ -6,10 +6,9 @@ use warnings;
 use Test::More;
 use Test::Exception;
 
-
 use DBICTest;
 
-my $schema = DBICTest->init_schema();
+my $schema = DBICTest->init_schema( no_deploy => 1 );
 
 for (
   { year => [1,2] },
@@ -18,7 +17,7 @@ for (
   { -and => [ year => 1, year => 2 ] },
 ) {
   throws_ok {
-    $schema->source('Track')->_resolve_relationship_condition(
+    $schema->source('Track')->resolve_relationship_condition(
       rel_name => 'cd_cref_cond',
       self_alias => 'me',
       foreign_alias => 'cd',
@@ -27,7 +26,9 @@ for (
   } qr/
     \Qis not a column on related source 'CD'\E
       |
-    \QValue supplied for '...{foreign_values}{year}' is not a direct equivalence expression\E
+    \Qsupplied value for foreign column 'year' is not a direct equivalence expression\E
+      |
+    \QThe key '-\E \w+ \Q' supplied as part of 'foreign_values' during relationship resolution must be a column name, not a function\E
   /x;
 }