X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05testapp.t;h=5862e67d906256653e93ebbc832bbb782b603f9c;hb=4c7770ddf435bacaa6eae1a8debe3dacfefeddce;hp=552ef4561fd348e0ae503fcab05bdcb74c598143;hpb=1fcd7804144856dad9148ced28e5648f28fb86d1;p=catagits%2FCatalyst-Model-DBIC-Schema.git

diff --git a/t/05testapp.t b/t/05testapp.t
index 552ef45..5862e67 100644
--- a/t/05testapp.t
+++ b/t/05testapp.t
@@ -1,65 +1,82 @@
 use strict;
 use Test::More;
 use FindBin;
-use File::Spec;
+use File::Spec::Functions qw/catfile catdir/;
 use File::Find;
+use Config;
+use DBI;
+use IPC::Open3 'open3';
 
 plan skip_all => 'Enable this optional test with $ENV{C_M_DBIC_SCHEMA_TESTAPP}'
     unless $ENV{C_M_DBIC_SCHEMA_TESTAPP};
 
-# XXX this test needs a re-write to fully test the current set of capabilities...
-
 my $test_params = [
     [ 'TestSchema', 'DBIC::Schema', '' ],
     [ 'TestSchemaDSN', 'DBIC::Schema', qw/fakedsn fakeuser fakepass/, '{ AutoCommit => 1 }' ],
-    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', 'moniker_map={ roles => "ROLE" }', 'constraint=^users\z', 'dbi:SQLite:testdb.db' ],
-    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', 'moniker_map={ roles => "ROLE" }', 'constraint=^users\z', 'dbi:SQLite:testdb.db', '', '', 'on_connect_do=["select 1", "select 2"]', 'quote_char="' ],
-    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', 'moniker_map={ roles => "ROLE" }', 'dbi:SQLite:testdb.db', 'on_connect_do=["select 1", "select 2"]', 'quote_char="' ],
+    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', q|moniker_map={ roles => 'ROLE' }|, 'constraint=^users\z', 'dbi:SQLite:testdb.db' ],
+    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', q|moniker_map={ roles => 'ROLE' }|, 'constraint=^users\z', 'dbi:SQLite:testdb.db', '', '', q|on_connect_do=['select 1', 'select 2']| ],
+    [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', q|moniker_map={ roles => 'ROLE' }|, 'dbi:SQLite:testdb.db', q|on_connect_do=['select 1', 'select 2']| ],
     [ 'TestSchemaDSN', 'DBIC::Schema', 'create=static', 'traits=Caching', 'inflect_singular=sub { $_[0] =~ /\A(.+?)(_id)?\z/; $1 }', q{moniker_map=sub { return join('', map ucfirst, split(/[\W_]+/, lc $_[0])); }}, 'dbi:SQLite:testdb.db' ],
 ];
 
 my $test_dir   = $FindBin::Bin;
-my $blib_dir   = File::Spec->catdir ($test_dir, '..', 'blib', 'lib');
-my $cat_dir    = File::Spec->catdir ($test_dir, 'TestApp');
-my $catlib_dir = File::Spec->catdir ($cat_dir, 'lib');
-my $schema_dir = File::Spec->catdir ($catlib_dir, 'TestSchemaDSN');
-my $creator    = File::Spec->catfile($cat_dir, 'script', 'testapp_create.pl');
-my $model_dir  = File::Spec->catdir ($catlib_dir, 'TestApp', 'Model');
-my $db         = File::Spec->catdir ($cat_dir, 'testdb.db');
+my $blib_dir   = catdir ($test_dir, '..', 'blib', 'lib');
+my $cat_dir    = catdir ($test_dir, 'TestApp');
+my $catlib_dir = catdir ($cat_dir, 'lib');
+my $schema_dir = catdir ($catlib_dir, 'TestSchemaDSN');
+my $creator    = catfile($cat_dir, 'script', 'testapp_create.pl');
+my $model_dir  = catdir ($catlib_dir, 'TestApp', 'Model');
+my $db         = catfile($cat_dir, 'testdb.db');
+
+my $catalyst_pl;
+
+foreach my $bin (split /(?:$Config{path_sep}|:)/, $ENV{PATH}) {
+   my $file = catfile($bin, 'catalyst.pl');
+   if (-f $file) {
+      $catalyst_pl = $file;
+      last;
+   }
+}
+
+plan skip_all => 'catalyst.pl not found' unless $catalyst_pl;
 
 chdir($test_dir);
-system("catalyst.pl TestApp");
+silent_exec("$^X $catalyst_pl TestApp");
 chdir($cat_dir);
 
 # create test db
-open my $sql, '|-', 'sqlite3', $db or die $!;
-print $sql <<'EOF';
+my $dbh = DBI->connect("dbi:SQLite:$db", '', '', {
+   RaiseError => 1, PrintError => 0
+});
+$dbh->do(<<'EOF');
 CREATE TABLE users (                       
-        id            INTEGER PRIMARY KEY, 
-        username      TEXT,                
-        password      TEXT,                
-        email_address TEXT,                
-        first_name    TEXT,                
-        last_name     TEXT,                
-        active        INTEGER              
+        id            INTEGER PRIMARY KEY,
+        username      TEXT,
+        password      TEXT,
+        email_address TEXT,
+        first_name    TEXT,
+        last_name     TEXT,
+        active        INTEGER
 );
+EOF
+$dbh->do(<<'EOF');
 CREATE TABLE roles (
         id   INTEGER PRIMARY KEY,
         role TEXT
 );
 EOF
-close $sql;
+$dbh->disconnect;
 
 foreach my $tparam (@$test_params) {
    my ($model, $helper, @args) = @$tparam;
 
    cleanup_schema();
 
-   system($^X, "-I$blib_dir", $creator, 'model', $model, $helper, $model, @args);
+   silent_exec($^X, "-I$blib_dir", $creator, 'model', $model, $helper, $model, @args);
 
-   my $model_path = File::Spec->catfile($model_dir, $model . '.pm');
+   my $model_path = catfile($model_dir, $model . '.pm');
    ok( -f $model_path, "$model_path is a file" );
-   my $compile_rv = system("$^X -I$blib_dir -I$catlib_dir -c $model_path");
+   my $compile_rv = silent_exec($^X, "-I$blib_dir", "-I$catlib_dir", "-c", $model_path);
    ok($compile_rv == 0, "perl -c $model_path");
 
    if (grep /create=static/, @args) {
@@ -84,7 +101,7 @@ foreach my $tparam (@$test_params) {
 {
    cleanup_schema();
 
-   system($^X, "-I$blib_dir", $creator, 'model',
+   silent_exec($^X, "-I$blib_dir", $creator, 'model',
       'TestSchemaDSN', 'DBIC::Schema', 'TestSchemaDSN',
       'create=static', 'use_moose=0', 'dbi:SQLite:testdb.db'
    );
@@ -98,7 +115,7 @@ foreach my $tparam (@$test_params) {
       unlike $code, qr/__PACKAGE__->meta->make_immutable;\n/, 'non use_moose=1 schema';
    }
 
-   system($^X, "-I$blib_dir", $creator, 'model',
+   silent_exec($^X, "-I$blib_dir", $creator, 'model',
       'TestSchemaDSN', 'DBIC::Schema', 'TestSchemaDSN',
       'create=static', 'dbi:SQLite:testdb.db'
    );
@@ -118,7 +135,7 @@ foreach my $tparam (@$test_params) {
 {
    cleanup_schema();
 
-   system($^X, "-I$blib_dir", $creator, 'model',
+   silent_exec($^X, "-I$blib_dir", $creator, 'model',
       'TestSchemaDSN', 'DBIC::Schema', 'TestSchemaDSN',
       'create=static', 'dbi:SQLite:testdb.db'
    );
@@ -135,7 +152,7 @@ foreach my $tparam (@$test_params) {
    print $fh "hlagh\n";
    close $fh;
 
-   system($^X, "-I$blib_dir", $creator, 'model',
+   silent_exec($^X, "-I$blib_dir", $creator, 'model',
       'TestSchemaDSN', 'DBIC::Schema', 'TestSchemaDSN',
       'create=static', 'dbi:SQLite:testdb.db'
    );
@@ -154,13 +171,13 @@ done_testing;
 
 sub rm_rf {
     my $name = $File::Find::name;
-    if(-d $name) { rmdir $name or die "Cannot rmdir $name: $!" }
+    if(-d $name) { rmdir $name or warn "Cannot rmdir $name: $!" }
     else { unlink $name or die "Cannot unlink $name: $!" }
 }
 
 sub cleanup_schema {
    return unless -d $schema_dir;
-   finddepth(\&rm_rf, $schema_dir);
+   finddepth({ wanted => \&rm_rf, no_chdir => 1 }, $schema_dir);
    unlink "${schema_dir}.pm";
 }
 
@@ -175,15 +192,39 @@ sub code_for {
 }
 
 sub result_files {
-   my $glob = File::Spec->catfile($schema_dir, 'Result', '*');
+   my $result_dir = catfile($schema_dir, 'Result');
+
+   my @results;
+
+   opendir my $dir, $result_dir
+      or die "Could not open $result_dir: $!";
+
+   while (my $file = readdir $dir) {
+      next unless $file =~ /\.pm\z/;
+
+      push @results, catfile($result_dir, $file);
+   }
+
+   closedir $dir;
+
+   return @results;
+}
+
+sub silent_exec {
+   local *NULL;
+   open NULL, '+<', File::Spec->devnull;
+
+   my $pid = open3('<&NULL', '>&NULL', '>&NULL', @_);
+
+   waitpid $pid, 0;
 
-   return glob($glob);
+   return $?;
 }
 
 END {
     if ($ENV{C_M_DBIC_SCHEMA_TESTAPP}) {
         chdir($test_dir);
-        finddepth(\&rm_rf, $cat_dir);
+        finddepth({ wanted => \&rm_rf, no_chdir => 1 }, $cat_dir);
     }
 }