Import the latest ::Optional::Dependencies from DBIC

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 10_04db2_common.t

diff --git a/t/10_04db2_common.t b/t/10_04db2_common.t
index 34e176a..0533dc0 100644 (file)
--- a/t/10_04db2_common.t
+++ b/t/10_04db2_common.t
@@ -1,10 +1,12 @@
+use DBIx::Class::Schema::Loader::Optional::Dependencies
+    -skip_all_without => 'test_rdbms_db2';
+
 use strict;
 use warnings;
 use Test::More;
 use Test::Exception;
 use Try::Tiny;
 use File::Path 'rmtree';
-use DBIx::Class::Optional::Dependencies;
 use DBIx::Class::Schema::Loader 'make_schema_at';
 
 use lib qw(t/lib);
@@ -18,12 +20,6 @@ my $dsn      = $ENV{DBICTEST_DB2_DSN} || '';
 my $user     = $ENV{DBICTEST_DB2_USER} || '';
 my $password = $ENV{DBICTEST_DB2_PASS} || '';
 
-plan skip_all => 'You need to set the DBICTEST_DB2_DSN, _USER, and _PASS environment variables'
-    unless ($dsn && $user);
-
-plan skip_all => 'You need to install ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_db2')
-    unless DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_db2');
-
 my ($schema, $schemas_created); # for cleanup in END for extra tests
 
 my $srv_ver = do {
@@ -41,7 +37,7 @@ my $extra_graphics_data_types = {
     'dbclob'           => { data_type => 'dbclob' },
 };
 
-my $tester = dbixcsl_common_tests->new(
+dbixcsl_common_tests->new(
     vendor         => 'DB2',
     auto_inc_pk    => 'INTEGER GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
     dsn            => $dsn,
@@ -356,9 +352,7 @@ EOF
 
         },
     },
-);
-
-$tester->run_tests();
+)->run_tests();
 
 END {
     if (not $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) {