Tighten notab/eol checks even more

[dbsrgits/DBIx-Class.git] / t / inflate / datetime_informix.t

diff --git a/t/inflate/datetime_informix.t b/t/inflate/datetime_informix.t
index af23410..8bbd524 100644 (file)
--- a/t/inflate/datetime_informix.t
+++ b/t/inflate/datetime_informix.t
@@ -1,12 +1,18 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
-use Test::Exception;
+use DBIx::Class::Optional::Dependencies ();
 use lib qw(t/lib);
 use DBICTest;
 use Scope::Guard ();
 
+plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_dt')
+. ' and ' .
+DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_informix')
+  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_dt')
+    && DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_informix');
+
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_INFORMIX_${_}" } qw/DSN USER PASS/};
 
 if (not $dsn) {
@@ -14,11 +20,6 @@ if (not $dsn) {
 Set $ENV{DBICTEST_INFORMIX_DSN} _USER and _PASS to run this test'.
 Warning: This test drops and creates a table called 'event'";
 EOF
-} else {
-  eval "use DateTime; use DateTime::Format::Strptime;";
-  if ($@) {
-    plan skip_all => 'needs DateTime and DateTime::Format::Strptime for testing';
-  }
 }
 
 my $schema;
@@ -28,7 +29,7 @@ my $schema;
     on_connect_call => [ 'datetime_setup' ],
   });
 
-  my $sg = Scope::Guard->new(\&cleanup);
+  my $sg = Scope::Guard->new(sub { cleanup($schema) } );
 
   eval { $schema->storage->dbh->do('DROP TABLE event') };
   $schema->storage->dbh->do(<<'SQL');
@@ -50,7 +51,7 @@ SQL
   my $row;
   ok( $row = $rs->create({
     id => 1,
-    starts_at => $date_only, 
+    starts_at => $date_only,
     created_on => $dt,
   }));
   ok( $row = $rs->search({ id => 1 }, { select => [qw/starts_at created_on/] })
@@ -68,7 +69,8 @@ done_testing;
 
 # clean up our mess
 sub cleanup {
-  my $dbh; 
+  my $schema = shift;
+  my $dbh;
   eval {
     $dbh = $schema->storage->dbh;
   };