test cleanups

[dbsrgits/DBIx-Class.git] / t / 99dbic_sqlt_parser.t

diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index c146649..313d2a6 100644 (file)
--- a/t/99dbic_sqlt_parser.t
+++ b/t/99dbic_sqlt_parser.t
@@ -2,6 +2,7 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 
@@ -18,7 +19,7 @@ my $schema = DBICTest->init_schema();
 # YearXXXXCDs and NoViewDefinition are views
 #
 my @sources = grep
-  { $_ !~ /^ (?: Dummy | CustomSql | Year\d{4}CDs | NoViewDefinition ) $/x }
+  { $_ !~ /^ (?: Dummy | CustomSql | Year\d{4}CDs ) $/x }
   $schema->sources
 ;
 
@@ -63,28 +64,24 @@ my @sources = grep
 }
 
 { 
-    #my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { } } });
-       my $sqlt_schema = create_schema({ schema => $schema });
-    
-    my @views = $sqlt_schema->get_views;
-
-    # the following views are skipped:
-    # Year1999CDs is virtual
-    # NoViewDefinition has no view_definition
-    is(scalar @views, 1, "number of views ok");
-
-    foreach my $view (@views) {
-        ok($view->is_valid, "view " . $view->name . " is valid");
+    {
+        package # hide from PAUSE
+            DBICTest::Schema::NoViewDefinition;
+
+        use base qw/DBICTest::BaseResult/;
+
+        __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+        __PACKAGE__->table('noviewdefinition');
+
+        1;
     }
 
-    my @expected_view_names = (qw/ year2000cds /);
-    my @view_names = sort map { $_->name } @views;
+    my $schema_invalid_view = $schema->clone;
+    $schema_invalid_view->register_class('NoViewDefinition', 'DBICTest::Schema::NoViewDefinition');
 
-    is_deeply( @view_names, @expected_view_names, "all expected views included int SQL::Translator schema" );
-    
-    #use Data::Dumper::Concise;
-    #warn Dumper(@view_names);
-    #is($view->error, undef, 'view with a view_definition is skipped.');
+    throws_ok { create_schema({ schema => $schema_invalid_view }) }
+        qr/view noviewdefinition is missing a view_definition/,
+        'parser detects views with a view_definition';
 }
 
 done_testing;
@@ -105,7 +102,7 @@ sub create_schema {
        my $sqlt = SQL::Translator->new( $sqltargs );
 
        $sqlt->parser('SQL::Translator::Parser::DBIx::Class');
-       return $sqlt->translate({ data => $schema }) or die $sqlt->error;
+       return $sqlt->translate({ data => $schema }) || die $sqlt->error;
 }
 
 sub get_table {