Parser correct; test includes failure, shorter query tests; new test schema for bad...

[dbsrgits/DBIx-Class.git] / t / 105view_deps.t

diff --git a/t/105view_deps.t b/t/105view_deps.t
index 223254d..66e409d 100644 (file)
--- a/t/105view_deps.t
+++ b/t/105view_deps.t
@@ -7,6 +7,7 @@ use Test::More;
 use Test::Exception;
 use lib qw(t/lib);
 use ViewDeps;
+use ViewDepsBad;
 
 BEGIN {
     use_ok('DBIx::Class::ResultSource::View');
@@ -14,7 +15,7 @@ BEGIN {
 
 #################### SANITY
 
-my $view = DBIx::Class::ResultSource::View->new( { name => 'Quux' } );
+my $view = DBIx::Class::ResultSource::View->new;
 
 isa_ok( $view, 'DBIx::Class::ResultSource', 'A new view' );
 isa_ok( $view, 'DBIx::Class', 'A new view also' );
@@ -27,38 +28,25 @@ my $schema
     = ViewDeps->connect( 'dbi:SQLite::memory:', { quote_char => '"', } );
 ok( $schema, 'Connected to ViewDeps schema OK' );
 
-my $deps_ref = {
-    map {
-        $schema->resultset($_)->result_source->name =>
-            $schema->resultset($_)->result_source->deploy_depends_on
-        }
-        grep {
-        $schema->resultset($_)
-            ->result_source->isa('DBIx::Class::ResultSource::View')
-        } @{ [ $schema->sources ] }
-};
-
-my @sorted_sources = sort {
-    keys %{ $deps_ref->{$a} || {} } <=> keys %{ $deps_ref->{$b} || {} }
-        || $a cmp $b
-    }
-    keys %$deps_ref;
-
 #################### DEPLOY
 
 $schema->deploy( { add_drop_table => 1 } );
 
 #################### DOES ORDERING WORK?
 
-my $tr = $schema->{sqlt};
+my $sqlt_object = $schema->{sqlt};
+
+my @keys = keys %{ $sqlt_object->{views} };
 
-my @keys = keys %{ $tr->{views} };
+my @sqlt_sources = sort {
+    $sqlt_object->{views}->{$a}->{order}
+        cmp $sqlt_object->{views}->{$b}->{order}
+} @keys;
 
-my @sqlt_sources
-    = sort { $tr->{views}->{$a}->{order} cmp $tr->{views}->{$b}->{order} }
-    @keys;
+my @expected
+    = qw/a_name_artists track_number_fives year_2010_cds ab_name_artists year_2010_cds_with_many_tracks aba_name_artists aba_name_artists_and_2010_cds_with_many_tracks/;
 
-is_deeply( \@sorted_sources, \@sqlt_sources,
+is_deeply( \@expected, \@sqlt_sources,
     "SQLT view order triumphantly matches our order." );
 
 #################### AND WHAT ABOUT USING THE SCHEMA?
@@ -69,4 +57,47 @@ lives_ok( sub { $schema->resultset($_)->next }, "Query on $_ succeeds" )
         ->result_source->isa('DBIx::Class::ResultSource::View')
     } @{ [ $schema->sources ] };
 
+#################### AND WHAT ABOUT A BAD DEPS CHAIN IN A VIEW?
+
+my $schema2
+    = ViewDepsBad->connect( 'dbi:SQLite::memory:', { quote_char => '"', } );
+ok( $schema2, 'Connected to ViewDepsBad schema OK' );
+
+#################### DEPLOY2
+
+$schema2->deploy( { add_drop_table => 1 } );
+
+#################### DOES ORDERING WORK 2?
+
+my $sqlt_object2 = $schema2->{sqlt};
+
+my @keys2 = keys %{ $sqlt_object->{views} };
+
+my @sqlt_sources2 = sort {
+    $sqlt_object->{views}->{$a}->{order}
+        cmp $sqlt_object->{views}->{$b}->{order}
+} @keys2;
+
+my @expected2
+    = qw/a_name_artists track_number_fives year_2010_cds ab_name_artists year_2010_cds_with_many_tracks aba_name_artists aba_name_artists_and_2010_cds_with_many_tracks/;
+
+is_deeply( \@expected2, \@sqlt_sources2,
+    "SQLT view order triumphantly matches our order." );
+
+#################### AND WHAT ABOUT USING THE SCHEMA2?
+
+lives_ok( sub { $schema2->resultset($_)->next }, "Query on $_ succeeds" )
+    for grep {
+    $schema2->resultset($_)
+        ->result_source->isa('DBIx::Class::ResultSource::View')
+    } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ }
+    @{ [ $schema2->sources ] };
+
+dies_ok(
+    sub {
+        $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next;
+    },
+    "Query on AbaNameArtistsAnd2010CDsWithManyTracks fails, because of incorrect deploy_depends_on in AbaNameArtists"
+);
+
 done_testing;