X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F105view_deps.t;h=6a40e20536386a1bd58472effbf001c50dae2eee;hb=26148d36e66d7f7c67863cea8d6501739b765692;hp=d056e9dc64e8535dd0ba4d3e573b7d0f3e82d0b8;hpb=68de943862f06cabd397d2e74d12cd9cdc999779;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/105view_deps.t b/t/105view_deps.t
index d056e9d..6a40e20 100644
--- a/t/105view_deps.t
+++ b/t/105view_deps.t
@@ -7,6 +7,7 @@ use Test::More;
 use Test::Exception;
 use Test::Warn;
 use lib qw(t/lib);
+use DBICTest;
 use ViewDeps;
 use ViewDepsBad;
 
@@ -29,89 +30,86 @@ isa_ok( $view, 'DBIx::Class', 'A new view also' );
 can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
 
 #################### DEPS
-
-my $schema
-    = ViewDeps->connect( 'dbi:SQLite::memory:', { quote_char => '"', } );
-ok( $schema, 'Connected to ViewDeps schema OK' );
+{
+  my $schema
+    = ViewDeps->connect( DBICTest->_database (quote_char => '"') );
+  ok( $schema, 'Connected to ViewDeps schema OK' );
 
 #################### DEPLOY
 
-$schema->deploy( { add_drop_table => 1 } );
+  $schema->deploy( { add_drop_table => 1 } );
 
 #################### DOES ORDERING WORK?
 
-my $sqlt_object = $schema->{sqlt};
-
-my @keys = keys %{ $sqlt_object->{views} };
-
-my @sqlt_sources = sort {
-    $sqlt_object->{views}->{$a}->{order}
-        cmp $sqlt_object->{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( \@expected, \@sqlt_sources,
-    "SQLT view order triumphantly matches our order." );
+  my $sqlt_object = $schema->{sqlt};
+
+  is_deeply(
+    [ map { $_->name } $sqlt_object->get_views ],
+    [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
+    /],
+    "SQLT view order triumphantly matches our order." 
+  );
 
 #################### AND WHAT ABOUT USING THE SCHEMA?
 
-lives_ok( sub { $schema->resultset($_)->next }, "Query on $_ succeeds" )
+  lives_ok( sub { $schema->resultset($_)->next }, "Query on $_ succeeds" )
     for grep {
     $schema->resultset($_)
-        ->result_source->isa('DBIx::Class::ResultSource::View')
+      ->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' );
+{
+  my $schema2
+    = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') );
+  ok( $schema2, 'Connected to ViewDepsBad schema OK' );
 
 #################### DEPLOY2
 
-warnings_exist { $schema2->deploy( { add_drop_table => 1 } ); }
-[qr/no such table: main.aba_name_artists/],
+  warnings_exist { $schema2->deploy( { add_drop_table => 1 } ) }
+    [qr/no such table: main.aba_name_artists/],
     "Deploying the bad schema produces a warning: aba_name_artists was not created.";
 
 #################### 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." );
+  my $sqlt_object2 = $schema2->{sqlt};
+
+  is_deeply(
+    [ map { $_->name } $sqlt_object2->get_views ],
+    [qw/
+      a_name_artists
+      track_number_fives
+      year_2010_cds
+      ab_name_artists
+      year_2010_cds_with_many_tracks
+      aba_name_artists_and_2010_cds_with_many_tracks
+      aba_name_artists
+    /],
+    "SQLT view order triumphantly matches our order." 
+  );
 
 #################### AND WHAT ABOUT USING THE SCHEMA2?
 
-lives_ok( sub { $schema2->resultset($_)->next }, "Query on $_ succeeds" )
+  lives_ok( sub { $schema2->resultset($_)->next }, "Query on $_ succeeds" )
     for grep {
     $schema2->resultset($_)
-        ->result_source->isa('DBIx::Class::ResultSource::View')
+      ->result_source->isa('DBIx::Class::ResultSource::View')
     } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ }
     @{ [ $schema2->sources ] };
 
-dies_ok(
-    sub {
-        $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next;
-    },
-    "Query on AbaNameArtistsAnd2010CDsWithManyTracks dies, because of incorrect deploy_depends_on in AbaNameArtists"
-);
-
-throws_ok {
-    $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next;
+  throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next }
+    qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/,
+    "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist"
+  ;
 }
-qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/,
-    "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist";
 
 done_testing;